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>

diff --git a/MdeModulePkg/Application/BootManagerMenuApp/BootManagerMenu.c b/MdeModulePkg/Application/BootManagerMenuApp/BootManagerMenu.c
index a25f2ca298c758ee6e7e145b79ebe2cd25ed17b3..6a6b19ad09d8040408da71e95acfea0744399b55 100644 (file)
--- a/MdeModulePkg/Application/BootManagerMenuApp/BootManagerMenu.c
+++ b/MdeModulePkg/Application/BootManagerMenuApp/BootManagerMenu.c
@@ -1,7 +1,7 @@
 /** @file\r
   The application to show the Boot Manager Menu.\r
 \r
 /** @file\r
   The application to show the Boot Manager Menu.\r
 \r

-Copyright (c) 2011 - 2017, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2011 - 2018, Intel Corporation. All rights reserved.<BR>\r

 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r


@@ -91,19 +91,19 @@ UINTN
 GetLineWidth (\r
   IN EFI_STRING_ID       StringId\r
   )\r
 GetLineWidth (\r
   IN EFI_STRING_ID       StringId\r
   )\r

-{  \r
+{\r

   UINTN        Index;\r
   UINTN        IncrementValue;\r
   EFI_STRING   String;\r
   UINTN        LineWidth;\r
   UINTN        Index;\r
   UINTN        IncrementValue;\r
   EFI_STRING   String;\r
   UINTN        LineWidth;\r

-  \r
+\r

   LineWidth = 0;\r
   LineWidth = 0;\r

-  String = HiiGetString (gStringPackHandle, StringId, NULL); \r
-  \r
+  String = HiiGetString (gStringPackHandle, StringId, NULL);\r
+\r

   if (String != NULL) {\r
     Index           = 0;\r
     IncrementValue  = 1;\r
   if (String != NULL) {\r
     Index           = 0;\r
     IncrementValue  = 1;\r

-    \r
+\r

     do {\r
       //\r
       // Advance to the null-terminator or to the first width directive\r
     do {\r
       //\r
       // Advance to the null-terminator or to the first width directive\r


@@ -113,7 +113,7 @@ GetLineWidth (
            Index++, LineWidth = LineWidth + IncrementValue\r
           )\r
         ;\r
            Index++, LineWidth = LineWidth + IncrementValue\r
           )\r
         ;\r

-    \r
+\r

       //\r
       // We hit the null-terminator, we now have a count\r
       //\r
       //\r
       // We hit the null-terminator, we now have a count\r
       //\r


@@ -137,11 +137,11 @@ GetLineWidth (
         Index++;\r
         IncrementValue = 2;\r
       }\r
         Index++;\r
         IncrementValue = 2;\r
       }\r

-    } while (String[Index] != 0);   \r
+    } while (String[Index] != 0);\r

     FreePool (String);\r
   }\r
     FreePool (String);\r
   }\r

-  \r
-  return LineWidth;  \r
+\r
+  return LineWidth;\r

 }\r
 \r
 /**\r
 }\r
 \r
 /**\r


@@ -150,10 +150,10 @@ GetLineWidth (
   @param  BootMenuData            The boot menu data to be processed.\r
 \r
   @return EFI_SUCCESS             calculate boot menu information successful.\r
   @param  BootMenuData            The boot menu data to be processed.\r
 \r
   @return EFI_SUCCESS             calculate boot menu information successful.\r

-  @retval EFI_INVALID_PARAMETER   Input parameter is invalid   \r
+  @retval EFI_INVALID_PARAMETER   Input parameter is invalid\r

 \r
 **/\r
 \r
 **/\r

-EFI_STATUS \r
+EFI_STATUS\r

 InitializeBootMenuScreen (\r
   IN OUT  BOOT_MENU_POPUP_DATA  *BootMenuData\r
   )\r
 InitializeBootMenuScreen (\r
   IN OUT  BOOT_MENU_POPUP_DATA  *BootMenuData\r
   )\r


@@ -172,21 +172,21 @@ InitializeBootMenuScreen (
   //\r
   // Get maximum string width\r
   //\r
   //\r
   // Get maximum string width\r
   //\r

-  MaxStrWidth = 0;  \r
-  for (Index = 0; Index < TITLE_TOKEN_COUNT; Index++) {    \r
+  MaxStrWidth = 0;\r
+  for (Index = 0; Index < TITLE_TOKEN_COUNT; Index++) {\r

     StrWidth = GetLineWidth (BootMenuData->TitleToken[Index]);\r
     MaxStrWidth = MaxStrWidth > StrWidth ? MaxStrWidth : StrWidth;\r
   }\r
     StrWidth = GetLineWidth (BootMenuData->TitleToken[Index]);\r
     MaxStrWidth = MaxStrWidth > StrWidth ? MaxStrWidth : StrWidth;\r
   }\r

-   \r
+\r

   for (Index = 0; Index < BootMenuData->ItemCount; Index++) {\r
     StrWidth = GetLineWidth (BootMenuData->PtrTokens[Index]);\r
   for (Index = 0; Index < BootMenuData->ItemCount; Index++) {\r
     StrWidth = GetLineWidth (BootMenuData->PtrTokens[Index]);\r

-    MaxStrWidth = MaxStrWidth > StrWidth ? MaxStrWidth : StrWidth; \r
-  } \r
-  \r
-  for (Index = 0; Index < HELP_TOKEN_COUNT; Index++) {    \r
+    MaxStrWidth = MaxStrWidth > StrWidth ? MaxStrWidth : StrWidth;\r
+  }\r
+\r
+  for (Index = 0; Index < HELP_TOKEN_COUNT; Index++) {\r

     StrWidth = GetLineWidth (BootMenuData->HelpToken[Index]);\r
     MaxStrWidth = MaxStrWidth > StrWidth ? MaxStrWidth : StrWidth;\r
     StrWidth = GetLineWidth (BootMenuData->HelpToken[Index]);\r
     MaxStrWidth = MaxStrWidth > StrWidth ? MaxStrWidth : StrWidth;\r

-  }  \r
+  }\r

   //\r
   // query current row and column to calculate boot menu location\r
   //\r
   //\r
   // query current row and column to calculate boot menu location\r
   //\r


@@ -195,10 +195,10 @@ InitializeBootMenuScreen (
                  gST->ConOut->Mode->Mode,\r
                  &Column,\r
                  &Row\r
                  gST->ConOut->Mode->Mode,\r
                  &Column,\r
                  &Row\r

-                 ); \r
-                 \r
-  MaxPrintRows = Row - 6;    \r
-  UnSelectableItmes = TITLE_TOKEN_COUNT + 2 + HELP_TOKEN_COUNT + 2;           \r
+                 );\r
+\r
+  MaxPrintRows = Row - 6;\r
+  UnSelectableItmes = TITLE_TOKEN_COUNT + 2 + HELP_TOKEN_COUNT + 2;\r

   BootMenuData->MenuScreen.Width = MaxStrWidth + 8;\r
   if (BootMenuData->ItemCount + UnSelectableItmes > MaxPrintRows) {\r
     BootMenuData->MenuScreen.Height = MaxPrintRows;\r
   BootMenuData->MenuScreen.Width = MaxStrWidth + 8;\r
   if (BootMenuData->ItemCount + UnSelectableItmes > MaxPrintRows) {\r
     BootMenuData->MenuScreen.Height = MaxPrintRows;\r


@@ -211,10 +211,10 @@ InitializeBootMenuScreen (
     BootMenuData->ScrollBarControl.HasScrollBar = FALSE;\r
     BootMenuData->ScrollBarControl.ItemCountPerScreen = BootMenuData->ItemCount;\r
     BootMenuData->ScrollBarControl.FirstItem = 0;\r
     BootMenuData->ScrollBarControl.HasScrollBar = FALSE;\r
     BootMenuData->ScrollBarControl.ItemCountPerScreen = BootMenuData->ItemCount;\r
     BootMenuData->ScrollBarControl.FirstItem = 0;\r

-    BootMenuData->ScrollBarControl.LastItem = BootMenuData->ItemCount - 1;    \r
+    BootMenuData->ScrollBarControl.LastItem = BootMenuData->ItemCount - 1;\r

   }\r
   }\r

-  BootMenuData->MenuScreen.StartCol = (Column -  BootMenuData->MenuScreen.Width) / 2;              \r
-  BootMenuData->MenuScreen.StartRow = (Row -  BootMenuData->MenuScreen.Height) / 2;  \r
+  BootMenuData->MenuScreen.StartCol = (Column -  BootMenuData->MenuScreen.Width) / 2;\r
+  BootMenuData->MenuScreen.StartRow = (Row -  BootMenuData->MenuScreen.Height) / 2;\r

 \r
   return EFI_SUCCESS;\r
 }\r
 \r
   return EFI_SUCCESS;\r
 }\r


@@ -222,7 +222,7 @@ InitializeBootMenuScreen (
   This function uses check boot option is wheher setup application or no\r
 \r
   @param   BootOption   Pointer to EFI_BOOT_MANAGER_LOAD_OPTION array.\r
   This function uses check boot option is wheher setup application or no\r
 \r
   @param   BootOption   Pointer to EFI_BOOT_MANAGER_LOAD_OPTION array.\r

-  \r
+\r

   @retval  TRUE         This boot option is setup application.\r
   @retval  FALSE        This boot options isn't setup application\r
 \r
   @retval  TRUE         This boot option is setup application.\r
   @retval  FALSE        This boot options isn't setup application\r
 \r


@@ -291,9 +291,9 @@ IgnoreBootOption (
   @param   BootOption             Pointer to EFI_BOOT_MANAGER_LOAD_OPTION array.\r
   @param   BootOptionCount        Number of boot option.\r
   @param   BootMenuData           The Input BootMenuData to be initialized.\r
   @param   BootOption             Pointer to EFI_BOOT_MANAGER_LOAD_OPTION array.\r
   @param   BootOptionCount        Number of boot option.\r
   @param   BootMenuData           The Input BootMenuData to be initialized.\r

-  \r
+\r

   @retval  EFI_SUCCESS            Initialize boot menu data successful.\r
   @retval  EFI_SUCCESS            Initialize boot menu data successful.\r

-  @retval  EFI_INVALID_PARAMETER  Input parameter is invalid.   \r
+  @retval  EFI_INVALID_PARAMETER  Input parameter is invalid.\r

 \r
 **/\r
 EFI_STATUS\r
 \r
 **/\r
 EFI_STATUS\r


@@ -305,7 +305,7 @@ InitializeBootMenuData (
 {\r
   UINTN                         Index;\r
   UINTN                         StrIndex;\r
 {\r
   UINTN                         Index;\r
   UINTN                         StrIndex;\r

-      \r
+\r

   if (BootOption == NULL || BootMenuData == NULL) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
   if (BootOption == NULL || BootMenuData == NULL) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r


@@ -324,21 +324,21 @@ InitializeBootMenuData (
 \r
     ASSERT (BootOption[Index].Description != NULL);\r
     BootMenuData->PtrTokens[StrIndex++] = HiiSetString (\r
 \r
     ASSERT (BootOption[Index].Description != NULL);\r
     BootMenuData->PtrTokens[StrIndex++] = HiiSetString (\r

-                                            gStringPackHandle, \r
+                                            gStringPackHandle,\r

                                             0,\r
                                             BootOption[Index].Description,\r
                                             NULL\r
                                             );\r
   }\r
 \r
                                             0,\r
                                             BootOption[Index].Description,\r
                                             NULL\r
                                             );\r
   }\r
 \r

-  BootMenuData->ItemCount           = StrIndex;   \r
+  BootMenuData->ItemCount           = StrIndex;\r

   BootMenuData->HelpToken[0] = STRING_TOKEN (STR_BOOT_POPUP_MENU_HELP1_STRING);\r
   BootMenuData->HelpToken[1] = STRING_TOKEN (STR_BOOT_POPUP_MENU_HELP2_STRING);\r
   BootMenuData->HelpToken[2] = STRING_TOKEN (STR_BOOT_POPUP_MENU_HELP3_STRING);\r
   InitializeBootMenuScreen (BootMenuData);\r
   BootMenuData->SelectItem = 0;\r
   return EFI_SUCCESS;\r
   BootMenuData->HelpToken[0] = STRING_TOKEN (STR_BOOT_POPUP_MENU_HELP1_STRING);\r
   BootMenuData->HelpToken[1] = STRING_TOKEN (STR_BOOT_POPUP_MENU_HELP2_STRING);\r
   BootMenuData->HelpToken[2] = STRING_TOKEN (STR_BOOT_POPUP_MENU_HELP3_STRING);\r
   InitializeBootMenuScreen (BootMenuData);\r
   BootMenuData->SelectItem = 0;\r
   return EFI_SUCCESS;\r

-}    \r
+}\r

 \r
 /**\r
   This function uses input select item to highlight selected item\r
 \r
 /**\r
   This function uses input select item to highlight selected item\r


@@ -347,9 +347,9 @@ InitializeBootMenuData (
   @param  WantSelectItem          The user wants to select item.\r
   @param  BootMenuData            The boot menu data to be processed\r
 \r
   @param  WantSelectItem          The user wants to select item.\r
   @param  BootMenuData            The boot menu data to be processed\r
 \r

-  @return EFI_SUCCESS             Highlight selected item and update current selected \r
-                                  item successful \r
-  @retval EFI_INVALID_PARAMETER   Input parameter is invalid   \r
+  @return EFI_SUCCESS             Highlight selected item and update current selected\r
+                                  item successful\r
+  @retval EFI_INVALID_PARAMETER   Input parameter is invalid\r

 **/\r
 EFI_STATUS\r
 BootMenuSelectItem (\r
 **/\r
 EFI_STATUS\r
 BootMenuSelectItem (\r


@@ -359,7 +359,7 @@ BootMenuSelectItem (
 {\r
   INT32                 SavedAttribute;\r
   EFI_STRING            String;\r
 {\r
   INT32                 SavedAttribute;\r
   EFI_STRING            String;\r

-  UINTN                 StartCol;  \r
+  UINTN                 StartCol;\r

   UINTN                 StartRow;\r
   UINTN                 PrintCol;\r
   UINTN                 PrintRow;\r
   UINTN                 StartRow;\r
   UINTN                 PrintCol;\r
   UINTN                 PrintRow;\r


@@ -370,7 +370,7 @@ BootMenuSelectItem (
   UINTN                 ItemCountPerScreen;\r
   UINTN                 Index;\r
   BOOLEAN               RePaintItems;\r
   UINTN                 ItemCountPerScreen;\r
   UINTN                 Index;\r
   BOOLEAN               RePaintItems;\r

-  \r
+\r

   if (BootMenuData == NULL || WantSelectItem >= BootMenuData->ItemCount) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
   if (BootMenuData == NULL || WantSelectItem >= BootMenuData->ItemCount) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r


@@ -381,20 +381,20 @@ BootMenuSelectItem (
   StartRow = BootMenuData->MenuScreen.StartRow;\r
   //\r
   // print selectable items again and adjust scroll bar if need\r
   StartRow = BootMenuData->MenuScreen.StartRow;\r
   //\r
   // print selectable items again and adjust scroll bar if need\r

-  //         \r
+  //\r

   if (BootMenuData->ScrollBarControl.HasScrollBar &&\r
       (WantSelectItem < BootMenuData->ScrollBarControl.FirstItem ||\r
       WantSelectItem > BootMenuData->ScrollBarControl.LastItem ||\r
   if (BootMenuData->ScrollBarControl.HasScrollBar &&\r
       (WantSelectItem < BootMenuData->ScrollBarControl.FirstItem ||\r
       WantSelectItem > BootMenuData->ScrollBarControl.LastItem ||\r

-      WantSelectItem == BootMenuData->SelectItem)) {          \r
+      WantSelectItem == BootMenuData->SelectItem)) {\r

     ItemCountPerScreen   = BootMenuData->ScrollBarControl.ItemCountPerScreen;\r
     //\r
     // Set first item and last item\r
     ItemCountPerScreen   = BootMenuData->ScrollBarControl.ItemCountPerScreen;\r
     //\r
     // Set first item and last item\r

-    //     \r
+    //\r

     if (WantSelectItem < BootMenuData->ScrollBarControl.FirstItem) {\r
       BootMenuData->ScrollBarControl.FirstItem = WantSelectItem;\r
     if (WantSelectItem < BootMenuData->ScrollBarControl.FirstItem) {\r
       BootMenuData->ScrollBarControl.FirstItem = WantSelectItem;\r

-      BootMenuData->ScrollBarControl.LastItem = WantSelectItem + ItemCountPerScreen - 1;  \r
+      BootMenuData->ScrollBarControl.LastItem = WantSelectItem + ItemCountPerScreen - 1;\r

     } else if (WantSelectItem > BootMenuData->ScrollBarControl.LastItem) {\r
     } else if (WantSelectItem > BootMenuData->ScrollBarControl.LastItem) {\r

-      BootMenuData->ScrollBarControl.FirstItem = WantSelectItem - ItemCountPerScreen + 1; \r
+      BootMenuData->ScrollBarControl.FirstItem = WantSelectItem - ItemCountPerScreen + 1;\r

       BootMenuData->ScrollBarControl.LastItem = WantSelectItem;\r
     }\r
     gST->ConOut->SetAttribute (gST->ConOut, EFI_WHITE | EFI_BACKGROUND_BLUE);\r
       BootMenuData->ScrollBarControl.LastItem = WantSelectItem;\r
     }\r
     gST->ConOut->SetAttribute (gST->ConOut, EFI_WHITE | EFI_BACKGROUND_BLUE);\r


@@ -407,7 +407,7 @@ BootMenuSelectItem (
         TopShadeNum++;\r
       }\r
       PrintCol = StartCol  + BootMenuData->MenuScreen.Width - 2;\r
         TopShadeNum++;\r
       }\r
       PrintCol = StartCol  + BootMenuData->MenuScreen.Width - 2;\r

-      PrintRow = StartRow + TITLE_TOKEN_COUNT + 2;  \r
+      PrintRow = StartRow + TITLE_TOKEN_COUNT + 2;\r

       for (Index = 0; Index < TopShadeNum; Index++, PrintRow++) {\r
         PrintCharAt (PrintCol, PrintRow, BLOCKELEMENT_LIGHT_SHADE);\r
       }\r
       for (Index = 0; Index < TopShadeNum; Index++, PrintRow++) {\r
         PrintCharAt (PrintCol, PrintRow, BLOCKELEMENT_LIGHT_SHADE);\r
       }\r


@@ -419,65 +419,65 @@ BootMenuSelectItem (
         LowShadeNum++;\r
       }\r
       PrintCol = StartCol  + BootMenuData->MenuScreen.Width - 2;\r
         LowShadeNum++;\r
       }\r
       PrintCol = StartCol  + BootMenuData->MenuScreen.Width - 2;\r

-      PrintRow = StartRow + TITLE_TOKEN_COUNT + 2 + ItemCountPerScreen - LowShadeNum;  \r
+      PrintRow = StartRow + TITLE_TOKEN_COUNT + 2 + ItemCountPerScreen - LowShadeNum;\r

       for (Index = 0; Index < LowShadeNum; Index++, PrintRow++) {\r
         PrintCharAt (PrintCol, PrintRow, BLOCKELEMENT_LIGHT_SHADE);\r
       for (Index = 0; Index < LowShadeNum; Index++, PrintRow++) {\r
         PrintCharAt (PrintCol, PrintRow, BLOCKELEMENT_LIGHT_SHADE);\r

-      } \r
+      }\r

     }\r
     PrintCol = StartCol  + BootMenuData->MenuScreen.Width - 2;\r
     }\r
     PrintCol = StartCol  + BootMenuData->MenuScreen.Width - 2;\r

-    PrintRow = StartRow + TITLE_TOKEN_COUNT + 2 + TopShadeNum;  \r
+    PrintRow = StartRow + TITLE_TOKEN_COUNT + 2 + TopShadeNum;\r

     for (Index = TopShadeNum; Index < ItemCountPerScreen - LowShadeNum; Index++, PrintRow++) {\r
       PrintCharAt (PrintCol, PrintRow, BLOCKELEMENT_FULL_BLOCK);\r
     for (Index = TopShadeNum; Index < ItemCountPerScreen - LowShadeNum; Index++, PrintRow++) {\r
       PrintCharAt (PrintCol, PrintRow, BLOCKELEMENT_FULL_BLOCK);\r

-    }      \r
+    }\r

 \r
 \r
     //\r
     // Clear selectable items first\r
     //\r
     PrintCol = StartCol  + 1;\r
 \r
 \r
     //\r
     // Clear selectable items first\r
     //\r
     PrintCol = StartCol  + 1;\r

-    PrintRow = StartRow + TITLE_TOKEN_COUNT + 2;  \r
+    PrintRow = StartRow + TITLE_TOKEN_COUNT + 2;\r

     String = AllocateZeroPool ((BootMenuData->MenuScreen.Width - 2) * sizeof (CHAR16));\r
     ASSERT (String != NULL);\r
     for (Index = 0; Index < BootMenuData->MenuScreen.Width - 3; Index++) {\r
       String[Index] = 0x20;\r
     String = AllocateZeroPool ((BootMenuData->MenuScreen.Width - 2) * sizeof (CHAR16));\r
     ASSERT (String != NULL);\r
     for (Index = 0; Index < BootMenuData->MenuScreen.Width - 3; Index++) {\r
       String[Index] = 0x20;\r

-    }      \r
-    for (Index = 0; Index < ItemCountPerScreen; Index++) {        \r
-      PrintStringAt (PrintCol, PrintRow + Index, String); \r
+    }\r
+    for (Index = 0; Index < ItemCountPerScreen; Index++) {\r
+      PrintStringAt (PrintCol, PrintRow + Index, String);\r

     }\r
     FreePool (String);\r
     //\r
     }\r
     FreePool (String);\r
     //\r

-    // print selectable items  \r
+    // print selectable items\r

     //\r
     for (Index = 0; Index < ItemCountPerScreen; Index++, PrintRow++) {\r
       String = HiiGetString (gStringPackHandle, BootMenuData->PtrTokens[Index + FirstItem], NULL);\r
       PrintStringAt (PrintCol, PrintRow, String);\r
     //\r
     for (Index = 0; Index < ItemCountPerScreen; Index++, PrintRow++) {\r
       String = HiiGetString (gStringPackHandle, BootMenuData->PtrTokens[Index + FirstItem], NULL);\r
       PrintStringAt (PrintCol, PrintRow, String);\r

-      FreePool (String); \r
+      FreePool (String);\r

     }\r
     RePaintItems = TRUE;\r
   }\r
     }\r
     RePaintItems = TRUE;\r
   }\r

-  \r
+\r

   //\r
   //\r

-  // Print want to select item \r
+  // Print want to select item\r

   //\r
   FirstItem = BootMenuData->ScrollBarControl.FirstItem;\r
   gST->ConOut->SetAttribute (gST->ConOut, EFI_WHITE | EFI_BACKGROUND_BLACK);\r
   String = HiiGetString (gStringPackHandle, BootMenuData->PtrTokens[WantSelectItem], NULL);\r
   //\r
   FirstItem = BootMenuData->ScrollBarControl.FirstItem;\r
   gST->ConOut->SetAttribute (gST->ConOut, EFI_WHITE | EFI_BACKGROUND_BLACK);\r
   String = HiiGetString (gStringPackHandle, BootMenuData->PtrTokens[WantSelectItem], NULL);\r

-  PrintCol = StartCol  + 1;  \r
-  PrintRow = StartRow + TITLE_TOKEN_COUNT + 2 + WantSelectItem - FirstItem;  \r
+  PrintCol = StartCol  + 1;\r
+  PrintRow = StartRow + TITLE_TOKEN_COUNT + 2 + WantSelectItem - FirstItem;\r

   PrintStringAt (PrintCol, PrintRow, String);\r
   FreePool (String);\r
   PrintStringAt (PrintCol, PrintRow, String);\r
   FreePool (String);\r

-  \r
+\r

   //\r
   //\r

-  // if Want Select and selected item isn't the same and doesn't re-draw selectable \r
+  // if Want Select and selected item isn't the same and doesn't re-draw selectable\r

   // items, clear select item\r
   //\r
   if (WantSelectItem != BootMenuData->SelectItem && !RePaintItems) {\r
     gST->ConOut->SetAttribute (gST->ConOut, EFI_WHITE | EFI_BACKGROUND_BLUE);\r
     String = HiiGetString (gStringPackHandle, BootMenuData->PtrTokens[BootMenuData->SelectItem], NULL);\r
   // items, clear select item\r
   //\r
   if (WantSelectItem != BootMenuData->SelectItem && !RePaintItems) {\r
     gST->ConOut->SetAttribute (gST->ConOut, EFI_WHITE | EFI_BACKGROUND_BLUE);\r
     String = HiiGetString (gStringPackHandle, BootMenuData->PtrTokens[BootMenuData->SelectItem], NULL);\r

-    PrintCol = StartCol  + 1;  \r
-    PrintRow = StartRow + 3 + BootMenuData->SelectItem - FirstItem;  \r
+    PrintCol = StartCol  + 1;\r
+    PrintRow = StartRow + 3 + BootMenuData->SelectItem - FirstItem;\r

     PrintStringAt (PrintCol, PrintRow, String);\r
     PrintStringAt (PrintCol, PrintRow, String);\r

-    FreePool (String);    \r
+    FreePool (String);\r

   }\r
 \r
   gST->ConOut->SetAttribute (gST->ConOut, SavedAttribute);\r
   }\r
 \r
   gST->ConOut->SetAttribute (gST->ConOut, SavedAttribute);\r


@@ -489,28 +489,28 @@ BootMenuSelectItem (
   This function uses to draw boot popup menu\r
 \r
   @param   BootMenuData           The Input BootMenuData to be processed.\r
   This function uses to draw boot popup menu\r
 \r
   @param   BootMenuData           The Input BootMenuData to be processed.\r

-  \r
+\r

   @retval  EFI_SUCCESS            Draw boot popup menu successful.\r
 \r
 **/\r
   @retval  EFI_SUCCESS            Draw boot popup menu successful.\r
 \r
 **/\r

-EFI_STATUS \r
+EFI_STATUS\r

 DrawBootPopupMenu (\r
   IN  BOOT_MENU_POPUP_DATA  *BootMenuData\r
   )\r
 {\r
   EFI_STRING            String;\r
   UINTN                 Index;\r
 DrawBootPopupMenu (\r
   IN  BOOT_MENU_POPUP_DATA  *BootMenuData\r
   )\r
 {\r
   EFI_STRING            String;\r
   UINTN                 Index;\r

-  UINTN                 Width;  \r
+  UINTN                 Width;\r

   UINTN                 StartCol;\r
   UINTN                 StartRow;\r
   UINTN                 PrintRow;\r
   UINTN                 PrintCol;\r
   UINTN                 LineWidth;\r
   UINTN                 StartCol;\r
   UINTN                 StartRow;\r
   UINTN                 PrintRow;\r
   UINTN                 PrintCol;\r
   UINTN                 LineWidth;\r

-  INT32                 SavedAttribute; \r
-  UINTN                 ItemCountPerScreen;  \r
+  INT32                 SavedAttribute;\r
+  UINTN                 ItemCountPerScreen;\r

 \r
   gST->ConOut->ClearScreen (gST->ConOut);\r
 \r
   gST->ConOut->ClearScreen (gST->ConOut);\r

-  \r
+\r

   SavedAttribute = gST->ConOut->Mode->Attribute;\r
   gST->ConOut->SetAttribute (gST->ConOut, EFI_WHITE | EFI_BACKGROUND_BLUE);\r
   Width    = BootMenuData->MenuScreen.Width;\r
   SavedAttribute = gST->ConOut->Mode->Attribute;\r
   gST->ConOut->SetAttribute (gST->ConOut, EFI_WHITE | EFI_BACKGROUND_BLUE);\r
   Width    = BootMenuData->MenuScreen.Width;\r


@@ -518,17 +518,17 @@ DrawBootPopupMenu (
   StartRow = BootMenuData->MenuScreen.StartRow;\r
   ItemCountPerScreen = BootMenuData->ScrollBarControl.ItemCountPerScreen;\r
   PrintRow = StartRow;\r
   StartRow = BootMenuData->MenuScreen.StartRow;\r
   ItemCountPerScreen = BootMenuData->ScrollBarControl.ItemCountPerScreen;\r
   PrintRow = StartRow;\r

- \r
+\r

   gST->ConOut->EnableCursor (gST->ConOut, FALSE);\r
   //\r
   // Draw Boot popup menu screen\r
   //\r
   PrintCharAt (StartCol, PrintRow, BOXDRAW_DOWN_RIGHT);\r
   for (Index = 1; Index < Width - 1; Index++) {\r
   gST->ConOut->EnableCursor (gST->ConOut, FALSE);\r
   //\r
   // Draw Boot popup menu screen\r
   //\r
   PrintCharAt (StartCol, PrintRow, BOXDRAW_DOWN_RIGHT);\r
   for (Index = 1; Index < Width - 1; Index++) {\r

-    PrintCharAt (StartCol + Index, PrintRow, BOXDRAW_HORIZONTAL); \r
+    PrintCharAt (StartCol + Index, PrintRow, BOXDRAW_HORIZONTAL);\r

   }\r
   PrintCharAt (StartCol + Width - 1, PrintRow, BOXDRAW_DOWN_LEFT);\r
   }\r
   PrintCharAt (StartCol + Width - 1, PrintRow, BOXDRAW_DOWN_LEFT);\r

-  \r
+\r

   //\r
   // Draw the screen for title\r
   //\r
   //\r
   // Draw the screen for title\r
   //\r


@@ -540,18 +540,18 @@ DrawBootPopupMenu (
 \r
   for (Index = 0; Index < TITLE_TOKEN_COUNT; Index++) {\r
     PrintRow++;\r
 \r
   for (Index = 0; Index < TITLE_TOKEN_COUNT; Index++) {\r
     PrintRow++;\r

-    PrintCharAt (StartCol, PrintRow, BOXDRAW_VERTICAL);  \r
+    PrintCharAt (StartCol, PrintRow, BOXDRAW_VERTICAL);\r

     PrintStringAt (StartCol + 1, PrintRow, String);\r
     PrintCharAt (StartCol + Width - 1, PrintRow, BOXDRAW_VERTICAL);\r
   }\r
     PrintStringAt (StartCol + 1, PrintRow, String);\r
     PrintCharAt (StartCol + Width - 1, PrintRow, BOXDRAW_VERTICAL);\r
   }\r

-  \r
+\r

   PrintRow++;\r
   PrintCharAt (StartCol, PrintRow, BOXDRAW_VERTICAL_RIGHT);\r
   for (Index = 1; Index < Width - 1; Index++) {\r
   PrintRow++;\r
   PrintCharAt (StartCol, PrintRow, BOXDRAW_VERTICAL_RIGHT);\r
   for (Index = 1; Index < Width - 1; Index++) {\r

-    PrintCharAt (StartCol + Index, PrintRow, BOXDRAW_HORIZONTAL); \r
+    PrintCharAt (StartCol + Index, PrintRow, BOXDRAW_HORIZONTAL);\r

   }\r
   }\r

-  PrintCharAt (StartCol + Width - 1, PrintRow, BOXDRAW_VERTICAL_LEFT);  \r
-  \r
+  PrintCharAt (StartCol + Width - 1, PrintRow, BOXDRAW_VERTICAL_LEFT);\r
+\r

   //\r
   // Draw screen for selectable items\r
   //\r
   //\r
   // Draw screen for selectable items\r
   //\r


@@ -560,15 +560,15 @@ DrawBootPopupMenu (
     PrintCharAt (StartCol, PrintRow, BOXDRAW_VERTICAL);\r
     PrintStringAt (StartCol + 1, PrintRow, String);\r
     PrintCharAt (StartCol + Width - 1, PrintRow, BOXDRAW_VERTICAL);\r
     PrintCharAt (StartCol, PrintRow, BOXDRAW_VERTICAL);\r
     PrintStringAt (StartCol + 1, PrintRow, String);\r
     PrintCharAt (StartCol + Width - 1, PrintRow, BOXDRAW_VERTICAL);\r

-  }  \r
+  }\r

 \r
   PrintRow++;\r
   PrintCharAt (StartCol, PrintRow, BOXDRAW_VERTICAL_RIGHT);\r
   for (Index = 1; Index < Width - 1; Index++) {\r
 \r
   PrintRow++;\r
   PrintCharAt (StartCol, PrintRow, BOXDRAW_VERTICAL_RIGHT);\r
   for (Index = 1; Index < Width - 1; Index++) {\r

-    PrintCharAt (StartCol + Index, PrintRow, BOXDRAW_HORIZONTAL); \r
+    PrintCharAt (StartCol + Index, PrintRow, BOXDRAW_HORIZONTAL);\r

   }\r
   PrintCharAt (StartCol + Width - 1, PrintRow, BOXDRAW_VERTICAL_LEFT);\r
   }\r
   PrintCharAt (StartCol + Width - 1, PrintRow, BOXDRAW_VERTICAL_LEFT);\r

-  \r
+\r

   //\r
   // Draw screen for Help\r
   //\r
   //\r
   // Draw screen for Help\r
   //\r


@@ -578,39 +578,39 @@ DrawBootPopupMenu (
     PrintStringAt (StartCol + 1, PrintRow, String);\r
     PrintCharAt (StartCol + Width - 1, PrintRow, BOXDRAW_VERTICAL);\r
   }\r
     PrintStringAt (StartCol + 1, PrintRow, String);\r
     PrintCharAt (StartCol + Width - 1, PrintRow, BOXDRAW_VERTICAL);\r
   }\r

-  FreePool (String);  \r
-    \r
-  PrintRow++;  \r
+  FreePool (String);\r
+\r
+  PrintRow++;\r

   PrintCharAt (StartCol, PrintRow, BOXDRAW_UP_RIGHT);\r
   for (Index = 1; Index < Width - 1; Index++) {\r
   PrintCharAt (StartCol, PrintRow, BOXDRAW_UP_RIGHT);\r
   for (Index = 1; Index < Width - 1; Index++) {\r

-    PrintCharAt (StartCol + Index, PrintRow, BOXDRAW_HORIZONTAL); \r
+    PrintCharAt (StartCol + Index, PrintRow, BOXDRAW_HORIZONTAL);\r

   }\r
   }\r

-  PrintCharAt (StartCol + Width - 1, PrintRow, BOXDRAW_UP_LEFT);        \r
-  \r
-  \r
+  PrintCharAt (StartCol + Width - 1, PrintRow, BOXDRAW_UP_LEFT);\r
+\r
+\r

   //\r
   // print title strings\r
   //\r
   PrintRow = StartRow + 1;\r
   for (Index = 0; Index < TITLE_TOKEN_COUNT; Index++, PrintRow++) {\r
     String = HiiGetString (gStringPackHandle, BootMenuData->TitleToken[Index], NULL);\r
   //\r
   // print title strings\r
   //\r
   PrintRow = StartRow + 1;\r
   for (Index = 0; Index < TITLE_TOKEN_COUNT; Index++, PrintRow++) {\r
     String = HiiGetString (gStringPackHandle, BootMenuData->TitleToken[Index], NULL);\r

-    LineWidth = GetLineWidth (BootMenuData->TitleToken[Index]);      \r
+    LineWidth = GetLineWidth (BootMenuData->TitleToken[Index]);\r

     PrintCol = StartCol + (Width - LineWidth) / 2;\r
     PrintStringAt (PrintCol, PrintRow, String);\r
     FreePool (String);\r
   }\r
     PrintCol = StartCol + (Width - LineWidth) / 2;\r
     PrintStringAt (PrintCol, PrintRow, String);\r
     FreePool (String);\r
   }\r

-  \r
+\r

   //\r
   // print selectable items\r
   //\r
   PrintCol = StartCol + 1;\r
   //\r
   // print selectable items\r
   //\r
   PrintCol = StartCol + 1;\r

-  PrintRow = StartRow + TITLE_TOKEN_COUNT + 2;  \r
+  PrintRow = StartRow + TITLE_TOKEN_COUNT + 2;\r

   for (Index = 0; Index < ItemCountPerScreen; Index++, PrintRow++) {\r
     String = HiiGetString (gStringPackHandle, BootMenuData->PtrTokens[Index], NULL);\r
     PrintStringAt (PrintCol, PrintRow, String);\r
   for (Index = 0; Index < ItemCountPerScreen; Index++, PrintRow++) {\r
     String = HiiGetString (gStringPackHandle, BootMenuData->PtrTokens[Index], NULL);\r
     PrintStringAt (PrintCol, PrintRow, String);\r

-    FreePool (String); \r
+    FreePool (String);\r

   }\r
   }\r

-  \r
+\r

   //\r
   // Print Help strings\r
   //\r
   //\r
   // Print Help strings\r
   //\r


@@ -622,20 +622,20 @@ DrawBootPopupMenu (
     PrintStringAt (PrintCol, PrintRow, String);\r
     FreePool (String);\r
   }\r
     PrintStringAt (PrintCol, PrintRow, String);\r
     FreePool (String);\r
   }\r

-  \r
+\r

   //\r
   // Print scroll bar if has scroll bar\r
   //\r
   if (BootMenuData->ScrollBarControl.HasScrollBar) {\r
     PrintCol = StartCol + Width - 2;\r
   //\r
   // Print scroll bar if has scroll bar\r
   //\r
   if (BootMenuData->ScrollBarControl.HasScrollBar) {\r
     PrintCol = StartCol + Width - 2;\r

-    PrintRow = StartRow + 2; \r
-    PrintCharAt (PrintCol, PrintRow, GEOMETRICSHAPE_UP_TRIANGLE); \r
-    PrintCharAt (PrintCol + 1, PrintRow, BOXDRAW_VERTICAL); \r
-    PrintRow += (ItemCountPerScreen + 1);    \r
+    PrintRow = StartRow + 2;\r
+    PrintCharAt (PrintCol, PrintRow, GEOMETRICSHAPE_UP_TRIANGLE);\r
+    PrintCharAt (PrintCol + 1, PrintRow, BOXDRAW_VERTICAL);\r
+    PrintRow += (ItemCountPerScreen + 1);\r

     PrintCharAt (PrintCol, PrintRow, GEOMETRICSHAPE_DOWN_TRIANGLE);\r
     PrintCharAt (PrintCol, PrintRow, GEOMETRICSHAPE_DOWN_TRIANGLE);\r

-    PrintCharAt (PrintCol + 1, PrintRow, BOXDRAW_VERTICAL); \r
-  }  \r
-    \r
+    PrintCharAt (PrintCol + 1, PrintRow, BOXDRAW_VERTICAL);\r
+  }\r
+\r

   gST->ConOut->SetAttribute (gST->ConOut, SavedAttribute);\r
   //\r
   // Print Selected item\r
   gST->ConOut->SetAttribute (gST->ConOut, SavedAttribute);\r
   //\r
   // Print Selected item\r


@@ -645,7 +645,7 @@ DrawBootPopupMenu (
 }\r
 \r
 /**\r
 }\r
 \r
 /**\r

-  This function uses to boot from selected item \r
+  This function uses to boot from selected item\r

 \r
   @param   BootOptions            Pointer to EFI_BOOT_MANAGER_LOAD_OPTION array.\r
   @param   BootOptionCount        Number of boot option.\r
 \r
   @param   BootOptions            Pointer to EFI_BOOT_MANAGER_LOAD_OPTION array.\r
   @param   BootOptionCount        Number of boot option.\r


@@ -654,7 +654,7 @@ DrawBootPopupMenu (
 VOID\r
 BootFromSelectOption (\r
   IN   EFI_BOOT_MANAGER_LOAD_OPTION  *BootOptions,\r
 VOID\r
 BootFromSelectOption (\r
   IN   EFI_BOOT_MANAGER_LOAD_OPTION  *BootOptions,\r

-  IN   UINTN                         BootOptionCount, \r
+  IN   UINTN                         BootOptionCount,\r

   IN   UINTN                         SelectItem\r
   )\r
 {\r
   IN   UINTN                         SelectItem\r
   )\r
 {\r


@@ -677,9 +677,9 @@ BootFromSelectOption (
 \r
 /**\r
   This function will change video resolution and text mode\r
 \r
 /**\r
   This function will change video resolution and text mode\r

-  according to defined setup mode or defined boot mode  \r
+  according to defined setup mode or defined boot mode\r

 \r
 \r

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

 \r
   @retval  EFI_SUCCESS  Mode is changed successfully.\r
   @retval  Others             Mode failed to be changed.\r
 \r
   @retval  EFI_SUCCESS  Mode is changed successfully.\r
   @retval  Others             Mode failed to be changed.\r


@@ -707,13 +707,13 @@ BdsSetConsoleMode (
   EFI_STATUS                            Status;\r
   UINTN                                 Index;\r
   UINTN                                 CurrentColumn;\r
   EFI_STATUS                            Status;\r
   UINTN                                 Index;\r
   UINTN                                 CurrentColumn;\r

-  UINTN                                 CurrentRow;  \r
+  UINTN                                 CurrentRow;\r

 \r
   MaxGopMode  = 0;\r
   MaxTextMode = 0;\r
 \r
   //\r
 \r
   MaxGopMode  = 0;\r
   MaxTextMode = 0;\r
 \r
   //\r

-  // Get current video resolution and text mode \r
+  // Get current video resolution and text mode\r

   //\r
   Status = gBS->HandleProtocol (\r
                   gST->ConsoleOutHandle,\r
   //\r
   Status = gBS->HandleProtocol (\r
                   gST->ConsoleOutHandle,\r


@@ -731,7 +731,7 @@ BdsSetConsoleMode (
                   );\r
   if (EFI_ERROR (Status)) {\r
     SimpleTextOut = NULL;\r
                   );\r
   if (EFI_ERROR (Status)) {\r
     SimpleTextOut = NULL;\r

-  }  \r
+  }\r

 \r
   if ((GraphicsOutput == NULL) || (SimpleTextOut == NULL)) {\r
     return EFI_UNSUPPORTED;\r
 \r
   if ((GraphicsOutput == NULL) || (SimpleTextOut == NULL)) {\r
     return EFI_UNSUPPORTED;\r


@@ -752,12 +752,12 @@ BdsSetConsoleMode (
     NewHorizontalResolution = mBootHorizontalResolution;\r
     NewVerticalResolution   = mBootVerticalResolution;\r
     NewColumns              = mBootTextModeColumn;\r
     NewHorizontalResolution = mBootHorizontalResolution;\r
     NewVerticalResolution   = mBootVerticalResolution;\r
     NewColumns              = mBootTextModeColumn;\r

-    NewRows                 = mBootTextModeRow;   \r
+    NewRows                 = mBootTextModeRow;\r

   }\r
   }\r

-  \r
+\r

   if (GraphicsOutput != NULL) {\r
     MaxGopMode  = GraphicsOutput->Mode->MaxMode;\r
   if (GraphicsOutput != NULL) {\r
     MaxGopMode  = GraphicsOutput->Mode->MaxMode;\r

-  } \r
+  }\r

 \r
   if (SimpleTextOut != NULL) {\r
     MaxTextMode = SimpleTextOut->Mode->MaxMode;\r
 \r
   if (SimpleTextOut != NULL) {\r
     MaxTextMode = SimpleTextOut->Mode->MaxMode;\r


@@ -861,7 +861,7 @@ BdsSetConsoleMode (
   ASSERT_EFI_ERROR (Status);\r
   Status = PcdSet32S (PcdConOutRow, NewRows);\r
   ASSERT_EFI_ERROR (Status);\r
   ASSERT_EFI_ERROR (Status);\r
   Status = PcdSet32S (PcdConOutRow, NewRows);\r
   ASSERT_EFI_ERROR (Status);\r

-  \r
+\r

   //\r
   // Video mode is changed, so restart graphics console driver and higher level driver.\r
   // Reconnect graphics console driver and higher level driver.\r
   //\r
   // Video mode is changed, so restart graphics console driver and higher level driver.\r
   // Reconnect graphics console driver and higher level driver.\r


@@ -894,10 +894,10 @@ BdsSetConsoleMode (
 \r
   @param   ImageHandle     The image handle.\r
   @param   SystemTable     The system table.\r
 \r
   @param   ImageHandle     The image handle.\r
   @param   SystemTable     The system table.\r

-  \r
+\r

   @retval  EFI_SUCCESS          Boot from selected boot option, and return success from boot option\r
   @retval  EFI_NOT_FOUND        User select to enter setup or can not find boot option\r
   @retval  EFI_SUCCESS          Boot from selected boot option, and return success from boot option\r
   @retval  EFI_NOT_FOUND        User select to enter setup or can not find boot option\r

-  \r
+\r

 **/\r
 EFI_STATUS\r
 EFIAPI\r
 **/\r
 EFI_STATUS\r
 EFIAPI\r


@@ -907,7 +907,7 @@ BootManagerMenuEntry (
   )\r
 {\r
   EFI_BOOT_MANAGER_LOAD_OPTION    *BootOption;\r
   )\r
 {\r
   EFI_BOOT_MANAGER_LOAD_OPTION    *BootOption;\r

-  UINTN                           BootOptionCount;  \r
+  UINTN                           BootOptionCount;\r

   EFI_STATUS                      Status;\r
   BOOT_MENU_POPUP_DATA            BootMenuData;\r
   UINTN                           Index;\r
   EFI_STATUS                      Status;\r
   BOOT_MENU_POPUP_DATA            BootMenuData;\r
   UINTN                           Index;\r


@@ -950,7 +950,7 @@ BootManagerMenuEntry (
 \r
   if (!mModeInitialized) {\r
     //\r
 \r
   if (!mModeInitialized) {\r
     //\r

-    // After the console is ready, get current video resolution \r
+    // After the console is ready, get current video resolution\r

     // and text mode before launching setup at first time.\r
     //\r
     Status = gBS->HandleProtocol (\r
     // and text mode before launching setup at first time.\r
     //\r
     Status = gBS->HandleProtocol (\r


@@ -961,7 +961,7 @@ BootManagerMenuEntry (
     if (EFI_ERROR (Status)) {\r
       GraphicsOutput = NULL;\r
     }\r
     if (EFI_ERROR (Status)) {\r
       GraphicsOutput = NULL;\r
     }\r

-    \r
+\r

     Status = gBS->HandleProtocol (\r
                     gST->ConsoleOutHandle,\r
                     &gEfiSimpleTextOutProtocolGuid,\r
     Status = gBS->HandleProtocol (\r
                     gST->ConsoleOutHandle,\r
                     &gEfiSimpleTextOutProtocolGuid,\r


@@ -969,7 +969,7 @@ BootManagerMenuEntry (
                     );\r
     if (EFI_ERROR (Status)) {\r
       SimpleTextOut = NULL;\r
                     );\r
     if (EFI_ERROR (Status)) {\r
       SimpleTextOut = NULL;\r

-    }  \r
+    }\r

 \r
     if (GraphicsOutput != NULL) {\r
       //\r
 \r
     if (GraphicsOutput != NULL) {\r
       //\r


@@ -992,14 +992,14 @@ BootManagerMenuEntry (
 \r
     //\r
     // Get user defined text mode for setup.\r
 \r
     //\r
     // Get user defined text mode for setup.\r

-    //  \r
+    //\r

     mSetupHorizontalResolution = PcdGet32 (PcdSetupVideoHorizontalResolution);\r
     mSetupHorizontalResolution = PcdGet32 (PcdSetupVideoHorizontalResolution);\r

-    mSetupVerticalResolution   = PcdGet32 (PcdSetupVideoVerticalResolution);      \r
+    mSetupVerticalResolution   = PcdGet32 (PcdSetupVideoVerticalResolution);\r

     mSetupTextModeColumn       = PcdGet32 (PcdSetupConOutColumn);\r
     mSetupTextModeRow          = PcdGet32 (PcdSetupConOutRow);\r
     mModeInitialized           = TRUE;\r
   }\r
     mSetupTextModeColumn       = PcdGet32 (PcdSetupConOutColumn);\r
     mSetupTextModeRow          = PcdGet32 (PcdSetupConOutRow);\r
     mModeInitialized           = TRUE;\r
   }\r

-  \r
+\r

   //\r
   // Set back to conventional setup resolution\r
   //\r
   //\r
   // Set back to conventional setup resolution\r
   //\r


@@ -1013,7 +1013,7 @@ BootManagerMenuEntry (
   // According to boot menu data to draw boot popup menu\r
   //\r
   DrawBootPopupMenu (&BootMenuData);\r
   // According to boot menu data to draw boot popup menu\r
   //\r
   DrawBootPopupMenu (&BootMenuData);\r

-  \r
+\r

   //\r
   // check user input to determine want to re-draw or boot from user selected item\r
   //\r
   //\r
   // check user input to determine want to re-draw or boot from user selected item\r
   //\r


@@ -1023,18 +1023,18 @@ BootManagerMenuEntry (
     Status = gST->ConIn->ReadKeyStroke (gST->ConIn, &Key);\r
     if (!EFI_ERROR (Status)) {\r
       switch (Key.UnicodeChar) {\r
     Status = gST->ConIn->ReadKeyStroke (gST->ConIn, &Key);\r
     if (!EFI_ERROR (Status)) {\r
       switch (Key.UnicodeChar) {\r

-      \r
-      case CHAR_NULL:        \r
-        switch (Key.ScanCode) {          \r
-          \r
+\r
+      case CHAR_NULL:\r
+        switch (Key.ScanCode) {\r
+\r

         case SCAN_UP:\r
           SelectItem = BootMenuData.SelectItem == 0 ? BootMenuData.ItemCount - 1 : BootMenuData.SelectItem - 1;\r
         case SCAN_UP:\r
           SelectItem = BootMenuData.SelectItem == 0 ? BootMenuData.ItemCount - 1 : BootMenuData.SelectItem - 1;\r

-          BootMenuSelectItem (SelectItem, &BootMenuData); \r
+          BootMenuSelectItem (SelectItem, &BootMenuData);\r

           break;\r
           break;\r

-        \r
+\r

         case SCAN_DOWN:\r
           SelectItem = BootMenuData.SelectItem == BootMenuData.ItemCount - 1 ? 0 : BootMenuData.SelectItem + 1;\r
         case SCAN_DOWN:\r
           SelectItem = BootMenuData.SelectItem == BootMenuData.ItemCount - 1 ? 0 : BootMenuData.SelectItem + 1;\r

-          BootMenuSelectItem (SelectItem, &BootMenuData); \r
+          BootMenuSelectItem (SelectItem, &BootMenuData);\r

           break;\r
 \r
         case SCAN_ESC:\r
           break;\r
 \r
         case SCAN_ESC:\r


@@ -1045,12 +1045,12 @@ BootManagerMenuEntry (
           //\r
           BdsSetConsoleMode (FALSE);\r
           break;\r
           //\r
           BdsSetConsoleMode (FALSE);\r
           break;\r

-          \r
+\r

         default:\r
           break;\r
         }\r
         break;\r
         default:\r
           break;\r
         }\r
         break;\r

-        \r
+\r

       case CHAR_CARRIAGE_RETURN:\r
         gST->ConOut->ClearScreen (gST->ConOut);\r
         //\r
       case CHAR_CARRIAGE_RETURN:\r
         gST->ConOut->ClearScreen (gST->ConOut);\r
         //\r


@@ -1064,7 +1064,7 @@ BootManagerMenuEntry (
         BdsSetConsoleMode (TRUE);\r
         DrawBootPopupMenu (&BootMenuData);\r
         break;\r
         BdsSetConsoleMode (TRUE);\r
         DrawBootPopupMenu (&BootMenuData);\r
         break;\r

-        \r
+\r

       default:\r
         break;\r
       }\r
       default:\r
         break;\r
       }\r


@@ -1076,5 +1076,5 @@ BootManagerMenuEntry (
   HiiRemovePackages (gStringPackHandle);\r
 \r
   return Status;\r
   HiiRemovePackages (gStringPackHandle);\r
 \r
   return Status;\r

-  \r
+\r

 }\r
 }\r

diff --git a/MdeModulePkg/Application/BootManagerMenuApp/BootManagerMenu.h b/MdeModulePkg/Application/BootManagerMenuApp/BootManagerMenu.h
index 26d9a318654c83518ff09ce480afb5c126947f73..dd7f5790a5924f068810bb9477beb57f55734e57 100644 (file)
--- a/MdeModulePkg/Application/BootManagerMenuApp/BootManagerMenu.h
+++ b/MdeModulePkg/Application/BootManagerMenuApp/BootManagerMenu.h
@@ -1,7 +1,7 @@
 /** @file\r
   FrontPage routines to handle the callbacks and browser calls\r
 \r
 /** @file\r
   FrontPage routines to handle the callbacks and browser calls\r
 \r

-Copyright (c) 2004 - 2015, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2004 - 2018, Intel Corporation. All rights reserved.<BR>\r

 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r


@@ -37,24 +37,24 @@ typedef struct _BOOT_MENU_SCREEN {
   UINTN        StartRow;\r
   UINTN        Width;\r
   UINTN        Height;\r
   UINTN        StartRow;\r
   UINTN        Width;\r
   UINTN        Height;\r

-} BOOT_MENU_SCREEN; \r
+} BOOT_MENU_SCREEN;\r

 \r
 typedef struct _BOOT_MENU_SCROLL_BAR_CONTROL {\r
   BOOLEAN      HasScrollBar;\r
   UINTN        ItemCountPerScreen;\r
   UINTN        FirstItem;\r
   UINTN        LastItem;\r
 \r
 typedef struct _BOOT_MENU_SCROLL_BAR_CONTROL {\r
   BOOLEAN      HasScrollBar;\r
   UINTN        ItemCountPerScreen;\r
   UINTN        FirstItem;\r
   UINTN        LastItem;\r

-} BOOT_MENU_SCROLL_BAR_CONTROL; \r
+} BOOT_MENU_SCROLL_BAR_CONTROL;\r

 \r
 typedef struct _BOOT_MENU_POPUP_DATA {\r
   EFI_STRING_ID                   TitleToken[TITLE_TOKEN_COUNT]; // Title string ID\r
   UINTN                           ItemCount;                     // Selectable item count\r
   EFI_STRING_ID                   *PtrTokens;                    // All of selectable items string ID\r
   EFI_STRING_ID                   HelpToken[HELP_TOKEN_COUNT];   // All of help string ID\r
 \r
 typedef struct _BOOT_MENU_POPUP_DATA {\r
   EFI_STRING_ID                   TitleToken[TITLE_TOKEN_COUNT]; // Title string ID\r
   UINTN                           ItemCount;                     // Selectable item count\r
   EFI_STRING_ID                   *PtrTokens;                    // All of selectable items string ID\r
   EFI_STRING_ID                   HelpToken[HELP_TOKEN_COUNT];   // All of help string ID\r

-  UINTN                           SelectItem;                    // Current select  item       \r
+  UINTN                           SelectItem;                    // Current select  item\r

   BOOT_MENU_SCREEN                MenuScreen;                    // Boot menu screen information\r
   BOOT_MENU_SCROLL_BAR_CONTROL    ScrollBarControl;              // Boot menu scroll bar inoformation\r
 } BOOT_MENU_POPUP_DATA;\r
 \r
   BOOT_MENU_SCREEN                MenuScreen;                    // Boot menu screen information\r
   BOOT_MENU_SCROLL_BAR_CONTROL    ScrollBarControl;              // Boot menu scroll bar inoformation\r
 } BOOT_MENU_POPUP_DATA;\r
 \r

-#endif \r
+#endif\r

 \r
 \r

diff --git a/MdeModulePkg/Application/BootManagerMenuApp/BootManagerMenuApp.inf b/MdeModulePkg/Application/BootManagerMenuApp/BootManagerMenuApp.inf
index 392a97065c3ed007ed3de060ca41b381d9ca88e3..3dc1bab9a0ea7ff462f1792059b99db18cb213e9 100644 (file)
--- a/MdeModulePkg/Application/BootManagerMenuApp/BootManagerMenuApp.inf
+++ b/MdeModulePkg/Application/BootManagerMenuApp/BootManagerMenuApp.inf
@@ -3,16 +3,16 @@
 #\r
 #  The application pops up a menu showing all the boot options referenced by\r
 #  BootOrder NV variable and user can choose to boot from one of them.\r
 #\r
 #  The application pops up a menu showing all the boot options referenced by\r
 #  BootOrder NV variable and user can choose to boot from one of them.\r

-#  \r
+#\r

 #  Copyright (c) 2011 - 2018, Intel Corporation. All rights reserved.<BR>\r
 #  This program and the accompanying materials\r
 #  are licensed and made available under the terms and conditions of the BSD License\r
 #  which accompanies this distribution.  The full text of the license may be found at\r
 #  http://opensource.org/licenses/bsd-license.php\r
 #  Copyright (c) 2011 - 2018, Intel Corporation. All rights reserved.<BR>\r
 #  This program and the accompanying materials\r
 #  are licensed and made available under the terms and conditions of the BSD License\r
 #  which accompanies this distribution.  The full text of the license may be found at\r
 #  http://opensource.org/licenses/bsd-license.php\r

-#  \r
+#\r

 #  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 #  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 #  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 #  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r

-#  \r
+#\r

 ##\r
 \r
 [Defines]\r
 ##\r
 \r
 [Defines]\r


@@ -21,7 +21,7 @@
   MODULE_UNI_FILE                = BootManagerMenuApp.uni\r
   FILE_GUID                      = EEC25BDC-67F2-4D95-B1D5-F81B2039D11D\r
   MODULE_TYPE                    = UEFI_APPLICATION\r
   MODULE_UNI_FILE                = BootManagerMenuApp.uni\r
   FILE_GUID                      = EEC25BDC-67F2-4D95-B1D5-F81B2039D11D\r
   MODULE_TYPE                    = UEFI_APPLICATION\r

-  VERSION_STRING                 = 1.0 \r
+  VERSION_STRING                 = 1.0\r

   ENTRY_POINT                    = BootManagerMenuEntry\r
 \r
 #\r
   ENTRY_POINT                    = BootManagerMenuEntry\r
 \r
 #\r


@@ -47,7 +47,7 @@
   UefiBootServicesTableLib\r
   UefiApplicationEntryPoint\r
   UefiBootManagerLib\r
   UefiBootServicesTableLib\r
   UefiApplicationEntryPoint\r
   UefiBootManagerLib\r

-  \r
+\r

 [Guids]\r
 \r
 [Protocols]\r
 [Guids]\r
 \r
 [Protocols]\r

diff --git a/MdeModulePkg/Application/BootManagerMenuApp/BootManagerMenuApp.uni b/MdeModulePkg/Application/BootManagerMenuApp/BootManagerMenuApp.uni
index a1470371f6f485910515581cb55ea2b0730fe0e7..390635f924f48a9d8b6fe3b1505f67624ff2d012 100644 (file)
--- a/MdeModulePkg/Application/BootManagerMenuApp/BootManagerMenuApp.uni
+++ b/MdeModulePkg/Application/BootManagerMenuApp/BootManagerMenuApp.uni
@@ -4,13 +4,13 @@
 // The application pops up a menu showing all the boot options referenced by\r
 // BootOrder NV variable and user can choose to boot from one of them.\r
 //\r
 // The application pops up a menu showing all the boot options referenced by\r
 // BootOrder NV variable and user can choose to boot from one of them.\r
 //\r

-// Copyright (c) 2015, Intel Corporation. All rights reserved.<BR>\r
+// Copyright (c) 2015 - 2018, Intel Corporation. All rights reserved.<BR>\r

 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r
 // which accompanies this distribution. The full text of the license may be found at\r
 // http://opensource.org/licenses/bsd-license.php.\r
 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r
 // which accompanies this distribution. The full text of the license may be found at\r
 // http://opensource.org/licenses/bsd-license.php.\r

-// \r
+//\r

 // THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 // WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 //\r
 // THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 // WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 //\r

diff --git a/MdeModulePkg/Application/BootManagerMenuApp/BootManagerMenuAppExtra.uni b/MdeModulePkg/Application/BootManagerMenuApp/BootManagerMenuAppExtra.uni
index 3887923d05bf0e51f6cb6856a0c514251d9769cb..99ab4bdab7e654b02e892243638e0c0b3bfe4941 100644 (file)
--- a/MdeModulePkg/Application/BootManagerMenuApp/BootManagerMenuAppExtra.uni
+++ b/MdeModulePkg/Application/BootManagerMenuApp/BootManagerMenuAppExtra.uni
@@ -4,7 +4,7 @@
 // The application pops up a menu showing all the boot options referenced by\r
 // BootOrder NV variable and user can choose to boot from one of them.\r
 //\r
 // The application pops up a menu showing all the boot options referenced by\r
 // BootOrder NV variable and user can choose to boot from one of them.\r
 //\r

-// Copyright (c) 2015, Intel Corporation. All rights reserved.<BR>\r
+// Copyright (c) 2015 - 2018, Intel Corporation. All rights reserved.<BR>\r

 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r
 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r


@@ -16,8 +16,8 @@
 //\r
 // **/\r
 \r
 //\r
 // **/\r
 \r

-#string STR_PROPERTIES_MODULE_NAME \r
-#language en-US \r
+#string STR_PROPERTIES_MODULE_NAME\r
+#language en-US\r

 "Boot Manager Menu Application"\r
 \r
 \r
 "Boot Manager Menu Application"\r
 \r
 \r

diff --git a/MdeModulePkg/Application/BootManagerMenuApp/BootManagerMenuStrings.uni b/MdeModulePkg/Application/BootManagerMenuApp/BootManagerMenuStrings.uni
index 6f5e44cc475d3e7c1433bd0299f028502d907cd0..f2893fb602fc1af66a40f984f38a27aebc0b1759 100644 (file)
--- a/MdeModulePkg/Application/BootManagerMenuApp/BootManagerMenuStrings.uni
+++ b/MdeModulePkg/Application/BootManagerMenuApp/BootManagerMenuStrings.uni
@@ -1,7 +1,7 @@
 // /** @file\r
 // String definitions for BootManagerMenuApp.\r
 // /** @file\r
 // String definitions for BootManagerMenuApp.\r

-//  \r
-// Copyright (c) 2004 - 2011, Intel Corporation. All rights reserved.<BR>\r
+//\r
+// Copyright (c) 2004 - 2018, Intel Corporation. All rights reserved.<BR>\r

 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r
 // which accompanies this distribution. The full text of the license may be found at\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r
 // which accompanies this distribution. The full text of the license may be found at\r

diff --git a/MdeModulePkg/Application/HelloWorld/HelloWorld.c b/MdeModulePkg/Application/HelloWorld/HelloWorld.c
index 164571bfb0ce43ce393d7f37939a7bad7bff7f44..0008cd14fda9f5f0fbf21b8df2a65682bfcc013d 100644 (file)
--- a/MdeModulePkg/Application/HelloWorld/HelloWorld.c
+++ b/MdeModulePkg/Application/HelloWorld/HelloWorld.c
@@ -1,15 +1,15 @@
 /** @file\r
 /** @file\r

-  This sample application bases on HelloWorld PCD setting \r
+  This sample application bases on HelloWorld PCD setting\r

   to print "UEFI Hello World!" to the UEFI Console.\r
 \r
   to print "UEFI Hello World!" to the UEFI Console.\r
 \r

-  Copyright (c) 2006 - 2016, Intel Corporation. All rights reserved.<BR>\r
-  This program and the accompanying materials                          \r
-  are licensed and made available under the terms and conditions of the BSD License         \r
-  which accompanies this distribution.  The full text of the license may be found at        \r
-  http://opensource.org/licenses/bsd-license.php                                            \r
+  Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r
+  This program and the accompanying materials\r
+  are licensed and made available under the terms and conditions of the BSD License\r
+  which accompanies this distribution.  The full text of the license may be found at\r
+  http://opensource.org/licenses/bsd-license.php\r

 \r
 \r

-  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     \r
-  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             \r
+  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
+  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r

 \r
 **/\r
 \r
 \r
 **/\r
 \r


@@ -32,9 +32,9 @@ GLOBAL_REMOVE_IF_UNREFERENCED EFI_STRING_ID mStringHelpTokenId = STRING_TOKEN (S
   The user Entry Point for Application. The user code starts with this function\r
   as the real entry point for the application.\r
 \r
   The user Entry Point for Application. The user code starts with this function\r
   as the real entry point for the application.\r
 \r

-  @param[in] ImageHandle    The firmware allocated handle for the EFI image.  \r
+  @param[in] ImageHandle    The firmware allocated handle for the EFI image.\r

   @param[in] SystemTable    A pointer to the EFI System Table.\r
   @param[in] SystemTable    A pointer to the EFI System Table.\r

-  \r
+\r

   @retval EFI_SUCCESS       The entry point is executed successfully.\r
   @retval other             Some error occurs when executing this entry point.\r
 \r
   @retval EFI_SUCCESS       The entry point is executed successfully.\r
   @retval other             Some error occurs when executing this entry point.\r
 \r


@@ -46,19 +46,19 @@ UefiMain (
   IN EFI_SYSTEM_TABLE  *SystemTable\r
   )\r
 {\r
   IN EFI_SYSTEM_TABLE  *SystemTable\r
   )\r
 {\r

-       UINT32 Index;\r
-       \r
-       Index = 0;\r
-  \r
+  UINT32 Index;\r
+\r
+  Index = 0;\r
+\r

   //\r
   // Three PCD type (FeatureFlag, UINT32 and String) are used as the sample.\r
   //\r
   if (FeaturePcdGet (PcdHelloWorldPrintEnable)) {\r
   //\r
   // Three PCD type (FeatureFlag, UINT32 and String) are used as the sample.\r
   //\r
   if (FeaturePcdGet (PcdHelloWorldPrintEnable)) {\r

-       for (Index = 0; Index < PcdGet32 (PcdHelloWorldPrintTimes); Index ++) {\r
-         //\r
-         // Use UefiLib Print API to print string to UEFI console\r
-         //\r
-       Print ((CHAR16*)PcdGetPtr (PcdHelloWorldPrintString));\r
+    for (Index = 0; Index < PcdGet32 (PcdHelloWorldPrintTimes); Index ++) {\r
+      //\r
+      // Use UefiLib Print API to print string to UEFI console\r
+      //\r
+      Print ((CHAR16*)PcdGetPtr (PcdHelloWorldPrintString));\r

     }\r
   }\r
 \r
     }\r
   }\r
 \r

diff --git a/MdeModulePkg/Application/HelloWorld/HelloWorld.uni b/MdeModulePkg/Application/HelloWorld/HelloWorld.uni
index f8be3d1463766febf38185ba5478d71f29987455..9fe187cb509d96340482fe5cb17cf0f096eacca3 100644 (file)
--- a/MdeModulePkg/Application/HelloWorld/HelloWorld.uni
+++ b/MdeModulePkg/Application/HelloWorld/HelloWorld.uni
@@ -3,10 +3,10 @@
 //\r
 // This is a sample shell application that will print "UEFI Hello World!" to the\r
 // UEFI Console based on PCD setting.\r
 //\r
 // This is a sample shell application that will print "UEFI Hello World!" to the\r
 // UEFI Console based on PCD setting.\r

-// \r
+//\r

 // It demos how to use EDKII PCD mechanism to make code more flexible.\r
 //\r
 // It demos how to use EDKII PCD mechanism to make code more flexible.\r
 //\r

-// Copyright (c) 2008 - 2014, Intel Corporation. All rights reserved.<BR>\r
+// Copyright (c) 2008 - 2018, Intel Corporation. All rights reserved.<BR>\r

 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r
 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r

diff --git a/MdeModulePkg/Application/HelloWorld/HelloWorldExtra.uni b/MdeModulePkg/Application/HelloWorld/HelloWorldExtra.uni
index e20b4a5a3ff72df46c7f4b5b8ad6c6d525d736a9..1b78d0c98c98411c320dc1a1541248ed458b99c3 100644 (file)
--- a/MdeModulePkg/Application/HelloWorld/HelloWorldExtra.uni
+++ b/MdeModulePkg/Application/HelloWorld/HelloWorldExtra.uni
@@ -1,7 +1,7 @@
 // /** @file\r
 // HelloWorld Localized Strings and Content\r
 //\r
 // /** @file\r
 // HelloWorld Localized Strings and Content\r
 //\r

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

 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r
 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r


@@ -12,8 +12,8 @@
 //\r
 // **/\r
 \r
 //\r
 // **/\r
 \r

-#string STR_PROPERTIES_MODULE_NAME \r
-#language en-US \r
+#string STR_PROPERTIES_MODULE_NAME\r
+#language en-US\r

 "Hello World Application"\r
 \r
 \r
 "Hello World Application"\r
 \r
 \r

diff --git a/MdeModulePkg/Application/MemoryProfileInfo/MemoryProfileInfoExtra.uni b/MdeModulePkg/Application/MemoryProfileInfo/MemoryProfileInfoExtra.uni
index c0967118437f3bd45015a411229f77aa22a6f963..5db93c7ec17fdc48a972586c5ed25c1a91747735 100644 (file)
--- a/MdeModulePkg/Application/MemoryProfileInfo/MemoryProfileInfoExtra.uni
+++ b/MdeModulePkg/Application/MemoryProfileInfo/MemoryProfileInfoExtra.uni
@@ -1,7 +1,7 @@
 // /** @file\r
 // MemoryProfileInfo Localized Strings and Content\r
 //\r
 // /** @file\r
 // MemoryProfileInfo Localized Strings and Content\r
 //\r

-// Copyright (c) 2014, Intel Corporation. All rights reserved.<BR>\r
+// Copyright (c) 2014 - 2018, Intel Corporation. All rights reserved.<BR>\r

 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r
 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r


@@ -12,8 +12,8 @@
 //\r
 // **/\r
 \r
 //\r
 // **/\r
 \r

-#string STR_PROPERTIES_MODULE_NAME \r
-#language en-US \r
+#string STR_PROPERTIES_MODULE_NAME\r
+#language en-US\r

 "Memory Profile Information Application"\r
 \r
 \r
 "Memory Profile Information Application"\r
 \r
 \r

diff --git a/MdeModulePkg/Application/UiApp/UiApp.inf b/MdeModulePkg/Application/UiApp/UiApp.inf
index d144462ce46d3d2fac5b5bc5cf9a26ffbde63e6d..417f1a3ec9f9589cc2708d6cce0eb61d9bfc9ee4 100644 (file)
--- a/MdeModulePkg/Application/UiApp/UiApp.inf
+++ b/MdeModulePkg/Application/UiApp/UiApp.inf
@@ -1,15 +1,15 @@
 ## @file\r
 #  UiApp module is driver for BDS phase.\r
 #\r
 ## @file\r
 #  UiApp module is driver for BDS phase.\r
 #\r

-#  Copyright (c) 2011 - 2016, Intel Corporation. All rights reserved.<BR>\r
+#  Copyright (c) 2011 - 2018, Intel Corporation. All rights reserved.<BR>\r

 #  This program and the accompanying materials\r
 #  are licensed and made available under the terms and conditions of the BSD License\r
 #  which accompanies this distribution.  The full text of the license may be found at\r
 #  http://opensource.org/licenses/bsd-license.php\r
 #  This program and the accompanying materials\r
 #  are licensed and made available under the terms and conditions of the BSD License\r
 #  which accompanies this distribution.  The full text of the license may be found at\r
 #  http://opensource.org/licenses/bsd-license.php\r

-#  \r
+#\r

 #  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 #  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 #  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 #  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r

-#  \r
+#\r

 ##\r
 \r
 [Defines]\r
 ##\r
 \r
 [Defines]\r


@@ -60,7 +60,7 @@
   PcdLib\r
   UefiHiiServicesLib\r
   UefiBootManagerLib\r
   PcdLib\r
   UefiHiiServicesLib\r
   UefiBootManagerLib\r

-  \r
+\r

 [Guids]\r
   gEfiIfrTianoGuid                              ## CONSUMES ## GUID (Extended IFR Guid Opcode)\r
   gEfiIfrFrontPageGuid                          ## CONSUMES ## GUID\r
 [Guids]\r
   gEfiIfrTianoGuid                              ## CONSUMES ## GUID (Extended IFR Guid Opcode)\r
   gEfiIfrFrontPageGuid                          ## CONSUMES ## GUID\r

diff --git a/MdeModulePkg/Application/VariableInfo/VariableInfoExtra.uni b/MdeModulePkg/Application/VariableInfo/VariableInfoExtra.uni
index 16c7461508ca7ee1fb03f21815e5957e652dcf85..dfdc9f8438c55f9c11371fed238030c6849fd2b4 100644 (file)
--- a/MdeModulePkg/Application/VariableInfo/VariableInfoExtra.uni
+++ b/MdeModulePkg/Application/VariableInfo/VariableInfoExtra.uni
@@ -1,7 +1,7 @@
 // /** @file\r
 // VariableInfo Localized Strings and Content\r
 //\r
 // /** @file\r
 // VariableInfo Localized Strings and Content\r
 //\r

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

 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r
 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r


@@ -12,8 +12,8 @@
 //\r
 // **/\r
 \r
 //\r
 // **/\r
 \r

-#string STR_PROPERTIES_MODULE_NAME \r
-#language en-US \r
+#string STR_PROPERTIES_MODULE_NAME\r
+#language en-US\r

 "Variable Information Application"\r
 \r
 \r
 "Variable Information Application"\r
 \r
 \r

diff --git a/MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AhciMode.c b/MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AhciMode.c
index 5da50183458b2cbd4dcd5e67296e03e950b54310..79ae11bd201a00b311cc028398d032cea27c030a 100644 (file)
--- a/MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AhciMode.c
+++ b/MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AhciMode.c
@@ -820,7 +820,7 @@ AhciPioTransfer (
         Offset = EFI_AHCI_PORT_START + Port * EFI_AHCI_PORT_REG_WIDTH + EFI_AHCI_PORT_TFD;\r
         PortTfd = AhciReadReg (PciIo, (UINT32) Offset);\r
         //\r
         Offset = EFI_AHCI_PORT_START + Port * EFI_AHCI_PORT_REG_WIDTH + EFI_AHCI_PORT_TFD;\r
         PortTfd = AhciReadReg (PciIo, (UINT32) Offset);\r
         //\r

-        // PxTFD will be updated if there is a D2H or SetupFIS received. \r
+        // PxTFD will be updated if there is a D2H or SetupFIS received.\r

         //\r
         if ((PortTfd & EFI_AHCI_PORT_TFD_ERR) != 0) {\r
           Status = EFI_DEVICE_ERROR;\r
         //\r
         if ((PortTfd & EFI_AHCI_PORT_TFD_ERR) != 0) {\r
           Status = EFI_DEVICE_ERROR;\r


@@ -2010,7 +2010,7 @@ AhciCreateTransferDescriptor (
   //\r
   MaxCommandSlotNumber = (UINT8) (((Capability & 0x1F00) >> 8) + 1);\r
   Support64Bit         = (BOOLEAN) (((Capability & BIT31) != 0) ? TRUE : FALSE);\r
   //\r
   MaxCommandSlotNumber = (UINT8) (((Capability & 0x1F00) >> 8) + 1);\r
   Support64Bit         = (BOOLEAN) (((Capability & BIT31) != 0) ? TRUE : FALSE);\r

-  \r
+\r

   PortImplementBitMap  = AhciReadReg(PciIo, EFI_AHCI_PI_OFFSET);\r
   //\r
   // Get the highest bit of implemented ports which decides how many bytes are allocated for recived FIS.\r
   PortImplementBitMap  = AhciReadReg(PciIo, EFI_AHCI_PI_OFFSET);\r
   //\r
   // Get the highest bit of implemented ports which decides how many bytes are allocated for recived FIS.\r

diff --git a/MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AhciMode.h b/MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AhciMode.h
index 0ef749b4c7ef5a00a7e40040bb33ba4880522be4..3b7500c662ee8028f302d64f59fdc7da4100722d 100644 (file)
--- a/MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AhciMode.h
+++ b/MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AhciMode.h
@@ -1,14 +1,14 @@
 /** @file\r
   Header file for AHCI mode of ATA host controller.\r
 /** @file\r
   Header file for AHCI mode of ATA host controller.\r

-  \r
+\r

   Copyright (c) 2010 - 2018, Intel Corporation. All rights reserved.<BR>\r
   Copyright (c) 2010 - 2018, Intel Corporation. All rights reserved.<BR>\r

-  This program and the accompanying materials                          \r
-  are licensed and made available under the terms and conditions of the BSD License         \r
-  which accompanies this distribution.  The full text of the license may be found at        \r
-  http://opensource.org/licenses/bsd-license.php                                            \r
+  This program and the accompanying materials\r
+  are licensed and made available under the terms and conditions of the BSD License\r
+  which accompanies this distribution.  The full text of the license may be found at\r
+  http://opensource.org/licenses/bsd-license.php\r

 \r
 \r

-  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     \r
-  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             \r
+  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
+  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r

 \r
 **/\r
 #ifndef __ATA_HC_AHCI_MODE_H__\r
 \r
 **/\r
 #ifndef __ATA_HC_AHCI_MODE_H__\r


@@ -68,7 +68,7 @@ typedef union {
 #define EFI_AHCI_MAX_DATA_PER_PRDT             0x400000\r
 \r
 #define EFI_AHCI_FIS_REGISTER_H2D              0x27      //Register FIS - Host to Device\r
 #define EFI_AHCI_MAX_DATA_PER_PRDT             0x400000\r
 \r
 #define EFI_AHCI_FIS_REGISTER_H2D              0x27      //Register FIS - Host to Device\r

-#define   EFI_AHCI_FIS_REGISTER_H2D_LENGTH     20 \r
+#define   EFI_AHCI_FIS_REGISTER_H2D_LENGTH     20\r

 #define EFI_AHCI_FIS_REGISTER_D2H              0x34      //Register FIS - Device to Host\r
 #define   EFI_AHCI_FIS_REGISTER_D2H_LENGTH     20\r
 #define EFI_AHCI_FIS_DMA_ACTIVATE              0x39      //DMA Activate FIS - Device to Host\r
 #define EFI_AHCI_FIS_REGISTER_D2H              0x34      //Register FIS - Device to Host\r
 #define   EFI_AHCI_FIS_REGISTER_D2H_LENGTH     20\r
 #define EFI_AHCI_FIS_DMA_ACTIVATE              0x39      //DMA Activate FIS - Device to Host\r


@@ -213,12 +213,12 @@ typedef struct {
   UINT32   AhciCmdPrdbc;      //Physical Region Descriptor Byte Count\r
   UINT32   AhciCmdCtba;       //Command Table Descriptor Base Address\r
   UINT32   AhciCmdCtbau;      //Command Table Descriptor Base Address Upper 32-BITs\r
   UINT32   AhciCmdPrdbc;      //Physical Region Descriptor Byte Count\r
   UINT32   AhciCmdCtba;       //Command Table Descriptor Base Address\r
   UINT32   AhciCmdCtbau;      //Command Table Descriptor Base Address Upper 32-BITs\r

-  UINT32   AhciCmdRsvd1[4]; \r
+  UINT32   AhciCmdRsvd1[4];\r

 } EFI_AHCI_COMMAND_LIST;\r
 \r
 //\r
 // This is a software constructed FIS.\r
 } EFI_AHCI_COMMAND_LIST;\r
 \r
 //\r
 // This is a software constructed FIS.\r

-// For data transfer operations, this is the H2D Register FIS format as \r
+// For data transfer operations, this is the H2D Register FIS format as\r

 // specified in the Serial ATA Revision 2.6 specification.\r
 //\r
 typedef struct {\r
 // specified in the Serial ATA Revision 2.6 specification.\r
 //\r
 typedef struct {\r


@@ -257,7 +257,7 @@ typedef struct {
 // Physical Region Descriptor Table includes up to 65535 entries\r
 // The entry data structure is listed at the following.\r
 // the actual entry number comes from the PRDTL field in the command\r
 // Physical Region Descriptor Table includes up to 65535 entries\r
 // The entry data structure is listed at the following.\r
 // the actual entry number comes from the PRDTL field in the command\r

-// list entry for this command slot. \r
+// list entry for this command slot.\r

 //\r
 typedef struct {\r
   UINT32   AhciPrdtDba;       //Data Base Address\r
 //\r
 typedef struct {\r
   UINT32   AhciPrdtDba;       //Data Base Address\r


@@ -285,13 +285,13 @@ typedef struct {
   UINT8    AhciDmaSetupFis[0x1C];         // Dma Setup Fis: offset 0x00\r
   UINT8    AhciDmaSetupFisRsvd[0x04];\r
   UINT8    AhciPioSetupFis[0x14];         // Pio Setup Fis: offset 0x20\r
   UINT8    AhciDmaSetupFis[0x1C];         // Dma Setup Fis: offset 0x00\r
   UINT8    AhciDmaSetupFisRsvd[0x04];\r
   UINT8    AhciPioSetupFis[0x14];         // Pio Setup Fis: offset 0x20\r

-  UINT8    AhciPioSetupFisRsvd[0x0C];     \r
+  UINT8    AhciPioSetupFisRsvd[0x0C];\r

   UINT8    AhciD2HRegisterFis[0x14];      // D2H Register Fis: offset 0x40\r
   UINT8    AhciD2HRegisterFisRsvd[0x04];\r
   UINT64   AhciSetDeviceBitsFis;          // Set Device Bits Fix: offset 0x58\r
   UINT8    AhciUnknownFis[0x40];          // Unkonwn Fis: offset 0x60\r
   UINT8    AhciD2HRegisterFis[0x14];      // D2H Register Fis: offset 0x40\r
   UINT8    AhciD2HRegisterFisRsvd[0x04];\r
   UINT64   AhciSetDeviceBitsFis;          // Set Device Bits Fix: offset 0x58\r
   UINT8    AhciUnknownFis[0x40];          // Unkonwn Fis: offset 0x60\r

-  UINT8    AhciUnknownFisRsvd[0x60];      \r
-} EFI_AHCI_RECEIVED_FIS; \r
+  UINT8    AhciUnknownFisRsvd[0x60];\r
+} EFI_AHCI_RECEIVED_FIS;\r

 \r
 typedef struct {\r
   UINT8  Madt : 5;\r
 \r
 typedef struct {\r
   UINT8  Madt : 5;\r


@@ -320,12 +320,12 @@ typedef struct {
 } EFI_AHCI_REGISTERS;\r
 \r
 /**\r
 } EFI_AHCI_REGISTERS;\r
 \r
 /**\r

-  This function is used to send out ATAPI commands conforms to the Packet Command \r
+  This function is used to send out ATAPI commands conforms to the Packet Command\r

   with PIO Protocol.\r
 \r
   @param PciIo              The PCI IO protocol instance.\r
   @param AhciRegisters      The pointer to the EFI_AHCI_REGISTERS.\r
   with PIO Protocol.\r
 \r
   @param PciIo              The PCI IO protocol instance.\r
   @param AhciRegisters      The pointer to the EFI_AHCI_REGISTERS.\r

-  @param Port               The number of port.     \r
+  @param Port               The number of port.\r

   @param PortMultiplier     The number of port multiplier.\r
   @param Packet             A pointer to EFI_EXT_SCSI_PASS_THRU_SCSI_REQUEST_PACKET structure.\r
 \r
   @param PortMultiplier     The number of port multiplier.\r
   @param Packet             A pointer to EFI_EXT_SCSI_PASS_THRU_SCSI_REQUEST_PACKET structure.\r
 \r


@@ -346,12 +346,12 @@ AhciPacketCommandExecute (
 \r
 /**\r
   Start command for give slot on specific port.\r
 \r
 /**\r
   Start command for give slot on specific port.\r

-    \r
+\r

   @param  PciIo              The PCI IO protocol instance.\r
   @param  Port               The number of port.\r
   @param  CommandSlot        The number of CommandSlot.\r
   @param  Timeout            The timeout value of start, uses 100ns as a unit.\r
   @param  PciIo              The PCI IO protocol instance.\r
   @param  Port               The number of port.\r
   @param  CommandSlot        The number of CommandSlot.\r
   @param  Timeout            The timeout value of start, uses 100ns as a unit.\r

-   \r
+\r

   @retval EFI_DEVICE_ERROR   The command start unsuccessfully.\r
   @retval EFI_TIMEOUT        The operation is time out.\r
   @retval EFI_SUCCESS        The command start successfully.\r
   @retval EFI_DEVICE_ERROR   The command start unsuccessfully.\r
   @retval EFI_TIMEOUT        The operation is time out.\r
   @retval EFI_SUCCESS        The command start successfully.\r


@@ -368,11 +368,11 @@ AhciStartCommand (
 \r
 /**\r
   Stop command running for giving port\r
 \r
 /**\r
   Stop command running for giving port\r

-    \r
+\r

   @param  PciIo              The PCI IO protocol instance.\r
   @param  Port               The number of port.\r
   @param  Timeout            The timeout value of stop, uses 100ns as a unit.\r
   @param  PciIo              The PCI IO protocol instance.\r
   @param  Port               The number of port.\r
   @param  Timeout            The timeout value of stop, uses 100ns as a unit.\r

-   \r
+\r

   @retval EFI_DEVICE_ERROR   The command stop unsuccessfully.\r
   @retval EFI_TIMEOUT        The operation is time out.\r
   @retval EFI_SUCCESS        The command stop successfully.\r
   @retval EFI_DEVICE_ERROR   The command stop unsuccessfully.\r
   @retval EFI_TIMEOUT        The operation is time out.\r
   @retval EFI_SUCCESS        The command stop successfully.\r

diff --git a/MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AtaAtapiPassThru.inf b/MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AtaAtapiPassThru.inf
index d1ce859091018df9c8876f662be50f2bda8b8e25..74e62649ce75419aab9acf2717e36f75e5727f63 100644 (file)
--- a/MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AtaAtapiPassThru.inf
+++ b/MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AtaAtapiPassThru.inf
@@ -29,9 +29,9 @@
 #\r
 #  VALID_ARCHITECTURES           = IA32 X64 IPF EBC\r
 #\r
 #\r
 #  VALID_ARCHITECTURES           = IA32 X64 IPF EBC\r
 #\r

-#  DRIVER_BINDING                =  gAtaAtapiPassThruDriverBinding                         \r
+#  DRIVER_BINDING                =  gAtaAtapiPassThruDriverBinding\r

 #  COMPONENT_NAME                =  gAtaAtapiPassThruComponentName\r
 #  COMPONENT_NAME                =  gAtaAtapiPassThruComponentName\r

-#  COMPONENT_NAME2               =  gAtaAtapiPassThruComponentName2                         \r
+#  COMPONENT_NAME2               =  gAtaAtapiPassThruComponentName2\r

 #\r
 #\r
 \r
 #\r
 #\r
 \r


@@ -43,7 +43,7 @@
   IdeMode.c\r
   IdeMode.h\r
   ComponentName.c\r
   IdeMode.c\r
   IdeMode.h\r
   ComponentName.c\r

-  \r
+\r

 [Packages]\r
   MdePkg/MdePkg.dec\r
   MdeModulePkg/MdeModulePkg.dec\r
 [Packages]\r
   MdePkg/MdePkg.dec\r
   MdeModulePkg/MdeModulePkg.dec\r

diff --git a/MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AtaAtapiPassThruDxeExtra.uni b/MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AtaAtapiPassThruDxeExtra.uni
index 8af8f56f2fabf3909e760b5194eea64270e9c0fa..4aff950feaf58eaa82a0fa6777f3cf03eca90f88 100644 (file)
--- a/MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AtaAtapiPassThruDxeExtra.uni
+++ b/MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AtaAtapiPassThruDxeExtra.uni
@@ -1,7 +1,7 @@
 // /** @file\r
 // AtaAtapiPassThruDxe Localized Strings and Content\r
 //\r
 // /** @file\r
 // AtaAtapiPassThruDxe Localized Strings and Content\r
 //\r

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

 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r
 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r


@@ -12,8 +12,8 @@
 //\r
 // **/\r
 \r
 //\r
 // **/\r
 \r

-#string STR_PROPERTIES_MODULE_NAME \r
-#language en-US \r
+#string STR_PROPERTIES_MODULE_NAME\r
+#language en-US\r

 "ATA ATAPI Pass Thru DXE Driver"\r
 \r
 \r
 "ATA ATAPI Pass Thru DXE Driver"\r
 \r
 \r

diff --git a/MdeModulePkg/Bus/Ata/AtaAtapiPassThru/ComponentName.c b/MdeModulePkg/Bus/Ata/AtaAtapiPassThru/ComponentName.c
index c3f7738d45b898992b3368bdc4858451dd584827..c4cfedd397f02b5365a27e967cf6130371bfad51 100644 (file)
--- a/MdeModulePkg/Bus/Ata/AtaAtapiPassThru/ComponentName.c
+++ b/MdeModulePkg/Bus/Ata/AtaAtapiPassThru/ComponentName.c
@@ -1,21 +1,21 @@
 /** @file\r
   UEFI Component Name(2) protocol implementation for AtaAtapiPassThru driver.\r
 /** @file\r
   UEFI Component Name(2) protocol implementation for AtaAtapiPassThru driver.\r

-  \r
-  Copyright (c) 2010 - 2011, Intel Corporation. All rights reserved.<BR>\r
-  This program and the accompanying materials                          \r
-  are licensed and made available under the terms and conditions of the BSD License         \r
-  which accompanies this distribution.  The full text of the license may be found at        \r
-  http://opensource.org/licenses/bsd-license.php                                            \r

 \r
 \r

-  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     \r
-  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             \r
+  Copyright (c) 2010 - 2018, Intel Corporation. All rights reserved.<BR>\r
+  This program and the accompanying materials\r
+  are licensed and made available under the terms and conditions of the BSD License\r
+  which accompanies this distribution.  The full text of the license may be found at\r
+  http://opensource.org/licenses/bsd-license.php\r
+\r
+  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
+  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r

 \r
 **/\r
 \r
 #include "AtaAtapiPassThru.h"\r
 \r
 //\r
 \r
 **/\r
 \r
 #include "AtaAtapiPassThru.h"\r
 \r
 //\r

-// Driver name table \r
+// Driver name table\r

 //\r
 GLOBAL_REMOVE_IF_UNREFERENCED EFI_UNICODE_STRING_TABLE mAtaAtapiPassThruDriverNameTable[] = {\r
   { "eng;en", L"AtaAtapiPassThru Driver" },\r
 //\r
 GLOBAL_REMOVE_IF_UNREFERENCED EFI_UNICODE_STRING_TABLE mAtaAtapiPassThruDriverNameTable[] = {\r
   { "eng;en", L"AtaAtapiPassThru Driver" },\r

diff --git a/MdeModulePkg/Bus/Ata/AtaAtapiPassThru/IdeMode.h b/MdeModulePkg/Bus/Ata/AtaAtapiPassThru/IdeMode.h
index 67fff646582cc21a488383069967cb0fe99911df..7b70d5f0aa10c6e337ceee66719dc6677de1c350 100644 (file)
--- a/MdeModulePkg/Bus/Ata/AtaAtapiPassThru/IdeMode.h
+++ b/MdeModulePkg/Bus/Ata/AtaAtapiPassThru/IdeMode.h
@@ -1,14 +1,14 @@
 /** @file\r
   Header file for IDE mode of ATA host controller.\r
 /** @file\r
   Header file for IDE mode of ATA host controller.\r

-  \r
-  Copyright (c) 2010 - 2011, Intel Corporation. All rights reserved.<BR>\r
-  This program and the accompanying materials                          \r
-  are licensed and made available under the terms and conditions of the BSD License         \r
-  which accompanies this distribution.  The full text of the license may be found at        \r
-  http://opensource.org/licenses/bsd-license.php                                            \r

 \r
 \r

-  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     \r
-  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             \r
+  Copyright (c) 2010 - 2018, Intel Corporation. All rights reserved.<BR>\r
+  This program and the accompanying materials\r
+  are licensed and made available under the terms and conditions of the BSD License\r
+  which accompanies this distribution.  The full text of the license may be found at\r
+  http://opensource.org/licenses/bsd-license.php\r
+\r
+  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
+  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r

 \r
 **/\r
 #ifndef __ATA_HC_IDE_MODE_H__\r
 \r
 **/\r
 #ifndef __ATA_HC_IDE_MODE_H__\r


@@ -121,7 +121,7 @@ typedef struct {
 #define IDE_SECONDARY_PROGRAMMABLE_INDICATOR  BIT3\r
 \r
 /**\r
 #define IDE_SECONDARY_PROGRAMMABLE_INDICATOR  BIT3\r
 \r
 /**\r

-  Get IDE i/o port registers' base addresses by mode. \r
+  Get IDE i/o port registers' base addresses by mode.\r

 \r
   In 'Compatibility' mode, use fixed addresses.\r
   In Native-PCI mode, get base addresses from BARs in the PCI IDE controller's\r
 \r
   In 'Compatibility' mode, use fixed addresses.\r
   In Native-PCI mode, get base addresses from BARs in the PCI IDE controller's\r


@@ -144,7 +144,7 @@ typedef struct {
   |___________|_______________|_______________|\r
 \r
   Table 1. Compatibility resource mappings\r
   |___________|_______________|_______________|\r
 \r
   Table 1. Compatibility resource mappings\r

-  \r
+\r

   b) In Native-PCI mode, IDE registers are mapped into IO space using the BARs\r
   in IDE controller's PCI Configuration Space, shown in the Table 2 below.\r
    ___________________________________________________\r
   b) In Native-PCI mode, IDE registers are mapped into IO space using the BARs\r
   in IDE controller's PCI Configuration Space, shown in the Table 2 below.\r
    ___________________________________________________\r


@@ -161,7 +161,7 @@ typedef struct {
   @param[in]      PciIo          Pointer to the EFI_PCI_IO_PROTOCOL instance\r
   @param[in, out] IdeRegisters   Pointer to EFI_IDE_REGISTERS which is used to\r
                                  store the IDE i/o port registers' base addresses\r
   @param[in]      PciIo          Pointer to the EFI_PCI_IO_PROTOCOL instance\r
   @param[in, out] IdeRegisters   Pointer to EFI_IDE_REGISTERS which is used to\r
                                  store the IDE i/o port registers' base addresses\r

-           \r
+\r

   @retval EFI_UNSUPPORTED        Return this value when the BARs is not IO type\r
   @retval EFI_SUCCESS            Get the Base address successfully\r
   @retval Other                  Read the pci configureation data error\r
   @retval EFI_UNSUPPORTED        Return this value when the BARs is not IO type\r
   @retval EFI_SUCCESS            Get the Base address successfully\r
   @retval Other                  Read the pci configureation data error\r


@@ -175,7 +175,7 @@ GetIdeRegisterIoAddr (
   );\r
 \r
 /**\r
   );\r
 \r
 /**\r

-  This function is used to send out ATAPI commands conforms to the Packet Command \r
+  This function is used to send out ATAPI commands conforms to the Packet Command\r

   with PIO Data In Protocol.\r
 \r
   @param[in] PciIo          Pointer to the EFI_PCI_IO_PROTOCOL instance\r
   with PIO Data In Protocol.\r
 \r
   @param[in] PciIo          Pointer to the EFI_PCI_IO_PROTOCOL instance\r

diff --git a/MdeModulePkg/Bus/Ata/AtaBusDxe/AtaBusDxeExtra.uni b/MdeModulePkg/Bus/Ata/AtaBusDxe/AtaBusDxeExtra.uni
index a55c9acb635e60d679add7212825b84b33deff40..ea8b25cfb67ac3fe6d6b738087e318554ca5c9fa 100644 (file)
--- a/MdeModulePkg/Bus/Ata/AtaBusDxe/AtaBusDxeExtra.uni
+++ b/MdeModulePkg/Bus/Ata/AtaBusDxe/AtaBusDxeExtra.uni
@@ -1,7 +1,7 @@
 // /** @file\r
 // AtaBusDxe Localized Strings and Content\r
 //\r
 // /** @file\r
 // AtaBusDxe Localized Strings and Content\r
 //\r

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

 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r
 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r


@@ -12,8 +12,8 @@
 //\r
 // **/\r
 \r
 //\r
 // **/\r
 \r

-#string STR_PROPERTIES_MODULE_NAME \r
-#language en-US \r
+#string STR_PROPERTIES_MODULE_NAME\r
+#language en-US\r

 "ATA Bus DXE Driver"\r
 \r
 \r
 "ATA Bus DXE Driver"\r
 \r
 \r

diff --git a/MdeModulePkg/Bus/Ata/AtaBusDxe/AtaPassThruExecute.c b/MdeModulePkg/Bus/Ata/AtaBusDxe/AtaPassThruExecute.c
index 35a1b47e8a36b63f9bf6c4017227a3ccf17d8aef..03b088804ba9d249864799b5f4bdf57f1b692829 100644 (file)
--- a/MdeModulePkg/Bus/Ata/AtaBusDxe/AtaPassThruExecute.c
+++ b/MdeModulePkg/Bus/Ata/AtaBusDxe/AtaPassThruExecute.c
@@ -10,7 +10,7 @@
   for Security Protocol Specific layout. This implementation uses big endian for\r
   Cylinder register.\r
 \r
   for Security Protocol Specific layout. This implementation uses big endian for\r
   Cylinder register.\r
 \r

-  Copyright (c) 2009 - 2016, Intel Corporation. All rights reserved.<BR>\r
+  Copyright (c) 2009 - 2018, Intel Corporation. All rights reserved.<BR>\r

   (C) Copyright 2016 Hewlett Packard Enterprise Development LP<BR>\r
   This program and the accompanying materials\r
   are licensed and made available under the terms and conditions of the BSD License\r
   (C) Copyright 2016 Hewlett Packard Enterprise Development LP<BR>\r
   This program and the accompanying materials\r
   are licensed and made available under the terms and conditions of the BSD License\r


@@ -633,7 +633,7 @@ AtaTerminateNonBlockingTask (
 \r
   //\r
   // Aborting operation has been done. From now on, don't need to abort normal operation.\r
 \r
   //\r
   // Aborting operation has been done. From now on, don't need to abort normal operation.\r

-  //  \r
+  //\r

   OldTpl = gBS->RaiseTPL (TPL_NOTIFY);\r
   AtaDevice->Abort = FALSE;\r
   gBS->RestoreTPL (OldTpl);\r
   OldTpl = gBS->RaiseTPL (TPL_NOTIFY);\r
   AtaDevice->Abort = FALSE;\r
   gBS->RestoreTPL (OldTpl);\r

diff --git a/MdeModulePkg/Bus/Ata/AtaBusDxe/ComponentName.c b/MdeModulePkg/Bus/Ata/AtaBusDxe/ComponentName.c
index ff9d727e6c391b523295e9276b36d76e768e6d24..e79ae3cefbca5d9c167f761bc5eb0dd4bd50e5c5 100644 (file)
--- a/MdeModulePkg/Bus/Ata/AtaBusDxe/ComponentName.c
+++ b/MdeModulePkg/Bus/Ata/AtaBusDxe/ComponentName.c
@@ -1,21 +1,21 @@
 /** @file\r
   UEFI Component Name(2) protocol implementation for ConPlatform driver.\r
 /** @file\r
   UEFI Component Name(2) protocol implementation for ConPlatform driver.\r

-  \r
-  Copyright (c) 2009 - 2011, Intel Corporation. All rights reserved.<BR>\r
-  This program and the accompanying materials                          \r
-  are licensed and made available under the terms and conditions of the BSD License         \r
-  which accompanies this distribution.  The full text of the license may be found at        \r
-  http://opensource.org/licenses/bsd-license.php                                            \r

 \r
 \r

-  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     \r
-  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             \r
+  Copyright (c) 2009 - 2018, Intel Corporation. All rights reserved.<BR>\r
+  This program and the accompanying materials\r
+  are licensed and made available under the terms and conditions of the BSD License\r
+  which accompanies this distribution.  The full text of the license may be found at\r
+  http://opensource.org/licenses/bsd-license.php\r
+\r
+  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
+  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r

 \r
 **/\r
 \r
 #include "AtaBus.h"\r
 \r
 //\r
 \r
 **/\r
 \r
 #include "AtaBus.h"\r
 \r
 //\r

-// Driver name table \r
+// Driver name table\r

 //\r
 GLOBAL_REMOVE_IF_UNREFERENCED EFI_UNICODE_STRING_TABLE mAtaBusDriverNameTable[] = {\r
   { "eng;en", L"ATA Bus Driver" },\r
 //\r
 GLOBAL_REMOVE_IF_UNREFERENCED EFI_UNICODE_STRING_TABLE mAtaBusDriverNameTable[] = {\r
   { "eng;en", L"ATA Bus Driver" },\r

diff --git a/MdeModulePkg/Bus/I2c/I2cDxe/I2cBus.c b/MdeModulePkg/Bus/I2c/I2cDxe/I2cBus.c
index cad5ad7d44a012c7dfbacb38fa7b222706628fe6..99d920849083e9fc6b2cbd8287ca92feb491cc7a 100644 (file)
--- a/MdeModulePkg/Bus/I2c/I2cDxe/I2cBus.c
+++ b/MdeModulePkg/Bus/I2c/I2cDxe/I2cBus.c
@@ -1,8 +1,8 @@
 /** @file\r
 /** @file\r

-  This file implements I2C IO Protocol which enables the user to manipulate a single \r
+  This file implements I2C IO Protocol which enables the user to manipulate a single\r

   I2C device independent of the host controller and I2C design.\r
 \r
   I2C device independent of the host controller and I2C design.\r
 \r

-  Copyright (c) 2013 - 2015, Intel Corporation. All rights reserved.<BR>\r
+  Copyright (c) 2013 - 2018, Intel Corporation. All rights reserved.<BR>\r

   This program and the accompanying materials\r
   are licensed and made available under the terms and conditions of the BSD License\r
   which accompanies this distribution.  The full text of the license may be found at\r
   This program and the accompanying materials\r
   are licensed and made available under the terms and conditions of the BSD License\r
   which accompanies this distribution.  The full text of the license may be found at\r


@@ -76,7 +76,7 @@ VENDOR_DEVICE_PATH gVendorDevicePathTemplate = {
 };\r
 \r
 //\r
 };\r
 \r
 //\r

-// Driver name table \r
+// Driver name table\r

 //\r
 GLOBAL_REMOVE_IF_UNREFERENCED EFI_UNICODE_STRING_TABLE mI2cBusDriverNameTable[] = {\r
   { "eng;en", (CHAR16 *) L"I2C Bus Driver" },\r
 //\r
 GLOBAL_REMOVE_IF_UNREFERENCED EFI_UNICODE_STRING_TABLE mI2cBusDriverNameTable[] = {\r
   { "eng;en", (CHAR16 *) L"I2C Bus Driver" },\r


@@ -241,12 +241,12 @@ I2cBusComponentNameGetControllerName (
 /**\r
   Check if the child of I2C controller has been created.\r
 \r
 /**\r
   Check if the child of I2C controller has been created.\r
 \r

-  @param[in] This                         A pointer to the EFI_DRIVER_BINDING_PROTOCOL instance.   \r
+  @param[in] This                         A pointer to the EFI_DRIVER_BINDING_PROTOCOL instance.\r

   @param[in] Controller                   I2C controller handle.\r
   @param[in] RemainingDevicePath          A pointer to the remaining portion of a device path.\r
   @param[in] RemainingHasControllerNode   Indicate if RemainingDevicePath contains CONTROLLER_DEVICE_PATH.\r
   @param[in] RemainingControllerNumber    Controller number in CONTROLLER_DEVICE_PATH.\r
   @param[in] Controller                   I2C controller handle.\r
   @param[in] RemainingDevicePath          A pointer to the remaining portion of a device path.\r
   @param[in] RemainingHasControllerNode   Indicate if RemainingDevicePath contains CONTROLLER_DEVICE_PATH.\r
   @param[in] RemainingControllerNumber    Controller number in CONTROLLER_DEVICE_PATH.\r

-  \r
+\r

   @retval EFI_SUCCESS                     The child of I2C controller is not created.\r
   @retval Others                          The child of I2C controller has been created or other errors happen.\r
 \r
   @retval EFI_SUCCESS                     The child of I2C controller is not created.\r
   @retval Others                          The child of I2C controller has been created or other errors happen.\r
 \r


@@ -266,11 +266,11 @@ CheckRemainingDevicePath (
   UINTN                                   EntryCount;\r
   UINTN                                   Index;\r
   BOOLEAN                                 SystemHasControllerNode;\r
   UINTN                                   EntryCount;\r
   UINTN                                   Index;\r
   BOOLEAN                                 SystemHasControllerNode;\r

-  UINT32                                  SystemControllerNumber;  \r
+  UINT32                                  SystemControllerNumber;\r

 \r
   SystemHasControllerNode = FALSE;\r
   SystemControllerNumber    = 0;\r
 \r
   SystemHasControllerNode = FALSE;\r
   SystemControllerNumber    = 0;\r

-  \r
+\r

   Status = gBS->OpenProtocolInformation (\r
                   Controller,\r
                   &gEfiI2cHostProtocolGuid,\r
   Status = gBS->OpenProtocolInformation (\r
                   Controller,\r
                   &gEfiI2cHostProtocolGuid,\r


@@ -280,7 +280,7 @@ CheckRemainingDevicePath (
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r

-  \r
+\r

   for (Index = 0; Index < EntryCount; Index++) {\r
     if ((OpenInfoBuffer[Index].Attributes & EFI_OPEN_PROTOCOL_BY_CHILD_CONTROLLER) != 0) {\r
       Status = gBS->OpenProtocol (\r
   for (Index = 0; Index < EntryCount; Index++) {\r
     if ((OpenInfoBuffer[Index].Attributes & EFI_OPEN_PROTOCOL_BY_CHILD_CONTROLLER) != 0) {\r
       Status = gBS->OpenProtocol (\r


@@ -294,7 +294,7 @@ CheckRemainingDevicePath (
       if (!EFI_ERROR (Status)) {\r
         //\r
         // Find vendor device path node and compare\r
       if (!EFI_ERROR (Status)) {\r
         //\r
         // Find vendor device path node and compare\r

-        //    \r
+        //\r

         while (!IsDevicePathEnd (SystemDevicePath)) {\r
           if ((DevicePathType (SystemDevicePath) == HARDWARE_DEVICE_PATH) &&\r
               (DevicePathSubType (SystemDevicePath) == HW_VENDOR_DP)) {\r
         while (!IsDevicePathEnd (SystemDevicePath)) {\r
           if ((DevicePathType (SystemDevicePath) == HARDWARE_DEVICE_PATH) &&\r
               (DevicePathSubType (SystemDevicePath) == HW_VENDOR_DP)) {\r


@@ -469,7 +469,7 @@ I2cBusDriverSupported (
   //\r
   // Determine if the I2C Host Protocol is available\r
   //\r
   //\r
   // Determine if the I2C Host Protocol is available\r
   //\r

-  Status = gBS->OpenProtocol ( \r
+  Status = gBS->OpenProtocol (\r

                   Controller,\r
                   &gEfiI2cHostProtocolGuid,\r
                   (VOID **) &I2cHost,\r
                   Controller,\r
                   &gEfiI2cHostProtocolGuid,\r
                   (VOID **) &I2cHost,\r


@@ -489,7 +489,7 @@ I2cBusDriverSupported (
 \r
 \r
   if (Status == EFI_ALREADY_STARTED) {\r
 \r
 \r
   if (Status == EFI_ALREADY_STARTED) {\r

-    if ((RemainingDevicePath == NULL) || \r
+    if ((RemainingDevicePath == NULL) ||\r

         ((RemainingDevicePath != NULL) && IsDevicePathEnd (RemainingDevicePath))) {\r
       //\r
       // If RemainingDevicePath is NULL or is the End of Device Path Node, return EFI_SUCCESS.\r
         ((RemainingDevicePath != NULL) && IsDevicePathEnd (RemainingDevicePath))) {\r
       //\r
       // If RemainingDevicePath is NULL or is the End of Device Path Node, return EFI_SUCCESS.\r


@@ -498,7 +498,7 @@ I2cBusDriverSupported (
     } else {\r
       //\r
       // Test if the child with the RemainingDevicePath has already been created.\r
     } else {\r
       //\r
       // Test if the child with the RemainingDevicePath has already been created.\r

-      //    \r
+      //\r

       Status = CheckRemainingDevicePath (\r
                  This,\r
                  Controller,\r
       Status = CheckRemainingDevicePath (\r
                  This,\r
                  Controller,\r


@@ -647,7 +647,7 @@ I2cBusDriverStart (
       Status = EFI_OUT_OF_RESOURCES;\r
       goto Error;\r
     }\r
       Status = EFI_OUT_OF_RESOURCES;\r
       goto Error;\r
     }\r

-    \r
+\r

     /*\r
        +----------------+\r
     .->| I2C_BUS_CONTEXT|<----- This file Protocol (gEfiCallerIdGuid) installed on I2C Controller handle\r
     /*\r
        +----------------+\r
     .->| I2C_BUS_CONTEXT|<----- This file Protocol (gEfiCallerIdGuid) installed on I2C Controller handle\r


@@ -660,7 +660,7 @@ I2cBusDriverStart (
        | I2C IO Protocol Structure  | <----- I2C IO Protocol\r
        |                            |\r
        +----------------------------+\r
        | I2C IO Protocol Structure  | <----- I2C IO Protocol\r
        |                            |\r
        +----------------------------+\r

-    \r
+\r

     */\r
     I2cBusContext->I2cHost      = I2cHost;\r
     I2cBusContext->I2cEnumerate = I2cEnumerate;\r
     */\r
     I2cBusContext->I2cHost      = I2cHost;\r
     I2cBusContext->I2cEnumerate = I2cEnumerate;\r


@@ -672,9 +672,9 @@ I2cBusDriverStart (
     // Parent controller device path used to create children device path\r
     //\r
     I2cBusContext->ParentDevicePath = ParentDevicePath;\r
     // Parent controller device path used to create children device path\r
     //\r
     I2cBusContext->ParentDevicePath = ParentDevicePath;\r

-    \r
+\r

     I2cBusContext->DriverBindingHandle = This->DriverBindingHandle;\r
     I2cBusContext->DriverBindingHandle = This->DriverBindingHandle;\r

-    \r
+\r

     Status = gBS->InstallMultipleProtocolInterfaces (\r
                     &Controller,\r
                     &gEfiCallerIdGuid,\r
     Status = gBS->InstallMultipleProtocolInterfaces (\r
                     &Controller,\r
                     &gEfiCallerIdGuid,\r


@@ -698,7 +698,7 @@ Error:
   if (EFI_ERROR (Status)) {\r
     DEBUG ((EFI_D_ERROR, "I2cBus: Start() function failed, Status = %r\n", Status));\r
     if (ParentDevicePath != NULL) {\r
   if (EFI_ERROR (Status)) {\r
     DEBUG ((EFI_D_ERROR, "I2cBus: Start() function failed, Status = %r\n", Status));\r
     if (ParentDevicePath != NULL) {\r

-      gBS->CloseProtocol ( \r
+      gBS->CloseProtocol (\r

             Controller,\r
             &gEfiDevicePathProtocolGuid,\r
             This->DriverBindingHandle,\r
             Controller,\r
             &gEfiDevicePathProtocolGuid,\r
             This->DriverBindingHandle,\r


@@ -716,14 +716,14 @@ Error:
     }\r
 \r
     if (I2cEnumerate != NULL) {\r
     }\r
 \r
     if (I2cEnumerate != NULL) {\r

-      gBS->CloseProtocol ( \r
+      gBS->CloseProtocol (\r

             Controller,\r
             &gEfiI2cEnumerateProtocolGuid,\r
             This->DriverBindingHandle,\r
             Controller\r
             );\r
     }\r
             Controller,\r
             &gEfiI2cEnumerateProtocolGuid,\r
             This->DriverBindingHandle,\r
             Controller\r
             );\r
     }\r

-    \r
+\r

     if (I2cBusContext != NULL) {\r
       Status = gBS->UninstallMultipleProtocolInterfaces (\r
                       &Controller,\r
     if (I2cBusContext != NULL) {\r
       Status = gBS->UninstallMultipleProtocolInterfaces (\r
                       &Controller,\r


@@ -783,7 +783,7 @@ I2cBusDriverStop (
   UINTN                       Index;\r
 \r
   if (NumberOfChildren == 0) {\r
   UINTN                       Index;\r
 \r
   if (NumberOfChildren == 0) {\r

-    gBS->CloseProtocol ( \r
+    gBS->CloseProtocol (\r

           Controller,\r
           &gEfiDevicePathProtocolGuid,\r
           This->DriverBindingHandle,\r
           Controller,\r
           &gEfiDevicePathProtocolGuid,\r
           This->DriverBindingHandle,\r


@@ -880,14 +880,14 @@ RegisterI2cDevice (
   // Default DeviceIndex\r
   //\r
   RemainingPathDeviceIndex = 0;\r
   // Default DeviceIndex\r
   //\r
   RemainingPathDeviceIndex = 0;\r

-  \r
+\r

   //\r
   // Determine the controller number in Controller Node Device Path when RemainingDevicePath is not NULL.\r
   //\r
   if (RemainingDevicePath != NULL) {\r
     //\r
     // Check if there is a controller node appended after vendor node\r
   //\r
   // Determine the controller number in Controller Node Device Path when RemainingDevicePath is not NULL.\r
   //\r
   if (RemainingDevicePath != NULL) {\r
     //\r
     // Check if there is a controller node appended after vendor node\r

-    //    \r
+    //\r

     DevPathNode = NextDevicePathNode (RemainingDevicePath);\r
     if ((DevicePathType (DevPathNode) == HARDWARE_DEVICE_PATH) &&\r
         (DevicePathSubType(DevPathNode) == HW_CONTROLLER_DP)) {\r
     DevPathNode = NextDevicePathNode (RemainingDevicePath);\r
     if ((DevicePathType (DevPathNode) == HARDWARE_DEVICE_PATH) &&\r
         (DevicePathSubType(DevPathNode) == HW_CONTROLLER_DP)) {\r


@@ -965,7 +965,7 @@ RegisterI2cDevice (
       //\r
       if ((!CompareGuid (&((VENDOR_DEVICE_PATH *)RemainingDevicePath)->Guid, Device->DeviceGuid)) ||\r
           (RemainingPathDeviceIndex != Device->DeviceIndex)) {\r
       //\r
       if ((!CompareGuid (&((VENDOR_DEVICE_PATH *)RemainingDevicePath)->Guid, Device->DeviceGuid)) ||\r
           (RemainingPathDeviceIndex != Device->DeviceIndex)) {\r

-        continue; \r
+        continue;\r

       }\r
     }\r
 \r
       }\r
     }\r
 \r


@@ -1015,7 +1015,7 @@ RegisterI2cDevice (
       ReleaseI2cDeviceContext (I2cDeviceContext);\r
       continue;\r
     }\r
       ReleaseI2cDeviceContext (I2cDeviceContext);\r
       continue;\r
     }\r

-    \r
+\r

     //\r
     // Create the child handle\r
     //\r
     //\r
     // Create the child handle\r
     //\r


@@ -1040,7 +1040,7 @@ RegisterI2cDevice (
       // Free resources for this I2C device\r
       //\r
       ReleaseI2cDeviceContext (I2cDeviceContext);\r
       // Free resources for this I2C device\r
       //\r
       ReleaseI2cDeviceContext (I2cDeviceContext);\r

-      continue;      \r
+      continue;\r

     }\r
 \r
     if (RemainingDevicePath != NULL) {\r
     }\r
 \r
     if (RemainingDevicePath != NULL) {\r


@@ -1074,7 +1074,7 @@ RegisterI2cDevice (
 \r
   The upper layer driver writer provides the following to the platform\r
   vendor:\r
 \r
   The upper layer driver writer provides the following to the platform\r
   vendor:\r

-  \r
+\r

   1.  Vendor specific GUID for the I2C part\r
   2.  Guidance on proper construction of the slave address array when the\r
       I2C device uses more than one slave address.  The I2C bus protocol\r
   1.  Vendor specific GUID for the I2C part\r
   2.  Guidance on proper construction of the slave address array when the\r
       I2C device uses more than one slave address.  The I2C bus protocol\r


@@ -1192,7 +1192,7 @@ ReleaseI2cDeviceContext (
   if (I2cDeviceContext == NULL) {\r
     return;\r
   }\r
   if (I2cDeviceContext == NULL) {\r
     return;\r
   }\r

-  \r
+\r

   if (I2cDeviceContext->DevicePath != NULL) {\r
     FreePool (I2cDeviceContext->DevicePath);\r
   }\r
   if (I2cDeviceContext->DevicePath != NULL) {\r
     FreePool (I2cDeviceContext->DevicePath);\r
   }\r


@@ -1282,12 +1282,12 @@ UnRegisterI2cDevice (
           );\r
     return Status;\r
   }\r
           );\r
     return Status;\r
   }\r

-  \r
+\r

   //\r
   // Free resources for this I2C device\r
   //\r
   ReleaseI2cDeviceContext (I2cDeviceContext);\r
   //\r
   // Free resources for this I2C device\r
   //\r
   ReleaseI2cDeviceContext (I2cDeviceContext);\r

-  \r
+\r

   return EFI_SUCCESS;\r
 }\r
 \r
   return EFI_SUCCESS;\r
 }\r
 \r


@@ -1310,12 +1310,12 @@ I2cBusDevicePathAppend (
   )\r
 {\r
   EFI_DEVICE_PATH_PROTOCOL  *PreviousDevicePath;\r
   )\r
 {\r
   EFI_DEVICE_PATH_PROTOCOL  *PreviousDevicePath;\r

-  \r
+\r

   PreviousDevicePath = NULL;\r
 \r
   //\r
   // Build vendor device path\r
   PreviousDevicePath = NULL;\r
 \r
   //\r
   // Build vendor device path\r

-  //  \r
+  //\r

   CopyMem (&gVendorDevicePathTemplate.Guid, I2cDeviceContext->I2cDevice->DeviceGuid, sizeof (EFI_GUID));\r
   I2cDeviceContext->DevicePath                    = AppendDevicePathNode (\r
                                                       I2cDeviceContext->I2cBusContext->ParentDevicePath,\r
   CopyMem (&gVendorDevicePathTemplate.Guid, I2cDeviceContext->I2cDevice->DeviceGuid, sizeof (EFI_GUID));\r
   I2cDeviceContext->DevicePath                    = AppendDevicePathNode (\r
                                                       I2cDeviceContext->I2cBusContext->ParentDevicePath,\r


@@ -1325,13 +1325,13 @@ I2cBusDevicePathAppend (
   if (I2cDeviceContext->DevicePath == NULL) {\r
     return EFI_OUT_OF_RESOURCES;\r
   }\r
   if (I2cDeviceContext->DevicePath == NULL) {\r
     return EFI_OUT_OF_RESOURCES;\r
   }\r

-  \r
+\r

   if ((BuildControllerNode) && (I2cDeviceContext->DevicePath != NULL)) {\r
     //\r
     // Build the final I2C device path with controller node\r
     //\r
     PreviousDevicePath = I2cDeviceContext->DevicePath;\r
   if ((BuildControllerNode) && (I2cDeviceContext->DevicePath != NULL)) {\r
     //\r
     // Build the final I2C device path with controller node\r
     //\r
     PreviousDevicePath = I2cDeviceContext->DevicePath;\r

-    gControllerDevicePathTemplate.ControllerNumber = I2cDeviceContext->I2cDevice->DeviceIndex; \r
+    gControllerDevicePathTemplate.ControllerNumber = I2cDeviceContext->I2cDevice->DeviceIndex;\r

     I2cDeviceContext->DevicePath          = AppendDevicePathNode (\r
                                               I2cDeviceContext->DevicePath,\r
                                               (EFI_DEVICE_PATH_PROTOCOL *) &gControllerDevicePathTemplate\r
     I2cDeviceContext->DevicePath          = AppendDevicePathNode (\r
                                               I2cDeviceContext->DevicePath,\r
                                               (EFI_DEVICE_PATH_PROTOCOL *) &gControllerDevicePathTemplate\r


@@ -1379,7 +1379,7 @@ InitializeI2cBus(
              );\r
   ASSERT_EFI_ERROR (Status);\r
 \r
              );\r
   ASSERT_EFI_ERROR (Status);\r
 \r

-  \r
+\r

   return Status;\r
 }\r
 \r
   return Status;\r
 }\r
 \r

diff --git a/MdeModulePkg/Bus/I2c/I2cDxe/I2cBusDxeExtra.uni b/MdeModulePkg/Bus/I2c/I2cDxe/I2cBusDxeExtra.uni
index 374debe440159af0f7a3cbba3862d0a2ec0b3afa..e7e84fdfec62c4064919134fab05573b086e3108 100644 (file)
--- a/MdeModulePkg/Bus/I2c/I2cDxe/I2cBusDxeExtra.uni
+++ b/MdeModulePkg/Bus/I2c/I2cDxe/I2cBusDxeExtra.uni
@@ -1,7 +1,7 @@
 // /** @file\r
 // I2cBusDxe Localized Strings and Content\r
 //\r
 // /** @file\r
 // I2cBusDxe Localized Strings and Content\r
 //\r

-// Copyright (c) 2014, Intel Corporation. All rights reserved.<BR>\r
+// Copyright (c) 2014 - 2018, Intel Corporation. All rights reserved.<BR>\r

 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r
 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r


@@ -12,8 +12,8 @@
 //\r
 // **/\r
 \r
 //\r
 // **/\r
 \r

-#string STR_PROPERTIES_MODULE_NAME \r
-#language en-US \r
+#string STR_PROPERTIES_MODULE_NAME\r
+#language en-US\r

 "I2C Bus DXE Driver"\r
 \r
 \r
 "I2C Bus DXE Driver"\r
 \r
 \r

diff --git a/MdeModulePkg/Bus/I2c/I2cDxe/I2cDxe.h b/MdeModulePkg/Bus/I2c/I2cDxe/I2cDxe.h
index 1490d4283a0239cfd1c99dc10261450164c424da..005dd3e0730208cd816804d744df29e2ea54b853 100644 (file)
--- a/MdeModulePkg/Bus/I2c/I2cDxe/I2cDxe.h
+++ b/MdeModulePkg/Bus/I2c/I2cDxe/I2cDxe.h
@@ -4,7 +4,7 @@
   This file defines common data structures, macro definitions and some module\r
   internal function header files.\r
 \r
   This file defines common data structures, macro definitions and some module\r
   internal function header files.\r
 \r

-  Copyright (c) 2013, Intel Corporation. All rights reserved.<BR>\r
+  Copyright (c) 2013 - 2018, Intel Corporation. All rights reserved.<BR>\r

   This program and the accompanying materials\r
   are licensed and made available under the terms and conditions of the BSD License\r
   which accompanies this distribution.  The full text of the license may be found at\r
   This program and the accompanying materials\r
   are licensed and made available under the terms and conditions of the BSD License\r
   which accompanies this distribution.  The full text of the license may be found at\r


@@ -53,7 +53,7 @@ typedef struct {
   EFI_I2C_HOST_PROTOCOL            *I2cHost;\r
   EFI_HANDLE                       Controller;\r
   EFI_DEVICE_PATH_PROTOCOL         *ParentDevicePath;\r
   EFI_I2C_HOST_PROTOCOL            *I2cHost;\r
   EFI_HANDLE                       Controller;\r
   EFI_DEVICE_PATH_PROTOCOL         *ParentDevicePath;\r

-  EFI_HANDLE                       DriverBindingHandle;  \r
+  EFI_HANDLE                       DriverBindingHandle;\r

 } I2C_BUS_CONTEXT;\r
 \r
 //\r
 } I2C_BUS_CONTEXT;\r
 \r
 //\r


@@ -102,7 +102,7 @@ typedef struct {
   // Signature\r
   //\r
   UINT32                            Signature;\r
   // Signature\r
   //\r
   UINT32                            Signature;\r

-  \r
+\r

   //\r
   // Next request in the pending request list\r
   //\r
   //\r
   // Next request in the pending request list\r
   //\r


@@ -218,7 +218,7 @@ extern EFI_DRIVER_BINDING_PROTOCOL    gI2cHostDriverBinding;
   @param[in] RemainingDevicePath      A pointer to the remaining portion of a device path.\r
 \r
   @retval EFI_SUCCESS                 Driver API properly initialized\r
   @param[in] RemainingDevicePath      A pointer to the remaining portion of a device path.\r
 \r
   @retval EFI_SUCCESS                 Driver API properly initialized\r

-  \r
+\r

 **/\r
 EFI_STATUS\r
 RegisterI2cDevice (\r
 **/\r
 EFI_STATUS\r
 RegisterI2cDevice (\r


@@ -285,7 +285,7 @@ I2cBusDevicePathAppend (
 \r
   The upper layer driver writer provides the following to the platform\r
   vendor:\r
 \r
   The upper layer driver writer provides the following to the platform\r
   vendor:\r

-  \r
+\r

   1.  Vendor specific GUID for the I2C part\r
   2.  Guidance on proper construction of the slave address array when the\r
       I2C device uses more than one slave address.  The I2C bus protocol\r
   1.  Vendor specific GUID for the I2C part\r
   2.  Guidance on proper construction of the slave address array when the\r
       I2C device uses more than one slave address.  The I2C bus protocol\r


@@ -524,7 +524,7 @@ I2cBusComponentNameGetDriverName (
   IN  CHAR8                        *Language,\r
   OUT CHAR16                       **DriverName\r
   );\r
   IN  CHAR8                        *Language,\r
   OUT CHAR16                       **DriverName\r
   );\r

-  \r
+\r

 /**\r
   Retrieves a Unicode string that is the user readable name of the controller\r
   that is being managed by a driver.\r
 /**\r
   Retrieves a Unicode string that is the user readable name of the controller\r
   that is being managed by a driver.\r


@@ -789,7 +789,7 @@ I2cHostDriverStart (
   IN EFI_HANDLE                         Controller,\r
   IN EFI_DEVICE_PATH_PROTOCOL           *RemainingDevicePath\r
   );\r
   IN EFI_HANDLE                         Controller,\r
   IN EFI_DEVICE_PATH_PROTOCOL           *RemainingDevicePath\r
   );\r

-  \r
+\r

 /**\r
   Stops a device controller or a bus controller.\r
 \r
 /**\r
   Stops a device controller or a bus controller.\r
 \r


@@ -871,7 +871,7 @@ I2cHostComponentNameGetDriverName (
   IN  CHAR8                        *Language,\r
   OUT CHAR16                       **DriverName\r
   );\r
   IN  CHAR8                        *Language,\r
   OUT CHAR16                       **DriverName\r
   );\r

-  \r
+\r

 /**\r
   Retrieves a Unicode string that is the user readable name of the controller\r
   that is being managed by a driver.\r
 /**\r
   Retrieves a Unicode string that is the user readable name of the controller\r
   that is being managed by a driver.\r

diff --git a/MdeModulePkg/Bus/I2c/I2cDxe/I2cDxeExtra.uni b/MdeModulePkg/Bus/I2c/I2cDxe/I2cDxeExtra.uni
index 1f27927531e28703a5373117636d6d32d709aa3c..17b02185842cd13d753d2775c39a9bc7682e00df 100644 (file)
--- a/MdeModulePkg/Bus/I2c/I2cDxe/I2cDxeExtra.uni
+++ b/MdeModulePkg/Bus/I2c/I2cDxe/I2cDxeExtra.uni
@@ -1,7 +1,7 @@
 // /** @file\r
 // I2cDxe Localized Strings and Content\r
 //\r
 // /** @file\r
 // I2cDxe Localized Strings and Content\r
 //\r

-// Copyright (c) 2014, Intel Corporation. All rights reserved.<BR>\r
+// Copyright (c) 2014 - 2018, Intel Corporation. All rights reserved.<BR>\r

 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r
 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r


@@ -12,8 +12,8 @@
 //\r
 // **/\r
 \r
 //\r
 // **/\r
 \r

-#string STR_PROPERTIES_MODULE_NAME \r
-#language en-US \r
+#string STR_PROPERTIES_MODULE_NAME\r
+#language en-US\r

 "I2C DXE Driver"\r
 \r
 \r
 "I2C DXE Driver"\r
 \r
 \r

diff --git a/MdeModulePkg/Bus/I2c/I2cDxe/I2cHost.c b/MdeModulePkg/Bus/I2c/I2cDxe/I2cHost.c
index 68dd93188751362787cdda7c4a08c206e553379b..d745b6df7896661ece73be1ef65e5afe564d0662 100644 (file)
--- a/MdeModulePkg/Bus/I2c/I2cDxe/I2cHost.c
+++ b/MdeModulePkg/Bus/I2c/I2cDxe/I2cHost.c
@@ -1,9 +1,9 @@
 /** @file\r
 /** @file\r

-  This file implements I2C Host Protocol which provides callers with the ability to \r
+  This file implements I2C Host Protocol which provides callers with the ability to\r

   do I/O transactions to all of the devices on the I2C bus.\r
 \r
   Copyright (c) 2014, Hewlett-Packard Development Company, L.P.<BR>\r
   do I/O transactions to all of the devices on the I2C bus.\r
 \r
   Copyright (c) 2014, Hewlett-Packard Development Company, L.P.<BR>\r

-  Copyright (c) 2013 - 2015, Intel Corporation. All rights reserved.<BR>\r
+  Copyright (c) 2013 - 2018, Intel Corporation. All rights reserved.<BR>\r

   This program and the accompanying materials\r
   are licensed and made available under the terms and conditions of the BSD License\r
   which accompanies this distribution.  The full text of the license may be found at\r
   This program and the accompanying materials\r
   are licensed and made available under the terms and conditions of the BSD License\r
   which accompanies this distribution.  The full text of the license may be found at\r


@@ -26,7 +26,7 @@ EFI_DRIVER_BINDING_PROTOCOL gI2cHostDriverBinding = {
 };\r
 \r
 //\r
 };\r
 \r
 //\r

-// Driver name table \r
+// Driver name table\r

 //\r
 GLOBAL_REMOVE_IF_UNREFERENCED EFI_UNICODE_STRING_TABLE mI2cHostDriverNameTable[] = {\r
   { "eng;en", L"I2c Host Driver" },\r
 //\r
 GLOBAL_REMOVE_IF_UNREFERENCED EFI_UNICODE_STRING_TABLE mI2cHostDriverNameTable[] = {\r
   { "eng;en", L"I2c Host Driver" },\r


@@ -356,7 +356,7 @@ I2cHostDriverStart (
   //\r
   // Locate I2C Master Protocol\r
   //\r
   //\r
   // Locate I2C Master Protocol\r
   //\r

-  Status = gBS->OpenProtocol ( \r
+  Status = gBS->OpenProtocol (\r

                   Controller,\r
                   &gEfiI2cMasterProtocolGuid,\r
                   (VOID **)&I2cMaster,\r
                   Controller,\r
                   &gEfiI2cMasterProtocolGuid,\r
                   (VOID **)&I2cMaster,\r


@@ -425,7 +425,7 @@ I2cHostDriverStart (
   if (EFI_ERROR (Status)) {\r
     DEBUG ((EFI_D_ERROR, "I2cHost: create bus available event error, Status = %r\n", Status));\r
     goto Exit;\r
   if (EFI_ERROR (Status)) {\r
     DEBUG ((EFI_D_ERROR, "I2cHost: create bus available event error, Status = %r\n", Status));\r
     goto Exit;\r

-  }  \r
+  }\r

 \r
   //\r
   // Build the I2C host protocol for the current I2C controller\r
 \r
   //\r
   // Build the I2C host protocol for the current I2C controller\r


@@ -451,9 +451,9 @@ Exit:
                       &gEfiI2cBusConfigurationManagementProtocolGuid,\r
                       This->DriverBindingHandle,\r
                       Controller\r
                       &gEfiI2cBusConfigurationManagementProtocolGuid,\r
                       This->DriverBindingHandle,\r
                       Controller\r

-                      );      \r
+                      );\r

     }\r
     }\r

-    \r
+\r

     if ((I2cHostContext != NULL) && (I2cHostContext->I2cEvent != NULL)) {\r
       gBS->CloseEvent (I2cHostContext->I2cEvent);\r
       I2cHostContext->I2cEvent = NULL;\r
     if ((I2cHostContext != NULL) && (I2cHostContext->I2cEvent != NULL)) {\r
       gBS->CloseEvent (I2cHostContext->I2cEvent);\r
       I2cHostContext->I2cEvent = NULL;\r


@@ -513,7 +513,7 @@ I2cHostDriverStop (
   IN  EFI_HANDLE                        *ChildHandleBuffer\r
   )\r
 {\r
   IN  EFI_HANDLE                        *ChildHandleBuffer\r
   )\r
 {\r

-  EFI_STATUS                  Status;  \r
+  EFI_STATUS                  Status;\r

   I2C_HOST_CONTEXT            *I2cHostContext;\r
   EFI_I2C_HOST_PROTOCOL       *I2cHost;\r
   EFI_TPL                     TplPrevious;\r
   I2C_HOST_CONTEXT            *I2cHostContext;\r
   EFI_I2C_HOST_PROTOCOL       *I2cHost;\r
   EFI_TPL                     TplPrevious;\r


@@ -543,14 +543,14 @@ I2cHostDriverStop (
   // Raise TPL for critical section\r
   //\r
   TplPrevious = gBS->RaiseTPL (TPL_I2C_SYNC);\r
   // Raise TPL for critical section\r
   //\r
   TplPrevious = gBS->RaiseTPL (TPL_I2C_SYNC);\r

-  \r
+\r

   //\r
   // If there is pending request or pending bus configuration, do not stop\r
   //\r
   Status = EFI_DEVICE_ERROR;\r
   if (( !I2cHostContext->I2cBusConfigurationManagementPending )\r
     && IsListEmpty (&I2cHostContext->RequestList)) {\r
   //\r
   // If there is pending request or pending bus configuration, do not stop\r
   //\r
   Status = EFI_DEVICE_ERROR;\r
   if (( !I2cHostContext->I2cBusConfigurationManagementPending )\r
     && IsListEmpty (&I2cHostContext->RequestList)) {\r

-    \r
+\r

     //\r
     //  Remove the I2C host protocol\r
     //\r
     //\r
     //  Remove the I2C host protocol\r
     //\r


@@ -561,7 +561,7 @@ I2cHostDriverStop (
                     NULL\r
                     );\r
   }\r
                     NULL\r
                     );\r
   }\r

-  \r
+\r

   //\r
   // Leave critical section\r
   //\r
   //\r
   // Leave critical section\r
   //\r


@@ -581,12 +581,12 @@ I2cHostDriverStop (
       gBS->CloseEvent (I2cHostContext->I2cBusConfigurationEvent);\r
       I2cHostContext->I2cBusConfigurationEvent = NULL;\r
     }\r
       gBS->CloseEvent (I2cHostContext->I2cBusConfigurationEvent);\r
       I2cHostContext->I2cBusConfigurationEvent = NULL;\r
     }\r

-    \r
+\r

     if (I2cHostContext->I2cEvent != NULL) {\r
       gBS->CloseEvent (I2cHostContext->I2cEvent);\r
       I2cHostContext->I2cEvent = NULL;\r
     }\r
     if (I2cHostContext->I2cEvent != NULL) {\r
       gBS->CloseEvent (I2cHostContext->I2cEvent);\r
       I2cHostContext->I2cEvent = NULL;\r
     }\r

-    \r
+\r

     FreePool (I2cHostContext);\r
   }\r
 \r
     FreePool (I2cHostContext);\r
   }\r
 \r


@@ -644,7 +644,7 @@ I2cHostI2cBusConfigurationAvailable (
     // Force next operation to enable the I2C bus configuration\r
     //\r
     I2cHostContext->I2cBusConfiguration = (UINTN) -1;\r
     // Force next operation to enable the I2C bus configuration\r
     //\r
     I2cHostContext->I2cBusConfiguration = (UINTN) -1;\r

-    \r
+\r

     //\r
     // Do not continue current I2C request\r
     //\r
     //\r
     // Do not continue current I2C request\r
     //\r


@@ -666,7 +666,7 @@ I2cHostI2cBusConfigurationAvailable (
   //\r
   // Start an I2C operation on the host, the status is returned by I2cHostContext->Status\r
   //\r
   //\r
   // Start an I2C operation on the host, the status is returned by I2cHostContext->Status\r
   //\r

-  Status = I2cMaster->StartRequest ( \r
+  Status = I2cMaster->StartRequest (\r

                         I2cMaster,\r
                         I2cRequest->SlaveAddress,\r
                         I2cRequest->RequestPacket,\r
                         I2cMaster,\r
                         I2cRequest->SlaveAddress,\r
                         I2cRequest->RequestPacket,\r


@@ -734,7 +734,7 @@ I2cHostRequestComplete (
   if(!IsListEmpty (EntryHeader)) {\r
     I2cHostRequestEnable (I2cHostContext);\r
   }\r
   if(!IsListEmpty (EntryHeader)) {\r
     I2cHostRequestEnable (I2cHostContext);\r
   }\r

-  \r
+\r

   return Status;\r
 }\r
 \r
   return Status;\r
 }\r
 \r


@@ -942,7 +942,7 @@ I2cHostQueueRequest (
   if (RequestPacket == NULL) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
   if (RequestPacket == NULL) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r

-  \r
+\r

   if ((SlaveAddress & I2C_ADDRESSING_10_BIT) != 0) {\r
     //\r
     // 10-bit address, bits 0-9 are used for 10-bit I2C slave addresses,\r
   if ((SlaveAddress & I2C_ADDRESSING_10_BIT) != 0) {\r
     //\r
     // 10-bit address, bits 0-9 are used for 10-bit I2C slave addresses,\r


@@ -970,7 +970,7 @@ I2cHostQueueRequest (
     //\r
     // For synchronous transaction, register an event used to wait for finishing synchronous transaction\r
     //\r
     //\r
     // For synchronous transaction, register an event used to wait for finishing synchronous transaction\r
     //\r

-    Status = gBS->CreateEvent ( \r
+    Status = gBS->CreateEvent (\r

                 0,\r
                 TPL_I2C_SYNC,\r
                 NULL,\r
                 0,\r
                 TPL_I2C_SYNC,\r
                 NULL,\r


@@ -981,7 +981,7 @@ I2cHostQueueRequest (
       return Status;\r
     }\r
   }\r
       return Status;\r
     }\r
   }\r

- \r
+\r

   //\r
   // TPL should be at or below TPL_NOTIFY.\r
   // For synchronous requests this routine must be called at or below TPL_CALLBACK.\r
   //\r
   // TPL should be at or below TPL_NOTIFY.\r
   // For synchronous requests this routine must be called at or below TPL_CALLBACK.\r


@@ -1022,9 +1022,9 @@ I2cHostQueueRequest (
   // Synchronize with the other threads\r
   //\r
   gBS->RaiseTPL ( TPL_I2C_SYNC );\r
   // Synchronize with the other threads\r
   //\r
   gBS->RaiseTPL ( TPL_I2C_SYNC );\r

-  \r
+\r

   FirstRequest = IsListEmpty (&I2cHostContext->RequestList);\r
   FirstRequest = IsListEmpty (&I2cHostContext->RequestList);\r

-  \r
+\r

   //\r
   // Insert new I2C request in the list\r
   //\r
   //\r
   // Insert new I2C request in the list\r
   //\r


@@ -1034,7 +1034,7 @@ I2cHostQueueRequest (
   // Release the thread synchronization\r
   //\r
   gBS->RestoreTPL (TplPrevious);\r
   // Release the thread synchronization\r
   //\r
   gBS->RestoreTPL (TplPrevious);\r

-  \r
+\r

   if (FirstRequest) {\r
     //\r
     // Start the first I2C request, then the subsequent of I2C request will continue\r
   if (FirstRequest) {\r
     //\r
     // Start the first I2C request, then the subsequent of I2C request will continue\r

diff --git a/MdeModulePkg/Bus/I2c/I2cDxe/I2cHostDxeExtra.uni b/MdeModulePkg/Bus/I2c/I2cDxe/I2cHostDxeExtra.uni
index 816663884cdac20d7f03b40306b3f9a05a1b7e4a..ed3b2d6e75d57c8dc0d29cda5a5b9cf469b186da 100644 (file)
--- a/MdeModulePkg/Bus/I2c/I2cDxe/I2cHostDxeExtra.uni
+++ b/MdeModulePkg/Bus/I2c/I2cDxe/I2cHostDxeExtra.uni
@@ -1,7 +1,7 @@
 // /** @file\r
 // I2cHostDxe Localized Strings and Content\r
 //\r
 // /** @file\r
 // I2cHostDxe Localized Strings and Content\r
 //\r

-// Copyright (c) 2014, Intel Corporation. All rights reserved.<BR>\r
+// Copyright (c) 2014 - 2018, Intel Corporation. All rights reserved.<BR>\r

 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r
 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r


@@ -12,8 +12,8 @@
 //\r
 // **/\r
 \r
 //\r
 // **/\r
 \r

-#string STR_PROPERTIES_MODULE_NAME \r
-#language en-US \r
+#string STR_PROPERTIES_MODULE_NAME\r
+#language en-US\r

 "I2C Host DXE Driver"\r
 \r
 \r
 "I2C Host DXE Driver"\r
 \r
 \r

diff --git a/MdeModulePkg/Bus/Isa/IsaBusDxe/ComponentName.c b/MdeModulePkg/Bus/Isa/IsaBusDxe/ComponentName.c
index ff7bbef278cf4555283c2cac8d9292a7a1122659..b0815615a6cdf2e9bda8301b599dcdd451f0549a 100644 (file)
--- a/MdeModulePkg/Bus/Isa/IsaBusDxe/ComponentName.c
+++ b/MdeModulePkg/Bus/Isa/IsaBusDxe/ComponentName.c
@@ -1,14 +1,14 @@
 /** @file\r
   UEFI Component Name(2) protocol implementation for IsaBusDxe driver.\r
 /** @file\r
   UEFI Component Name(2) protocol implementation for IsaBusDxe driver.\r

-  \r
-  Copyright (c) 2015, Intel Corporation. All rights reserved.<BR>\r
-  This program and the accompanying materials                          \r
-  are licensed and made available under the terms and conditions of the BSD License         \r
-  which accompanies this distribution.  The full text of the license may be found at        \r
-  http://opensource.org/licenses/bsd-license.php                                            \r

 \r
 \r

-  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     \r
-  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             \r
+  Copyright (c) 2015 - 2018, Intel Corporation. All rights reserved.<BR>\r
+  This program and the accompanying materials\r
+  are licensed and made available under the terms and conditions of the BSD License\r
+  which accompanies this distribution.  The full text of the license may be found at\r
+  http://opensource.org/licenses/bsd-license.php\r
+\r
+  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
+  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r

 \r
 **/\r
 \r
 \r
 **/\r
 \r


@@ -16,7 +16,7 @@
 #include <Library/UefiLib.h>\r
 \r
 //\r
 #include <Library/UefiLib.h>\r
 \r
 //\r

-// Driver name table \r
+// Driver name table\r

 //\r
 GLOBAL_REMOVE_IF_UNREFERENCED EFI_UNICODE_STRING_TABLE     mIsaBusDriverNameTable[] = {\r
   { "eng;en", L"PI ISA BUS Driver" },\r
 //\r
 GLOBAL_REMOVE_IF_UNREFERENCED EFI_UNICODE_STRING_TABLE     mIsaBusDriverNameTable[] = {\r
   { "eng;en", L"PI ISA BUS Driver" },\r

diff --git a/MdeModulePkg/Bus/Isa/IsaBusDxe/ComponentName.h b/MdeModulePkg/Bus/Isa/IsaBusDxe/ComponentName.h
index f533971833c182a122b87617b1424695dc166f0d..41ec235f1be5e77d45962b12b4a30e14c6911376 100644 (file)
--- a/MdeModulePkg/Bus/Isa/IsaBusDxe/ComponentName.h
+++ b/MdeModulePkg/Bus/Isa/IsaBusDxe/ComponentName.h
@@ -1,14 +1,14 @@
 /** @file\r
   UEFI Component Name(2) protocol implementation for IsaBusDxe driver.\r
 /** @file\r
   UEFI Component Name(2) protocol implementation for IsaBusDxe driver.\r

-  \r
-  Copyright (c) 2015, Intel Corporation. All rights reserved.<BR>\r
-  This program and the accompanying materials                          \r
-  are licensed and made available under the terms and conditions of the BSD License         \r
-  which accompanies this distribution.  The full text of the license may be found at        \r
-  http://opensource.org/licenses/bsd-license.php                                            \r
-\r
-  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     \r
-  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             \r
+\r
+  Copyright (c) 2015 - 2018, Intel Corporation. All rights reserved.<BR>\r
+  This program and the accompanying materials\r
+  are licensed and made available under the terms and conditions of the BSD License\r
+  which accompanies this distribution.  The full text of the license may be found at\r
+  http://opensource.org/licenses/bsd-license.php\r
+\r
+  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
+  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r

 \r
 **/\r
 \r
 \r
 **/\r
 \r

diff --git a/MdeModulePkg/Bus/Isa/IsaBusDxe/IsaBusDxe.c b/MdeModulePkg/Bus/Isa/IsaBusDxe/IsaBusDxe.c
index 0bd9b24fbdba55c29d0e366a5516f097b28bd417..8aba2d3aacdda64b1d0995038fda179c04006794 100644 (file)
--- a/MdeModulePkg/Bus/Isa/IsaBusDxe/IsaBusDxe.c
+++ b/MdeModulePkg/Bus/Isa/IsaBusDxe/IsaBusDxe.c
@@ -3,7 +3,7 @@
   Controller and installs the ISA Host Controller Service Binding protocol\r
   on the ISA Host Controller's handle.\r
 \r
   Controller and installs the ISA Host Controller Service Binding protocol\r
   on the ISA Host Controller's handle.\r
 \r

-  Copyright (c) 2015 - 2016, Intel Corporation. All rights reserved.<BR>\r
+  Copyright (c) 2015 - 2018, Intel Corporation. All rights reserved.<BR>\r

   This program and the accompanying materials\r
   are licensed and made available under the terms and conditions of the BSD License\r
   which accompanies this distribution.  The full text of the license may be found at\r
   This program and the accompanying materials\r
   are licensed and made available under the terms and conditions of the BSD License\r
   which accompanies this distribution.  The full text of the license may be found at\r


@@ -19,19 +19,19 @@
 #include "ComponentName.h"\r
 \r
 /**\r
 #include "ComponentName.h"\r
 \r
 /**\r

-  Tests to see if this driver supports a given controller. If a child device is provided, \r
+  Tests to see if this driver supports a given controller. If a child device is provided,\r

   it further tests to see if this driver supports creating a handle for the specified child device.\r
 \r
   @param[in]  This                 A pointer to the EFI_DRIVER_BINDING_PROTOCOL instance.\r
   it further tests to see if this driver supports creating a handle for the specified child device.\r
 \r
   @param[in]  This                 A pointer to the EFI_DRIVER_BINDING_PROTOCOL instance.\r

-  @param[in]  ControllerHandle     The handle of the controller to test. This handle \r
-                                   must support a protocol interface that supplies \r
+  @param[in]  ControllerHandle     The handle of the controller to test. This handle\r
+                                   must support a protocol interface that supplies\r

                                    an I/O abstraction to the driver.\r
                                    an I/O abstraction to the driver.\r

-  @param[in]  RemainingDevicePath  A pointer to the remaining portion of a device path.  This \r
-                                   parameter is ignored by device drivers, and is optional for bus \r
-                                   drivers. For bus drivers, if this parameter is not NULL, then \r
-                                   the bus driver must determine if the bus controller specified \r
-                                   by ControllerHandle and the child controller specified \r
-                                   by RemainingDevicePath are both supported by this \r
+  @param[in]  RemainingDevicePath  A pointer to the remaining portion of a device path.  This\r
+                                   parameter is ignored by device drivers, and is optional for bus\r
+                                   drivers. For bus drivers, if this parameter is not NULL, then\r
+                                   the bus driver must determine if the bus controller specified\r
+                                   by ControllerHandle and the child controller specified\r
+                                   by RemainingDevicePath are both supported by this\r

                                    bus driver.\r
 \r
   @retval EFI_SUCCESS              The device specified by ControllerHandle and\r
                                    bus driver.\r
 \r
   @retval EFI_SUCCESS              The device specified by ControllerHandle and\r


@@ -105,14 +105,14 @@ ISA_BUS_CHILD_PRIVATE_DATA mIsaBusChildPrivateTemplate = {
 \r
 /**\r
   Creates a child handle and installs a protocol.\r
 \r
 /**\r
   Creates a child handle and installs a protocol.\r

-  \r
-  The CreateChild() function installs a protocol on ChildHandle. \r
-  If ChildHandle is a pointer to NULL, then a new handle is created and returned in ChildHandle. \r
+\r
+  The CreateChild() function installs a protocol on ChildHandle.\r
+  If ChildHandle is a pointer to NULL, then a new handle is created and returned in ChildHandle.\r

   If ChildHandle is not a pointer to NULL, then the protocol installs on the existing ChildHandle.\r
 \r
   @param  This        Pointer to the EFI_SERVICE_BINDING_PROTOCOL instance.\r
   @param  ChildHandle Pointer to the handle of the child to create. If it is NULL,\r
   If ChildHandle is not a pointer to NULL, then the protocol installs on the existing ChildHandle.\r
 \r
   @param  This        Pointer to the EFI_SERVICE_BINDING_PROTOCOL instance.\r
   @param  ChildHandle Pointer to the handle of the child to create. If it is NULL,\r

-                      then a new handle is created. If it is a pointer to an existing UEFI handle, \r
+                      then a new handle is created. If it is a pointer to an existing UEFI handle,\r

                       then the protocol is added to the existing UEFI handle.\r
 \r
   @retval EFI_SUCCES            The protocol was added to ChildHandle.\r
                       then the protocol is added to the existing UEFI handle.\r
 \r
   @retval EFI_SUCCES            The protocol was added to ChildHandle.\r


@@ -164,9 +164,9 @@ IsaBusCreateChild (
 \r
 /**\r
   Destroys a child handle with a protocol installed on it.\r
 \r
 /**\r
   Destroys a child handle with a protocol installed on it.\r

-  \r
-  The DestroyChild() function does the opposite of CreateChild(). It removes a protocol \r
-  that was installed by CreateChild() from ChildHandle. If the removed protocol is the \r
+\r
+  The DestroyChild() function does the opposite of CreateChild(). It removes a protocol\r
+  that was installed by CreateChild() from ChildHandle. If the removed protocol is the\r

   last protocol on ChildHandle, then ChildHandle is destroyed.\r
 \r
   @param  This        Pointer to the EFI_SERVICE_BINDING_PROTOCOL instance.\r
   last protocol on ChildHandle, then ChildHandle is destroyed.\r
 \r
   @param  This        Pointer to the EFI_SERVICE_BINDING_PROTOCOL instance.\r


@@ -260,18 +260,18 @@ ISA_BUS_PRIVATE_DATA   mIsaBusPrivateTemplate = {
   Starts a device controller or a bus controller.\r
 \r
   @param[in]  This                 A pointer to the EFI_DRIVER_BINDING_PROTOCOL instance.\r
   Starts a device controller or a bus controller.\r
 \r
   @param[in]  This                 A pointer to the EFI_DRIVER_BINDING_PROTOCOL instance.\r

-  @param[in]  ControllerHandle     The handle of the controller to start. This handle \r
-                                   must support a protocol interface that supplies \r
+  @param[in]  ControllerHandle     The handle of the controller to start. This handle\r
+                                   must support a protocol interface that supplies\r

                                    an I/O abstraction to the driver.\r
                                    an I/O abstraction to the driver.\r

-  @param[in]  RemainingDevicePath  A pointer to the remaining portion of a device path.  This \r
-                                   parameter is ignored by device drivers, and is optional for bus \r
-                                   drivers. For a bus driver, if this parameter is NULL, then handles \r
-                                   for all the children of Controller are created by this driver.  \r
-                                   If this parameter is not NULL and the first Device Path Node is \r
-                                   not the End of Device Path Node, then only the handle for the \r
-                                   child device specified by the first Device Path Node of \r
+  @param[in]  RemainingDevicePath  A pointer to the remaining portion of a device path.  This\r
+                                   parameter is ignored by device drivers, and is optional for bus\r
+                                   drivers. For a bus driver, if this parameter is NULL, then handles\r
+                                   for all the children of Controller are created by this driver.\r
+                                   If this parameter is not NULL and the first Device Path Node is\r
+                                   not the End of Device Path Node, then only the handle for the\r
+                                   child device specified by the first Device Path Node of\r

                                    RemainingDevicePath is created by this driver.\r
                                    RemainingDevicePath is created by this driver.\r

-                                   If the first Device Path Node of RemainingDevicePath is \r
+                                   If the first Device Path Node of RemainingDevicePath is\r

                                    the End of Device Path Node, no child handle is created by this\r
                                    driver.\r
 \r
                                    the End of Device Path Node, no child handle is created by this\r
                                    driver.\r
 \r


@@ -340,13 +340,13 @@ IsaBusDriverBindingStart (
 \r
 /**\r
   Stops a device controller or a bus controller.\r
 \r
 /**\r
   Stops a device controller or a bus controller.\r

-  \r
+\r

   @param[in]  This              A pointer to the EFI_DRIVER_BINDING_PROTOCOL instance.\r
   @param[in]  This              A pointer to the EFI_DRIVER_BINDING_PROTOCOL instance.\r

-  @param[in]  ControllerHandle  A handle to the device being stopped. The handle must \r
-                                support a bus specific I/O protocol for the driver \r
+  @param[in]  ControllerHandle  A handle to the device being stopped. The handle must\r
+                                support a bus specific I/O protocol for the driver\r

                                 to use to stop the device.\r
   @param[in]  NumberOfChildren  The number of child device handles in ChildHandleBuffer.\r
                                 to use to stop the device.\r
   @param[in]  NumberOfChildren  The number of child device handles in ChildHandleBuffer.\r

-  @param[in]  ChildHandleBuffer An array of child handles to be freed. May be NULL \r
+  @param[in]  ChildHandleBuffer An array of child handles to be freed. May be NULL\r

                                 if NumberOfChildren is 0.\r
 \r
   @retval EFI_SUCCESS           The device was stopped.\r
                                 if NumberOfChildren is 0.\r
 \r
   @retval EFI_SUCCESS           The device was stopped.\r


@@ -432,10 +432,10 @@ EFI_DRIVER_BINDING_PROTOCOL gIsaBusDriverBinding = {
 \r
 /**\r
   Entry point of the IsaBusDxe driver.\r
 \r
 /**\r
   Entry point of the IsaBusDxe driver.\r

-  \r
-  @param[in] ImageHandle    The firmware allocated handle for the EFI image.  \r
+\r
+  @param[in] ImageHandle    The firmware allocated handle for the EFI image.\r

   @param[in] SystemTable    A pointer to the EFI System Table.\r
   @param[in] SystemTable    A pointer to the EFI System Table.\r

-  \r
+\r

   @retval EFI_SUCCESS       The entry point is executed successfully.\r
   @retval other             Some error occurs when executing this entry point.\r
 **/\r
   @retval EFI_SUCCESS       The entry point is executed successfully.\r
   @retval other             Some error occurs when executing this entry point.\r
 **/\r


@@ -447,7 +447,7 @@ InitializeIsaBus (
   )\r
 {\r
   EFI_STATUS           Status;\r
   )\r
 {\r
   EFI_STATUS           Status;\r

-  \r
+\r

   Status = EfiLibInstallDriverBindingComponentName2 (\r
              ImageHandle,\r
              SystemTable,\r
   Status = EfiLibInstallDriverBindingComponentName2 (\r
              ImageHandle,\r
              SystemTable,\r

diff --git a/MdeModulePkg/Bus/Isa/IsaBusDxe/IsaBusDxe.inf b/MdeModulePkg/Bus/Isa/IsaBusDxe/IsaBusDxe.inf
index 1d9e22ec4c80b8fdd87ea027123e30538f479193..b257e99dbaf5da1cf310ab6de9d6c105fa658520 100644 (file)
--- a/MdeModulePkg/Bus/Isa/IsaBusDxe/IsaBusDxe.inf
+++ b/MdeModulePkg/Bus/Isa/IsaBusDxe/IsaBusDxe.inf
@@ -6,7 +6,7 @@
 #  the ISA Host Controller and installs the ISA Host Controller Service Binding\r
 #  protocol on the ISA Host Controller's handle.\r
 #\r
 #  the ISA Host Controller and installs the ISA Host Controller Service Binding\r
 #  protocol on the ISA Host Controller's handle.\r
 #\r

-#  Copyright (c) 2015, Intel Corporation. All rights reserved.<BR>\r
+#  Copyright (c) 2015 - 2018, Intel Corporation. All rights reserved.<BR>\r

 #\r
 #  This program and the accompanying materials\r
 #  are licensed and made available under the terms and conditions of the BSD License\r
 #\r
 #  This program and the accompanying materials\r
 #  are licensed and made available under the terms and conditions of the BSD License\r


@@ -56,9 +56,9 @@
   DebugLib\r
 \r
 [Protocols]\r
   DebugLib\r
 \r
 [Protocols]\r

-  ## CONSUMES \r
+  ## CONSUMES\r

   ## PRODUCES\r
   ## PRODUCES\r

-  gEfiIsaHcProtocolGuid                 \r
+  gEfiIsaHcProtocolGuid\r

   gEfiIsaHcServiceBindingProtocolGuid   ## PRODUCES\r
 \r
 [UserExtensions.TianoCore."ExtraFiles"]\r
   gEfiIsaHcServiceBindingProtocolGuid   ## PRODUCES\r
 \r
 [UserExtensions.TianoCore."ExtraFiles"]\r

diff --git a/MdeModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2KbdTextIn.c b/MdeModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2KbdTextIn.c
index 5986eca5f3149abb9efb7944b37d1d35e9c44b30..9eda6f5ca01e157d18c049c406e69d8fabaf4acd 100644 (file)
--- a/MdeModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2KbdTextIn.c
+++ b/MdeModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2KbdTextIn.c
@@ -718,7 +718,7 @@ KeyNotifyProcessHandler (
   while (TRUE) {\r
     //\r
     // Enter critical section\r
   while (TRUE) {\r
     //\r
     // Enter critical section\r

-    //  \r
+    //\r

     OldTpl = gBS->RaiseTPL (TPL_NOTIFY);\r
     Status = PopEfikeyBufHead (&ConsoleIn->EfiKeyQueueForNotify, &KeyData);\r
     //\r
     OldTpl = gBS->RaiseTPL (TPL_NOTIFY);\r
     Status = PopEfikeyBufHead (&ConsoleIn->EfiKeyQueueForNotify, &KeyData);\r
     //\r

diff --git a/MdeModulePkg/Bus/Pci/EhciDxe/ComponentName.c b/MdeModulePkg/Bus/Pci/EhciDxe/ComponentName.c
index 3181b9da5b0f0b178ace3552ceb93d4592418591..a5fb7ed4c704f3cd00dea96988d9996bd9243861 100644 (file)
--- a/MdeModulePkg/Bus/Pci/EhciDxe/ComponentName.c
+++ b/MdeModulePkg/Bus/Pci/EhciDxe/ComponentName.c
@@ -1,8 +1,8 @@
 /** @file\r
   UEFI Component Name(2) protocol implementation for EHCI driver.\r
 \r
 /** @file\r
   UEFI Component Name(2) protocol implementation for EHCI driver.\r
 \r

-Copyright (c) 2006 - 2011, Intel Corporation. All rights reserved.<BR>\r
-  \r
+Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r
+\r

 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions\r
 of the BSD License which accompanies this distribution.  The\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions\r
 of the BSD License which accompanies this distribution.  The\r

diff --git a/MdeModulePkg/Bus/Pci/EhciDxe/Ehci.c b/MdeModulePkg/Bus/Pci/EhciDxe/Ehci.c
index f18ee82261ad3313a32d08d2a5211355915122a2..30ad2b2ffeef5304b44b5ca46831a243f3a9fb02 100644 (file)
--- a/MdeModulePkg/Bus/Pci/EhciDxe/Ehci.c
+++ b/MdeModulePkg/Bus/Pci/EhciDxe/Ehci.c
@@ -1,14 +1,14 @@
-/** @file  \r
+/** @file\r

   The Ehci controller driver.\r
 \r
   The Ehci controller driver.\r
 \r

-  EhciDxe driver is responsible for managing the behavior of EHCI controller. \r
-  It implements the interfaces of monitoring the status of all ports and transferring \r
+  EhciDxe driver is responsible for managing the behavior of EHCI controller.\r
+  It implements the interfaces of monitoring the status of all ports and transferring\r

   Control, Bulk, Interrupt and Isochronous requests to Usb2.0 device.\r
 \r
   Note that EhciDxe driver is enhanced to guarantee that the EHCI controller get attached\r
   Control, Bulk, Interrupt and Isochronous requests to Usb2.0 device.\r
 \r
   Note that EhciDxe driver is enhanced to guarantee that the EHCI controller get attached\r

-  to the EHCI controller before a UHCI or OHCI driver attaches to the companion UHCI or \r
-  OHCI controller.  This way avoids the control transfer on a shared port between EHCI \r
-  and companion host controller when UHCI or OHCI gets attached earlier than EHCI and a \r
+  to the EHCI controller before a UHCI or OHCI driver attaches to the companion UHCI or\r
+  OHCI controller.  This way avoids the control transfer on a shared port between EHCI\r
+  and companion host controller when UHCI or OHCI gets attached earlier than EHCI and a\r

   USB 2.0 device inserts.\r
 \r
 Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r
   USB 2.0 device inserts.\r
 \r
 Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r


@@ -1608,7 +1608,7 @@ EhcCreateUsb2Hc (
     gBS->FreePool (Ehc);\r
     return NULL;\r
   }\r
     gBS->FreePool (Ehc);\r
     return NULL;\r
   }\r

-  \r
+\r

   EhcGetUsbDebugPortInfo (Ehc);\r
 \r
   //\r
   EhcGetUsbDebugPortInfo (Ehc);\r
 \r
   //\r


@@ -1781,12 +1781,12 @@ EhcDriverBindingStart (
     goto CLOSE_PCIIO;\r
   }\r
   //\r
     goto CLOSE_PCIIO;\r
   }\r
   //\r

-  // Determine if the device is UHCI or OHCI host controller or not. If yes, then find out the \r
+  // Determine if the device is UHCI or OHCI host controller or not. If yes, then find out the\r

   // companion usb ehci host controller and force EHCI driver get attached to it before\r
   // UHCI or OHCI driver attaches to UHCI or OHCI host controller.\r
   //\r
   if ((UsbClassCReg.ProgInterface == PCI_IF_UHCI || UsbClassCReg.ProgInterface == PCI_IF_OHCI) &&\r
   // companion usb ehci host controller and force EHCI driver get attached to it before\r
   // UHCI or OHCI driver attaches to UHCI or OHCI host controller.\r
   //\r
   if ((UsbClassCReg.ProgInterface == PCI_IF_UHCI || UsbClassCReg.ProgInterface == PCI_IF_OHCI) &&\r

-       (UsbClassCReg.BaseCode == PCI_CLASS_SERIAL) && \r
+       (UsbClassCReg.BaseCode == PCI_CLASS_SERIAL) &&\r

        (UsbClassCReg.SubClassCode == PCI_CLASS_SERIAL_USB)) {\r
     Status = PciIo->GetLocation (\r
                     PciIo,\r
        (UsbClassCReg.SubClassCode == PCI_CLASS_SERIAL_USB)) {\r
     Status = PciIo->GetLocation (\r
                     PciIo,\r


@@ -1835,7 +1835,7 @@ EhcDriverBindingStart (
       }\r
 \r
       if ((UsbClassCReg.ProgInterface == PCI_IF_EHCI) &&\r
       }\r
 \r
       if ((UsbClassCReg.ProgInterface == PCI_IF_EHCI) &&\r

-           (UsbClassCReg.BaseCode == PCI_CLASS_SERIAL) && \r
+           (UsbClassCReg.BaseCode == PCI_CLASS_SERIAL) &&\r

            (UsbClassCReg.SubClassCode == PCI_CLASS_SERIAL_USB)) {\r
         Status = Instance->GetLocation (\r
                     Instance,\r
            (UsbClassCReg.SubClassCode == PCI_CLASS_SERIAL_USB)) {\r
         Status = Instance->GetLocation (\r
                     Instance,\r


@@ -2098,7 +2098,7 @@ EhcDriverBindingStop (
   }\r
 \r
   //\r
   }\r
 \r
   //\r

-  // Disable routing of all ports to EHCI controller, so all ports are \r
+  // Disable routing of all ports to EHCI controller, so all ports are\r

   // routed back to the UHCI or OHCI controller.\r
   //\r
   EhcClearOpRegBit (Ehc, EHC_CONFIG_FLAG_OFFSET, CONFIGFLAG_ROUTE_EHC);\r
   // routed back to the UHCI or OHCI controller.\r
   //\r
   EhcClearOpRegBit (Ehc, EHC_CONFIG_FLAG_OFFSET, CONFIGFLAG_ROUTE_EHC);\r

diff --git a/MdeModulePkg/Bus/Pci/EhciDxe/Ehci.h b/MdeModulePkg/Bus/Pci/EhciDxe/Ehci.h
index 3415816c53b60e75e960f845fd0f820007a2df19..f7556754f8ead8399221a5a6227d4edf934f304f 100644 (file)
--- a/MdeModulePkg/Bus/Pci/EhciDxe/Ehci.h
+++ b/MdeModulePkg/Bus/Pci/EhciDxe/Ehci.h
@@ -2,7 +2,7 @@
 \r
   Provides some data struct used by EHCI controller driver.\r
 \r
 \r
   Provides some data struct used by EHCI controller driver.\r
 \r

-Copyright (c) 2006 - 2015, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r

 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r


@@ -133,7 +133,7 @@ struct _USB2_HC_DEV {
   EFI_EVENT                 PollTimer;\r
 \r
   //\r
   EFI_EVENT                 PollTimer;\r
 \r
   //\r

-  // ExitBootServicesEvent is used to stop the EHC DMA operation \r
+  // ExitBootServicesEvent is used to stop the EHC DMA operation\r

   // after exit boot service.\r
   //\r
   EFI_EVENT                 ExitBootServiceEvent;\r
   // after exit boot service.\r
   //\r
   EFI_EVENT                 ExitBootServiceEvent;\r

diff --git a/MdeModulePkg/Bus/Pci/EhciDxe/EhciDxe.inf b/MdeModulePkg/Bus/Pci/EhciDxe/EhciDxe.inf
index 238923e828b57414f5d48e8b7ab20089ffd4c6fc..bc6bd4ce295a7b95583b8c69f036af43f966dc10 100644 (file)
--- a/MdeModulePkg/Bus/Pci/EhciDxe/EhciDxe.inf
+++ b/MdeModulePkg/Bus/Pci/EhciDxe/EhciDxe.inf
@@ -1,14 +1,14 @@
 ## @file\r
 #  The EhciDxe driver is responsible for managing the behavior of EHCI controller.\r
 ## @file\r
 #  The EhciDxe driver is responsible for managing the behavior of EHCI controller.\r

-#  It implements the interfaces of monitoring the status of all ports and transferring \r
+#  It implements the interfaces of monitoring the status of all ports and transferring\r

 #  Control, Bulk, Interrupt and Isochronous requests to Usb2.0 device.\r
 #\r
 #  Note that EhciDxe driver is enhanced to guarantee that the EHCI controller get attached\r
 #  Control, Bulk, Interrupt and Isochronous requests to Usb2.0 device.\r
 #\r
 #  Note that EhciDxe driver is enhanced to guarantee that the EHCI controller get attached\r

-#  to the EHCI controller before the UHCI driver attaches to the companion UHCI controller. \r
+#  to the EHCI controller before the UHCI driver attaches to the companion UHCI controller.\r

 #  This way avoids the control transfer on a shared port between EHCI and companion host\r
 #  controller when UHCI gets attached earlier than EHCI and a USB 2.0 device inserts.\r
 #\r
 #  This way avoids the control transfer on a shared port between EHCI and companion host\r
 #  controller when UHCI gets attached earlier than EHCI and a USB 2.0 device inserts.\r
 #\r

-#  Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.<BR>\r
+#  Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r

 #\r
 #  This program and the accompanying materials\r
 #  are licensed and made available under the terms and conditions of the BSD License\r
 #\r
 #  This program and the accompanying materials\r
 #  are licensed and made available under the terms and conditions of the BSD License\r


@@ -36,7 +36,7 @@
 #\r
 #  VALID_ARCHITECTURES           = IA32 X64 IPF EBC ARM AARCH64\r
 #\r
 #\r
 #  VALID_ARCHITECTURES           = IA32 X64 IPF EBC ARM AARCH64\r
 #\r

-#  DRIVER_BINDING                =  gEhciDriverBinding                        \r
+#  DRIVER_BINDING                =  gEhciDriverBinding\r

 #  COMPONENT_NAME                =  gEhciComponentName\r
 #  COMPONENT_NAME2               =  gEhciComponentName2\r
 #\r
 #  COMPONENT_NAME                =  gEhciComponentName\r
 #  COMPONENT_NAME2               =  gEhciComponentName2\r
 #\r

diff --git a/MdeModulePkg/Bus/Pci/EhciDxe/EhciDxe.uni b/MdeModulePkg/Bus/Pci/EhciDxe/EhciDxe.uni
index e36ee52663c4cc3f5ba128c4b7639aafc35ab234..eb930abdd0534d749d526b14c4ebd7bd69b8560a 100644 (file)
--- a/MdeModulePkg/Bus/Pci/EhciDxe/EhciDxe.uni
+++ b/MdeModulePkg/Bus/Pci/EhciDxe/EhciDxe.uni
@@ -3,19 +3,19 @@
 //\r
 // It implements the interfaces of monitoring the status of all ports and transferring\r
 // Control, Bulk, Interrupt and Isochronous requests to Usb2.0 device.\r
 //\r
 // It implements the interfaces of monitoring the status of all ports and transferring\r
 // Control, Bulk, Interrupt and Isochronous requests to Usb2.0 device.\r

-// \r
+//\r

 // Note that EhciDxe driver is enhanced to guarantee that the EHCI controller get attached\r
 // to the EHCI controller before the UHCI driver attaches to the companion UHCI controller.\r
 // This way avoids the control transfer on a shared port between EHCI and companion host\r
 // controller when UHCI gets attached earlier than EHCI and a USB 2.0 device inserts.\r
 //\r
 // Note that EhciDxe driver is enhanced to guarantee that the EHCI controller get attached\r
 // to the EHCI controller before the UHCI driver attaches to the companion UHCI controller.\r
 // This way avoids the control transfer on a shared port between EHCI and companion host\r
 // controller when UHCI gets attached earlier than EHCI and a USB 2.0 device inserts.\r
 //\r

-// Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.<BR>\r
+// Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r

 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r
 // which accompanies this distribution. The full text of the license may be found at\r
 // http://opensource.org/licenses/bsd-license.php\r
 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r
 // which accompanies this distribution. The full text of the license may be found at\r
 // http://opensource.org/licenses/bsd-license.php\r

-// \r
+//\r

 // THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 // WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 //\r
 // THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 // WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 //\r

diff --git a/MdeModulePkg/Bus/Pci/EhciDxe/EhciDxeExtra.uni b/MdeModulePkg/Bus/Pci/EhciDxe/EhciDxeExtra.uni
index 1d625a9f7b2e60ccc7df126769994dcdea9c933f..8bce7f98ecddb83078cdc63925055639f4f7e979 100644 (file)
--- a/MdeModulePkg/Bus/Pci/EhciDxe/EhciDxeExtra.uni
+++ b/MdeModulePkg/Bus/Pci/EhciDxe/EhciDxeExtra.uni
@@ -1,7 +1,7 @@
 // /** @file\r
 // EhciDxe Localized Strings and Content\r
 //\r
 // /** @file\r
 // EhciDxe Localized Strings and Content\r
 //\r

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

 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r
 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r


@@ -13,8 +13,8 @@
 //\r
 // **/\r
 \r
 //\r
 // **/\r
 \r

-#string STR_PROPERTIES_MODULE_NAME \r
-#language en-US \r
+#string STR_PROPERTIES_MODULE_NAME\r
+#language en-US\r

 "EHCI Controller DXE Driver"\r
 \r
 \r
 "EHCI Controller DXE Driver"\r
 \r
 \r

diff --git a/MdeModulePkg/Bus/Pci/EhciDxe/EhciSched.c b/MdeModulePkg/Bus/Pci/EhciDxe/EhciSched.c
index 036c00b32b4006e6130f27bb0d75c708c2829ca5..fea6f47f4c04146e85cae140a9689dde97527403 100644 (file)
--- a/MdeModulePkg/Bus/Pci/EhciDxe/EhciSched.c
+++ b/MdeModulePkg/Bus/Pci/EhciDxe/EhciSched.c
@@ -2,7 +2,7 @@
 \r
   EHCI transfer scheduling routines.\r
 \r
 \r
   EHCI transfer scheduling routines.\r
 \r

-Copyright (c) 2007 - 2013, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2007 - 2018, Intel Corporation. All rights reserved.<BR>\r

 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r


@@ -918,7 +918,7 @@ EhcUpdateAsyncRequest (
       //\r
       // calculate physical address by offset.\r
       //\r
       //\r
       // calculate physical address by offset.\r
       //\r

-      PciAddr = (UINTN)Urb->DataPhy + ((UINTN)Qtd->Data - (UINTN)Urb->Data); \r
+      PciAddr = (UINTN)Urb->DataPhy + ((UINTN)Qtd->Data - (UINTN)Urb->Data);\r

       QtdHw->Page[0]    = EHC_LOW_32BIT (PciAddr);\r
       QtdHw->PageHigh[0]= EHC_HIGH_32BIT (PciAddr);\r
     }\r
       QtdHw->Page[0]    = EHC_LOW_32BIT (PciAddr);\r
       QtdHw->PageHigh[0]= EHC_HIGH_32BIT (PciAddr);\r
     }\r

diff --git a/MdeModulePkg/Bus/Pci/EhciPei/EhcPeim.c b/MdeModulePkg/Bus/Pci/EhciPei/EhcPeim.c
index 5cad25e926c578df51411af22b2f25c9c78c4bda..6abd3d4d713098bf54e33e37c127a6bfccecabb1 100644 (file)
--- a/MdeModulePkg/Bus/Pci/EhciPei/EhcPeim.c
+++ b/MdeModulePkg/Bus/Pci/EhciPei/EhcPeim.c
@@ -2,8 +2,8 @@
 PEIM to produce gPeiUsb2HostControllerPpiGuid based on gPeiUsbControllerPpiGuid\r
 which is used to enable recovery function from USB Drivers.\r
 \r
 PEIM to produce gPeiUsb2HostControllerPpiGuid based on gPeiUsbControllerPpiGuid\r
 which is used to enable recovery function from USB Drivers.\r
 \r

-Copyright (c) 2010 - 2017, Intel Corporation. All rights reserved.<BR>\r
-  \r
+Copyright (c) 2010 - 2018, Intel Corporation. All rights reserved.<BR>\r
+\r

 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions\r
 of the BSD License which accompanies this distribution.  The\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions\r
 of the BSD License which accompanies this distribution.  The\r


@@ -39,7 +39,7 @@ USB_PORT_STATE_MAP  mUsbPortChangeMap[] = {
 \r
 /**\r
   Read Ehc Operation register.\r
 \r
 /**\r
   Read Ehc Operation register.\r

-  \r
+\r

   @param  Ehc       The EHCI device.\r
   @param  Offset    The operation register offset.\r
 \r
   @param  Ehc       The EHCI device.\r
   @param  Offset    The operation register offset.\r
 \r


@@ -53,17 +53,17 @@ EhcReadOpReg (
   )\r
 {\r
   UINT32                  Data;\r
   )\r
 {\r
   UINT32                  Data;\r

- \r
+\r

   ASSERT (Ehc->CapLen != 0);\r
 \r
   Data = MmioRead32 (Ehc->UsbHostControllerBaseAddress + Ehc->CapLen + Offset);\r
   ASSERT (Ehc->CapLen != 0);\r
 \r
   Data = MmioRead32 (Ehc->UsbHostControllerBaseAddress + Ehc->CapLen + Offset);\r

-  \r
+\r

   return Data;\r
 }\r
 \r
 /**\r
   Write the data to the EHCI operation register.\r
   return Data;\r
 }\r
 \r
 /**\r
   Write the data to the EHCI operation register.\r

-  \r
+\r

   @param  Ehc       The EHCI device.\r
   @param  Offset    EHCI operation register offset.\r
   @param  Data      The data to write.\r
   @param  Ehc       The EHCI device.\r
   @param  Offset    EHCI operation register offset.\r
   @param  Data      The data to write.\r


@@ -85,7 +85,7 @@ EhcWriteOpReg (
 \r
 /**\r
   Set one bit of the operational register while keeping other bits.\r
 \r
 /**\r
   Set one bit of the operational register while keeping other bits.\r

-  \r
+\r

   @param  Ehc       The EHCI device.\r
   @param  Offset    The offset of the operational register.\r
   @param  Bit       The bit mask of the register to set.\r
   @param  Ehc       The EHCI device.\r
   @param  Offset    The offset of the operational register.\r
   @param  Bit       The bit mask of the register to set.\r


@@ -107,7 +107,7 @@ EhcSetOpRegBit (
 \r
 /**\r
   Clear one bit of the operational register while keeping other bits.\r
 \r
 /**\r
   Clear one bit of the operational register while keeping other bits.\r

-  \r
+\r

   @param  Ehc       The EHCI device.\r
   @param  Offset    The offset of the operational register.\r
   @param  Bit       The bit mask of the register to clear.\r
   @param  Ehc       The EHCI device.\r
   @param  Offset    The offset of the operational register.\r
   @param  Bit       The bit mask of the register to clear.\r


@@ -128,9 +128,9 @@ EhcClearOpRegBit (
 }\r
 \r
 /**\r
 }\r
 \r
 /**\r

-  Wait the operation register's bit as specified by Bit \r
+  Wait the operation register's bit as specified by Bit\r

   to become set (or clear).\r
   to become set (or clear).\r

-  \r
+\r

   @param  Ehc           The EHCI device.\r
   @param  Offset        The offset of the operational register.\r
   @param  Bit           The bit mask of the register to wait for.\r
   @param  Ehc           The EHCI device.\r
   @param  Offset        The offset of the operational register.\r
   @param  Bit           The bit mask of the register to wait for.\r


@@ -165,7 +165,7 @@ EhcWaitOpRegBit (
 \r
 /**\r
   Read EHCI capability register.\r
 \r
 /**\r
   Read EHCI capability register.\r

-  \r
+\r

   @param  Ehc       The EHCI device.\r
   @param  Offset    Capability register address.\r
 \r
   @param  Ehc       The EHCI device.\r
   @param  Offset    Capability register address.\r
 \r


@@ -179,16 +179,16 @@ EhcReadCapRegister (
   )\r
 {\r
   UINT32                  Data;\r
   )\r
 {\r
   UINT32                  Data;\r

-  \r
+\r

   Data = MmioRead32(Ehc->UsbHostControllerBaseAddress + Offset);\r
   Data = MmioRead32(Ehc->UsbHostControllerBaseAddress + Offset);\r

-  \r
+\r

   return Data;\r
 }\r
 \r
 /**\r
   Set door bell and wait it to be ACKed by host controller.\r
   This function is used to synchronize with the hardware.\r
   return Data;\r
 }\r
 \r
 /**\r
   Set door bell and wait it to be ACKed by host controller.\r
   This function is used to synchronize with the hardware.\r

-  \r
+\r

   @param  Ehc       The EHCI device.\r
   @param  Timeout   The time to wait before abort (in millisecond, ms).\r
 \r
   @param  Ehc       The EHCI device.\r
   @param  Timeout   The time to wait before abort (in millisecond, ms).\r
 \r


@@ -223,9 +223,9 @@ EhcSetAndWaitDoorBell (
 }\r
 \r
 /**\r
 }\r
 \r
 /**\r

-  Clear all the interrutp status bits, these bits \r
+  Clear all the interrutp status bits, these bits\r

   are Write-Clean.\r
   are Write-Clean.\r

-  \r
+\r

   @param  Ehc       The EHCI device.\r
 \r
 **/\r
   @param  Ehc       The EHCI device.\r
 \r
 **/\r


@@ -238,9 +238,9 @@ EhcAckAllInterrupt (
 }\r
 \r
 /**\r
 }\r
 \r
 /**\r

-  Enable the periodic schedule then wait EHC to \r
+  Enable the periodic schedule then wait EHC to\r

   actually enable it.\r
   actually enable it.\r

-  \r
+\r

   @param  Ehc       The EHCI device.\r
   @param  Timeout   The time to wait before abort (in millisecond, ms).\r
 \r
   @param  Ehc       The EHCI device.\r
   @param  Timeout   The time to wait before abort (in millisecond, ms).\r
 \r


@@ -264,7 +264,7 @@ EhcEnablePeriodSchd (
 \r
 /**\r
   Enable asynchrounous schedule.\r
 \r
 /**\r
   Enable asynchrounous schedule.\r

-  \r
+\r

   @param  Ehc       The EHCI device.\r
   @param  Timeout   Time to wait before abort.\r
 \r
   @param  Ehc       The EHCI device.\r
   @param  Timeout   Time to wait before abort.\r
 \r


@@ -288,7 +288,7 @@ EhcEnableAsyncSchd (
 \r
 /**\r
   Check whether Ehc is halted.\r
 \r
 /**\r
   Check whether Ehc is halted.\r

-  \r
+\r

   @param  Ehc       The EHCI device.\r
 \r
   @retval TRUE      The controller is halted.\r
   @param  Ehc       The EHCI device.\r
 \r
   @retval TRUE      The controller is halted.\r


@@ -305,7 +305,7 @@ EhcIsHalt (
 \r
 /**\r
   Check whether system error occurred.\r
 \r
 /**\r
   Check whether system error occurred.\r

-  \r
+\r

   @param  Ehc       The EHCI device.\r
 \r
   @retval TRUE      System error happened.\r
   @param  Ehc       The EHCI device.\r
 \r
   @retval TRUE      System error happened.\r


@@ -322,7 +322,7 @@ EhcIsSysError (
 \r
 /**\r
   Reset the host controller.\r
 \r
 /**\r
   Reset the host controller.\r

-  \r
+\r

   @param  Ehc             The EHCI device.\r
   @param  Timeout         Time to wait before abort (in millisecond, ms).\r
 \r
   @param  Ehc             The EHCI device.\r
   @param  Timeout         Time to wait before abort (in millisecond, ms).\r
 \r


@@ -356,7 +356,7 @@ EhcResetHC (
 \r
 /**\r
   Halt the host controller.\r
 \r
 /**\r
   Halt the host controller.\r

-  \r
+\r

   @param  Ehc             The EHCI device.\r
   @param  Timeout         Time to wait before abort.\r
 \r
   @param  Ehc             The EHCI device.\r
   @param  Timeout         Time to wait before abort.\r
 \r


@@ -379,7 +379,7 @@ EhcHaltHC (
 \r
 /**\r
   Set the EHCI to run.\r
 \r
 /**\r
   Set the EHCI to run.\r

-  \r
+\r

   @param  Ehc             The EHCI device.\r
   @param  Timeout         Time to wait before abort.\r
 \r
   @param  Ehc             The EHCI device.\r
   @param  Timeout         Time to wait before abort.\r
 \r


@@ -402,7 +402,7 @@ EhcRunHC (
 \r
 /**\r
   Power On All EHCI Ports.\r
 \r
 /**\r
   Power On All EHCI Ports.\r

-  \r
+\r

   @param  Ehc             The EHCI device.\r
 \r
 **/\r
   @param  Ehc             The EHCI device.\r
 \r
 **/\r


@@ -414,7 +414,7 @@ EhcPowerOnAllPorts (
   UINT8     PortNumber;\r
   UINT8     Index;\r
   UINT32    RegVal;\r
   UINT8     PortNumber;\r
   UINT8     Index;\r
   UINT32    RegVal;\r

-  \r
+\r

   PortNumber = (UINT8)(Ehc->HcStructParams & HCSP_NPORTS);\r
   for (Index = 0; Index < PortNumber; Index++) {\r
     //\r
   PortNumber = (UINT8)(Ehc->HcStructParams & HCSP_NPORTS);\r
   for (Index = 0; Index < PortNumber; Index++) {\r
     //\r


@@ -429,14 +429,14 @@ EhcPowerOnAllPorts (
 }\r
 \r
 /**\r
 }\r
 \r
 /**\r

-  Initialize the HC hardware. \r
+  Initialize the HC hardware.\r

   EHCI spec lists the five things to do to initialize the hardware.\r
   1. Program CTRLDSSEGMENT.\r
   2. Set USBINTR to enable interrupts.\r
   3. Set periodic list base.\r
   4. Set USBCMD, interrupt threshold, frame list size etc.\r
   5. Write 1 to CONFIGFLAG to route all ports to EHCI.\r
   EHCI spec lists the five things to do to initialize the hardware.\r
   1. Program CTRLDSSEGMENT.\r
   2. Set USBINTR to enable interrupts.\r
   3. Set periodic list base.\r
   4. Set USBCMD, interrupt threshold, frame list size etc.\r
   5. Write 1 to CONFIGFLAG to route all ports to EHCI.\r

-  \r
+\r

   @param  Ehc             The EHCI device.\r
 \r
   @retval EFI_SUCCESS     The EHCI has come out of halt state.\r
   @param  Ehc             The EHCI device.\r
 \r
   @retval EFI_SUCCESS     The EHCI has come out of halt state.\r


@@ -451,7 +451,7 @@ EhcInitHC (
   EFI_STATUS              Status;\r
   EFI_PHYSICAL_ADDRESS        TempPtr;\r
   UINTN               PageNumber;\r
   EFI_STATUS              Status;\r
   EFI_PHYSICAL_ADDRESS        TempPtr;\r
   UINTN               PageNumber;\r

-  \r
+\r

   ASSERT (EhcIsHalt (Ehc));\r
 \r
   //\r
   ASSERT (EhcIsHalt (Ehc));\r
 \r
   //\r


@@ -472,9 +472,9 @@ EhcInitHC (
     return Status;\r
   }\r
 \r
     return Status;\r
   }\r
 \r

-  EhcPowerOnAllPorts (Ehc);  \r
+  EhcPowerOnAllPorts (Ehc);\r

   MicroSecondDelay (EHC_ROOT_PORT_RECOVERY_STALL);\r
   MicroSecondDelay (EHC_ROOT_PORT_RECOVERY_STALL);\r

-  \r
+\r

   Status = EhcInitSched (Ehc);\r
 \r
   if (EFI_ERROR (Status)) {\r
   Status = EhcInitSched (Ehc);\r
 \r
   if (EFI_ERROR (Status)) {\r


@@ -523,26 +523,26 @@ EhcInitHC (
 \r
 /**\r
   Submits bulk transfer to a bulk endpoint of a USB device.\r
 \r
 /**\r
   Submits bulk transfer to a bulk endpoint of a USB device.\r

-  \r
+\r

   @param  PeiServices           The pointer of EFI_PEI_SERVICES.\r
   @param  This                  The pointer of PEI_USB2_HOST_CONTROLLER_PPI.\r
   @param  DeviceAddress         Target device address.\r
   @param  EndPointAddress       Endpoint number and its direction in bit 7.\r
   @param  PeiServices           The pointer of EFI_PEI_SERVICES.\r
   @param  This                  The pointer of PEI_USB2_HOST_CONTROLLER_PPI.\r
   @param  DeviceAddress         Target device address.\r
   @param  EndPointAddress       Endpoint number and its direction in bit 7.\r

-  @param  DeviceSpeed           Device speed, Low speed device doesn't support \r
+  @param  DeviceSpeed           Device speed, Low speed device doesn't support\r

                                 bulk transfer.\r
                                 bulk transfer.\r

-  @param  MaximumPacketLength   Maximum packet size the endpoint is capable of \r
+  @param  MaximumPacketLength   Maximum packet size the endpoint is capable of\r

                                 sending or receiving.\r
                                 sending or receiving.\r

-  @param  Data                  Array of pointers to the buffers of data to transmit \r
+  @param  Data                  Array of pointers to the buffers of data to transmit\r

                                 from or receive into.\r
   @param  DataLength            The lenght of the data buffer.\r
   @param  DataToggle            On input, the initial data toggle for the transfer;\r
                                 from or receive into.\r
   @param  DataLength            The lenght of the data buffer.\r
   @param  DataToggle            On input, the initial data toggle for the transfer;\r

-                                On output, it is updated to to next data toggle to use of \r
+                                On output, it is updated to to next data toggle to use of\r

                                 the subsequent bulk transfer.\r
   @param  TimeOut               Indicates the maximum time, in millisecond, which the\r
                                 transfer is allowed to complete.\r
                                 If Timeout is 0, then the caller must wait for the function\r
                                 to be completed until EFI_SUCCESS or EFI_DEVICE_ERROR is returned.\r
                                 the subsequent bulk transfer.\r
   @param  TimeOut               Indicates the maximum time, in millisecond, which the\r
                                 transfer is allowed to complete.\r
                                 If Timeout is 0, then the caller must wait for the function\r
                                 to be completed until EFI_SUCCESS or EFI_DEVICE_ERROR is returned.\r

-  @param  Translator            A pointr to the transaction translator data.                                \r
+  @param  Translator            A pointr to the transaction translator data.\r

   @param  TransferResult        A pointer to the detailed result information of the\r
                                 bulk transfer.\r
 \r
   @param  TransferResult        A pointer to the detailed result information of the\r
                                 bulk transfer.\r
 \r


@@ -577,7 +577,7 @@ EhcBulkTransfer (
   //\r
   // Validate the parameters\r
   //\r
   //\r
   // Validate the parameters\r
   //\r

-  if ((DataLength == NULL) || (*DataLength == 0) || \r
+  if ((DataLength == NULL) || (*DataLength == 0) ||\r

       (Data == NULL) || (Data[0] == NULL) || (TransferResult == NULL)) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
       (Data == NULL) || (Data[0] == NULL) || (TransferResult == NULL)) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r


@@ -652,10 +652,10 @@ ON_EXIT:
   Retrieves the number of root hub ports.\r
 \r
   @param[in]  PeiServices   The pointer to the PEI Services Table.\r
   Retrieves the number of root hub ports.\r
 \r
   @param[in]  PeiServices   The pointer to the PEI Services Table.\r

-  @param[in]  This          The pointer to this instance of the \r
+  @param[in]  This          The pointer to this instance of the\r

                             PEI_USB2_HOST_CONTROLLER_PPI.\r
                             PEI_USB2_HOST_CONTROLLER_PPI.\r

-  @param[out] PortNumber    The pointer to the number of the root hub ports.                                \r
-                                \r
+  @param[out] PortNumber    The pointer to the number of the root hub ports.\r
+\r

   @retval EFI_SUCCESS           The port number was retrieved successfully.\r
   @retval EFI_INVALID_PARAMETER PortNumber is NULL.\r
 \r
   @retval EFI_SUCCESS           The port number was retrieved successfully.\r
   @retval EFI_INVALID_PARAMETER PortNumber is NULL.\r
 \r


@@ -671,19 +671,19 @@ EhcGetRootHubPortNumber (
 \r
   PEI_USB2_HC_DEV             *EhcDev;\r
   EhcDev = PEI_RECOVERY_USB_EHC_DEV_FROM_EHCI_THIS (This);\r
 \r
   PEI_USB2_HC_DEV             *EhcDev;\r
   EhcDev = PEI_RECOVERY_USB_EHC_DEV_FROM_EHCI_THIS (This);\r

-  \r
+\r

   if (PortNumber == NULL) {\r
     return EFI_INVALID_PARAMETER;\r
   if (PortNumber == NULL) {\r
     return EFI_INVALID_PARAMETER;\r

-  }  \r
-  \r
+  }\r
+\r

   *PortNumber = (UINT8)(EhcDev->HcStructParams & HCSP_NPORTS);\r
   return EFI_SUCCESS;\r
   *PortNumber = (UINT8)(EhcDev->HcStructParams & HCSP_NPORTS);\r
   return EFI_SUCCESS;\r

-  \r
+\r

 }\r
 \r
 /**\r
   Clears a feature for the specified root hub port.\r
 }\r
 \r
 /**\r
   Clears a feature for the specified root hub port.\r

-  \r
+\r

   @param  PeiServices           The pointer of EFI_PEI_SERVICES.\r
   @param  This                  The pointer of PEI_USB2_HOST_CONTROLLER_PPI.\r
   @param  PortNumber            Specifies the root hub port whose feature\r
   @param  PeiServices           The pointer of EFI_PEI_SERVICES.\r
   @param  This                  The pointer of PEI_USB2_HOST_CONTROLLER_PPI.\r
   @param  PortNumber            Specifies the root hub port whose feature\r


@@ -691,7 +691,7 @@ EhcGetRootHubPortNumber (
   @param  PortFeature           Indicates the feature selector associated with the\r
                                 feature clear request.\r
 \r
   @param  PortFeature           Indicates the feature selector associated with the\r
                                 feature clear request.\r
 \r

-  @retval EFI_SUCCESS            The feature specified by PortFeature was cleared \r
+  @retval EFI_SUCCESS            The feature specified by PortFeature was cleared\r

                                  for the USB root hub port specified by PortNumber.\r
   @retval EFI_INVALID_PARAMETER  PortNumber is invalid or PortFeature is invalid.\r
 \r
                                  for the USB root hub port specified by PortNumber.\r
   @retval EFI_INVALID_PARAMETER  PortNumber is invalid or PortFeature is invalid.\r
 \r


@@ -805,7 +805,7 @@ ON_EXIT:
 \r
 /**\r
   Sets a feature for the specified root hub port.\r
 \r
 /**\r
   Sets a feature for the specified root hub port.\r

-  \r
+\r

   @param  PeiServices           The pointer of EFI_PEI_SERVICES\r
   @param  This                  The pointer of PEI_USB2_HOST_CONTROLLER_PPI\r
   @param  PortNumber            Root hub port to set.\r
   @param  PeiServices           The pointer of EFI_PEI_SERVICES\r
   @param  This                  The pointer of PEI_USB2_HOST_CONTROLLER_PPI\r
   @param  PortNumber            Root hub port to set.\r


@@ -876,7 +876,7 @@ EhcSetRootHubPortFeature (
         break;\r
       }\r
     }\r
         break;\r
       }\r
     }\r

-    \r
+\r

     //\r
     // Set one to PortReset bit must also set zero to PortEnable bit\r
     //\r
     //\r
     // Set one to PortReset bit must also set zero to PortEnable bit\r
     //\r


@@ -907,10 +907,10 @@ ON_EXIT:
 \r
 /**\r
   Retrieves the current status of a USB root hub port.\r
 \r
 /**\r
   Retrieves the current status of a USB root hub port.\r

-  \r
+\r

   @param  PeiServices            The pointer of EFI_PEI_SERVICES.\r
   @param  This                   The pointer of PEI_USB2_HOST_CONTROLLER_PPI.\r
   @param  PeiServices            The pointer of EFI_PEI_SERVICES.\r
   @param  This                   The pointer of PEI_USB2_HOST_CONTROLLER_PPI.\r

-  @param  PortNumber             The root hub port to retrieve the state from.  \r
+  @param  PortNumber             The root hub port to retrieve the state from.\r

   @param  PortStatus             Variable to receive the port state.\r
 \r
   @retval EFI_SUCCESS            The status of the USB root hub port specified.\r
   @param  PortStatus             Variable to receive the port state.\r
 \r
   @retval EFI_SUCCESS            The status of the USB root hub port specified.\r


@@ -957,9 +957,9 @@ EhcGetRootHubPortStatus (
 \r
   //\r
   // Identify device speed. If in K state, it is low speed.\r
 \r
   //\r
   // Identify device speed. If in K state, it is low speed.\r

-  // If the port is enabled after reset, the device is of \r
+  // If the port is enabled after reset, the device is of\r

   // high speed. The USB bus driver should retrieve the actual\r
   // high speed. The USB bus driver should retrieve the actual\r

-  // port speed after reset. \r
+  // port speed after reset.\r

   //\r
   if (EHC_BIT_IS_SET (State, PORTSC_LINESTATE_K)) {\r
     PortStatus->PortStatus |= USB_PORT_STAT_LOW_SPEED;\r
   //\r
   if (EHC_BIT_IS_SET (State, PORTSC_LINESTATE_K)) {\r
     PortStatus->PortStatus |= USB_PORT_STAT_LOW_SPEED;\r


@@ -967,7 +967,7 @@ EhcGetRootHubPortStatus (
   } else if (EHC_BIT_IS_SET (State, PORTSC_ENABLED)) {\r
     PortStatus->PortStatus |= USB_PORT_STAT_HIGH_SPEED;\r
   }\r
   } else if (EHC_BIT_IS_SET (State, PORTSC_ENABLED)) {\r
     PortStatus->PortStatus |= USB_PORT_STAT_HIGH_SPEED;\r
   }\r

-  \r
+\r

   //\r
   // Convert the EHCI port/port change state to UEFI status\r
   //\r
   //\r
   // Convert the EHCI port/port change state to UEFI status\r
   //\r


@@ -993,12 +993,12 @@ ON_EXIT:
 \r
 /**\r
   Submits control transfer to a target USB device.\r
 \r
 /**\r
   Submits control transfer to a target USB device.\r

-  \r
+\r

   @param  PeiServices            The pointer of EFI_PEI_SERVICES.\r
   @param  This                   The pointer of PEI_USB2_HOST_CONTROLLER_PPI.\r
   @param  DeviceAddress          The target device address.\r
   @param  DeviceSpeed            Target device speed.\r
   @param  PeiServices            The pointer of EFI_PEI_SERVICES.\r
   @param  This                   The pointer of PEI_USB2_HOST_CONTROLLER_PPI.\r
   @param  DeviceAddress          The target device address.\r
   @param  DeviceSpeed            Target device speed.\r

-  @param  MaximumPacketLength    Maximum packet size the default control transfer \r
+  @param  MaximumPacketLength    Maximum packet size the default control transfer\r

                                  endpoint is capable of sending or receiving.\r
   @param  Request                USB device request to send.\r
   @param  TransferDirection      Specifies the data direction for the data stage.\r
                                  endpoint is capable of sending or receiving.\r
   @param  Request                USB device request to send.\r
   @param  TransferDirection      Specifies the data direction for the data stage.\r


@@ -1052,12 +1052,12 @@ EhcControlTransfer (
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r

-  if ((TransferDirection == EfiUsbNoData) && \r
+  if ((TransferDirection == EfiUsbNoData) &&\r

       ((Data != NULL) || (*DataLength != 0))) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
       ((Data != NULL) || (*DataLength != 0))) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r

-  if ((TransferDirection != EfiUsbNoData) && \r
+  if ((TransferDirection != EfiUsbNoData) &&\r

      ((Data == NULL) || (*DataLength == 0))) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
      ((Data == NULL) || (*DataLength == 0))) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r


@@ -1225,7 +1225,7 @@ EhcPeimEntry (
     if (EFI_ERROR (Status)) {\r
       break;\r
     }\r
     if (EFI_ERROR (Status)) {\r
       break;\r
     }\r

-    \r
+\r

     //\r
     // This PEIM is for UHC type controller.\r
     //\r
     //\r
     // This PEIM is for UHC type controller.\r
     //\r


@@ -1303,19 +1303,19 @@ EhcPeimEntry (
 **/\r
 EFI_STATUS\r
 InitializeUsbHC (\r
 **/\r
 EFI_STATUS\r
 InitializeUsbHC (\r

-  IN PEI_USB2_HC_DEV      *EhcDev  \r
+  IN PEI_USB2_HC_DEV      *EhcDev\r

   )\r
 {\r
   EFI_STATUS  Status;\r
 \r
   )\r
 {\r
   EFI_STATUS  Status;\r
 \r

-       \r
+\r

   EhcResetHC (EhcDev, EHC_RESET_TIMEOUT);\r
 \r
   Status = EhcInitHC (EhcDev);\r
 \r
   if (EFI_ERROR (Status)) {\r
   EhcResetHC (EhcDev, EHC_RESET_TIMEOUT);\r
 \r
   Status = EhcInitHC (EhcDev);\r
 \r
   if (EFI_ERROR (Status)) {\r

-    return EFI_ABORTED;      \r
+    return EFI_ABORTED;\r

   }\r
   }\r

-  \r
+\r

   return EFI_SUCCESS;\r
 }\r
   return EFI_SUCCESS;\r
 }\r

diff --git a/MdeModulePkg/Bus/Pci/EhciPei/EhcPeim.h b/MdeModulePkg/Bus/Pci/EhciPei/EhcPeim.h
index 715a5ab1c142d2d2eb373bf7498e88b3b50ba0a0..be4237d84b40192768b98e214bfdf5ee63d977c0 100644 (file)
--- a/MdeModulePkg/Bus/Pci/EhciPei/EhcPeim.h
+++ b/MdeModulePkg/Bus/Pci/EhciPei/EhcPeim.h
@@ -1,8 +1,8 @@
 /** @file\r
 Private Header file for Usb Host Controller PEIM\r
 \r
 /** @file\r
 Private Header file for Usb Host Controller PEIM\r
 \r

-Copyright (c) 2010 - 2017, Intel Corporation. All rights reserved.<BR>\r
-  \r
+Copyright (c) 2010 - 2018, Intel Corporation. All rights reserved.<BR>\r
+\r

 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions\r
 of the BSD License which accompanies this distribution.  The\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions\r
 of the BSD License which accompanies this distribution.  The\r


@@ -118,20 +118,20 @@ struct _PEI_USB2_HC_DEV {
   //\r
   PEI_EHC_QTD                         *ShortReadStop;\r
   EFI_EVENT                           PollTimer;\r
   //\r
   PEI_EHC_QTD                         *ShortReadStop;\r
   EFI_EVENT                           PollTimer;\r

-  \r
+\r

   //\r
   //\r

-  // Asynchronous(bulk and control) transfer schedule data: \r
+  // Asynchronous(bulk and control) transfer schedule data:\r

   // ReclaimHead is used as the head of the asynchronous transfer\r
   // ReclaimHead is used as the head of the asynchronous transfer\r

-  // list. It acts as the reclamation header. \r
+  // list. It acts as the reclamation header.\r

   //\r
   PEI_EHC_QH                          *ReclaimHead;\r
   //\r
   PEI_EHC_QH                          *ReclaimHead;\r

-  \r
+\r

   //\r
   // Periodic (interrupt) transfer schedule data:\r
   //\r
   //\r
   // Periodic (interrupt) transfer schedule data:\r
   //\r

-  VOID                                *PeriodFrame;     // Mapped as common buffer \r
+  VOID                                *PeriodFrame;     // Mapped as common buffer\r

   VOID                                *PeriodFrameMap;\r
   VOID                                *PeriodFrameMap;\r

-                                      \r
+\r

   PEI_EHC_QH                          *PeriodOne;\r
   EFI_LIST_ENTRY                      AsyncIntTransfers;\r
 \r
   PEI_EHC_QH                          *PeriodOne;\r
   EFI_LIST_ENTRY                      AsyncIntTransfers;\r
 \r


@@ -156,14 +156,14 @@ struct _PEI_USB2_HC_DEV {
 **/\r
 EFI_STATUS\r
 InitializeUsbHC (\r
 **/\r
 EFI_STATUS\r
 InitializeUsbHC (\r

-  IN PEI_USB2_HC_DEV      *EhcDev  \r
+  IN PEI_USB2_HC_DEV      *EhcDev\r

   );\r
 \r
 /**\r
   Initialize the memory management pool for the host controller.\r
   );\r
 \r
 /**\r
   Initialize the memory management pool for the host controller.\r

-  \r
+\r

   @param  Ehc                   The EHCI device.\r
   @param  Ehc                   The EHCI device.\r

-  @param  Check4G               Whether the host controller requires allocated memory \r
+  @param  Check4G               Whether the host controller requires allocated memory\r

                                 from one 4G address space.\r
   @param  Which4G               The 4G memory area each memory allocated should be from.\r
 \r
                                 from one 4G address space.\r
   @param  Which4G               The 4G memory area each memory allocated should be from.\r
 \r


@@ -178,7 +178,7 @@ UsbHcInitMemPool (
   IN UINT32               Which4G\r
   )\r
 ;\r
   IN UINT32               Which4G\r
   )\r
 ;\r

-            \r
+\r

 /**\r
   Release the memory management pool.\r
 \r
 /**\r
   Release the memory management pool.\r
 \r


@@ -199,7 +199,7 @@ UsbHcFreeMemPool (
 /**\r
   Allocate some memory from the host controller's memory pool\r
   which can be used to communicate with host controller.\r
 /**\r
   Allocate some memory from the host controller's memory pool\r
   which can be used to communicate with host controller.\r

-  \r
+\r

   @param  Ehc       The EHCI device.\r
   @param  Pool      The host controller's memory pool.\r
   @param  Size      Size of the memory to allocate.\r
   @param  Ehc       The EHCI device.\r
   @param  Pool      The host controller's memory pool.\r
   @param  Size      Size of the memory to allocate.\r

diff --git a/MdeModulePkg/Bus/Pci/EhciPei/EhciPei.inf b/MdeModulePkg/Bus/Pci/EhciPei/EhciPei.inf
index 813ccc94507df046281935858dcda42c9627b434..74c13db1c1884f1c9699394e4bf1560a4f4ca0cf 100644 (file)
--- a/MdeModulePkg/Bus/Pci/EhciPei/EhciPei.inf
+++ b/MdeModulePkg/Bus/Pci/EhciPei/EhciPei.inf
@@ -4,14 +4,14 @@
 # It produces gPeiUsb2HostControllerPpiGuid based on gPeiUsbControllerPpiGuid\r
 # which is used to enable recovery function from USB Drivers.\r
 #\r
 # It produces gPeiUsb2HostControllerPpiGuid based on gPeiUsbControllerPpiGuid\r
 # which is used to enable recovery function from USB Drivers.\r
 #\r

-# Copyright (c) 2010 - 2017, Intel Corporation. All rights reserved.<BR>\r
+# Copyright (c) 2010 - 2018, Intel Corporation. All rights reserved.<BR>\r

 #\r
 # This program and the accompanying materials\r
 # are licensed and made available under the terms and conditions\r
 # of the BSD License which accompanies this distribution.  The\r
 # full text of the license may be found at\r
 # http://opensource.org/licenses/bsd-license.php\r
 #\r
 # This program and the accompanying materials\r
 # are licensed and made available under the terms and conditions\r
 # of the BSD License which accompanies this distribution.  The\r
 # full text of the license may be found at\r
 # http://opensource.org/licenses/bsd-license.php\r

-# \r
+#\r

 # THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 # WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 #\r
 # THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 # WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 #\r

diff --git a/MdeModulePkg/Bus/Pci/EhciPei/EhciPei.uni b/MdeModulePkg/Bus/Pci/EhciPei/EhciPei.uni
index 9bc809c876233db92bf6de8e750194c362b4feb7..e633014bfcafc8d4f0b197be08bd80903cc19ec4 100644 (file)
--- a/MdeModulePkg/Bus/Pci/EhciPei/EhciPei.uni
+++ b/MdeModulePkg/Bus/Pci/EhciPei/EhciPei.uni
@@ -4,14 +4,14 @@
 // It produces gPeiUsb2HostControllerPpiGuid based on gPeiUsbControllerPpiGuid\r
 // which is used to enable recovery function from USB Drivers.\r
 //\r
 // It produces gPeiUsb2HostControllerPpiGuid based on gPeiUsbControllerPpiGuid\r
 // which is used to enable recovery function from USB Drivers.\r
 //\r

-// Copyright (c) 2010 - 2014, Intel Corporation. All rights reserved.<BR>\r
+// Copyright (c) 2010 - 2018, Intel Corporation. All rights reserved.<BR>\r

 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions\r
 // of the BSD License which accompanies this distribution.  The\r
 // full text of the license may be found at\r
 // http://opensource.org/licenses/bsd-license.php\r
 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions\r
 // of the BSD License which accompanies this distribution.  The\r
 // full text of the license may be found at\r
 // http://opensource.org/licenses/bsd-license.php\r

-// \r
+//\r

 // THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 // WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 //\r
 // THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 // WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 //\r

diff --git a/MdeModulePkg/Bus/Pci/EhciPei/EhciPeiExtra.uni b/MdeModulePkg/Bus/Pci/EhciPei/EhciPeiExtra.uni
index cbf1b7d6682c91a4d15114c22599dad38e784a93..4319fe2a771908232fa55d2d1d7ae6e1548feb7c 100644 (file)
--- a/MdeModulePkg/Bus/Pci/EhciPei/EhciPeiExtra.uni
+++ b/MdeModulePkg/Bus/Pci/EhciPei/EhciPeiExtra.uni
@@ -1,7 +1,7 @@
 // /** @file\r
 // EhciPei Localized Strings and Content\r
 //\r
 // /** @file\r
 // EhciPei Localized Strings and Content\r
 //\r

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

 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions\r
 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions\r


@@ -14,8 +14,8 @@
 //\r
 // **/\r
 \r
 //\r
 // **/\r
 \r

-#string STR_PROPERTIES_MODULE_NAME \r
-#language en-US \r
+#string STR_PROPERTIES_MODULE_NAME\r
+#language en-US\r

 "EHCI PEI Module for Recovery"\r
 \r
 \r
 "EHCI PEI Module for Recovery"\r
 \r
 \r

diff --git a/MdeModulePkg/Bus/Pci/EhciPei/EhciReg.h b/MdeModulePkg/Bus/Pci/EhciPei/EhciReg.h
index 34c61d8a9436be8fd022b4c15071349e12546429..14d3f77e44315b8eb48d32073ab5b3b737bf1062 100644 (file)
--- a/MdeModulePkg/Bus/Pci/EhciPei/EhciReg.h
+++ b/MdeModulePkg/Bus/Pci/EhciPei/EhciReg.h
@@ -1,8 +1,8 @@
 /** @file\r
 Private Header file for Usb Host Controller PEIM\r
 \r
 /** @file\r
 Private Header file for Usb Host Controller PEIM\r
 \r

-Copyright (c) 2010, Intel Corporation. All rights reserved.<BR>\r
-  \r
+Copyright (c) 2010 - 2018, Intel Corporation. All rights reserved.<BR>\r
+\r

 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions\r
 of the BSD License which accompanies this distribution.  The\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions\r
 of the BSD License which accompanies this distribution.  The\r


@@ -94,8 +94,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #define EHCI_IS_DATAIN(EndpointAddr) EHC_BIT_IS_SET((EndpointAddr), 0x80)\r
 \r
 //\r
 #define EHCI_IS_DATAIN(EndpointAddr) EHC_BIT_IS_SET((EndpointAddr), 0x80)\r
 \r
 //\r

-// Structure to map the hardware port states to the \r
-// UEFI's port states. \r
+// Structure to map the hardware port states to the\r
+// UEFI's port states.\r

 //\r
 typedef struct {\r
   UINT16                  HwState;\r
 //\r
 typedef struct {\r
   UINT16                  HwState;\r


@@ -116,7 +116,7 @@ typedef struct {
 \r
 /**\r
   Read EHCI capability register.\r
 \r
 /**\r
   Read EHCI capability register.\r

-  \r
+\r

   @param  Ehc       The EHCI device.\r
   @param  Offset    Capability register address.\r
 \r
   @param  Ehc       The EHCI device.\r
   @param  Offset    Capability register address.\r
 \r


@@ -132,7 +132,7 @@ EhcReadCapRegister (
 \r
 /**\r
   Read Ehc Operation register.\r
 \r
 /**\r
   Read Ehc Operation register.\r

-  \r
+\r

   @param  Ehc       The EHCI device.\r
   @param  Offset    The operation register offset.\r
 \r
   @param  Ehc       The EHCI device.\r
   @param  Offset    The operation register offset.\r
 \r


@@ -148,7 +148,7 @@ EhcReadOpReg (
 \r
 /**\r
   Write the data to the EHCI operation register.\r
 \r
 /**\r
   Write the data to the EHCI operation register.\r

-  \r
+\r

   @param  Ehc       The EHCI device.\r
   @param  Offset    EHCI operation register offset.\r
   @param  Data      The data to write.\r
   @param  Ehc       The EHCI device.\r
   @param  Offset    EHCI operation register offset.\r
   @param  Data      The data to write.\r


@@ -164,7 +164,7 @@ EhcWriteOpReg (
 \r
 /**\r
   Stop the legacy USB SMI support.\r
 \r
 /**\r
   Stop the legacy USB SMI support.\r

-  \r
+\r

   @param  Ehc       The EHCI device.\r
 \r
 **/\r
   @param  Ehc       The EHCI device.\r
 \r
 **/\r


@@ -177,7 +177,7 @@ EhcClearLegacySupport (
 /**\r
   Set door bell and wait it to be ACKed by host controller.\r
   This function is used to synchronize with the hardware.\r
 /**\r
   Set door bell and wait it to be ACKed by host controller.\r
   This function is used to synchronize with the hardware.\r

-  \r
+\r

   @param  Ehc       The EHCI device.\r
   @param  Timeout   The time to wait before abort (in millisecond, ms).\r
 \r
   @param  Ehc       The EHCI device.\r
   @param  Timeout   The time to wait before abort (in millisecond, ms).\r
 \r


@@ -193,9 +193,9 @@ EhcSetAndWaitDoorBell (
 ;\r
 \r
 /**\r
 ;\r
 \r
 /**\r

-  Clear all the interrutp status bits, these bits \r
+  Clear all the interrutp status bits, these bits\r

   are Write-Clean.\r
   are Write-Clean.\r

-  \r
+\r

   @param  Ehc       The EHCI device.\r
 \r
 **/\r
   @param  Ehc       The EHCI device.\r
 \r
 **/\r


@@ -207,7 +207,7 @@ EhcAckAllInterrupt (
 \r
 /**\r
   Check whether Ehc is halted.\r
 \r
 /**\r
   Check whether Ehc is halted.\r

-  \r
+\r

   @param  Ehc       The EHCI device.\r
 \r
   @retval TRUE      The controller is halted.\r
   @param  Ehc       The EHCI device.\r
 \r
   @retval TRUE      The controller is halted.\r


@@ -222,7 +222,7 @@ EhcIsHalt (
 \r
 /**\r
   Check whether system error occurred.\r
 \r
 /**\r
   Check whether system error occurred.\r

-  \r
+\r

   @param  Ehc       The EHCI device.\r
 \r
   @retval TRUE      System error happened.\r
   @param  Ehc       The EHCI device.\r
 \r
   @retval TRUE      System error happened.\r


@@ -237,7 +237,7 @@ EhcIsSysError (
 \r
 /**\r
   Reset the host controller.\r
 \r
 /**\r
   Reset the host controller.\r

-  \r
+\r

   @param  Ehc             The EHCI device.\r
   @param  Timeout         Time to wait before abort (in millisecond, ms).\r
 \r
   @param  Ehc             The EHCI device.\r
   @param  Timeout         Time to wait before abort (in millisecond, ms).\r
 \r


@@ -254,7 +254,7 @@ EhcResetHC (
 \r
 /**\r
   Halt the host controller.\r
 \r
 /**\r
   Halt the host controller.\r

-  \r
+\r

   @param  Ehc             The EHCI device.\r
   @param  Timeout         Time to wait before abort.\r
 \r
   @param  Ehc             The EHCI device.\r
   @param  Timeout         Time to wait before abort.\r
 \r


@@ -271,7 +271,7 @@ EhcHaltHC (
 \r
 /**\r
   Set the EHCI to run\r
 \r
 /**\r
   Set the EHCI to run\r

-  \r
+\r

   @param  Ehc             The EHCI device.\r
   @param  Timeout         Time to wait before abort.\r
 \r
   @param  Ehc             The EHCI device.\r
   @param  Timeout         Time to wait before abort.\r
 \r


@@ -287,14 +287,14 @@ EhcRunHC (
 ;\r
 \r
 /**\r
 ;\r
 \r
 /**\r

-  Initialize the HC hardware. \r
+  Initialize the HC hardware.\r

   EHCI spec lists the five things to do to initialize the hardware.\r
   1. Program CTRLDSSEGMENT.\r
   2. Set USBINTR to enable interrupts.\r
   3. Set periodic list base.\r
   4. Set USBCMD, interrupt threshold, frame list size etc.\r
   5. Write 1 to CONFIGFLAG to route all ports to EHCI.\r
   EHCI spec lists the five things to do to initialize the hardware.\r
   1. Program CTRLDSSEGMENT.\r
   2. Set USBINTR to enable interrupts.\r
   3. Set periodic list base.\r
   4. Set USBCMD, interrupt threshold, frame list size etc.\r
   5. Write 1 to CONFIGFLAG to route all ports to EHCI.\r

-  \r
+\r

   @param  Ehc             The EHCI device.\r
 \r
   @retval EFI_SUCCESS     The EHCI has come out of halt state.\r
   @param  Ehc             The EHCI device.\r
 \r
   @retval EFI_SUCCESS     The EHCI has come out of halt state.\r

diff --git a/MdeModulePkg/Bus/Pci/EhciPei/EhciSched.c b/MdeModulePkg/Bus/Pci/EhciPei/EhciSched.c
index 6b19362699b10619b8cbcb0fc34a02d386d5cbb3..65bc84f0c20ec5abb35f14f94516b18750755a2c 100644 (file)
--- a/MdeModulePkg/Bus/Pci/EhciPei/EhciSched.c
+++ b/MdeModulePkg/Bus/Pci/EhciPei/EhciSched.c
@@ -2,8 +2,8 @@
 PEIM to produce gPeiUsb2HostControllerPpiGuid based on gPeiUsbControllerPpiGuid\r
 which is used to enable recovery function from USB Drivers.\r
 \r
 PEIM to produce gPeiUsb2HostControllerPpiGuid based on gPeiUsbControllerPpiGuid\r
 which is used to enable recovery function from USB Drivers.\r
 \r

-Copyright (c) 2010 - 2017, Intel Corporation. All rights reserved.<BR>\r
-  \r
+Copyright (c) 2010 - 2018, Intel Corporation. All rights reserved.<BR>\r
+\r

 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions\r
 of the BSD License which accompanies this distribution.  The\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions\r
 of the BSD License which accompanies this distribution.  The\r


@@ -19,7 +19,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 \r
 /**\r
   Create helper QTD/QH for the EHCI device.\r
 \r
 /**\r
   Create helper QTD/QH for the EHCI device.\r

-  \r
+\r

   @param  Ehc         The EHCI device.\r
 \r
   @retval EFI_OUT_OF_RESOURCES  Failed to allocate resource for helper QTD/QH.\r
   @param  Ehc         The EHCI device.\r
 \r
   @retval EFI_OUT_OF_RESOURCES  Failed to allocate resource for helper QTD/QH.\r


@@ -95,7 +95,7 @@ EhcCreateHelpQ (
 \r
 /**\r
   Initialize the schedule data structure such as frame list.\r
 \r
 /**\r
   Initialize the schedule data structure such as frame list.\r

-  \r
+\r

   @param  Ehc                   The EHCI device to init schedule data for.\r
 \r
   @retval EFI_OUT_OF_RESOURCES  Failed to allocate resource to init schedule data.\r
   @param  Ehc                   The EHCI device to init schedule data for.\r
 \r
   @retval EFI_OUT_OF_RESOURCES  Failed to allocate resource to init schedule data.\r


@@ -162,7 +162,7 @@ EhcInitSched (
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r

-  \r
+\r

   //\r
   // Initialize the frame list entries then set the registers\r
   //\r
   //\r
   // Initialize the frame list entries then set the registers\r
   //\r


@@ -186,8 +186,8 @@ EhcInitSched (
 \r
 /**\r
   Free the schedule data. It may be partially initialized.\r
 \r
 /**\r
   Free the schedule data. It may be partially initialized.\r

-  \r
-  @param  Ehc   The EHCI device. \r
+\r
+  @param  Ehc   The EHCI device.\r

 \r
 **/\r
 VOID\r
 \r
 **/\r
 VOID\r


@@ -230,7 +230,7 @@ EhcFreeSched (
   due to its interfaces. This simplifies the AsynList\r
   management: A reclamation header is always linked to\r
   the AsyncListAddr, the only active QH is appended to it.\r
   due to its interfaces. This simplifies the AsynList\r
   management: A reclamation header is always linked to\r
   the AsyncListAddr, the only active QH is appended to it.\r

-  \r
+\r

   @param  Ehc   The EHCI device.\r
   @param  Qh    The queue head to link.\r
 \r
   @param  Ehc   The EHCI device.\r
   @param  Qh    The queue head to link.\r
 \r


@@ -260,7 +260,7 @@ EhcLinkQhToAsync (
 /**\r
   Unlink a queue head from the asynchronous schedule list.\r
   Need to synchronize with hardware.\r
 /**\r
   Unlink a queue head from the asynchronous schedule list.\r
   Need to synchronize with hardware.\r

-  \r
+\r

   @param  Ehc   The EHCI device.\r
   @param  Qh    The queue head to unlink.\r
 \r
   @param  Ehc   The EHCI device.\r
   @param  Qh    The queue head to unlink.\r
 \r


@@ -291,13 +291,13 @@ EhcUnlinkQhFromAsync (
   // Set and wait the door bell to synchronize with the hardware\r
   //\r
   EhcSetAndWaitDoorBell (Ehc, EHC_GENERIC_TIMEOUT);\r
   // Set and wait the door bell to synchronize with the hardware\r
   //\r
   EhcSetAndWaitDoorBell (Ehc, EHC_GENERIC_TIMEOUT);\r

-  \r
+\r

   return;\r
 }\r
 \r
 /**\r
   Check the URB's execution result and update the URB's\r
   return;\r
 }\r
 \r
 /**\r
   Check the URB's execution result and update the URB's\r

-  result accordingly. \r
+  result accordingly.\r

 \r
   @param Ehc   The EHCI device.\r
   @param Urb   The URB to check result.\r
 \r
   @param Ehc   The EHCI device.\r
   @param Urb   The URB to check result.\r


@@ -358,13 +358,13 @@ EhcCheckUrbResult (
 \r
       Finished = TRUE;\r
       goto ON_EXIT;\r
 \r
       Finished = TRUE;\r
       goto ON_EXIT;\r

-      \r
+\r

     } else if (EHC_BIT_IS_SET (State, QTD_STAT_ACTIVE)) {\r
       //\r
       // The QTD is still active, no need to check furthur.\r
       //\r
       Urb->Result |= EFI_USB_ERR_NOTEXECUTE;\r
     } else if (EHC_BIT_IS_SET (State, QTD_STAT_ACTIVE)) {\r
       //\r
       // The QTD is still active, no need to check furthur.\r
       //\r
       Urb->Result |= EFI_USB_ERR_NOTEXECUTE;\r

-      \r
+\r

       Finished = FALSE;\r
       goto ON_EXIT;\r
 \r
       Finished = FALSE;\r
       goto ON_EXIT;\r
 \r


@@ -387,7 +387,7 @@ EhcCheckUrbResult (
         // Status Stage of the setup transfer to get the finial result\r
         //\r
         if (QtdHw->AltNext == QTD_LINK (Ehc->ShortReadStop, FALSE)) {\r
         // Status Stage of the setup transfer to get the finial result\r
         //\r
         if (QtdHw->AltNext == QTD_LINK (Ehc->ShortReadStop, FALSE)) {\r

-          \r
+\r

           Finished = TRUE;\r
           goto ON_EXIT;\r
         }\r
           Finished = TRUE;\r
           goto ON_EXIT;\r
         }\r


@@ -412,7 +412,7 @@ ON_EXIT:
 \r
 /**\r
   Execute the transfer by polling the URB. This is a synchronous operation.\r
 \r
 /**\r
   Execute the transfer by polling the URB. This is a synchronous operation.\r

-  \r
+\r

   @param  Ehc               The EHCI device.\r
   @param  Urb               The URB to execute.\r
   @param  TimeOut           The time to wait before abort, in millisecond.\r
   @param  Ehc               The EHCI device.\r
   @param  Urb               The URB to execute.\r
   @param  TimeOut           The time to wait before abort, in millisecond.\r

diff --git a/MdeModulePkg/Bus/Pci/EhciPei/EhciSched.h b/MdeModulePkg/Bus/Pci/EhciPei/EhciSched.h
index 6cc52f8d0aa4e872116b0756ce35cb89be230464..ebe407c5dd3969ede567b1cd877ef132143c1083 100644 (file)
--- a/MdeModulePkg/Bus/Pci/EhciPei/EhciSched.h
+++ b/MdeModulePkg/Bus/Pci/EhciPei/EhciSched.h
@@ -1,8 +1,8 @@
 /** @file\r
 Private Header file for Usb Host Controller PEIM\r
 \r
 /** @file\r
 Private Header file for Usb Host Controller PEIM\r
 \r

-Copyright (c) 2010 - 2011, Intel Corporation. All rights reserved.<BR>\r
-  \r
+Copyright (c) 2010 - 2018, Intel Corporation. All rights reserved.<BR>\r
+\r

 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions\r
 of the BSD License which accompanies this distribution.  The\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions\r
 of the BSD License which accompanies this distribution.  The\r


@@ -19,7 +19,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 \r
 /**\r
   Initialize the schedule data structure such as frame list.\r
 \r
 /**\r
   Initialize the schedule data structure such as frame list.\r

-  \r
+\r

   @param  Ehc   The EHCI device to init schedule data for.\r
 \r
   @retval EFI_OUT_OF_RESOURCES  Failed to allocate resource to init schedule data.\r
   @param  Ehc   The EHCI device to init schedule data for.\r
 \r
   @retval EFI_OUT_OF_RESOURCES  Failed to allocate resource to init schedule data.\r


@@ -34,7 +34,7 @@ EhcInitSched (
 \r
 /**\r
   Free the schedule data. It may be partially initialized.\r
 \r
 /**\r
   Free the schedule data. It may be partially initialized.\r

-  \r
+\r

   @param  Ehc   The EHCI device.\r
 \r
 **/\r
   @param  Ehc   The EHCI device.\r
 \r
 **/\r


@@ -50,7 +50,7 @@ EhcFreeSched (
   due to its interfaces. This simplifies the AsynList\r
   management: A reclamation header is always linked to\r
   the AsyncListAddr, the only active QH is appended to it.\r
   due to its interfaces. This simplifies the AsynList\r
   management: A reclamation header is always linked to\r
   the AsyncListAddr, the only active QH is appended to it.\r

-  \r
+\r

   @param  Ehc   The EHCI device.\r
   @param  Qh    The queue head to link.\r
 \r
   @param  Ehc   The EHCI device.\r
   @param  Qh    The queue head to link.\r
 \r


@@ -65,7 +65,7 @@ EhcLinkQhToAsync (
 /**\r
   Unlink a queue head from the asynchronous schedule list.\r
   Need to synchronize with hardware.\r
 /**\r
   Unlink a queue head from the asynchronous schedule list.\r
   Need to synchronize with hardware.\r

-  \r
+\r

   @param  Ehc   The EHCI device.\r
   @param  Qh    The queue head to unlink.\r
 \r
   @param  Ehc   The EHCI device.\r
   @param  Qh    The queue head to unlink.\r
 \r


@@ -79,7 +79,7 @@ EhcUnlinkQhFromAsync (
 \r
 /**\r
   Execute the transfer by polling the URB. This is a synchronous operation.\r
 \r
 /**\r
   Execute the transfer by polling the URB. This is a synchronous operation.\r

-  \r
+\r

   @param  Ehc               The EHCI device.\r
   @param  Urb               The URB to execute.\r
   @param  TimeOut           The time to wait before abort, in millisecond.\r
   @param  Ehc               The EHCI device.\r
   @param  Urb               The URB to execute.\r
   @param  TimeOut           The time to wait before abort, in millisecond.\r

diff --git a/MdeModulePkg/Bus/Pci/EhciPei/EhciUrb.c b/MdeModulePkg/Bus/Pci/EhciPei/EhciUrb.c
index baacf5d56080ec615b1a8efbb7ea64111396f51d..a766f70a9dda74bf51e686c237540a1258f752c8 100644 (file)
--- a/MdeModulePkg/Bus/Pci/EhciPei/EhciUrb.c
+++ b/MdeModulePkg/Bus/Pci/EhciPei/EhciUrb.c
@@ -2,8 +2,8 @@
 PEIM to produce gPeiUsb2HostControllerPpiGuid based on gPeiUsbControllerPpiGuid\r
 which is used to enable recovery function from USB Drivers.\r
 \r
 PEIM to produce gPeiUsb2HostControllerPpiGuid based on gPeiUsbControllerPpiGuid\r
 which is used to enable recovery function from USB Drivers.\r
 \r

-Copyright (c) 2010 - 2017, Intel Corporation. All rights reserved.<BR>\r
-  \r
+Copyright (c) 2010 - 2018, Intel Corporation. All rights reserved.<BR>\r
+\r

 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions\r
 of the BSD License which accompanies this distribution.  The\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions\r
 of the BSD License which accompanies this distribution.  The\r


@@ -20,7 +20,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 /**\r
   Delete a single asynchronous interrupt transfer for\r
   the device and endpoint.\r
 /**\r
   Delete a single asynchronous interrupt transfer for\r
   the device and endpoint.\r

-  \r
+\r

   @param  Ehc         The EHCI device.\r
   @param  Data        Current data not associated with a QTD.\r
   @param  DataLen     The length of the data.\r
   @param  Ehc         The EHCI device.\r
   @param  Data        Current data not associated with a QTD.\r
   @param  DataLen     The length of the data.\r


@@ -96,7 +96,7 @@ EhcCreateQtd (
       Len += ThisBufLen;\r
       Data += ThisBufLen;\r
     }\r
       Len += ThisBufLen;\r
       Data += ThisBufLen;\r
     }\r

-    \r
+\r

     //\r
     // Need to fix the last pointer if the Qtd can't hold all the\r
     // user's data to make sure that the length is in the unit of\r
     //\r
     // Need to fix the last pointer if the Qtd can't hold all the\r
     // user's data to make sure that the length is in the unit of\r


@@ -120,7 +120,7 @@ EhcCreateQtd (
     1. SplitXState in the Status field.\r
     2. Microframe S-mask.\r
     3. Microframe C-mask.\r
     1. SplitXState in the Status field.\r
     2. Microframe S-mask.\r
     3. Microframe C-mask.\r

-  \r
+\r

   @param  Ep    The queue head's related endpoint.\r
   @param  QhHw  The queue head to initialize.\r
 \r
   @param  Ep    The queue head's related endpoint.\r
   @param  QhHw  The queue head to initialize.\r
 \r


@@ -142,7 +142,7 @@ EhcInitIntQh (
     QhHw->SMask = QH_MICROFRAME_0;\r
     return ;\r
   }\r
     QhHw->SMask = QH_MICROFRAME_0;\r
     return ;\r
   }\r

-  \r
+\r

   //\r
   // For low/full speed device, the transfer must go through\r
   // the split transaction. Need to update three fields\r
   //\r
   // For low/full speed device, the transfer must go through\r
   // the split transaction. Need to update three fields\r


@@ -160,7 +160,7 @@ EhcInitIntQh (
 \r
 /**\r
   Allocate and initialize a EHCI queue head.\r
 \r
 /**\r
   Allocate and initialize a EHCI queue head.\r

-  \r
+\r

   @param  Ehci      The EHCI device.\r
   @param  Ep        The endpoint to create queue head for.\r
 \r
   @param  Ehci      The EHCI device.\r
   @param  Ep        The endpoint to create queue head for.\r
 \r


@@ -185,7 +185,7 @@ EhcCreateQh (
   Qh->Signature       = EHC_QH_SIG;\r
   Qh->NextQh          = NULL;\r
   Qh->Interval        = Ep->PollRate;\r
   Qh->Signature       = EHC_QH_SIG;\r
   Qh->NextQh          = NULL;\r
   Qh->Interval        = Ep->PollRate;\r

-  \r
+\r

   InitializeListHead (&Qh->Qtds);\r
 \r
   QhHw                = &Qh->QhHw;\r
   InitializeListHead (&Qh->Qtds);\r
 \r
   QhHw                = &Qh->QhHw;\r


@@ -250,7 +250,7 @@ EhcCreateQh (
   can't support high speed endpoint with a interval less\r
   than 8 microframe because interval is specified in\r
   the unit of ms (millisecond).\r
   can't support high speed endpoint with a interval less\r
   than 8 microframe because interval is specified in\r
   the unit of ms (millisecond).\r

-  \r
+\r

   @param Interval       The interval to convert.\r
 \r
   @retval The converted interval.\r
   @param Interval       The interval to convert.\r
 \r
   @retval The converted interval.\r


@@ -266,7 +266,7 @@ EhcConvertPollRate (
   if (Interval == 0) {\r
     return 1;\r
   }\r
   if (Interval == 0) {\r
     return 1;\r
   }\r

-  \r
+\r

   //\r
   // Find the index (1 based) of the highest non-zero bit\r
   //\r
   //\r
   // Find the index (1 based) of the highest non-zero bit\r
   //\r


@@ -282,7 +282,7 @@ EhcConvertPollRate (
 \r
 /**\r
   Free a list of QTDs.\r
 \r
 /**\r
   Free a list of QTDs.\r

-  \r
+\r

   @param  Ehc         The EHCI device.\r
   @param  Qtds        The list head of the QTD.\r
 \r
   @param  Ehc         The EHCI device.\r
   @param  Qtds        The list head of the QTD.\r
 \r


@@ -307,7 +307,7 @@ EhcFreeQtds (
 \r
 /**\r
   Free an allocated URB. It is possible for it to be partially inited.\r
 \r
 /**\r
   Free an allocated URB. It is possible for it to be partially inited.\r

-  \r
+\r

   @param  Ehc         The EHCI device.\r
   @param  Urb         The URB to free.\r
 \r
   @param  Ehc         The EHCI device.\r
   @param  Urb         The URB to free.\r
 \r


@@ -338,7 +338,7 @@ EhcFreeUrb (
 \r
 /**\r
   Create a list of QTDs for the URB.\r
 \r
 /**\r
   Create a list of QTDs for the URB.\r

-  \r
+\r

   @param  Ehc         The EHCI device.\r
   @param  Urb         The URB to create QTDs for.\r
 \r
   @param  Ehc         The EHCI device.\r
   @param  Urb         The URB to create QTDs for.\r
 \r


@@ -380,7 +380,7 @@ EhcCreateQtds (
   if (Ep->Direction == EfiUsbDataIn) {\r
     AlterNext = QTD_LINK (Ehc->ShortReadStop, FALSE);\r
   }\r
   if (Ep->Direction == EfiUsbDataIn) {\r
     AlterNext = QTD_LINK (Ehc->ShortReadStop, FALSE);\r
   }\r

-  \r
+\r

   //\r
   // Build the Setup and status packets for control transfer\r
   //\r
   //\r
   // Build the Setup and status packets for control transfer\r
   //\r


@@ -457,7 +457,7 @@ EhcCreateQtds (
 \r
     Len += Qtd->DataLen;\r
   }\r
 \r
     Len += Qtd->DataLen;\r
   }\r

-  \r
+\r

   //\r
   // Insert the status packet for control transfer\r
   //\r
   //\r
   // Insert the status packet for control transfer\r
   //\r


@@ -496,7 +496,7 @@ ON_ERROR:
 \r
 /**\r
   Create a new URB and its associated QTD.\r
 \r
 /**\r
   Create a new URB and its associated QTD.\r

-  \r
+\r

   @param  Ehc               The EHCI device.\r
   @param  DevAddr           The device address.\r
   @param  EpAddr            Endpoint addrress & its direction.\r
   @param  Ehc               The EHCI device.\r
   @param  DevAddr           The device address.\r
   @param  EpAddr            Endpoint addrress & its direction.\r


@@ -519,7 +519,7 @@ PEI_URB *
 EhcCreateUrb (\r
   IN PEI_USB2_HC_DEV                    *Ehc,\r
   IN UINT8                              DevAddr,\r
 EhcCreateUrb (\r
   IN PEI_USB2_HC_DEV                    *Ehc,\r
   IN UINT8                              DevAddr,\r

-  IN UINT8                              EpAddr,  \r
+  IN UINT8                              EpAddr,\r

   IN UINT8                              DevSpeed,\r
   IN UINT8                              Toggle,\r
   IN UINTN                              MaxPacket,\r
   IN UINT8                              DevSpeed,\r
   IN UINT8                              Toggle,\r
   IN UINTN                              MaxPacket,\r


@@ -540,7 +540,7 @@ EhcCreateUrb (
   UINTN                         Len;\r
   PEI_URB                       *Urb;\r
   VOID                          *Map;\r
   UINTN                         Len;\r
   PEI_URB                       *Urb;\r
   VOID                          *Map;\r

-  \r
+\r

   Urb = Ehc->Urb;\r
   Urb->Signature  = EHC_URB_SIG;\r
   InitializeListHead (&Urb->UrbList);\r
   Urb = Ehc->Urb;\r
   Urb->Signature  = EHC_URB_SIG;\r
   InitializeListHead (&Urb->UrbList);\r

diff --git a/MdeModulePkg/Bus/Pci/EhciPei/EhciUrb.h b/MdeModulePkg/Bus/Pci/EhciPei/EhciUrb.h
index 3fe93fb294e7f80cc3f62aa28b7c5ee71a5e6310..009b67d6c9a32a0ae9b74025cb35546fc77d2842 100644 (file)
--- a/MdeModulePkg/Bus/Pci/EhciPei/EhciUrb.h
+++ b/MdeModulePkg/Bus/Pci/EhciPei/EhciUrb.h
@@ -1,8 +1,8 @@
 /** @file\r
 Private Header file for Usb Host Controller PEIM\r
 \r
 /** @file\r
 Private Header file for Usb Host Controller PEIM\r
 \r

-Copyright (c) 2010, Intel Corporation. All rights reserved.<BR>\r
-  \r
+Copyright (c) 2010 - 2018, Intel Corporation. All rights reserved.<BR>\r
+\r

 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions\r
 of the BSD License which accompanies this distribution.  The\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions\r
 of the BSD License which accompanies this distribution.  The\r


@@ -73,7 +73,7 @@ typedef struct _PEI_URB     PEI_URB;
 #define USB_ERR_SHORT_PACKET    0x200\r
 \r
 //\r
 #define USB_ERR_SHORT_PACKET    0x200\r
 \r
 //\r

-// Fill in the hardware link point: pass in a EHC_QH/QH_HW \r
+// Fill in the hardware link point: pass in a EHC_QH/QH_HW\r

 // pointer to QH_LINK; A EHC_QTD/QTD_HW pointer to QTD_LINK\r
 //\r
 #define QH_LINK(Addr, Type, Term) \\r
 // pointer to QH_LINK; A EHC_QTD/QTD_HW pointer to QTD_LINK\r
 //\r
 #define QH_LINK(Addr, Type, Term) \\r


@@ -82,16 +82,16 @@ typedef struct _PEI_URB     PEI_URB;
 #define QTD_LINK(Addr, Term)      QH_LINK((Addr), 0, (Term))\r
 \r
 //\r
 #define QTD_LINK(Addr, Term)      QH_LINK((Addr), 0, (Term))\r
 \r
 //\r

-// The defination of EHCI hardware used data structure for \r
-// little endian architecture. The QTD and QH structures \r
-// are required to be 32 bytes aligned. Don't add members \r
+// The defination of EHCI hardware used data structure for\r
+// little endian architecture. The QTD and QH structures\r
+// are required to be 32 bytes aligned. Don't add members\r

 // to the head of the associated software strucuture.\r
 //\r
 #pragma pack(1)\r
 typedef struct {\r
   UINT32                  NextQtd;\r
   UINT32                  AltNext;\r
 // to the head of the associated software strucuture.\r
 //\r
 #pragma pack(1)\r
 typedef struct {\r
   UINT32                  NextQtd;\r
   UINT32                  AltNext;\r

-  \r
+\r

   UINT32                  Status       : 8;\r
   UINT32                  Pid          : 2;\r
   UINT32                  ErrCnt       : 2;\r
   UINT32                  Status       : 8;\r
   UINT32                  Pid          : 2;\r
   UINT32                  ErrCnt       : 2;\r


@@ -105,7 +105,7 @@ typedef struct {
 } QTD_HW;\r
 \r
 typedef struct {\r
 } QTD_HW;\r
 \r
 typedef struct {\r

-  UINT32                  HorizonLink;  \r
+  UINT32                  HorizonLink;\r

   //\r
   // Endpoint capabilities/Characteristics DWord 1 and DWord 2\r
   //\r
   //\r
   // Endpoint capabilities/Characteristics DWord 1 and DWord 2\r
   //\r


@@ -131,7 +131,7 @@ typedef struct {
   UINT32                  CurQtd;\r
   UINT32                  NextQtd;\r
   UINT32                  AltQtd;\r
   UINT32                  CurQtd;\r
   UINT32                  NextQtd;\r
   UINT32                  AltQtd;\r

-  \r
+\r

   UINT32                  Status       : 8;\r
   UINT32                  Pid          : 2;\r
   UINT32                  ErrCnt       : 2;\r
   UINT32                  Status       : 8;\r
   UINT32                  Pid          : 2;\r
   UINT32                  ErrCnt       : 2;\r


@@ -163,7 +163,7 @@ typedef struct _USB_ENDPOINT {
 } USB_ENDPOINT;\r
 \r
 //\r
 } USB_ENDPOINT;\r
 \r
 //\r

-// Software QTD strcture, this is used to manage all the \r
+// Software QTD strcture, this is used to manage all the\r

 // QTD generated from a URB. Don't add fields before QtdHw.\r
 //\r
 struct _PEI_EHC_QTD {\r
 // QTD generated from a URB. Don't add fields before QtdHw.\r
 //\r
 struct _PEI_EHC_QTD {\r


@@ -177,17 +177,17 @@ struct _PEI_EHC_QTD {
 \r
 \r
 //\r
 \r
 \r
 //\r

-// Software QH structure. All three different transaction types \r
-// supported by UEFI USB, that is the control/bulk/interrupt \r
-// transfers use the queue head and queue token strcuture. \r
+// Software QH structure. All three different transaction types\r
+// supported by UEFI USB, that is the control/bulk/interrupt\r
+// transfers use the queue head and queue token strcuture.\r

 //\r
 // Interrupt QHs are linked to periodic frame list in the reversed\r
 //\r
 // Interrupt QHs are linked to periodic frame list in the reversed\r

-// 2^N tree. Each interrupt QH is linked to the list starting at \r
+// 2^N tree. Each interrupt QH is linked to the list starting at\r

 // frame 0. There is a dummy interrupt QH linked to each frame as\r
 // a sentinental whose polling interval is 1. Synchronous interrupt\r
 // frame 0. There is a dummy interrupt QH linked to each frame as\r
 // a sentinental whose polling interval is 1. Synchronous interrupt\r

-// transfer is linked after this dummy QH. \r
-// \r
-// For control/bulk transfer, only synchronous (in the sense of UEFI) \r
+// transfer is linked after this dummy QH.\r
+//\r
+// For control/bulk transfer, only synchronous (in the sense of UEFI)\r

 // transfer is supported. A dummy QH is linked to EHCI AsyncListAddr\r
 // as the reclamation header. New transfer is inserted after this QH.\r
 //\r
 // transfer is supported. A dummy QH is linked to EHCI AsyncListAddr\r
 // as the reclamation header. New transfer is inserted after this QH.\r
 //\r


@@ -196,17 +196,17 @@ struct _PEI_EHC_QH {
   UINT32                  Signature;\r
   PEI_EHC_QH              *NextQh;    // The queue head pointed to by horizontal link\r
   EFI_LIST_ENTRY          Qtds;       // The list of QTDs to this queue head\r
   UINT32                  Signature;\r
   PEI_EHC_QH              *NextQh;    // The queue head pointed to by horizontal link\r
   EFI_LIST_ENTRY          Qtds;       // The list of QTDs to this queue head\r

-  UINTN                   Interval; \r
+  UINTN                   Interval;\r

 };\r
 \r
 //\r
 };\r
 \r
 //\r

-// URB (Usb Request Block) contains information for all kinds of \r
+// URB (Usb Request Block) contains information for all kinds of\r

 // usb requests.\r
 //\r
 struct _PEI_URB {\r
   UINT32                          Signature;\r
   EFI_LIST_ENTRY                  UrbList;\r
 // usb requests.\r
 //\r
 struct _PEI_URB {\r
   UINT32                          Signature;\r
   EFI_LIST_ENTRY                  UrbList;\r

-  \r
+\r

   //\r
   // Transaction information\r
   //\r
   //\r
   // Transaction information\r
   //\r


@@ -218,14 +218,14 @@ struct _PEI_URB {
   UINTN                           DataLen;\r
   VOID                            *DataPhy;     // Address of the mapped user data\r
   VOID                            *DataMap;\r
   UINTN                           DataLen;\r
   VOID                            *DataPhy;     // Address of the mapped user data\r
   VOID                            *DataMap;\r

-  EFI_ASYNC_USB_TRANSFER_CALLBACK Callback; \r
+  EFI_ASYNC_USB_TRANSFER_CALLBACK Callback;\r

   VOID                            *Context;\r
 \r
   //\r
   // Schedule data\r
   //\r
   PEI_EHC_QH                      *Qh;\r
   VOID                            *Context;\r
 \r
   //\r
   // Schedule data\r
   //\r
   PEI_EHC_QH                      *Qh;\r

-  \r
+\r

   //\r
   // Transaction result\r
   //\r
   //\r
   // Transaction result\r
   //\r


@@ -237,7 +237,7 @@ struct _PEI_URB {
 /**\r
   Delete a single asynchronous interrupt transfer for\r
   the device and endpoint.\r
 /**\r
   Delete a single asynchronous interrupt transfer for\r
   the device and endpoint.\r

-  \r
+\r

   @param  Ehc         The EHCI device.\r
   @param  Data        Current data not associated with a QTD.\r
   @param  DataLen     The length of the data.\r
   @param  Ehc         The EHCI device.\r
   @param  Data        Current data not associated with a QTD.\r
   @param  DataLen     The length of the data.\r


@@ -261,7 +261,7 @@ EhcCreateQtd (
 \r
 /**\r
   Allocate and initialize a EHCI queue head.\r
 \r
 /**\r
   Allocate and initialize a EHCI queue head.\r

-  \r
+\r

   @param  Ehci      The EHCI device.\r
   @param  Ep        The endpoint to create queue head for.\r
 \r
   @param  Ehci      The EHCI device.\r
   @param  Ep        The endpoint to create queue head for.\r
 \r


@@ -277,7 +277,7 @@ EhcCreateQh (
 \r
 /**\r
   Free an allocated URB. It is possible for it to be partially inited.\r
 \r
 /**\r
   Free an allocated URB. It is possible for it to be partially inited.\r

-  \r
+\r

   @param  Ehc         The EHCI device.\r
   @param  Urb         The URB to free.\r
 \r
   @param  Ehc         The EHCI device.\r
   @param  Urb         The URB to free.\r
 \r


@@ -291,7 +291,7 @@ EhcFreeUrb (
 \r
 /**\r
   Create a new URB and its associated QTD.\r
 \r
 /**\r
   Create a new URB and its associated QTD.\r

-  \r
+\r

   @param  Ehc               The EHCI device.\r
   @param  DevAddr           The device address.\r
   @param  EpAddr            Endpoint addrress & its direction.\r
   @param  Ehc               The EHCI device.\r
   @param  DevAddr           The device address.\r
   @param  EpAddr            Endpoint addrress & its direction.\r


@@ -314,7 +314,7 @@ PEI_URB *
 EhcCreateUrb (\r
   IN PEI_USB2_HC_DEV                    *Ehc,\r
   IN UINT8                              DevAddr,\r
 EhcCreateUrb (\r
   IN PEI_USB2_HC_DEV                    *Ehc,\r
   IN UINT8                              DevAddr,\r

-  IN UINT8                              EpAddr,  \r
+  IN UINT8                              EpAddr,\r

   IN UINT8                              DevSpeed,\r
   IN UINT8                              Toggle,\r
   IN UINTN                              MaxPacket,\r
   IN UINT8                              DevSpeed,\r
   IN UINT8                              Toggle,\r
   IN UINTN                              MaxPacket,\r

diff --git a/MdeModulePkg/Bus/Pci/EhciPei/UsbHcMem.c b/MdeModulePkg/Bus/Pci/EhciPei/UsbHcMem.c
index a0419bd857229992804a817c21f6107c2842a6ac..3cc31f50548ade616c369892063acddc4c64b287 100644 (file)
--- a/MdeModulePkg/Bus/Pci/EhciPei/UsbHcMem.c
+++ b/MdeModulePkg/Bus/Pci/EhciPei/UsbHcMem.c
@@ -2,8 +2,8 @@
 PEIM to produce gPeiUsb2HostControllerPpiGuid based on gPeiUsbControllerPpiGuid\r
 which is used to enable recovery function from USB Drivers.\r
 \r
 PEIM to produce gPeiUsb2HostControllerPpiGuid based on gPeiUsbControllerPpiGuid\r
 which is used to enable recovery function from USB Drivers.\r
 \r

-Copyright (c) 2010 - 2017, Intel Corporation. All rights reserved.<BR>\r
-  \r
+Copyright (c) 2010 - 2018, Intel Corporation. All rights reserved.<BR>\r
+\r

 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions\r
 of the BSD License which accompanies this distribution.  The\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions\r
 of the BSD License which accompanies this distribution.  The\r


@@ -54,28 +54,28 @@ UsbHcAllocMemBlock (
       return NULL;\r
   }\r
   ZeroMem ((VOID   *)(UINTN)TempPtr, PageNumber*EFI_PAGE_SIZE);\r
       return NULL;\r
   }\r
   ZeroMem ((VOID   *)(UINTN)TempPtr, PageNumber*EFI_PAGE_SIZE);\r

-  \r
+\r

   //\r
   // each bit in the bit array represents USBHC_MEM_UNIT\r
   // bytes of memory in the memory block.\r
   //\r
   ASSERT (USBHC_MEM_UNIT * 8 <= EFI_PAGE_SIZE);\r
   //\r
   // each bit in the bit array represents USBHC_MEM_UNIT\r
   // bytes of memory in the memory block.\r
   //\r
   ASSERT (USBHC_MEM_UNIT * 8 <= EFI_PAGE_SIZE);\r

-  \r
+\r

   Block = (USBHC_MEM_BLOCK*)(UINTN)TempPtr;\r
   Block->BufLen   = EFI_PAGES_TO_SIZE (Pages);\r
   Block->BitsLen  = Block->BufLen / (USBHC_MEM_UNIT * 8);\r
   Block = (USBHC_MEM_BLOCK*)(UINTN)TempPtr;\r
   Block->BufLen   = EFI_PAGES_TO_SIZE (Pages);\r
   Block->BitsLen  = Block->BufLen / (USBHC_MEM_UNIT * 8);\r

-  \r
+\r

   PageNumber =  (Block->BitsLen)/PAGESIZE +1;\r
   Status = PeiServicesAllocatePages (\r
              EfiBootServicesCode,\r
              PageNumber,\r
              &TempPtr\r
              );\r
   PageNumber =  (Block->BitsLen)/PAGESIZE +1;\r
   Status = PeiServicesAllocatePages (\r
              EfiBootServicesCode,\r
              PageNumber,\r
              &TempPtr\r
              );\r

-  \r
+\r

     if (EFI_ERROR (Status)) {\r
       return NULL;\r
     }\r
     if (EFI_ERROR (Status)) {\r
       return NULL;\r
     }\r

-  ZeroMem ((VOID   *)(UINTN)TempPtr, PageNumber*EFI_PAGE_SIZE);        \r
+  ZeroMem ((VOID   *)(UINTN)TempPtr, PageNumber*EFI_PAGE_SIZE);\r

 \r
   Block->Bits  = (UINT8 *)(UINTN)TempPtr;\r
 \r
 \r
   Block->Bits  = (UINT8 *)(UINTN)TempPtr;\r
 \r


@@ -184,7 +184,7 @@ UsbHcAllocMemFromBlock (
   if (Available < Units) {\r
     return NULL;\r
   }\r
   if (Available < Units) {\r
     return NULL;\r
   }\r

-  \r
+\r

   //\r
   // Mark the memory as allocated\r
   //\r
   //\r
   // Mark the memory as allocated\r
   //\r


@@ -283,7 +283,7 @@ UsbHcIsMemBlockEmpty (
 {\r
   UINTN                   Index;\r
 \r
 {\r
   UINTN                   Index;\r
 \r

-  \r
+\r

   for (Index = 0; Index < Block->BitsLen; Index++) {\r
     if (Block->Bits[Index] != 0) {\r
       return FALSE;\r
   for (Index = 0; Index < Block->BitsLen; Index++) {\r
     if (Block->Bits[Index] != 0) {\r
       return FALSE;\r


@@ -321,7 +321,7 @@ UsbHcUnlinkMemBlock (
 \r
 /**\r
   Initialize the memory management pool for the host controller.\r
 \r
 /**\r
   Initialize the memory management pool for the host controller.\r

-  \r
+\r

   @param  Ehc                   The EHCI device.\r
   @param  Check4G               Whether the host controller requires allocated memory.\r
                                 from one 4G address space.\r
   @param  Ehc                   The EHCI device.\r
   @param  Check4G               Whether the host controller requires allocated memory.\r
                                 from one 4G address space.\r


@@ -342,7 +342,7 @@ UsbHcInitMemPool (
   UINTN               PageNumber;\r
   EFI_STATUS              Status;\r
   EFI_PHYSICAL_ADDRESS        TempPtr;\r
   UINTN               PageNumber;\r
   EFI_STATUS              Status;\r
   EFI_PHYSICAL_ADDRESS        TempPtr;\r

-  \r
+\r

   PageNumber =  sizeof(USBHC_MEM_POOL)/PAGESIZE +1;\r
   Status = PeiServicesAllocatePages (\r
              EfiBootServicesCode,\r
   PageNumber =  sizeof(USBHC_MEM_POOL)/PAGESIZE +1;\r
   Status = PeiServicesAllocatePages (\r
              EfiBootServicesCode,\r


@@ -353,9 +353,9 @@ UsbHcInitMemPool (
     if (EFI_ERROR (Status)) {\r
       return NULL;\r
     }\r
     if (EFI_ERROR (Status)) {\r
       return NULL;\r
     }\r

-  ZeroMem ((VOID   *)(UINTN)TempPtr, PageNumber*EFI_PAGE_SIZE);        \r
+  ZeroMem ((VOID   *)(UINTN)TempPtr, PageNumber*EFI_PAGE_SIZE);\r

 \r
 \r

-  Pool = (USBHC_MEM_POOL *) ((UINTN) TempPtr); \r
+  Pool = (USBHC_MEM_POOL *) ((UINTN) TempPtr);\r

 \r
   Pool->Check4G = Check4G;\r
   Pool->Which4G = Which4G;\r
 \r
   Pool->Check4G = Check4G;\r
   Pool->Which4G = Which4G;\r


@@ -405,7 +405,7 @@ UsbHcFreeMemPool (
 /**\r
   Allocate some memory from the host controller's memory pool\r
   which can be used to communicate with host controller.\r
 /**\r
   Allocate some memory from the host controller's memory pool\r
   which can be used to communicate with host controller.\r

-  \r
+\r

   @param  Ehc       The EHCI device.\r
   @param  Pool      The host controller's memory pool.\r
   @param  Size      Size of the memory to allocate.\r
   @param  Ehc       The EHCI device.\r
   @param  Pool      The host controller's memory pool.\r
   @param  Size      Size of the memory to allocate.\r


@@ -464,7 +464,7 @@ UsbHcAllocateMem (
   if (NewBlock == NULL) {\r
     return NULL;\r
   }\r
   if (NewBlock == NULL) {\r
     return NULL;\r
   }\r

-  \r
+\r

   //\r
   // Add the new memory block to the pool, then allocate memory from it\r
   //\r
   //\r
   // Add the new memory block to the pool, then allocate memory from it\r
   //\r

diff --git a/MdeModulePkg/Bus/Pci/EhciPei/UsbHcMem.h b/MdeModulePkg/Bus/Pci/EhciPei/UsbHcMem.h
index 717a8c822c90de545109efa180c7cbeda962e6ba..17e60f652c8c0d8eed3bfbce2c05cf556b090534 100644 (file)
--- a/MdeModulePkg/Bus/Pci/EhciPei/UsbHcMem.h
+++ b/MdeModulePkg/Bus/Pci/EhciPei/UsbHcMem.h
@@ -1,8 +1,8 @@
 /** @file\r
 Private Header file for Usb Host Controller PEIM\r
 \r
 /** @file\r
 Private Header file for Usb Host Controller PEIM\r
 \r

-Copyright (c) 2010 - 2017, Intel Corporation. All rights reserved.<BR>\r
-  \r
+Copyright (c) 2010 - 2018, Intel Corporation. All rights reserved.<BR>\r
+\r

 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions\r
 of the BSD License which accompanies this distribution.  The\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions\r
 of the BSD License which accompanies this distribution.  The\r


@@ -32,22 +32,22 @@ typedef struct _USBHC_MEM_BLOCK USBHC_MEM_BLOCK;
 \r
 struct _USBHC_MEM_BLOCK {\r
   UINT8                   *Bits;    // Bit array to record which unit is allocated\r
 \r
 struct _USBHC_MEM_BLOCK {\r
   UINT8                   *Bits;    // Bit array to record which unit is allocated\r

-  UINTN                   BitsLen; \r
+  UINTN                   BitsLen;\r

   UINT8                   *Buf;\r
   UINT8                   *BufHost;\r
   UINTN                   BufLen;   // Memory size in bytes\r
   UINT8                   *Buf;\r
   UINT8                   *BufHost;\r
   UINTN                   BufLen;   // Memory size in bytes\r

-  VOID                    *Mapping;     \r
+  VOID                    *Mapping;\r

   USBHC_MEM_BLOCK         *Next;\r
 };\r
 \r
 //\r
   USBHC_MEM_BLOCK         *Next;\r
 };\r
 \r
 //\r

-// USBHC_MEM_POOL is used to manage the memory used by USB \r
+// USBHC_MEM_POOL is used to manage the memory used by USB\r

 // host controller. EHCI requires the control memory and transfer\r
 // host controller. EHCI requires the control memory and transfer\r

-// data to be on the same 4G memory. \r
+// data to be on the same 4G memory.\r

 //\r
 typedef struct _USBHC_MEM_POOL {\r
 //\r
 typedef struct _USBHC_MEM_POOL {\r

-  BOOLEAN                 Check4G;      \r
-  UINT32                  Which4G;      \r
+  BOOLEAN                 Check4G;\r
+  UINT32                  Which4G;\r

   USBHC_MEM_BLOCK         *Head;\r
 } USBHC_MEM_POOL;\r
 \r
   USBHC_MEM_BLOCK         *Head;\r
 } USBHC_MEM_POOL;\r
 \r


@@ -71,7 +71,7 @@ typedef struct _USBHC_MEM_POOL {
               (Byte)++;       \\r
               (Bit) = 0;      \\r
             }                 \\r
               (Byte)++;       \\r
               (Bit) = 0;      \\r
             }                 \\r

-          } while (0)       \r
+          } while (0)\r

 \r
 \r
 /**\r
 \r
 \r
 /**\r

diff --git a/MdeModulePkg/Bus/Pci/IdeBusPei/AtapiPeim.c b/MdeModulePkg/Bus/Pci/IdeBusPei/AtapiPeim.c
index 58bef161fb37e8a2228aa1c41394d1f167b7f0c6..f509b749d2e59cc9b7ecf886a3245db9c80535c4 100644 (file)
--- a/MdeModulePkg/Bus/Pci/IdeBusPei/AtapiPeim.c
+++ b/MdeModulePkg/Bus/Pci/IdeBusPei/AtapiPeim.c
@@ -5,7 +5,7 @@ ATA controllers in the platform.
 This PPI can be consumed by PEIM which produce gEfiPeiDeviceRecoveryModulePpiGuid\r
 for Atapi CD ROM device.\r
 \r
 This PPI can be consumed by PEIM which produce gEfiPeiDeviceRecoveryModulePpiGuid\r
 for Atapi CD ROM device.\r
 \r

-Copyright (c) 2006 - 2017, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r

 \r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions\r
 \r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions\r


@@ -21,8 +21,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #include "AtapiPeim.h"\r
 \r
 /**\r
 #include "AtapiPeim.h"\r
 \r
 /**\r

-  Initializes the Atapi Block Io PPI.  \r
-  \r
+  Initializes the Atapi Block Io PPI.\r
+\r

   @param[in]  FileHandle           Handle of the file being invoked.\r
   @param[in]  PeiServices          Describes the list of possible PEI Services.\r
 \r
   @param[in]  FileHandle           Handle of the file being invoked.\r
   @param[in]  PeiServices          Describes the list of possible PEI Services.\r
 \r


@@ -97,16 +97,16 @@ AtapiPeimEntry (
 /**\r
   Gets the count of block I/O devices that one specific block driver detects.\r
 \r
 /**\r
   Gets the count of block I/O devices that one specific block driver detects.\r
 \r

-  This function is used for getting the count of block I/O devices that one \r
+  This function is used for getting the count of block I/O devices that one\r

   specific block driver detects.  To the PEI ATAPI driver, it returns the number\r
   specific block driver detects.  To the PEI ATAPI driver, it returns the number\r

-  of all the detected ATAPI devices it detects during the enumeration process. \r
-  To the PEI legacy floppy driver, it returns the number of all the legacy \r
-  devices it finds during its enumeration process. If no device is detected, \r
-  then the function will return zero.  \r
-  \r
-  @param[in]  PeiServices          General-purpose services that are available \r
+  of all the detected ATAPI devices it detects during the enumeration process.\r
+  To the PEI legacy floppy driver, it returns the number of all the legacy\r
+  devices it finds during its enumeration process. If no device is detected,\r
+  then the function will return zero.\r
+\r
+  @param[in]  PeiServices          General-purpose services that are available\r

                                    to every PEIM.\r
                                    to every PEIM.\r

-  @param[in]  This                 Indicates the EFI_PEI_RECOVERY_BLOCK_IO_PPI \r
+  @param[in]  This                 Indicates the EFI_PEI_RECOVERY_BLOCK_IO_PPI\r

                                    instance.\r
   @param[out] NumberBlockDevices   The number of block I/O devices discovered.\r
 \r
                                    instance.\r
   @param[out] NumberBlockDevices   The number of block I/O devices discovered.\r
 \r


@@ -135,27 +135,27 @@ AtapiGetNumberOfBlockDevices (
 /**\r
   Gets a block device's media information.\r
 \r
 /**\r
   Gets a block device's media information.\r
 \r

-  This function will provide the caller with the specified block device's media \r
-  information. If the media changes, calling this function will update the media \r
+  This function will provide the caller with the specified block device's media\r
+  information. If the media changes, calling this function will update the media\r

   information accordingly.\r
 \r
   @param[in]  PeiServices   General-purpose services that are available to every\r
                             PEIM\r
   @param[in]  This          Indicates the EFI_PEI_RECOVERY_BLOCK_IO_PPI instance.\r
   information accordingly.\r
 \r
   @param[in]  PeiServices   General-purpose services that are available to every\r
                             PEIM\r
   @param[in]  This          Indicates the EFI_PEI_RECOVERY_BLOCK_IO_PPI instance.\r

-  @param[in]  DeviceIndex   Specifies the block device to which the function wants \r
-                            to talk. Because the driver that implements Block I/O \r
-                            PPIs will manage multiple block devices, the PPIs that \r
-                            want to talk to a single device must specify the \r
+  @param[in]  DeviceIndex   Specifies the block device to which the function wants\r
+                            to talk. Because the driver that implements Block I/O\r
+                            PPIs will manage multiple block devices, the PPIs that\r
+                            want to talk to a single device must specify the\r

                             device index that was assigned during the enumeration\r
                             device index that was assigned during the enumeration\r

-                            process. This index is a number from one to \r
+                            process. This index is a number from one to\r

                             NumberBlockDevices.\r
                             NumberBlockDevices.\r

-  @param[out] MediaInfo     The media information of the specified block media.  \r
-                            The caller is responsible for the ownership of this \r
+  @param[out] MediaInfo     The media information of the specified block media.\r
+                            The caller is responsible for the ownership of this\r

                             data structure.\r
                             data structure.\r

-  \r
-  @retval EFI_SUCCESS           Media information about the specified block device \r
+\r
+  @retval EFI_SUCCESS           Media information about the specified block device\r

                                 was obtained successfully.\r
                                 was obtained successfully.\r

-  @retval EFI_DEVICE_ERROR      Cannot get the media information due to a hardware \r
+  @retval EFI_DEVICE_ERROR      Cannot get the media information due to a hardware\r

                                 error.\r
   @retval Others                Other failure occurs.\r
 \r
                                 error.\r
   @retval Others                Other failure occurs.\r
 \r


@@ -196,7 +196,7 @@ AtapiGetBlockDeviceMediaInfo (
   //\r
   // probe media and retrieve latest media information\r
   //\r
   //\r
   // probe media and retrieve latest media information\r
   //\r

-  DEBUG ((EFI_D_INFO, "Atatpi GetInfo DevicePosition is %d\n", AtapiBlkIoDev->DeviceInfo[Index].DevicePosition));  \r
+  DEBUG ((EFI_D_INFO, "Atatpi GetInfo DevicePosition is %d\n", AtapiBlkIoDev->DeviceInfo[Index].DevicePosition));\r

   DEBUG ((EFI_D_INFO, "Atatpi GetInfo DeviceType is   %d\n", AtapiBlkIoDev->DeviceInfo[Index].MediaInfo.DeviceType));\r
   DEBUG ((EFI_D_INFO, "Atatpi GetInfo MediaPresent is %d\n", AtapiBlkIoDev->DeviceInfo[Index].MediaInfo.MediaPresent));\r
   DEBUG ((EFI_D_INFO, "Atatpi GetInfo BlockSize is  0x%x\n", AtapiBlkIoDev->DeviceInfo[Index].MediaInfo.BlockSize));\r
   DEBUG ((EFI_D_INFO, "Atatpi GetInfo DeviceType is   %d\n", AtapiBlkIoDev->DeviceInfo[Index].MediaInfo.DeviceType));\r
   DEBUG ((EFI_D_INFO, "Atatpi GetInfo MediaPresent is %d\n", AtapiBlkIoDev->DeviceInfo[Index].MediaInfo.MediaPresent));\r
   DEBUG ((EFI_D_INFO, "Atatpi GetInfo BlockSize is  0x%x\n", AtapiBlkIoDev->DeviceInfo[Index].MediaInfo.BlockSize));\r


@@ -217,7 +217,7 @@ AtapiGetBlockDeviceMediaInfo (
   DEBUG ((EFI_D_INFO, "Atatpi GetInfo MediaPresent is %d\n", AtapiBlkIoDev->DeviceInfo[Index].MediaInfo.MediaPresent));\r
   DEBUG ((EFI_D_INFO, "Atatpi GetInfo BlockSize is  0x%x\n", AtapiBlkIoDev->DeviceInfo[Index].MediaInfo.BlockSize));\r
   DEBUG ((EFI_D_INFO, "Atatpi GetInfo LastBlock is  0x%x\n", AtapiBlkIoDev->DeviceInfo[Index].MediaInfo.LastBlock));\r
   DEBUG ((EFI_D_INFO, "Atatpi GetInfo MediaPresent is %d\n", AtapiBlkIoDev->DeviceInfo[Index].MediaInfo.MediaPresent));\r
   DEBUG ((EFI_D_INFO, "Atatpi GetInfo BlockSize is  0x%x\n", AtapiBlkIoDev->DeviceInfo[Index].MediaInfo.BlockSize));\r
   DEBUG ((EFI_D_INFO, "Atatpi GetInfo LastBlock is  0x%x\n", AtapiBlkIoDev->DeviceInfo[Index].MediaInfo.LastBlock));\r

-  \r
+\r

   //\r
   // Get media info from AtapiBlkIoDev\r
   //\r
   //\r
   // Get media info from AtapiBlkIoDev\r
   //\r


@@ -229,31 +229,31 @@ AtapiGetBlockDeviceMediaInfo (
 /**\r
   Reads the requested number of blocks from the specified block device.\r
 \r
 /**\r
   Reads the requested number of blocks from the specified block device.\r
 \r

-  The function reads the requested number of blocks from the device. All the \r
+  The function reads the requested number of blocks from the device. All the\r

   blocks are read, or an error is returned. If there is no media in the device,\r
   the function returns EFI_NO_MEDIA.\r
 \r
   blocks are read, or an error is returned. If there is no media in the device,\r
   the function returns EFI_NO_MEDIA.\r
 \r

-  @param[in]  PeiServices   General-purpose services that are available to \r
+  @param[in]  PeiServices   General-purpose services that are available to\r

                             every PEIM.\r
   @param[in]  This          Indicates the EFI_PEI_RECOVERY_BLOCK_IO_PPI instance.\r
                             every PEIM.\r
   @param[in]  This          Indicates the EFI_PEI_RECOVERY_BLOCK_IO_PPI instance.\r

-  @param[in]  DeviceIndex   Specifies the block device to which the function wants \r
-                            to talk. Because the driver that implements Block I/O \r
-                            PPIs will manage multiple block devices, the PPIs that \r
-                            want to talk to a single device must specify the device \r
-                            index that was assigned during the enumeration process. \r
+  @param[in]  DeviceIndex   Specifies the block device to which the function wants\r
+                            to talk. Because the driver that implements Block I/O\r
+                            PPIs will manage multiple block devices, the PPIs that\r
+                            want to talk to a single device must specify the device\r
+                            index that was assigned during the enumeration process.\r

                             This index is a number from one to NumberBlockDevices.\r
   @param[in]  StartLBA      The starting logical block address (LBA) to read from\r
                             on the device\r
   @param[in]  BufferSize    The size of the Buffer in bytes. This number must be\r
                             a multiple of the intrinsic block size of the device.\r
   @param[out] Buffer        A pointer to the destination buffer for the data.\r
                             This index is a number from one to NumberBlockDevices.\r
   @param[in]  StartLBA      The starting logical block address (LBA) to read from\r
                             on the device\r
   @param[in]  BufferSize    The size of the Buffer in bytes. This number must be\r
                             a multiple of the intrinsic block size of the device.\r
   @param[out] Buffer        A pointer to the destination buffer for the data.\r

-                            The caller is responsible for the ownership of the \r
+                            The caller is responsible for the ownership of the\r

                             buffer.\r
                             buffer.\r

-                         \r
+\r

   @retval EFI_SUCCESS             The data was read correctly from the device.\r
   @retval EFI_SUCCESS             The data was read correctly from the device.\r

-  @retval EFI_DEVICE_ERROR        The device reported an error while attempting \r
+  @retval EFI_DEVICE_ERROR        The device reported an error while attempting\r

                                   to perform the read operation.\r
                                   to perform the read operation.\r

-  @retval EFI_INVALID_PARAMETER   The read request contains LBAs that are not \r
+  @retval EFI_INVALID_PARAMETER   The read request contains LBAs that are not\r

                                   valid, or the buffer is not properly aligned.\r
   @retval EFI_NO_MEDIA            There is no media in the device.\r
   @retval EFI_BAD_BUFFER_SIZE     The BufferSize parameter is not a multiple of\r
                                   valid, or the buffer is not properly aligned.\r
   @retval EFI_NO_MEDIA            There is no media in the device.\r
   @retval EFI_BAD_BUFFER_SIZE     The BufferSize parameter is not a multiple of\r


@@ -553,7 +553,7 @@ AtapiEnumerateDevices (
                                   );\r
 \r
   //\r
                                   );\r
 \r
   //\r

-  // Allow SATA Devices to spin-up. This is needed if \r
+  // Allow SATA Devices to spin-up. This is needed if\r

   // SEC and PEI phase is too short, for example Release Build.\r
   //\r
   DEBUG ((EFI_D_INFO, "Delay for %d seconds for SATA devices to spin-up\n", PcdGet16 (PcdSataSpinUpDelayInSecForRecoveryPath)));\r
   // SEC and PEI phase is too short, for example Release Build.\r
   //\r
   DEBUG ((EFI_D_INFO, "Delay for %d seconds for SATA devices to spin-up\n", PcdGet16 (PcdSataSpinUpDelayInSecForRecoveryPath)));\r


@@ -571,7 +571,7 @@ AtapiEnumerateDevices (
   //\r
   // Using Command and Control Regs Base Address to fill other registers.\r
   //\r
   //\r
   // Using Command and Control Regs Base Address to fill other registers.\r
   //\r

-  for (Index1 = 0; Index1 < IdeEnabledNumber; Index1 ++) { \r
+  for (Index1 = 0; Index1 < IdeEnabledNumber; Index1 ++) {\r

     CommandBlockBaseAddr               = IdeRegsBaseAddr[Index1].CommandBlockBaseAddr;\r
     AtapiBlkIoDev->IdeIoPortReg[Index1].Data         = CommandBlockBaseAddr;\r
     AtapiBlkIoDev->IdeIoPortReg[Index1].Reg1.Feature = (UINT16) (CommandBlockBaseAddr + 0x1);\r
     CommandBlockBaseAddr               = IdeRegsBaseAddr[Index1].CommandBlockBaseAddr;\r
     AtapiBlkIoDev->IdeIoPortReg[Index1].Data         = CommandBlockBaseAddr;\r
     AtapiBlkIoDev->IdeIoPortReg[Index1].Reg1.Feature = (UINT16) (CommandBlockBaseAddr + 0x1);\r


@@ -585,7 +585,7 @@ AtapiEnumerateDevices (
     ControlBlockBaseAddr                = IdeRegsBaseAddr[Index1].ControlBlockBaseAddr;\r
     AtapiBlkIoDev->IdeIoPortReg[Index1].Alt.DeviceControl = ControlBlockBaseAddr;\r
     AtapiBlkIoDev->IdeIoPortReg[Index1].DriveAddress      = (UINT16) (ControlBlockBaseAddr + 0x1);\r
     ControlBlockBaseAddr                = IdeRegsBaseAddr[Index1].ControlBlockBaseAddr;\r
     AtapiBlkIoDev->IdeIoPortReg[Index1].Alt.DeviceControl = ControlBlockBaseAddr;\r
     AtapiBlkIoDev->IdeIoPortReg[Index1].DriveAddress      = (UINT16) (ControlBlockBaseAddr + 0x1);\r

-    \r
+\r

     //\r
     // Scan IDE bus for ATAPI devices IDE or Sata device\r
     //\r
     //\r
     // Scan IDE bus for ATAPI devices IDE or Sata device\r
     //\r


@@ -628,7 +628,7 @@ AtapiEnumerateDevices (
 \r
 /**\r
   Detect Atapi devices.\r
 \r
 /**\r
   Detect Atapi devices.\r

-  \r
+\r

   @param[in]  AtapiBlkIoDev   A pointer to atapi block IO device.\r
   @param[in]  DevicePosition  An integer to signify device position.\r
   @param[out] MediaInfo       The media information of the specified block media.\r
   @param[in]  AtapiBlkIoDev   A pointer to atapi block IO device.\r
   @param[in]  DevicePosition  An integer to signify device position.\r
   @param[out] MediaInfo       The media information of the specified block media.\r


@@ -667,7 +667,7 @@ DiscoverAtapiDevice (
 \r
 /**\r
   Check power mode of Atapi devices.\r
 \r
 /**\r
   Check power mode of Atapi devices.\r

-  \r
+\r

   @param[in]  AtapiBlkIoDev   A pointer to atapi block IO device.\r
   @param[in]  DevicePosition  An integer to signify device position.\r
   @param[in]  AtaCommand      The Ata Command passed in.\r
   @param[in]  AtapiBlkIoDev   A pointer to atapi block IO device.\r
   @param[in]  DevicePosition  An integer to signify device position.\r
   @param[in]  AtaCommand      The Ata Command passed in.\r


@@ -800,7 +800,7 @@ CheckPowerMode (
 \r
 /**\r
   Detect if an IDE controller exists in specified position.\r
 \r
 /**\r
   Detect if an IDE controller exists in specified position.\r

-  \r
+\r

   @param[in]  AtapiBlkIoDev   A pointer to atapi block IO device.\r
   @param[in]  DevicePosition  An integer to signify device position.\r
 \r
   @param[in]  AtapiBlkIoDev   A pointer to atapi block IO device.\r
   @param[in]  DevicePosition  An integer to signify device position.\r
 \r


@@ -842,7 +842,7 @@ DetectIDEController (
 \r
 /**\r
   Wait specified time interval to poll for BSY bit clear in the Status Register.\r
 \r
 /**\r
   Wait specified time interval to poll for BSY bit clear in the Status Register.\r

-  \r
+\r

   @param[in]  AtapiBlkIoDev          A pointer to atapi block IO device.\r
   @param[in]  IdeIoRegisters         A pointer to IDE IO registers.\r
   @param[in]  TimeoutInMilliSeconds  Time specified in milliseconds.\r
   @param[in]  AtapiBlkIoDev          A pointer to atapi block IO device.\r
   @param[in]  IdeIoRegisters         A pointer to IDE IO registers.\r
   @param[in]  TimeoutInMilliSeconds  Time specified in milliseconds.\r


@@ -887,7 +887,7 @@ WaitForBSYClear (
 \r
 /**\r
   Wait specified time interval to poll for DRDY bit set in the Status register.\r
 \r
 /**\r
   Wait specified time interval to poll for DRDY bit set in the Status register.\r

-  \r
+\r

   @param[in]  AtapiBlkIoDev          A pointer to atapi block IO device.\r
   @param[in]  IdeIoRegisters         A pointer to IDE IO registers.\r
   @param[in]  TimeoutInMilliSeconds  Time specified in milliseconds.\r
   @param[in]  AtapiBlkIoDev          A pointer to atapi block IO device.\r
   @param[in]  IdeIoRegisters         A pointer to IDE IO registers.\r
   @param[in]  TimeoutInMilliSeconds  Time specified in milliseconds.\r


@@ -928,7 +928,7 @@ DRDYReady (
     return EFI_ABORTED;\r
     }\r
   }\r
     return EFI_ABORTED;\r
     }\r
   }\r

-  \r
+\r

     MicroSecondDelay (250);\r
 \r
     Delay--;\r
     MicroSecondDelay (250);\r
 \r
     Delay--;\r


@@ -944,7 +944,7 @@ DRDYReady (
 \r
 /**\r
   Wait specified time interval to poll for DRQ bit clear in the Status Register.\r
 \r
 /**\r
   Wait specified time interval to poll for DRQ bit clear in the Status Register.\r

-  \r
+\r

   @param[in]  AtapiBlkIoDev          A pointer to atapi block IO device.\r
   @param[in]  IdeIoRegisters         A pointer to IDE IO registers.\r
   @param[in]  TimeoutInMilliSeconds  Time specified in milliseconds.\r
   @param[in]  AtapiBlkIoDev          A pointer to atapi block IO device.\r
   @param[in]  IdeIoRegisters         A pointer to IDE IO registers.\r
   @param[in]  TimeoutInMilliSeconds  Time specified in milliseconds.\r


@@ -987,7 +987,7 @@ DRQClear (
     return EFI_ABORTED;\r
     }\r
   }\r
     return EFI_ABORTED;\r
     }\r
   }\r

-  \r
+\r

     MicroSecondDelay (250);\r
 \r
     Delay--;\r
     MicroSecondDelay (250);\r
 \r
     Delay--;\r


@@ -1002,7 +1002,7 @@ DRQClear (
 \r
 /**\r
   Wait specified time interval to poll for DRQ bit clear in the Alternate Status Register.\r
 \r
 /**\r
   Wait specified time interval to poll for DRQ bit clear in the Alternate Status Register.\r

-  \r
+\r

   @param[in]  AtapiBlkIoDev          A pointer to atapi block IO device.\r
   @param[in]  IdeIoRegisters         A pointer to IDE IO registers.\r
   @param[in]  TimeoutInMilliSeconds  Time specified in milliseconds.\r
   @param[in]  AtapiBlkIoDev          A pointer to atapi block IO device.\r
   @param[in]  IdeIoRegisters         A pointer to IDE IO registers.\r
   @param[in]  TimeoutInMilliSeconds  Time specified in milliseconds.\r


@@ -1045,7 +1045,7 @@ DRQClear2 (
     return EFI_ABORTED;\r
     }\r
   }\r
     return EFI_ABORTED;\r
     }\r
   }\r

-  \r
+\r

     MicroSecondDelay (250);\r
 \r
     Delay--;\r
     MicroSecondDelay (250);\r
 \r
     Delay--;\r


@@ -1406,7 +1406,7 @@ TestUnitReady (
 \r
 /**\r
   Send out ATAPI commands conforms to the Packet Command with PIO Data In Protocol.\r
 \r
 /**\r
   Send out ATAPI commands conforms to the Packet Command with PIO Data In Protocol.\r

-  \r
+\r

   @param[in]  AtapiBlkIoDev         A pointer to atapi block IO device.\r
   @param[in]  DevicePosition        An integer to signify device position.\r
   @param[in]  Packet                A pointer to ATAPI command packet.\r
   @param[in]  AtapiBlkIoDev         A pointer to atapi block IO device.\r
   @param[in]  DevicePosition        An integer to signify device position.\r
   @param[in]  Packet                A pointer to ATAPI command packet.\r


@@ -1702,8 +1702,8 @@ Inquiry (
   return EFI_SUCCESS;\r
 }\r
 \r
   return EFI_SUCCESS;\r
 }\r
 \r

-/**  \r
-  Used before read/write blocks from/to ATAPI device media. \r
+/**\r
+  Used before read/write blocks from/to ATAPI device media.\r

   Since ATAPI device media is removable, it is necessary to detect\r
   whether media is present and get current present media's information.\r
 \r
   Since ATAPI device media is removable, it is necessary to detect\r
   whether media is present and get current present media's information.\r
 \r


@@ -1739,7 +1739,7 @@ DetectMedia (
   if (SenseBuffers == NULL) {\r
     return EFI_OUT_OF_RESOURCES;\r
   }\r
   if (SenseBuffers == NULL) {\r
     return EFI_OUT_OF_RESOURCES;\r
   }\r

-  \r
+\r

   //\r
   // Test Unit Ready command is used to detect whether device is accessible,\r
   // the device will produce corresponding Sense data.\r
   //\r
   // Test Unit Ready command is used to detect whether device is accessible,\r
   // the device will produce corresponding Sense data.\r


@@ -1878,7 +1878,7 @@ DetectMedia (
   return EFI_SUCCESS;\r
 }\r
 \r
   return EFI_SUCCESS;\r
 }\r
 \r

-/**  \r
+/**\r

   Reset specified Atapi device.\r
 \r
   @param[in]  AtapiBlkIoDev     A pointer to atapi block IO device.\r
   Reset specified Atapi device.\r
 \r
   @param[in]  AtapiBlkIoDev     A pointer to atapi block IO device.\r


@@ -1976,7 +1976,7 @@ ResetDevice (
 \r
 }\r
 \r
 \r
 }\r
 \r

-/**  \r
+/**\r

   Sends out ATAPI Request Sense Packet Command to the specified device.\r
 \r
   @param[in]      AtapiBlkIoDev   A pointer to atapi block IO device.\r
   Sends out ATAPI Request Sense Packet Command to the specified device.\r
 \r
   @param[in]      AtapiBlkIoDev   A pointer to atapi block IO device.\r


@@ -2072,7 +2072,7 @@ RequestSense (
   return EFI_SUCCESS;\r
 }\r
 \r
   return EFI_SUCCESS;\r
 }\r
 \r

-/**  \r
+/**\r

   Sends out ATAPI Read Capacity Packet Command to the specified device.\r
   This command will return the information regarding the capacity of the\r
   media in the device.\r
   Sends out ATAPI Read Capacity Packet Command to the specified device.\r
   This command will return the information regarding the capacity of the\r
   media in the device.\r


@@ -2185,7 +2185,7 @@ ReadCapacity (
   }\r
 }\r
 \r
   }\r
 }\r
 \r

-/**  \r
+/**\r

   Perform read from disk in block unit.\r
 \r
   @param[in]  AtapiBlkIoDev   A pointer to atapi block IO device.\r
   Perform read from disk in block unit.\r
 \r
   @param[in]  AtapiBlkIoDev   A pointer to atapi block IO device.\r


@@ -2288,7 +2288,7 @@ ReadSectors (
   return Status;\r
 }\r
 \r
   return Status;\r
 }\r
 \r

-/**  \r
+/**\r

   Check if there is media according to sense data.\r
 \r
   @param[in]  SenseData   Pointer to sense data.\r
   Check if there is media according to sense data.\r
 \r
   @param[in]  SenseData   Pointer to sense data.\r


@@ -2324,14 +2324,14 @@ IsNoMedia (
   return IsNoMedia;\r
 }\r
 \r
   return IsNoMedia;\r
 }\r
 \r

-/**  \r
+/**\r

   Check if device state is unclear according to sense data.\r
 \r
   @param[in]  SenseData   Pointer to sense data.\r
   @param[in]  SenseCounts Count of sense data.\r
 \r
   @retval TRUE    Device state is unclear\r
   Check if device state is unclear according to sense data.\r
 \r
   @param[in]  SenseData   Pointer to sense data.\r
   @param[in]  SenseCounts Count of sense data.\r
 \r
   @retval TRUE    Device state is unclear\r

-  @retval FALSE   Device state is clear  \r
+  @retval FALSE   Device state is clear\r

 \r
 **/\r
 BOOLEAN\r
 \r
 **/\r
 BOOLEAN\r


@@ -2365,7 +2365,7 @@ IsDeviceStateUnclear (
   return Unclear;\r
 }\r
 \r
   return Unclear;\r
 }\r
 \r

-/**  \r
+/**\r

   Check if there is media error according to sense data.\r
 \r
   @param[in]  SenseData   Pointer to sense data.\r
   Check if there is media error according to sense data.\r
 \r
   @param[in]  SenseData   Pointer to sense data.\r


@@ -2438,7 +2438,7 @@ IsMediaError (
   return IsError;\r
 }\r
 \r
   return IsError;\r
 }\r
 \r

-/**  \r
+/**\r

   Check if drive is ready according to sense data.\r
 \r
   @param[in]  SenseData   Pointer to sense data.\r
   Check if drive is ready according to sense data.\r
 \r
   @param[in]  SenseData   Pointer to sense data.\r

diff --git a/MdeModulePkg/Bus/Pci/IdeBusPei/AtapiPeim.h b/MdeModulePkg/Bus/Pci/IdeBusPei/AtapiPeim.h
index 20b35c4afd3226212e308a6c78c65cf69bf3bb5a..2b06a8ba1b2b436d0b35fcb7826a32673826cfa0 100644 (file)
--- a/MdeModulePkg/Bus/Pci/IdeBusPei/AtapiPeim.h
+++ b/MdeModulePkg/Bus/Pci/IdeBusPei/AtapiPeim.h
@@ -1,7 +1,7 @@
 /** @file\r
 Private Include file for IdeBus PEIM.\r
 \r
 /** @file\r
 Private Include file for IdeBus PEIM.\r
 \r

-Copyright (c) 2006 - 2015, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r

 \r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions\r
 \r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions\r


@@ -140,16 +140,16 @@ typedef struct {
 /**\r
   Gets the count of block I/O devices that one specific block driver detects.\r
 \r
 /**\r
   Gets the count of block I/O devices that one specific block driver detects.\r
 \r

-  This function is used for getting the count of block I/O devices that one \r
+  This function is used for getting the count of block I/O devices that one\r

   specific block driver detects.  To the PEI ATAPI driver, it returns the number\r
   specific block driver detects.  To the PEI ATAPI driver, it returns the number\r

-  of all the detected ATAPI devices it detects during the enumeration process. \r
-  To the PEI legacy floppy driver, it returns the number of all the legacy \r
-  devices it finds during its enumeration process. If no device is detected, \r
-  then the function will return zero.  \r
-  \r
-  @param[in]  PeiServices          General-purpose services that are available \r
+  of all the detected ATAPI devices it detects during the enumeration process.\r
+  To the PEI legacy floppy driver, it returns the number of all the legacy\r
+  devices it finds during its enumeration process. If no device is detected,\r
+  then the function will return zero.\r
+\r
+  @param[in]  PeiServices          General-purpose services that are available\r

                                    to every PEIM.\r
                                    to every PEIM.\r

-  @param[in]  This                 Indicates the EFI_PEI_RECOVERY_BLOCK_IO_PPI \r
+  @param[in]  This                 Indicates the EFI_PEI_RECOVERY_BLOCK_IO_PPI\r

                                    instance.\r
   @param[out] NumberBlockDevices   The number of block I/O devices discovered.\r
 \r
                                    instance.\r
   @param[out] NumberBlockDevices   The number of block I/O devices discovered.\r
 \r


@@ -167,27 +167,27 @@ AtapiGetNumberOfBlockDevices (
 /**\r
   Gets a block device's media information.\r
 \r
 /**\r
   Gets a block device's media information.\r
 \r

-  This function will provide the caller with the specified block device's media \r
-  information. If the media changes, calling this function will update the media \r
+  This function will provide the caller with the specified block device's media\r
+  information. If the media changes, calling this function will update the media\r

   information accordingly.\r
 \r
   @param[in]  PeiServices   General-purpose services that are available to every\r
                             PEIM\r
   @param[in]  This          Indicates the EFI_PEI_RECOVERY_BLOCK_IO_PPI instance.\r
   information accordingly.\r
 \r
   @param[in]  PeiServices   General-purpose services that are available to every\r
                             PEIM\r
   @param[in]  This          Indicates the EFI_PEI_RECOVERY_BLOCK_IO_PPI instance.\r

-  @param[in]  DeviceIndex   Specifies the block device to which the function wants \r
-                            to talk. Because the driver that implements Block I/O \r
-                            PPIs will manage multiple block devices, the PPIs that \r
-                            want to talk to a single device must specify the \r
+  @param[in]  DeviceIndex   Specifies the block device to which the function wants\r
+                            to talk. Because the driver that implements Block I/O\r
+                            PPIs will manage multiple block devices, the PPIs that\r
+                            want to talk to a single device must specify the\r

                             device index that was assigned during the enumeration\r
                             device index that was assigned during the enumeration\r

-                            process. This index is a number from one to \r
+                            process. This index is a number from one to\r

                             NumberBlockDevices.\r
                             NumberBlockDevices.\r

-  @param[out] MediaInfo     The media information of the specified block media.  \r
-                            The caller is responsible for the ownership of this \r
+  @param[out] MediaInfo     The media information of the specified block media.\r
+                            The caller is responsible for the ownership of this\r

                             data structure.\r
                             data structure.\r

-  \r
-  @retval EFI_SUCCESS           Media information about the specified block device \r
+\r
+  @retval EFI_SUCCESS           Media information about the specified block device\r

                                 was obtained successfully.\r
                                 was obtained successfully.\r

-  @retval EFI_DEVICE_ERROR      Cannot get the media information due to a hardware \r
+  @retval EFI_DEVICE_ERROR      Cannot get the media information due to a hardware\r

                                 error.\r
   @retval Others                Other failure occurs.\r
 \r
                                 error.\r
   @retval Others                Other failure occurs.\r
 \r


@@ -204,31 +204,31 @@ AtapiGetBlockDeviceMediaInfo (
 /**\r
   Reads the requested number of blocks from the specified block device.\r
 \r
 /**\r
   Reads the requested number of blocks from the specified block device.\r
 \r

-  The function reads the requested number of blocks from the device. All the \r
+  The function reads the requested number of blocks from the device. All the\r

   blocks are read, or an error is returned. If there is no media in the device,\r
   the function returns EFI_NO_MEDIA.\r
 \r
   blocks are read, or an error is returned. If there is no media in the device,\r
   the function returns EFI_NO_MEDIA.\r
 \r

-  @param[in]  PeiServices   General-purpose services that are available to \r
+  @param[in]  PeiServices   General-purpose services that are available to\r

                             every PEIM.\r
   @param[in]  This          Indicates the EFI_PEI_RECOVERY_BLOCK_IO_PPI instance.\r
                             every PEIM.\r
   @param[in]  This          Indicates the EFI_PEI_RECOVERY_BLOCK_IO_PPI instance.\r

-  @param[in]  DeviceIndex   Specifies the block device to which the function wants \r
-                            to talk. Because the driver that implements Block I/O \r
-                            PPIs will manage multiple block devices, the PPIs that \r
-                            want to talk to a single device must specify the device \r
-                            index that was assigned during the enumeration process. \r
+  @param[in]  DeviceIndex   Specifies the block device to which the function wants\r
+                            to talk. Because the driver that implements Block I/O\r
+                            PPIs will manage multiple block devices, the PPIs that\r
+                            want to talk to a single device must specify the device\r
+                            index that was assigned during the enumeration process.\r

                             This index is a number from one to NumberBlockDevices.\r
   @param[in]  StartLBA      The starting logical block address (LBA) to read from\r
                             on the device\r
   @param[in]  BufferSize    The size of the Buffer in bytes. This number must be\r
                             a multiple of the intrinsic block size of the device.\r
   @param[out] Buffer        A pointer to the destination buffer for the data.\r
                             This index is a number from one to NumberBlockDevices.\r
   @param[in]  StartLBA      The starting logical block address (LBA) to read from\r
                             on the device\r
   @param[in]  BufferSize    The size of the Buffer in bytes. This number must be\r
                             a multiple of the intrinsic block size of the device.\r
   @param[out] Buffer        A pointer to the destination buffer for the data.\r

-                            The caller is responsible for the ownership of the \r
+                            The caller is responsible for the ownership of the\r

                             buffer.\r
                             buffer.\r

-                         \r
+\r

   @retval EFI_SUCCESS             The data was read correctly from the device.\r
   @retval EFI_SUCCESS             The data was read correctly from the device.\r

-  @retval EFI_DEVICE_ERROR        The device reported an error while attempting \r
+  @retval EFI_DEVICE_ERROR        The device reported an error while attempting\r

                                   to perform the read operation.\r
                                   to perform the read operation.\r

-  @retval EFI_INVALID_PARAMETER   The read request contains LBAs that are not \r
+  @retval EFI_INVALID_PARAMETER   The read request contains LBAs that are not\r

                                   valid, or the buffer is not properly aligned.\r
   @retval EFI_NO_MEDIA            There is no media in the device.\r
   @retval EFI_BAD_BUFFER_SIZE     The BufferSize parameter is not a multiple of\r
                                   valid, or the buffer is not properly aligned.\r
   @retval EFI_NO_MEDIA            There is no media in the device.\r
   @retval EFI_BAD_BUFFER_SIZE     The BufferSize parameter is not a multiple of\r


@@ -374,7 +374,7 @@ AtapiEnumerateDevices (
 \r
 /**\r
   Detect Atapi devices.\r
 \r
 /**\r
   Detect Atapi devices.\r

-  \r
+\r

   @param[in]  AtapiBlkIoDev   A pointer to atapi block IO device.\r
   @param[in]  DevicePosition  An integer to signify device position.\r
   @param[out] MediaInfo       The media information of the specified block media.\r
   @param[in]  AtapiBlkIoDev   A pointer to atapi block IO device.\r
   @param[in]  DevicePosition  An integer to signify device position.\r
   @param[out] MediaInfo       The media information of the specified block media.\r


@@ -394,7 +394,7 @@ DiscoverAtapiDevice (
 \r
 /**\r
   Detect if an IDE controller exists in specified position.\r
 \r
 /**\r
   Detect if an IDE controller exists in specified position.\r

-  \r
+\r

   @param[in]  AtapiBlkIoDev   A pointer to atapi block IO device.\r
   @param[in]  DevicePosition  An integer to signify device position.\r
 \r
   @param[in]  AtapiBlkIoDev   A pointer to atapi block IO device.\r
   @param[in]  DevicePosition  An integer to signify device position.\r
 \r


@@ -410,7 +410,7 @@ DetectIDEController (
 \r
 /**\r
   Wait specified time interval to poll for BSY bit clear in the Status Register.\r
 \r
 /**\r
   Wait specified time interval to poll for BSY bit clear in the Status Register.\r

-  \r
+\r

   @param[in]  AtapiBlkIoDev          A pointer to atapi block IO device.\r
   @param[in]  IdeIoRegisters         A pointer to IDE IO registers.\r
   @param[in]  TimeoutInMilliSeconds  Time specified in milliseconds.\r
   @param[in]  AtapiBlkIoDev          A pointer to atapi block IO device.\r
   @param[in]  IdeIoRegisters         A pointer to IDE IO registers.\r
   @param[in]  TimeoutInMilliSeconds  Time specified in milliseconds.\r


@@ -428,7 +428,7 @@ WaitForBSYClear (
 \r
 /**\r
   Wait specified time interval to poll for DRDY bit set in the Status register.\r
 \r
 /**\r
   Wait specified time interval to poll for DRDY bit set in the Status register.\r

-  \r
+\r

   @param[in]  AtapiBlkIoDev          A pointer to atapi block IO device.\r
   @param[in]  IdeIoRegisters         A pointer to IDE IO registers.\r
   @param[in]  TimeoutInMilliSeconds  Time specified in milliseconds.\r
   @param[in]  AtapiBlkIoDev          A pointer to atapi block IO device.\r
   @param[in]  IdeIoRegisters         A pointer to IDE IO registers.\r
   @param[in]  TimeoutInMilliSeconds  Time specified in milliseconds.\r


@@ -446,7 +446,7 @@ DRDYReady (
 \r
 /**\r
   Wait specified time interval to poll for DRQ bit clear in the Status Register.\r
 \r
 /**\r
   Wait specified time interval to poll for DRQ bit clear in the Status Register.\r

-  \r
+\r

   @param[in]  AtapiBlkIoDev          A pointer to atapi block IO device.\r
   @param[in]  IdeIoRegisters         A pointer to IDE IO registers.\r
   @param[in]  TimeoutInMilliSeconds  Time specified in milliseconds.\r
   @param[in]  AtapiBlkIoDev          A pointer to atapi block IO device.\r
   @param[in]  IdeIoRegisters         A pointer to IDE IO registers.\r
   @param[in]  TimeoutInMilliSeconds  Time specified in milliseconds.\r


@@ -464,7 +464,7 @@ DRQClear (
 \r
 /**\r
   Wait specified time interval to poll for DRQ bit clear in the Alternate Status Register.\r
 \r
 /**\r
   Wait specified time interval to poll for DRQ bit clear in the Alternate Status Register.\r

-  \r
+\r

   @param[in]  AtapiBlkIoDev          A pointer to atapi block IO device.\r
   @param[in]  IdeIoRegisters         A pointer to IDE IO registers.\r
   @param[in]  TimeoutInMilliSeconds  Time specified in milliseconds.\r
   @param[in]  AtapiBlkIoDev          A pointer to atapi block IO device.\r
   @param[in]  IdeIoRegisters         A pointer to IDE IO registers.\r
   @param[in]  TimeoutInMilliSeconds  Time specified in milliseconds.\r


@@ -569,7 +569,7 @@ TestUnitReady (
 \r
 /**\r
   Send out ATAPI commands conforms to the Packet Command with PIO Data In Protocol.\r
 \r
 /**\r
   Send out ATAPI commands conforms to the Packet Command with PIO Data In Protocol.\r

-  \r
+\r

   @param[in]  AtapiBlkIoDev         A pointer to atapi block IO device.\r
   @param[in]  DevicePosition        An integer to signify device position.\r
   @param[in]  Packet                A pointer to ATAPI command packet.\r
   @param[in]  AtapiBlkIoDev         A pointer to atapi block IO device.\r
   @param[in]  DevicePosition        An integer to signify device position.\r
   @param[in]  Packet                A pointer to ATAPI command packet.\r


@@ -613,10 +613,10 @@ Inquiry (
   OUT EFI_PEI_BLOCK_IO2_MEDIA       *MediaInfo2\r
   );\r
 \r
   OUT EFI_PEI_BLOCK_IO2_MEDIA       *MediaInfo2\r
   );\r
 \r

-/**  \r
-  Used before read/write blocks from/to ATAPI device media. \r
+/**\r
+  Used before read/write blocks from/to ATAPI device media.\r

   Since ATAPI device media is removable, it is necessary to detect\r
   Since ATAPI device media is removable, it is necessary to detect\r

-  whether media is present and get current present media's information.  \r
+  whether media is present and get current present media's information.\r

 \r
   @param[in]  AtapiBlkIoDev     A pointer to atapi block IO device.\r
   @param[in]  DevicePosition    An integer to signify device position.\r
 \r
   @param[in]  AtapiBlkIoDev     A pointer to atapi block IO device.\r
   @param[in]  DevicePosition    An integer to signify device position.\r


@@ -636,7 +636,7 @@ DetectMedia (
   IN OUT EFI_PEI_BLOCK_IO2_MEDIA    *MediaInfo2\r
   );\r
 \r
   IN OUT EFI_PEI_BLOCK_IO2_MEDIA    *MediaInfo2\r
   );\r
 \r

-/**  \r
+/**\r

   Reset specified Atapi device.\r
 \r
   @param[in]  AtapiBlkIoDev     A pointer to atapi block IO device.\r
   Reset specified Atapi device.\r
 \r
   @param[in]  AtapiBlkIoDev     A pointer to atapi block IO device.\r


@@ -654,7 +654,7 @@ ResetDevice (
   IN  BOOLEAN           Extensive\r
   );\r
 \r
   IN  BOOLEAN           Extensive\r
   );\r
 \r

-/**  \r
+/**\r

   Sends out ATAPI Request Sense Packet Command to the specified device.\r
 \r
   @param[in]      AtapiBlkIoDev   A pointer to atapi block IO device.\r
   Sends out ATAPI Request Sense Packet Command to the specified device.\r
 \r
   @param[in]      AtapiBlkIoDev   A pointer to atapi block IO device.\r


@@ -674,7 +674,7 @@ RequestSense (
   IN OUT  UINT8                 *SenseCounts\r
   );\r
 \r
   IN OUT  UINT8                 *SenseCounts\r
   );\r
 \r

-/**  \r
+/**\r

   Sends out ATAPI Read Capacity Packet Command to the specified device.\r
   This command will return the information regarding the capacity of the\r
   media in the device.\r
   Sends out ATAPI Read Capacity Packet Command to the specified device.\r
   This command will return the information regarding the capacity of the\r
   media in the device.\r


@@ -696,7 +696,7 @@ ReadCapacity (
   IN OUT EFI_PEI_BLOCK_IO2_MEDIA    *MediaInfo2\r
   );\r
 \r
   IN OUT EFI_PEI_BLOCK_IO2_MEDIA    *MediaInfo2\r
   );\r
 \r

-/**  \r
+/**\r

   Perform read from disk in block unit.\r
 \r
   @param[in]  AtapiBlkIoDev   A pointer to atapi block IO device.\r
   Perform read from disk in block unit.\r
 \r
   @param[in]  AtapiBlkIoDev   A pointer to atapi block IO device.\r


@@ -720,7 +720,7 @@ ReadSectors (
   IN  UINTN               BlockSize\r
   );\r
 \r
   IN  UINTN               BlockSize\r
   );\r
 \r

-/**  \r
+/**\r

   Check if there is media according to sense data.\r
 \r
   @param[in]  SenseData   Pointer to sense data.\r
   Check if there is media according to sense data.\r
 \r
   @param[in]  SenseData   Pointer to sense data.\r


@@ -736,14 +736,14 @@ IsNoMedia (
   IN  UINTN                 SenseCounts\r
   );\r
 \r
   IN  UINTN                 SenseCounts\r
   );\r
 \r

-/**  \r
+/**\r

   Check if device state is unclear according to sense data.\r
 \r
   @param[in]  SenseData   Pointer to sense data.\r
   @param[in]  SenseCounts Count of sense data.\r
 \r
   @retval TRUE    Device state is unclear\r
   Check if device state is unclear according to sense data.\r
 \r
   @param[in]  SenseData   Pointer to sense data.\r
   @param[in]  SenseCounts Count of sense data.\r
 \r
   @retval TRUE    Device state is unclear\r

-  @retval FALSE   Device state is clear  \r
+  @retval FALSE   Device state is clear\r

 \r
 **/\r
 BOOLEAN\r
 \r
 **/\r
 BOOLEAN\r


@@ -752,7 +752,7 @@ IsDeviceStateUnclear (
   IN  UINTN                 SenseCounts\r
   );\r
 \r
   IN  UINTN                 SenseCounts\r
   );\r
 \r

-/**  \r
+/**\r

   Check if there is media error according to sense data.\r
 \r
   @param[in]  SenseData   Pointer to sense data.\r
   Check if there is media error according to sense data.\r
 \r
   @param[in]  SenseData   Pointer to sense data.\r


@@ -768,7 +768,7 @@ IsMediaError (
   IN  UINTN                 SenseCounts\r
   );\r
 \r
   IN  UINTN                 SenseCounts\r
   );\r
 \r

-/**  \r
+/**\r

   Check if drive is ready according to sense data.\r
 \r
   @param[in]  SenseData   Pointer to sense data.\r
   Check if drive is ready according to sense data.\r
 \r
   @param[in]  SenseData   Pointer to sense data.\r

diff --git a/MdeModulePkg/Bus/Pci/IdeBusPei/IdeBusPei.uni b/MdeModulePkg/Bus/Pci/IdeBusPei/IdeBusPei.uni
index 60d235c75f6be8ca5ccd0520d252a1efbe4c49a3..15d50c143437ab6714b97893b9c8b3c71587bd71 100644 (file)
--- a/MdeModulePkg/Bus/Pci/IdeBusPei/IdeBusPei.uni
+++ b/MdeModulePkg/Bus/Pci/IdeBusPei/IdeBusPei.uni
@@ -3,17 +3,17 @@
 //\r
 // This PPI can be consumed by PEIM which produce gEfiPeiDeviceRecoveryModulePpiGuid\r
 // for Atapi CD ROM device.\r
 //\r
 // This PPI can be consumed by PEIM which produce gEfiPeiDeviceRecoveryModulePpiGuid\r
 // for Atapi CD ROM device.\r

-// \r
+//\r

 // This module discovers CDROM devices in Legacy and native mode and installs block IO ppis for them.\r
 //\r
 // This module discovers CDROM devices in Legacy and native mode and installs block IO ppis for them.\r
 //\r

-// Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.<BR>\r
+// Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r

 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions\r
 // of the BSD License which accompanies this distribution.  The\r
 // full text of the license may be found at\r
 // http://opensource.org/licenses/bsd-license.php\r
 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions\r
 // of the BSD License which accompanies this distribution.  The\r
 // full text of the license may be found at\r
 // http://opensource.org/licenses/bsd-license.php\r

-// \r
+//\r

 // THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 // WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 //\r
 // THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 // WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 //\r

diff --git a/MdeModulePkg/Bus/Pci/IdeBusPei/IdeBusPeiExtra.uni b/MdeModulePkg/Bus/Pci/IdeBusPei/IdeBusPeiExtra.uni
index 59ce6b159f3a293a84da7c70a8dca2b0ef19b1f7..10243428f6cd46d04368f757bebeabef417c878c 100644 (file)
--- a/MdeModulePkg/Bus/Pci/IdeBusPei/IdeBusPeiExtra.uni
+++ b/MdeModulePkg/Bus/Pci/IdeBusPei/IdeBusPeiExtra.uni
@@ -1,7 +1,7 @@
 // /** @file\r
 // IdeBusPei Localized Strings and Content\r
 //\r
 // /** @file\r
 // IdeBusPei Localized Strings and Content\r
 //\r

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

 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions\r
 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions\r


@@ -14,8 +14,8 @@
 //\r
 // **/\r
 \r
 //\r
 // **/\r
 \r

-#string STR_PROPERTIES_MODULE_NAME \r
-#language en-US \r
+#string STR_PROPERTIES_MODULE_NAME\r
+#language en-US\r

 "IDE Bus PEI Module for Recovery"\r
 \r
 \r
 "IDE Bus PEI Module for Recovery"\r
 \r
 \r

diff --git a/MdeModulePkg/Bus/Pci/IncompatiblePciDeviceSupportDxe/IncompatiblePciDeviceSupport.c b/MdeModulePkg/Bus/Pci/IncompatiblePciDeviceSupportDxe/IncompatiblePciDeviceSupport.c
index da8daba87d80f26d9f69ebcd5dad8f99896183a5..6764a85dd135f322f22a3ed7e29b7657796650e4 100644 (file)
--- a/MdeModulePkg/Bus/Pci/IncompatiblePciDeviceSupportDxe/IncompatiblePciDeviceSupport.c
+++ b/MdeModulePkg/Bus/Pci/IncompatiblePciDeviceSupportDxe/IncompatiblePciDeviceSupport.c
@@ -1,7 +1,7 @@
 /** @file\r
   This module is one template module for Incompatible PCI Device Support protocol.\r
   It includes one incompatible pci devices list template.\r
 /** @file\r
   This module is one template module for Incompatible PCI Device Support protocol.\r
   It includes one incompatible pci devices list template.\r

-  \r
+\r

   Incompatible PCI Device Support protocol allows the PCI bus driver to support\r
   resource allocation for some PCI devices that do not comply with the PCI Specification.\r
 \r
   Incompatible PCI Device Support protocol allows the PCI bus driver to support\r
   resource allocation for some PCI devices that do not comply with the PCI Specification.\r
 \r


@@ -68,7 +68,7 @@ typedef struct {
                                 the configuration requirement.\r
 \r
   @retval EFI_SUCCESS           Successfully got ACPI resource for specified PCI device.\r
                                 the configuration requirement.\r
 \r
   @retval EFI_SUCCESS           Successfully got ACPI resource for specified PCI device.\r

-  @retval EFI_INVALID_PARAMETER Configuration is NULL. \r
+  @retval EFI_INVALID_PARAMETER Configuration is NULL.\r

   @retval EFI_OUT_OF_RESOURCES  No memory available.\r
   @retval EFI_UNSUPPORTED       The specified PCI device wasn't supported.\r
 \r
   @retval EFI_OUT_OF_RESOURCES  No memory available.\r
   @retval EFI_UNSUPPORTED       The specified PCI device wasn't supported.\r
 \r


@@ -233,7 +233,7 @@ IncompatiblePciDeviceSupportEntryPoint (
                                 the configuration requirement.\r
 \r
   @retval EFI_SUCCESS           Successfully got ACPI resource for specified PCI device.\r
                                 the configuration requirement.\r
 \r
   @retval EFI_SUCCESS           Successfully got ACPI resource for specified PCI device.\r

-  @retval EFI_INVALID_PARAMETER Configuration is NULL. \r
+  @retval EFI_INVALID_PARAMETER Configuration is NULL.\r

   @retval EFI_OUT_OF_RESOURCES  No memory available.\r
   @retval EFI_UNSUPPORTED       The specified PCI device wasn't supported.\r
 \r
   @retval EFI_OUT_OF_RESOURCES  No memory available.\r
   @retval EFI_UNSUPPORTED       The specified PCI device wasn't supported.\r
 \r

diff --git a/MdeModulePkg/Bus/Pci/IncompatiblePciDeviceSupportDxe/IncompatiblePciDeviceSupportDxe.inf b/MdeModulePkg/Bus/Pci/IncompatiblePciDeviceSupportDxe/IncompatiblePciDeviceSupportDxe.inf
index a83edaec7bd400a4c76469507c47ff2412275239..fa3e012cc70b8d37fe112366decec50011af47f0 100644 (file)
--- a/MdeModulePkg/Bus/Pci/IncompatiblePciDeviceSupportDxe/IncompatiblePciDeviceSupportDxe.inf
+++ b/MdeModulePkg/Bus/Pci/IncompatiblePciDeviceSupportDxe/IncompatiblePciDeviceSupportDxe.inf
@@ -1,10 +1,10 @@
 ## @file\r
 #  PCI Incompatible device support module template.\r
 #\r
 ## @file\r
 #  PCI Incompatible device support module template.\r
 #\r

-#  Installs EFI PCI Incompatible Device Support protocol and includes one incompatile \r
+#  Installs EFI PCI Incompatible Device Support protocol and includes one incompatile\r

 #  pci devices list template.\r
 #\r
 #  pci devices list template.\r
 #\r

-#  Copyright (c) 2009 - 2014, Intel Corporation. All rights reserved.<BR>\r
+#  Copyright (c) 2009 - 2018, Intel Corporation. All rights reserved.<BR>\r

 #\r
 #  This program and the accompanying materials\r
 #  are licensed and made available under the terms and conditions of the BSD License\r
 #\r
 #  This program and the accompanying materials\r
 #  are licensed and made available under the terms and conditions of the BSD License\r

diff --git a/MdeModulePkg/Bus/Pci/IncompatiblePciDeviceSupportDxe/IncompatiblePciDeviceSupportExtra.uni b/MdeModulePkg/Bus/Pci/IncompatiblePciDeviceSupportDxe/IncompatiblePciDeviceSupportExtra.uni
index 260014009455224ffc761b31092c185d075d16b1..1306b5f920a8a1d55ffb3a8c8d4189e5fa60560b 100644 (file)
--- a/MdeModulePkg/Bus/Pci/IncompatiblePciDeviceSupportDxe/IncompatiblePciDeviceSupportExtra.uni
+++ b/MdeModulePkg/Bus/Pci/IncompatiblePciDeviceSupportDxe/IncompatiblePciDeviceSupportExtra.uni
@@ -1,7 +1,7 @@
 // /** @file\r
 // IncompatiblePciDeviceSupport Localized Strings and Content\r
 //\r
 // /** @file\r
 // IncompatiblePciDeviceSupport Localized Strings and Content\r
 //\r

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

 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r
 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r


@@ -12,8 +12,8 @@
 //\r
 // **/\r
 \r
 //\r
 // **/\r
 \r

-#string STR_PROPERTIES_MODULE_NAME \r
-#language en-US \r
+#string STR_PROPERTIES_MODULE_NAME\r
+#language en-US\r

 "Incompatible PCI Device Support DXE Driver"\r
 \r
 \r
 "Incompatible PCI Device Support DXE Driver"\r
 \r
 \r

diff --git a/MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpressDxe.inf b/MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpressDxe.inf
index 491869610423f525a5052071f1d20ae43aef82ff..bfb783205cf41e7e83f8cb87208f122308bd9c76 100644 (file)
--- a/MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpressDxe.inf
+++ b/MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpressDxe.inf
@@ -4,7 +4,7 @@
 #  NvmExpressDxe driver is used to manage non-volatile memory subsystem which follows\r
 #  NVM Express specification.\r
 #\r
 #  NvmExpressDxe driver is used to manage non-volatile memory subsystem which follows\r
 #  NVM Express specification.\r
 #\r

-#  Copyright (c) 2013 - 2017, Intel Corporation. All rights reserved.<BR>\r
+#  Copyright (c) 2013 - 2018, Intel Corporation. All rights reserved.<BR>\r

 #\r
 #  This program and the accompanying materials\r
 #  are licensed and made available under the terms and conditions of the BSD License\r
 #\r
 #  This program and the accompanying materials\r
 #  are licensed and made available under the terms and conditions of the BSD License\r


@@ -78,4 +78,4 @@
 #\r
 \r
 [UserExtensions.TianoCore."ExtraFiles"]\r
 #\r
 \r
 [UserExtensions.TianoCore."ExtraFiles"]\r

-  NvmExpressDxeExtra.uni
\ No newline at end of file
+  NvmExpressDxeExtra.uni\r

diff --git a/MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpressDxeExtra.uni b/MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpressDxeExtra.uni
index 2f0ef9422dacb9c454822fad8dd0a1d86f58dcf8..5b7fa329765f79fd529ef0a8b17a9154a8889f33 100644 (file)
--- a/MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpressDxeExtra.uni
+++ b/MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpressDxeExtra.uni
@@ -1,7 +1,7 @@
 // /** @file\r
 // NvmExpressDxe Localized Strings and Content\r
 //\r
 // /** @file\r
 // NvmExpressDxe Localized Strings and Content\r
 //\r

-// Copyright (c) 2014, Intel Corporation. All rights reserved.<BR>\r
+// Copyright (c) 2014 - 2018, Intel Corporation. All rights reserved.<BR>\r

 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r
 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r


@@ -12,8 +12,8 @@
 //\r
 // **/\r
 \r
 //\r
 // **/\r
 \r

-#string STR_PROPERTIES_MODULE_NAME \r
-#language en-US \r
+#string STR_PROPERTIES_MODULE_NAME\r
+#language en-US\r

 "NVM Express DXE Driver"\r
 \r
 \r
 "NVM Express DXE Driver"\r
 \r
 \r

diff --git a/MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpressHci.c b/MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpressHci.c
index ea48e78827a6457f831d08959e1695842c4d74c9..30ade3a589f1677d56bf0db019ba5dde4d859dea 100644 (file)
--- a/MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpressHci.c
+++ b/MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpressHci.c
@@ -2,7 +2,7 @@
   NvmExpressDxe driver is used to manage non-volatile memory subsystem which follows\r
   NVM Express specification.\r
 \r
   NvmExpressDxe driver is used to manage non-volatile memory subsystem which follows\r
   NVM Express specification.\r
 \r

-  Copyright (c) 2013 - 2017, Intel Corporation. All rights reserved.<BR>\r
+  Copyright (c) 2013 - 2018, Intel Corporation. All rights reserved.<BR>\r

   This program and the accompanying materials\r
   are licensed and made available under the terms and conditions of the BSD License\r
   which accompanies this distribution.  The full text of the license may be found at\r
   This program and the accompanying materials\r
   are licensed and made available under the terms and conditions of the BSD License\r
   which accompanies this distribution.  The full text of the license may be found at\r


@@ -1003,7 +1003,7 @@ NvmeControllerInit (
   //\r
   if (Private->ControllerData == NULL) {\r
     Private->ControllerData = (NVME_ADMIN_CONTROLLER_DATA *)AllocateZeroPool (sizeof(NVME_ADMIN_CONTROLLER_DATA));\r
   //\r
   if (Private->ControllerData == NULL) {\r
     Private->ControllerData = (NVME_ADMIN_CONTROLLER_DATA *)AllocateZeroPool (sizeof(NVME_ADMIN_CONTROLLER_DATA));\r

-    \r
+\r

     if (Private->ControllerData == NULL) {\r
       return EFI_OUT_OF_RESOURCES;\r
     }\r
     if (Private->ControllerData == NULL) {\r
       return EFI_OUT_OF_RESOURCES;\r
     }\r

diff --git a/MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpressPassthru.c b/MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpressPassthru.c
index cfad1587f299acff738723a73ca94d2a94d5fce2..2468871322187965f5bd92a029b93277bbb214e3 100644 (file)
--- a/MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpressPassthru.c
+++ b/MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpressPassthru.c
@@ -781,7 +781,7 @@ NvmExpressPassThru (
       // Copy the Respose Queue entry for this command to the callers response buffer\r
       //\r
       CopyMem(Packet->NvmeCompletion, Cq, sizeof(EFI_NVM_EXPRESS_COMPLETION));\r
       // Copy the Respose Queue entry for this command to the callers response buffer\r
       //\r
       CopyMem(Packet->NvmeCompletion, Cq, sizeof(EFI_NVM_EXPRESS_COMPLETION));\r

-    \r
+\r

       //\r
       // Dump every completion entry status for debugging.\r
       //\r
       //\r
       // Dump every completion entry status for debugging.\r
       //\r

diff --git a/MdeModulePkg/Bus/Pci/PciBusDxe/PciBus.c b/MdeModulePkg/Bus/Pci/PciBusDxe/PciBus.c
index a1654c0025d2fdb4ee931ee6f9d3cfa68a0dac92..9ae45cca9be926081a7de55f5b69748952c26410 100644 (file)
--- a/MdeModulePkg/Bus/Pci/PciBusDxe/PciBus.c
+++ b/MdeModulePkg/Bus/Pci/PciBusDxe/PciBus.c
@@ -140,7 +140,7 @@ PciBusDriverBindingSupported (
   //\r
   if (RemainingDevicePath != NULL) {\r
     //\r
   //\r
   if (RemainingDevicePath != NULL) {\r
     //\r

-    // Check if RemainingDevicePath is the End of Device Path Node, \r
+    // Check if RemainingDevicePath is the End of Device Path Node,\r

     // if yes, go on checking other conditions\r
     //\r
     if (!IsDevicePathEnd (RemainingDevicePath)) {\r
     // if yes, go on checking other conditions\r
     //\r
     if (!IsDevicePathEnd (RemainingDevicePath)) {\r


@@ -254,7 +254,7 @@ PciBusDriverBindingStart (
   //\r
   if (RemainingDevicePath != NULL) {\r
     //\r
   //\r
   if (RemainingDevicePath != NULL) {\r
     //\r

-    // Check if RemainingDevicePath is the End of Device Path Node, \r
+    // Check if RemainingDevicePath is the End of Device Path Node,\r

     // if yes, return EFI_SUCCESS\r
     //\r
     if (IsDevicePathEnd (RemainingDevicePath)) {\r
     // if yes, return EFI_SUCCESS\r
     //\r
     if (IsDevicePathEnd (RemainingDevicePath)) {\r


@@ -282,14 +282,14 @@ PciBusDriverBindingStart (
   //\r
   // If PCI Platform protocol doesn't exist, try to Pci Override Protocol.\r
   //\r
   //\r
   // If PCI Platform protocol doesn't exist, try to Pci Override Protocol.\r
   //\r

-  if (gPciPlatformProtocol == NULL) { \r
+  if (gPciPlatformProtocol == NULL) {\r

     gPciOverrideProtocol = NULL;\r
     gBS->LocateProtocol (\r
           &gEfiPciOverrideProtocolGuid,\r
           NULL,\r
           (VOID **) &gPciOverrideProtocol\r
           );\r
     gPciOverrideProtocol = NULL;\r
     gBS->LocateProtocol (\r
           &gEfiPciOverrideProtocolGuid,\r
           NULL,\r
           (VOID **) &gPciOverrideProtocol\r
           );\r

-  }  \r
+  }\r

 \r
   if (mIoMmuProtocol == NULL) {\r
     gBS->LocateProtocol (\r
 \r
   if (mIoMmuProtocol == NULL) {\r
     gBS->LocateProtocol (\r


@@ -315,7 +315,7 @@ PciBusDriverBindingStart (
                   This->DriverBindingHandle,\r
                   Controller,\r
                   EFI_OPEN_PROTOCOL_GET_PROTOCOL\r
                   This->DriverBindingHandle,\r
                   Controller,\r
                   EFI_OPEN_PROTOCOL_GET_PROTOCOL\r

-                  );  \r
+                  );\r

   ASSERT_EFI_ERROR (Status);\r
 \r
   //\r
   ASSERT_EFI_ERROR (Status);\r
 \r
   //\r

diff --git a/MdeModulePkg/Bus/Pci/PciBusDxe/PciBusDxe.inf b/MdeModulePkg/Bus/Pci/PciBusDxe/PciBusDxe.inf
index 97608bfcf2458d4c792c52c4ec4934f68897bce7..a21dd2b5edf40bbd722305e14f3ce495cd6a48f2 100644 (file)
--- a/MdeModulePkg/Bus/Pci/PciBusDxe/PciBusDxe.inf
+++ b/MdeModulePkg/Bus/Pci/PciBusDxe/PciBusDxe.inf
@@ -2,7 +2,7 @@
 #  The PCI bus driver will probe all PCI devices and allocate MMIO and IO space for these devices.\r
 #  Please use PCD feature flag PcdPciBusHotplugDeviceSupport to enable hot plug supporting.\r
 #\r
 #  The PCI bus driver will probe all PCI devices and allocate MMIO and IO space for these devices.\r
 #  Please use PCD feature flag PcdPciBusHotplugDeviceSupport to enable hot plug supporting.\r
 #\r

-#  Copyright (c) 2006 - 2017, Intel Corporation. All rights reserved.<BR>\r
+#  Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r

 #\r
 #  This program and the accompanying materials\r
 #  are licensed and made available under the terms and conditions of the BSD License\r
 #\r
 #  This program and the accompanying materials\r
 #  are licensed and made available under the terms and conditions of the BSD License\r


@@ -90,8 +90,8 @@
   gEfiPciHotPlugInitProtocolGuid                  ## SOMETIMES_CONSUMES\r
   gEfiPciHostBridgeResourceAllocationProtocolGuid ## TO_START\r
   gEfiPciPlatformProtocolGuid                     ## SOMETIMES_CONSUMES\r
   gEfiPciHotPlugInitProtocolGuid                  ## SOMETIMES_CONSUMES\r
   gEfiPciHostBridgeResourceAllocationProtocolGuid ## TO_START\r
   gEfiPciPlatformProtocolGuid                     ## SOMETIMES_CONSUMES\r

-  gEfiPciOverrideProtocolGuid                     ## SOMETIMES_CONSUMES \r
-  gEfiPciEnumerationCompleteProtocolGuid          ## PRODUCES \r
+  gEfiPciOverrideProtocolGuid                     ## SOMETIMES_CONSUMES\r
+  gEfiPciEnumerationCompleteProtocolGuid          ## PRODUCES\r

   gEfiPciRootBridgeIoProtocolGuid                 ## TO_START\r
   gEfiIncompatiblePciDeviceSupportProtocolGuid    ## SOMETIMES_CONSUMES\r
   gEfiLoadFile2ProtocolGuid                       ## SOMETIMES_PRODUCES\r
   gEfiPciRootBridgeIoProtocolGuid                 ## TO_START\r
   gEfiIncompatiblePciDeviceSupportProtocolGuid    ## SOMETIMES_CONSUMES\r
   gEfiLoadFile2ProtocolGuid                       ## SOMETIMES_PRODUCES\r

diff --git a/MdeModulePkg/Bus/Pci/PciBusDxe/PciBusDxeExtra.uni b/MdeModulePkg/Bus/Pci/PciBusDxe/PciBusDxeExtra.uni
index 8f318d8f55b6ae325559b533cc8aae8da4f8abd3..f562ae8b67603190ac2627344749aa2f879fd55c 100644 (file)
--- a/MdeModulePkg/Bus/Pci/PciBusDxe/PciBusDxeExtra.uni
+++ b/MdeModulePkg/Bus/Pci/PciBusDxe/PciBusDxeExtra.uni
@@ -1,7 +1,7 @@
 // /** @file\r
 // PciBusDxe Localized Strings and Content\r
 //\r
 // /** @file\r
 // PciBusDxe Localized Strings and Content\r
 //\r

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

 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r
 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r


@@ -12,8 +12,8 @@
 //\r
 // **/\r
 \r
 //\r
 // **/\r
 \r

-#string STR_PROPERTIES_MODULE_NAME \r
-#language en-US \r
+#string STR_PROPERTIES_MODULE_NAME\r
+#language en-US\r

 "PCI Bus DXE Driver"\r
 \r
 \r
 "PCI Bus DXE Driver"\r
 \r
 \r

diff --git a/MdeModulePkg/Bus/Pci/PciBusDxe/PciDeviceSupport.c b/MdeModulePkg/Bus/Pci/PciBusDxe/PciDeviceSupport.c
index f69fe938da061263fb0fde7dce895d14d2afd450..ad7a2337f578fd56eee846e874b868ff9eb82aad 100644 (file)
--- a/MdeModulePkg/Bus/Pci/PciBusDxe/PciDeviceSupport.c
+++ b/MdeModulePkg/Bus/Pci/PciBusDxe/PciDeviceSupport.c
@@ -236,7 +236,7 @@ RegisterPciDevice (
   PciIo = &(PciIoDevice->PciIo);\r
   Data8 = PCI_INT_LINE_UNKNOWN;\r
   PciIo->Pci.Write (PciIo, EfiPciIoWidthUint8, 0x3C, 1, &Data8);\r
   PciIo = &(PciIoDevice->PciIo);\r
   Data8 = PCI_INT_LINE_UNKNOWN;\r
   PciIo->Pci.Write (PciIo, EfiPciIoWidthUint8, 0x3C, 1, &Data8);\r

- \r
+\r

   //\r
   // Process OpRom\r
   //\r
   //\r
   // Process OpRom\r
   //\r


@@ -296,7 +296,7 @@ RegisterPciDevice (
           PciIoDevice->PciIo.RomImage,\r
           PciIoDevice->PciIo.RomSize\r
           );\r
           PciIoDevice->PciIo.RomImage,\r
           PciIoDevice->PciIo.RomSize\r
           );\r

-      }   \r
+      }\r

     }\r
   }\r
 \r
     }\r
   }\r
 \r

diff --git a/MdeModulePkg/Bus/Pci/PciBusDxe/PciEnumerator.c b/MdeModulePkg/Bus/Pci/PciBusDxe/PciEnumerator.c
index d5d3c07393e27a65f8b251a107bec0ee862efed1..f44db01a9dea280f8eec49d09237c0da1f6fb3d2 100644 (file)
--- a/MdeModulePkg/Bus/Pci/PciBusDxe/PciEnumerator.c
+++ b/MdeModulePkg/Bus/Pci/PciBusDxe/PciEnumerator.c
@@ -187,7 +187,7 @@ PciRootBridgeEnumerator (
       AddrRangeMin = Configuration1->AddrRangeMin;\r
       Configuration1->AddrRangeMin = Configuration2->AddrRangeMin;\r
       Configuration2->AddrRangeMin = AddrRangeMin;\r
       AddrRangeMin = Configuration1->AddrRangeMin;\r
       Configuration1->AddrRangeMin = Configuration2->AddrRangeMin;\r
       Configuration2->AddrRangeMin = AddrRangeMin;\r

-      \r
+\r

       AddrLen = Configuration1->AddrLen;\r
       Configuration1->AddrLen = Configuration2->AddrLen;\r
       Configuration2->AddrLen = AddrLen;\r
       AddrLen = Configuration1->AddrLen;\r
       Configuration1->AddrLen = Configuration2->AddrLen;\r
       Configuration2->AddrLen = AddrLen;\r


@@ -234,7 +234,7 @@ PciRootBridgeEnumerator (
   Status = PciAllocateBusNumber (RootBridgeDev, SubBusNumber, PaddedBusRange, &SubBusNumber);\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   Status = PciAllocateBusNumber (RootBridgeDev, SubBusNumber, PaddedBusRange, &SubBusNumber);\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r

-  }  \r
+  }\r

 \r
   //\r
   // Find the bus range which contains the higest bus number, then returns the number of buses\r
 \r
   //\r
   // Find the bus range which contains the higest bus number, then returns the number of buses\r


@@ -252,7 +252,7 @@ PciRootBridgeEnumerator (
   Configuration++;\r
   Desc = Configuration->Desc;\r
   Configuration->Desc = ACPI_END_TAG_DESCRIPTOR;\r
   Configuration++;\r
   Desc = Configuration->Desc;\r
   Configuration->Desc = ACPI_END_TAG_DESCRIPTOR;\r

-  \r
+\r

   //\r
   // Set bus number\r
   //\r
   //\r
   // Set bus number\r
   //\r


@@ -267,7 +267,7 @@ PciRootBridgeEnumerator (
   //\r
   Configuration->Desc = Desc;\r
   (Configuration - 1)->AddrLen = AddrLen;\r
   //\r
   Configuration->Desc = Desc;\r
   (Configuration - 1)->AddrLen = AddrLen;\r

-  \r
+\r

   return Status;\r
 }\r
 \r
   return Status;\r
 }\r
 \r


@@ -1812,7 +1812,7 @@ NotifyPhase (
                             Phase,\r
                             ChipsetEntry\r
                             );\r
                             Phase,\r
                             ChipsetEntry\r
                             );\r

-  }  \r
+  }\r

 \r
   Status = PciResAlloc->NotifyPhase (\r
                           PciResAlloc,\r
 \r
   Status = PciResAlloc->NotifyPhase (\r
                           PciResAlloc,\r


@@ -2043,7 +2043,7 @@ PciHotPlugRequestNotify (
       return EFI_INVALID_PARAMETER;\r
     }\r
   }\r
       return EFI_INVALID_PARAMETER;\r
     }\r
   }\r

-  \r
+\r

   Status = gBS->OpenProtocol (\r
                   Controller,\r
                   &gEfiPciIoProtocolGuid,\r
   Status = gBS->OpenProtocol (\r
                   Controller,\r
                   &gEfiPciIoProtocolGuid,\r

diff --git a/MdeModulePkg/Bus/Pci/PciBusDxe/PciEnumeratorSupport.c b/MdeModulePkg/Bus/Pci/PciBusDxe/PciEnumeratorSupport.c
index 6f3d1bebc6c298fbba88bffa660fff1b0f81fdd0..cfd291ef7d9095db00592e5a9778d38404829007 100644 (file)
--- a/MdeModulePkg/Bus/Pci/PciBusDxe/PciEnumeratorSupport.c
+++ b/MdeModulePkg/Bus/Pci/PciBusDxe/PciEnumeratorSupport.c
@@ -1736,7 +1736,7 @@ PciIovParseVfBar (
       break;\r
     }\r
   }\r
       break;\r
     }\r
   }\r

-  \r
+\r

   //\r
   // Check the length again so as to keep compatible with some special bars\r
   //\r
   //\r
   // Check the length again so as to keep compatible with some special bars\r
   //\r


@@ -1745,7 +1745,7 @@ PciIovParseVfBar (
     PciIoDevice->VfPciBar[BarIndex].BaseAddress = 0;\r
     PciIoDevice->VfPciBar[BarIndex].Alignment   = 0;\r
   }\r
     PciIoDevice->VfPciBar[BarIndex].BaseAddress = 0;\r
     PciIoDevice->VfPciBar[BarIndex].Alignment   = 0;\r
   }\r

-  \r
+\r

   //\r
   // Increment number of bar\r
   //\r
   //\r
   // Increment number of bar\r
   //\r


@@ -2185,7 +2185,7 @@ CreatePciIoDevice (
       //\r
       ParentPciIo = &Bridge->PciIo;\r
       ParentPciIo->Pci.Read (\r
       //\r
       ParentPciIo = &Bridge->PciIo;\r
       ParentPciIo->Pci.Read (\r

-                          ParentPciIo, \r
+                          ParentPciIo,\r

                           EfiPciIoWidthUint32,\r
                           Bridge->PciExpressCapabilityOffset + EFI_PCIE_CAPABILITY_DEVICE_CAPABILITIES_2_OFFSET,\r
                           1,\r
                           EfiPciIoWidthUint32,\r
                           Bridge->PciExpressCapabilityOffset + EFI_PCIE_CAPABILITY_DEVICE_CAPABILITIES_2_OFFSET,\r
                           1,\r

diff --git a/MdeModulePkg/Bus/Pci/PciBusDxe/PciIo.c b/MdeModulePkg/Bus/Pci/PciBusDxe/PciIo.c
index 62179eb44bbdbf9d4f57d34dc11f68f13444a182..87b0b9884adfb71408525cd5c10e125379704b94 100644 (file)
--- a/MdeModulePkg/Bus/Pci/PciBusDxe/PciIo.c
+++ b/MdeModulePkg/Bus/Pci/PciBusDxe/PciIo.c
@@ -1,7 +1,7 @@
 /** @file\r
   EFI PCI IO protocol functions implementation for PCI Bus module.\r
 \r
 /** @file\r
   EFI PCI IO protocol functions implementation for PCI Bus module.\r
 \r

-Copyright (c) 2006 - 2017, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r

 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r


@@ -232,7 +232,7 @@ PciIoPollMem (
 \r
   //\r
   // If request is not aligned, then convert request to EfiPciIoWithXXXUint8\r
 \r
   //\r
   // If request is not aligned, then convert request to EfiPciIoWithXXXUint8\r

-  //  \r
+  //\r

   if (FeaturePcdGet (PcdUnalignedPciIoEnable)) {\r
     if ((Offset & ((1 << (Width & 0x03)) - 1)) != 0) {\r
       Status  = PciIoMemRead (This, Width, BarIndex, Offset, 1, Result);\r
   if (FeaturePcdGet (PcdUnalignedPciIoEnable)) {\r
     if ((Offset & ((1 << (Width & 0x03)) - 1)) != 0) {\r
       Status  = PciIoMemRead (This, Width, BarIndex, Offset, 1, Result);\r


@@ -262,7 +262,7 @@ PciIoPollMem (
       } while (TRUE);\r
     }\r
   }\r
       } while (TRUE);\r
     }\r
   }\r

-  \r
+\r

   Status = PciIoDevice->PciRootBridgeIo->PollMem (\r
                                            PciIoDevice->PciRootBridgeIo,\r
                                            (EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL_WIDTH) Width,\r
   Status = PciIoDevice->PciRootBridgeIo->PollMem (\r
                                            PciIoDevice->PciRootBridgeIo,\r
                                            (EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL_WIDTH) Width,\r


@@ -335,7 +335,7 @@ PciIoPollIo (
 \r
   //\r
   // If request is not aligned, then convert request to EfiPciIoWithXXXUint8\r
 \r
   //\r
   // If request is not aligned, then convert request to EfiPciIoWithXXXUint8\r

-  //  \r
+  //\r

   if (FeaturePcdGet (PcdUnalignedPciIoEnable)) {\r
     if ((Offset & ((1 << (Width & 0x03)) - 1)) != 0) {\r
       Status  = PciIoIoRead (This, Width, BarIndex, Offset, 1, Result);\r
   if (FeaturePcdGet (PcdUnalignedPciIoEnable)) {\r
     if ((Offset & ((1 << (Width & 0x03)) - 1)) != 0) {\r
       Status  = PciIoIoRead (This, Width, BarIndex, Offset, 1, Result);\r


@@ -365,7 +365,7 @@ PciIoPollIo (
       } while (TRUE);\r
     }\r
   }\r
       } while (TRUE);\r
     }\r
   }\r

-  \r
+\r

   Status = PciIoDevice->PciRootBridgeIo->PollIo (\r
                                            PciIoDevice->PciRootBridgeIo,\r
                                            (EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL_WIDTH) Width,\r
   Status = PciIoDevice->PciRootBridgeIo->PollIo (\r
                                            PciIoDevice->PciRootBridgeIo,\r
                                            (EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL_WIDTH) Width,\r


@@ -438,14 +438,14 @@ PciIoMemRead (
 \r
   //\r
   // If request is not aligned, then convert request to EfiPciIoWithXXXUint8\r
 \r
   //\r
   // If request is not aligned, then convert request to EfiPciIoWithXXXUint8\r

-  //  \r
+  //\r

   if (FeaturePcdGet (PcdUnalignedPciIoEnable)) {\r
     if ((Offset & ((1 << (Width & 0x03)) - 1)) != 0) {\r
       Count *=  (UINTN)(1 << (Width & 0x03));\r
       Width = (EFI_PCI_IO_PROTOCOL_WIDTH) (Width & (~0x03));\r
     }\r
   if (FeaturePcdGet (PcdUnalignedPciIoEnable)) {\r
     if ((Offset & ((1 << (Width & 0x03)) - 1)) != 0) {\r
       Count *=  (UINTN)(1 << (Width & 0x03));\r
       Width = (EFI_PCI_IO_PROTOCOL_WIDTH) (Width & (~0x03));\r
     }\r

-  }  \r
-  \r
+  }\r
+\r

 \r
   Status = PciIoDevice->PciRootBridgeIo->Mem.Read (\r
                                               PciIoDevice->PciRootBridgeIo,\r
 \r
   Status = PciIoDevice->PciRootBridgeIo->Mem.Read (\r
                                               PciIoDevice->PciRootBridgeIo,\r


@@ -517,7 +517,7 @@ PciIoMemWrite (
 \r
   //\r
   // If request is not aligned, then convert request to EfiPciIoWithXXXUint8\r
 \r
   //\r
   // If request is not aligned, then convert request to EfiPciIoWithXXXUint8\r

-  //  \r
+  //\r

   if (FeaturePcdGet (PcdUnalignedPciIoEnable)) {\r
     if ((Offset & ((1 << (Width & 0x03)) - 1)) != 0) {\r
       Count *=  (UINTN)(1 << (Width & 0x03));\r
   if (FeaturePcdGet (PcdUnalignedPciIoEnable)) {\r
     if ((Offset & ((1 << (Width & 0x03)) - 1)) != 0) {\r
       Count *=  (UINTN)(1 << (Width & 0x03));\r


@@ -595,13 +595,13 @@ PciIoIoRead (
 \r
   //\r
   // If request is not aligned, then convert request to EfiPciIoWithXXXUint8\r
 \r
   //\r
   // If request is not aligned, then convert request to EfiPciIoWithXXXUint8\r

-  //  \r
+  //\r

   if (FeaturePcdGet (PcdUnalignedPciIoEnable)) {\r
     if ((Offset & ((1 << (Width & 0x03)) - 1)) != 0) {\r
       Count *=  (UINTN)(1 << (Width & 0x03));\r
       Width = (EFI_PCI_IO_PROTOCOL_WIDTH) (Width & (~0x03));\r
     }\r
   if (FeaturePcdGet (PcdUnalignedPciIoEnable)) {\r
     if ((Offset & ((1 << (Width & 0x03)) - 1)) != 0) {\r
       Count *=  (UINTN)(1 << (Width & 0x03));\r
       Width = (EFI_PCI_IO_PROTOCOL_WIDTH) (Width & (~0x03));\r
     }\r

-  }    \r
+  }\r

 \r
   Status = PciIoDevice->PciRootBridgeIo->Io.Read (\r
                                               PciIoDevice->PciRootBridgeIo,\r
 \r
   Status = PciIoDevice->PciRootBridgeIo->Io.Read (\r
                                               PciIoDevice->PciRootBridgeIo,\r


@@ -673,13 +673,13 @@ PciIoIoWrite (
 \r
   //\r
   // If request is not aligned, then convert request to EfiPciIoWithXXXUint8\r
 \r
   //\r
   // If request is not aligned, then convert request to EfiPciIoWithXXXUint8\r

-  //  \r
+  //\r

   if (FeaturePcdGet (PcdUnalignedPciIoEnable)) {\r
     if ((Offset & ((1 << (Width & 0x03)) - 1)) != 0) {\r
       Count *=  (UINTN)(1 << (Width & 0x03));\r
       Width = (EFI_PCI_IO_PROTOCOL_WIDTH) (Width & (~0x03));\r
     }\r
   if (FeaturePcdGet (PcdUnalignedPciIoEnable)) {\r
     if ((Offset & ((1 << (Width & 0x03)) - 1)) != 0) {\r
       Count *=  (UINTN)(1 << (Width & 0x03));\r
       Width = (EFI_PCI_IO_PROTOCOL_WIDTH) (Width & (~0x03));\r
     }\r

-  }  \r
+  }\r

 \r
   Status = PciIoDevice->PciRootBridgeIo->Io.Write (\r
                                               PciIoDevice->PciRootBridgeIo,\r
 \r
   Status = PciIoDevice->PciRootBridgeIo->Io.Write (\r
                                               PciIoDevice->PciRootBridgeIo,\r


@@ -739,16 +739,16 @@ PciIoConfigRead (
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r

-  \r
+\r

   //\r
   // If request is not aligned, then convert request to EfiPciIoWithXXXUint8\r
   //\r
   // If request is not aligned, then convert request to EfiPciIoWithXXXUint8\r

-  //  \r
+  //\r

   if (FeaturePcdGet (PcdUnalignedPciIoEnable)) {\r
     if ((Offset & ((1 << (Width & 0x03)) - 1)) != 0) {\r
       Count *=  (UINTN)(1 << (Width & 0x03));\r
       Width = (EFI_PCI_IO_PROTOCOL_WIDTH) (Width & (~0x03));\r
     }\r
   if (FeaturePcdGet (PcdUnalignedPciIoEnable)) {\r
     if ((Offset & ((1 << (Width & 0x03)) - 1)) != 0) {\r
       Count *=  (UINTN)(1 << (Width & 0x03));\r
       Width = (EFI_PCI_IO_PROTOCOL_WIDTH) (Width & (~0x03));\r
     }\r

-  }    \r
+  }\r

 \r
   Status = PciIoDevice->PciRootBridgeIo->Pci.Read (\r
                                                PciIoDevice->PciRootBridgeIo,\r
 \r
   Status = PciIoDevice->PciRootBridgeIo->Pci.Read (\r
                                                PciIoDevice->PciRootBridgeIo,\r


@@ -811,14 +811,14 @@ PciIoConfigWrite (
 \r
   //\r
   // If request is not aligned, then convert request to EfiPciIoWithXXXUint8\r
 \r
   //\r
   // If request is not aligned, then convert request to EfiPciIoWithXXXUint8\r

-  //  \r
+  //\r

   if (FeaturePcdGet (PcdUnalignedPciIoEnable)) {\r
     if ((Offset & ((1 << (Width & 0x03)) - 1)) != 0) {\r
       Count *=  (UINTN)(1 << (Width & 0x03));\r
       Width = (EFI_PCI_IO_PROTOCOL_WIDTH) (Width & (~0x03));\r
     }\r
   if (FeaturePcdGet (PcdUnalignedPciIoEnable)) {\r
     if ((Offset & ((1 << (Width & 0x03)) - 1)) != 0) {\r
       Count *=  (UINTN)(1 << (Width & 0x03));\r
       Width = (EFI_PCI_IO_PROTOCOL_WIDTH) (Width & (~0x03));\r
     }\r

-  }  \r
-  \r
+  }\r
+\r

   Status = PciIoDevice->PciRootBridgeIo->Pci.Write (\r
                                               PciIoDevice->PciRootBridgeIo,\r
                                               (EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL_WIDTH) Width,\r
   Status = PciIoDevice->PciRootBridgeIo->Pci.Write (\r
                                               PciIoDevice->PciRootBridgeIo,\r
                                               (EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL_WIDTH) Width,\r


@@ -910,13 +910,13 @@ PciIoCopyMem (
 \r
   //\r
   // If request is not aligned, then convert request to EfiPciIoWithXXXUint8\r
 \r
   //\r
   // If request is not aligned, then convert request to EfiPciIoWithXXXUint8\r

-  //  \r
+  //\r

   if (FeaturePcdGet (PcdUnalignedPciIoEnable)) {\r
     if ((SrcOffset & ((1 << (Width & 0x03)) - 1)) != 0 || (DestOffset & ((1 << (Width & 0x03)) - 1)) != 0) {\r
       Count *=  (UINTN)(1 << (Width & 0x03));\r
       Width = (EFI_PCI_IO_PROTOCOL_WIDTH) (Width & (~0x03));\r
     }\r
   if (FeaturePcdGet (PcdUnalignedPciIoEnable)) {\r
     if ((SrcOffset & ((1 << (Width & 0x03)) - 1)) != 0 || (DestOffset & ((1 << (Width & 0x03)) - 1)) != 0) {\r
       Count *=  (UINTN)(1 << (Width & 0x03));\r
       Width = (EFI_PCI_IO_PROTOCOL_WIDTH) (Width & (~0x03));\r
     }\r

-  }  \r
+  }\r

 \r
   Status = PciIoDevice->PciRootBridgeIo->CopyMem (\r
                                           PciIoDevice->PciRootBridgeIo,\r
 \r
   Status = PciIoDevice->PciRootBridgeIo->CopyMem (\r
                                           PciIoDevice->PciRootBridgeIo,\r


@@ -1790,7 +1790,7 @@ PciIoAttributes (
   @param AddrRangeMin    The base address of the MMIO.\r
   @param AddrLen         The length of the MMIO.\r
 \r
   @param AddrRangeMin    The base address of the MMIO.\r
   @param AddrLen         The length of the MMIO.\r
 \r

-  @retval The AddrTranslationOffset from RootBridgeIo for the \r
+  @retval The AddrTranslationOffset from RootBridgeIo for the\r

           specified range, or (UINT64) -1 if the range is not\r
           found in RootBridgeIo.\r
 **/\r
           specified range, or (UINT64) -1 if the range is not\r
           found in RootBridgeIo.\r
 **/\r

diff --git a/MdeModulePkg/Bus/Pci/PciBusDxe/PciLib.c b/MdeModulePkg/Bus/Pci/PciBusDxe/PciLib.c
index 126a2f7117ecc6b3022eab106856ce4b7c106f96..b81f81a1368a028dfb1c5bbd6df4ca714318959a 100644 (file)
--- a/MdeModulePkg/Bus/Pci/PciBusDxe/PciLib.c
+++ b/MdeModulePkg/Bus/Pci/PciBusDxe/PciLib.c
@@ -269,11 +269,11 @@ DumpBridgeResource (
 \r
 /**\r
   Find the corresponding resource node for the Device in child list of BridgeResource.\r
 \r
 /**\r
   Find the corresponding resource node for the Device in child list of BridgeResource.\r

-  \r
+\r

   @param[in]  Device          Pointer to PCI_IO_DEVICE.\r
   @param[in]  BridgeResource  Pointer to PCI_RESOURCE_NODE.\r
   @param[out] DeviceResources Pointer to a buffer to receive resources for the Device.\r
   @param[in]  Device          Pointer to PCI_IO_DEVICE.\r
   @param[in]  BridgeResource  Pointer to PCI_RESOURCE_NODE.\r
   @param[out] DeviceResources Pointer to a buffer to receive resources for the Device.\r

-  \r
+\r

   @return Count of the resource descriptors returned.\r
 **/\r
 UINTN\r
   @return Count of the resource descriptors returned.\r
 **/\r
 UINTN\r


@@ -306,7 +306,7 @@ FindResourceNode (
 \r
 /**\r
   Dump the resource map of all the devices under Bridge.\r
 \r
 /**\r
   Dump the resource map of all the devices under Bridge.\r

-  \r
+\r

   @param[in] Bridge        Bridge device instance.\r
   @param[in] Resources     Resource descriptors for the bridge device.\r
   @param[in] ResourceCount Count of resource descriptors.\r
   @param[in] Bridge        Bridge device instance.\r
   @param[in] Resources     Resource descriptors for the bridge device.\r
   @param[in] ResourceCount Count of resource descriptors.\r

diff --git a/MdeModulePkg/Bus/Pci/PciBusDxe/PciOptionRomSupport.c b/MdeModulePkg/Bus/Pci/PciBusDxe/PciOptionRomSupport.c
index d390bb655a3986caec145226043a57bd4d4deb44..c2be85a906af289ce694dc5f2114ce6d6be007a4 100644 (file)
--- a/MdeModulePkg/Bus/Pci/PciBusDxe/PciOptionRomSupport.c
+++ b/MdeModulePkg/Bus/Pci/PciBusDxe/PciOptionRomSupport.c
@@ -1,7 +1,7 @@
 /** @file\r
   PCI Rom supporting funtions implementation for PCI Bus module.\r
 \r
 /** @file\r
   PCI Rom supporting funtions implementation for PCI Bus module.\r
 \r

-Copyright (c) 2006 - 2017, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r

 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r


@@ -342,7 +342,7 @@ ContainEfiImage (
     }\r
 \r
     //\r
     }\r
 \r
     //\r

-    // The PCI Data Structure must be DWORD aligned. \r
+    // The PCI Data Structure must be DWORD aligned.\r

     //\r
     if (RomHeader->PcirOffset == 0 ||\r
         (RomHeader->PcirOffset & 3) != 0 ||\r
     //\r
     if (RomHeader->PcirOffset == 0 ||\r
         (RomHeader->PcirOffset & 3) != 0 ||\r


@@ -471,8 +471,8 @@ LoadOpRomImage (
     FirstCheck  = FALSE;\r
     OffsetPcir  = RomHeader->PcirOffset;\r
     //\r
     FirstCheck  = FALSE;\r
     OffsetPcir  = RomHeader->PcirOffset;\r
     //\r

-    // If the pointer to the PCI Data Structure is invalid, no further images can be located. \r
-    // The PCI Data Structure must be DWORD aligned. \r
+    // If the pointer to the PCI Data Structure is invalid, no further images can be located.\r
+    // The PCI Data Structure must be DWORD aligned.\r

     //\r
     if (OffsetPcir == 0 ||\r
         (OffsetPcir & 3) != 0 ||\r
     //\r
     if (OffsetPcir == 0 ||\r
         (OffsetPcir & 3) != 0 ||\r

diff --git a/MdeModulePkg/Bus/Pci/PciBusDxe/PciResourceSupport.c b/MdeModulePkg/Bus/Pci/PciBusDxe/PciResourceSupport.c
index 2f713fcee95eb0479e37b87ee8411aebe10ac5c7..f3e51d61508512f4c6e9e309318b0edebfedbfff 100644 (file)
--- a/MdeModulePkg/Bus/Pci/PciBusDxe/PciResourceSupport.c
+++ b/MdeModulePkg/Bus/Pci/PciBusDxe/PciResourceSupport.c
@@ -1,7 +1,7 @@
 /** @file\r
   PCI resouces support functions implemntation for PCI Bus module.\r
 \r
 /** @file\r
   PCI resouces support functions implemntation for PCI Bus module.\r
 \r

-Copyright (c) 2006 - 2017, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r

 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r


@@ -1116,7 +1116,7 @@ DegradeResource (
         PMem64Node,\r
         TRUE\r
         );\r
         PMem64Node,\r
         TRUE\r
         );\r

-    } \r
+    }\r

 \r
     //\r
     // if both PMEM64 and PMEM32 requests from child devices, which can not be satisfied\r
 \r
     //\r
     // if both PMEM64 and PMEM32 requests from child devices, which can not be satisfied\r

diff --git a/MdeModulePkg/Bus/Pci/PciHostBridgeDxe/PciRootBridgeIo.c b/MdeModulePkg/Bus/Pci/PciHostBridgeDxe/PciRootBridgeIo.c
index 83f553a0a3291989d06c4efa95a643c21661e1c7..f8a1239ceb1f81bf829893227cba6bc840d4c5d2 100644 (file)
--- a/MdeModulePkg/Bus/Pci/PciHostBridgeDxe/PciRootBridgeIo.c
+++ b/MdeModulePkg/Bus/Pci/PciHostBridgeDxe/PciRootBridgeIo.c
@@ -537,7 +537,7 @@ GetElapsedTick (
   )\r
 {\r
   UINT64  PreviousTick;\r
   )\r
 {\r
   UINT64  PreviousTick;\r

-  \r
+\r

   PreviousTick = *CurrentTick;\r
   *CurrentTick = GetPerformanceCounter();\r
   if (StartTick < EndTick) {\r
   PreviousTick = *CurrentTick;\r
   *CurrentTick = GetPerformanceCounter();\r
   if (StartTick < EndTick) {\r

diff --git a/MdeModulePkg/Bus/Pci/PciSioSerialDxe/PciSioSerialDxe.uni b/MdeModulePkg/Bus/Pci/PciSioSerialDxe/PciSioSerialDxe.uni
index abf85ec411d7d856d1b8abbd038767f8ea97851e..3b43b95ab48f9c01ef21d7e6768a1619ce57a723 100644 (file)
--- a/MdeModulePkg/Bus/Pci/PciSioSerialDxe/PciSioSerialDxe.uni
+++ b/MdeModulePkg/Bus/Pci/PciSioSerialDxe/PciSioSerialDxe.uni
@@ -3,13 +3,13 @@
 //\r
 // Produces the Serial I/O protocol for standard UARTS using Super I/O or PCI I/O.\r
 //\r
 //\r
 // Produces the Serial I/O protocol for standard UARTS using Super I/O or PCI I/O.\r
 //\r

-// Copyright (c) 2007 - 2015, Intel Corporation. All rights reserved.<BR>\r
+// Copyright (c) 2007 - 2018, Intel Corporation. All rights reserved.<BR>\r

 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r
 // which accompanies this distribution. The full text of the license may be found at\r
 // http://opensource.org/licenses/bsd-license.php\r
 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r
 // which accompanies this distribution. The full text of the license may be found at\r
 // http://opensource.org/licenses/bsd-license.php\r

-// \r
+//\r

 // THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 // WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 //\r
 // THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 // WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 //\r

diff --git a/MdeModulePkg/Bus/Pci/PciSioSerialDxe/PciSioSerialDxeExtra.uni b/MdeModulePkg/Bus/Pci/PciSioSerialDxe/PciSioSerialDxeExtra.uni
index d6146f01a831f314cafe28f5232c1392e4553908..bd57f1de8dc8ba8ac79b7b824f6ac7fdc5cbc2e2 100644 (file)
--- a/MdeModulePkg/Bus/Pci/PciSioSerialDxe/PciSioSerialDxeExtra.uni
+++ b/MdeModulePkg/Bus/Pci/PciSioSerialDxe/PciSioSerialDxeExtra.uni
@@ -1,7 +1,7 @@
 // /** @file\r
 // PciSioSerialDxe Localized Strings and Content\r
 //\r
 // /** @file\r
 // PciSioSerialDxe Localized Strings and Content\r
 //\r

-// Copyright (c) 2013 - 2015, Intel Corporation. All rights reserved.<BR>\r
+// Copyright (c) 2013 - 2018, Intel Corporation. All rights reserved.<BR>\r

 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r
 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r


@@ -13,6 +13,6 @@
 //\r
 // **/\r
 \r
 //\r
 // **/\r
 \r

-#string STR_PROPERTIES_MODULE_NAME \r
-#language en-US \r
+#string STR_PROPERTIES_MODULE_NAME\r
+#language en-US\r

 "PCI SIO UART Serial Bus DXE Driver"\r
 "PCI SIO UART Serial Bus DXE Driver"\r

diff --git a/MdeModulePkg/Bus/Pci/PciSioSerialDxe/Serial.c b/MdeModulePkg/Bus/Pci/PciSioSerialDxe/Serial.c
index a9dc8274d92fa97740b31303ffdbb97843a33442..5fd9b36ebd77f1f44db8d6c03fceb63706119ca9 100644 (file)
--- a/MdeModulePkg/Bus/Pci/PciSioSerialDxe/Serial.c
+++ b/MdeModulePkg/Bus/Pci/PciSioSerialDxe/Serial.c
@@ -1,7 +1,7 @@
 /** @file\r
   Serial driver for PCI or SIO UARTS.\r
 \r
 /** @file\r
   Serial driver for PCI or SIO UARTS.\r
 \r

-Copyright (c) 2006 - 2016, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r

 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r


@@ -94,7 +94,7 @@ SERIAL_DEV  gSerialDevTemplate = {
   Check the device path node whether it's the Flow Control node or not.\r
 \r
   @param[in] FlowControl    The device path node to be checked.\r
   Check the device path node whether it's the Flow Control node or not.\r
 \r
   @param[in] FlowControl    The device path node to be checked.\r

-  \r
+\r

   @retval TRUE              It's the Flow Control node.\r
   @retval FALSE             It's not.\r
 \r
   @retval TRUE              It's the Flow Control node.\r
   @retval FALSE             It's not.\r
 \r


@@ -114,9 +114,9 @@ IsUartFlowControlDevicePathNode (
 /**\r
   The user Entry Point for module PciSioSerial. The user code starts with this function.\r
 \r
 /**\r
   The user Entry Point for module PciSioSerial. The user code starts with this function.\r
 \r

-  @param[in] ImageHandle    The firmware allocated handle for the EFI image.  \r
+  @param[in] ImageHandle    The firmware allocated handle for the EFI image.\r

   @param[in] SystemTable    A pointer to the EFI System Table.\r
   @param[in] SystemTable    A pointer to the EFI System Table.\r

-  \r
+\r

   @retval EFI_SUCCESS       The entry point is executed successfully.\r
   @retval other             Some error occurs when executing this entry point.\r
 \r
   @retval EFI_SUCCESS       The entry point is executed successfully.\r
   @retval other             Some error occurs when executing this entry point.\r
 \r


@@ -396,7 +396,7 @@ SerialControllerDriverSupported (
   if (EFI_ERROR (Status)) {\r
     Status = IsPciSerialController (Controller);\r
   }\r
   if (EFI_ERROR (Status)) {\r
     Status = IsPciSerialController (Controller);\r
   }\r

-  return Status;  \r
+  return Status;\r

 }\r
 \r
 /**\r
 }\r
 \r
 /**\r

diff --git a/MdeModulePkg/Bus/Pci/PciSioSerialDxe/Serial.h b/MdeModulePkg/Bus/Pci/PciSioSerialDxe/Serial.h
index 3c7eb915f4c1c450c7ed1dc7ef59c4a647cc6219..0d931a3d8e674e8fe1efb6035f128eb0d2053a94 100644 (file)
--- a/MdeModulePkg/Bus/Pci/PciSioSerialDxe/Serial.h
+++ b/MdeModulePkg/Bus/Pci/PciSioSerialDxe/Serial.h
@@ -1,7 +1,7 @@
 /** @file\r
   Header file for PciSioSerial Driver\r
 \r
 /** @file\r
   Header file for PciSioSerial Driver\r
 \r

-Copyright (c) 2006 - 2016, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r

 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r


@@ -497,7 +497,7 @@ SerialFifoFull (
 \r
 /**\r
   Detect whether specific FIFO is empty or not.\r
 \r
 /**\r
   Detect whether specific FIFO is empty or not.\r

- \r
+\r

   @param  Fifo    A pointer to the Data Structure SERIAL_DEV_FIFO\r
 \r
   @return whether specific FIFO is empty or not\r
   @param  Fifo    A pointer to the Data Structure SERIAL_DEV_FIFO\r
 \r
   @return whether specific FIFO is empty or not\r


@@ -777,7 +777,7 @@ SkipControllerDevicePathNode (
   Check the device path node whether it's the Flow Control node or not.\r
 \r
   @param[in] FlowControl    The device path node to be checked.\r
   Check the device path node whether it's the Flow Control node or not.\r
 \r
   @param[in] FlowControl    The device path node to be checked.\r

-  \r
+\r

   @retval TRUE              It's the Flow Control node.\r
   @retval FALSE             It's not.\r
 \r
   @retval TRUE              It's the Flow Control node.\r
   @retval FALSE             It's not.\r
 \r

diff --git a/MdeModulePkg/Bus/Pci/PciSioSerialDxe/SerialIo.c b/MdeModulePkg/Bus/Pci/PciSioSerialDxe/SerialIo.c
index c0682e93b6668e00d1458a2c7970757b72b75206..31d5ab42ecfa36ac3bd7954a8a6b567d1d47b73f 100644 (file)
--- a/MdeModulePkg/Bus/Pci/PciSioSerialDxe/SerialIo.c
+++ b/MdeModulePkg/Bus/Pci/PciSioSerialDxe/SerialIo.c
@@ -1,7 +1,7 @@
 /** @file\r
   SerialIo implementation for PCI or SIO UARTs.\r
 \r
 /** @file\r
   SerialIo implementation for PCI or SIO UARTs.\r
 \r

-Copyright (c) 2006 - 2016, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r

 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r


@@ -92,7 +92,7 @@ VerifyUartParameters (
       ((DataBits >= 6) && (DataBits <= 8) && (StopBits == OneFiveStopBits))\r
       ) {\r
     return FALSE;\r
       ((DataBits >= 6) && (DataBits <= 8) && (StopBits == OneFiveStopBits))\r
       ) {\r
     return FALSE;\r

-  } \r
+  }\r

 \r
   //\r
   // Do not verify the baud rate if clock rate is unknown (0).\r
 \r
   //\r
   // Do not verify the baud rate if clock rate is unknown (0).\r


@@ -169,8 +169,8 @@ VerifyUartParameters (
   }\r
 \r
   //\r
   }\r
 \r
   //\r

-  // ActualBaudRate is higher than requested baud rate and more than 4% \r
-  // higher than the requested value.  Increment Divisor if it is less \r
+  // ActualBaudRate is higher than requested baud rate and more than 4%\r
+  // higher than the requested value.  Increment Divisor if it is less\r

   // than MAX_UINT16 and computed baud rate with new divisor.\r
   //\r
   if (ComputedDivisor == MAX_UINT16) {\r
   // than MAX_UINT16 and computed baud rate with new divisor.\r
   //\r
   if (ComputedDivisor == MAX_UINT16) {\r


@@ -212,7 +212,7 @@ SerialFifoFull (
 \r
 /**\r
   Detect whether specific FIFO is empty or not.\r
 \r
 /**\r
   Detect whether specific FIFO is empty or not.\r

- \r
+\r

   @param  Fifo    A pointer to the Data Structure SERIAL_DEV_FIFO\r
 \r
   @return whether specific FIFO is empty or not\r
   @param  Fifo    A pointer to the Data Structure SERIAL_DEV_FIFO\r
 \r
   @return whether specific FIFO is empty or not\r


@@ -363,7 +363,7 @@ SerialReceiveTransmit (
           Data = READ_RBR (SerialDevice);\r
 \r
           SerialFifoAdd (&SerialDevice->Receive, Data);\r
           Data = READ_RBR (SerialDevice);\r
 \r
           SerialFifoAdd (&SerialDevice->Receive, Data);\r

-          \r
+\r

           //\r
           // For full handshake flow control, if receive buffer full\r
           // tell the peer to stop sending data.\r
           //\r
           // For full handshake flow control, if receive buffer full\r
           // tell the peer to stop sending data.\r


@@ -1065,7 +1065,7 @@ SerialWrite (
                 NULL\r
                 )\r
               );\r
                 NULL\r
                 )\r
               );\r

-  \r
+\r

   for (Index = 0; Index < *BufferSize; Index++) {\r
     SerialFifoAdd (&SerialDevice->Transmit, CharBuffer[Index]);\r
 \r
   for (Index = 0; Index < *BufferSize; Index++) {\r
     SerialFifoAdd (&SerialDevice->Transmit, CharBuffer[Index]);\r
 \r

diff --git a/MdeModulePkg/Bus/Pci/SataControllerDxe/ComponentName.c b/MdeModulePkg/Bus/Pci/SataControllerDxe/ComponentName.c
index 467ad11d1ad694bbb344106ede7ff377328364cf..cb18aae6c5833f6dc15c2f73060c7b1ec951fe2f 100644 (file)
--- a/MdeModulePkg/Bus/Pci/SataControllerDxe/ComponentName.c
+++ b/MdeModulePkg/Bus/Pci/SataControllerDxe/ComponentName.c
@@ -1,7 +1,7 @@
 /** @file\r
   UEFI Component Name(2) protocol implementation for Sata Controller driver.\r
 \r
 /** @file\r
   UEFI Component Name(2) protocol implementation for Sata Controller driver.\r
 \r

-  Copyright (c) 2011 - 2016, Intel Corporation. All rights reserved.<BR>\r
+  Copyright (c) 2011 - 2018, Intel Corporation. All rights reserved.<BR>\r

   This program and the accompanying materials\r
   are licensed and made available under the terms and conditions of the BSD License\r
   which accompanies this distribution.  The full text of the license may be found at\r
   This program and the accompanying materials\r
   are licensed and made available under the terms and conditions of the BSD License\r
   which accompanies this distribution.  The full text of the license may be found at\r


@@ -72,7 +72,7 @@ GLOBAL_REMOVE_IF_UNREFERENCED EFI_UNICODE_STRING_TABLE mSataControllerController
   @param DriverName             A pointer to the Unicode string to return.  This Unicode string\r
                                 is the name of the driver specified by This in the language\r
                                 specified by Language.\r
   @param DriverName             A pointer to the Unicode string to return.  This Unicode string\r
                                 is the name of the driver specified by This in the language\r
                                 specified by Language.\r

-  \r
+\r

   @retval EFI_SUCCESS           The Unicode string for the Driver specified by This\r
                                 and the language specified by Language was returned\r
                                 in DriverName.\r
   @retval EFI_SUCCESS           The Unicode string for the Driver specified by This\r
                                 and the language specified by Language was returned\r
                                 in DriverName.\r


@@ -100,7 +100,7 @@ SataControllerComponentNameGetDriverName (
 \r
 /**\r
   Retrieves a Unicode string that is the user readable name of the controller\r
 \r
 /**\r
   Retrieves a Unicode string that is the user readable name of the controller\r

-  that is being managed by an UEFI Driver.  \r
+  that is being managed by an UEFI Driver.\r

 \r
   @param This                   A pointer to the EFI_COMPONENT_NAME_PROTOCOL instance.\r
   @param ControllerHandle       The handle of a controller that the driver specified by\r
 \r
   @param This                   A pointer to the EFI_COMPONENT_NAME_PROTOCOL instance.\r
   @param ControllerHandle       The handle of a controller that the driver specified by\r


@@ -123,7 +123,7 @@ SataControllerComponentNameGetDriverName (
                                 ControllerHandle and ChildHandle in the language\r
                                 specified by Language from the point of view of the\r
                                 driver specified by This.\r
                                 ControllerHandle and ChildHandle in the language\r
                                 specified by Language from the point of view of the\r
                                 driver specified by This.\r

-  \r
+\r

   @retval EFI_SUCCESS           The Unicode string for the user readable name in the\r
                                 language specified by Language for the driver\r
                                 specified by This was returned in DriverName.\r
   @retval EFI_SUCCESS           The Unicode string for the user readable name in the\r
                                 language specified by Language for the driver\r
                                 specified by This was returned in DriverName.\r

diff --git a/MdeModulePkg/Bus/Pci/SataControllerDxe/SataController.c b/MdeModulePkg/Bus/Pci/SataControllerDxe/SataController.c
index 87c201dabdcf14fa228c0b3577fbbead2ec9b6bd..7dc40f82e81977224b3da64884c2924766e9180b 100644 (file)
--- a/MdeModulePkg/Bus/Pci/SataControllerDxe/SataController.c
+++ b/MdeModulePkg/Bus/Pci/SataControllerDxe/SataController.c
@@ -1,7 +1,7 @@
 /** @file\r
   This driver module produces IDE_CONTROLLER_INIT protocol for Sata Controllers.\r
 \r
 /** @file\r
   This driver module produces IDE_CONTROLLER_INIT protocol for Sata Controllers.\r
 \r

-  Copyright (c) 2011 - 2016, Intel Corporation. All rights reserved.<BR>\r
+  Copyright (c) 2011 - 2018, Intel Corporation. All rights reserved.<BR>\r

   Copyright (c) 2018, ARM Ltd. All rights reserved.<BR>\r
   This program and the accompanying materials\r
   are licensed and made available under the terms and conditions of the BSD License\r
   Copyright (c) 2018, ARM Ltd. All rights reserved.<BR>\r
   This program and the accompanying materials\r
   are licensed and made available under the terms and conditions of the BSD License\r


@@ -46,7 +46,7 @@ AhciReadReg (
   UINT32    Data;\r
 \r
   ASSERT (PciIo != NULL);\r
   UINT32    Data;\r
 \r
   ASSERT (PciIo != NULL);\r

-  \r
+\r

   Data = 0;\r
 \r
   PciIo->Mem.Read (\r
   Data = 0;\r
 \r
   PciIo->Mem.Read (\r


@@ -242,9 +242,9 @@ CalculateBestUdmaMode (
 /**\r
   The Entry Point of module. It follows the standard UEFI driver model.\r
 \r
 /**\r
   The Entry Point of module. It follows the standard UEFI driver model.\r
 \r

-  @param[in] ImageHandle    The firmware allocated handle for the EFI image.  \r
+  @param[in] ImageHandle    The firmware allocated handle for the EFI image.\r

   @param[in] SystemTable    A pointer to the EFI System Table.\r
   @param[in] SystemTable    A pointer to the EFI System Table.\r

-  \r
+\r

   @retval EFI_SUCCESS   The entry point is executed successfully.\r
   @retval other         Some error occurs when executing this entry point.\r
 \r
   @retval EFI_SUCCESS   The entry point is executed successfully.\r
   @retval other         Some error occurs when executing this entry point.\r
 \r


@@ -338,7 +338,7 @@ SataControllerSupported (
 }\r
 \r
 /**\r
 }\r
 \r
 /**\r

-  This routine is called right after the .Supported() called and \r
+  This routine is called right after the .Supported() called and\r

   Start this driver on ControllerHandle.\r
 \r
   @param This                   Protocol instance pointer.\r
   Start this driver on ControllerHandle.\r
 \r
   @param This                   Protocol instance pointer.\r


@@ -558,7 +558,7 @@ Done:
   @param This               A pointer to the EFI_DRIVER_BINDING_PROTOCOL instance.\r
   @param Controller         A handle to the device being stopped.\r
   @param NumberOfChildren   The number of child device handles in ChildHandleBuffer.\r
   @param This               A pointer to the EFI_DRIVER_BINDING_PROTOCOL instance.\r
   @param Controller         A handle to the device being stopped.\r
   @param NumberOfChildren   The number of child device handles in ChildHandleBuffer.\r

-  @param ChildHandleBuffer  An array of child handles to be freed. \r
+  @param ChildHandleBuffer  An array of child handles to be freed.\r

 \r
   @retval EFI_SUCCESS       This driver is removed from this device.\r
   @retval other             Some error occurs when removing this driver from this device.\r
 \r
   @retval EFI_SUCCESS       This driver is removed from this device.\r
   @retval other             Some error occurs when removing this driver from this device.\r


@@ -679,34 +679,34 @@ FlatDeviceIndex (
 //\r
 /**\r
   Returns the information about the specified IDE channel.\r
 //\r
 /**\r
   Returns the information about the specified IDE channel.\r

-  \r
+\r

   This function can be used to obtain information about a particular IDE channel.\r
   This function can be used to obtain information about a particular IDE channel.\r

-  The driver entity uses this information during the enumeration process. \r
-  \r
-  If Enabled is set to FALSE, the driver entity will not scan the channel. Note \r
+  The driver entity uses this information during the enumeration process.\r
+\r
+  If Enabled is set to FALSE, the driver entity will not scan the channel. Note\r

   that it will not prevent an operating system driver from scanning the channel.\r
   that it will not prevent an operating system driver from scanning the channel.\r

-  \r
-  For most of today's controllers, MaxDevices will either be 1 or 2. For SATA \r
-  controllers, this value will always be 1. SATA configurations can contain SATA \r
+\r
+  For most of today's controllers, MaxDevices will either be 1 or 2. For SATA\r
+  controllers, this value will always be 1. SATA configurations can contain SATA\r

   port multipliers. SATA port multipliers behave like SATA bridges and can support\r
   port multipliers. SATA port multipliers behave like SATA bridges and can support\r

-  up to 16 devices on the other side. If a SATA port out of the IDE controller \r
-  is connected to a port multiplier, MaxDevices will be set to the number of SATA \r
-  devices that the port multiplier supports. Because today's port multipliers \r
-  support up to fifteen SATA devices, this number can be as large as fifteen. The IDE  \r
-  bus driver is required to scan for the presence of port multipliers behind an SATA \r
-  controller and enumerate up to MaxDevices number of devices behind the port \r
-  multiplier.    \r
-  \r
-  In this context, the devices behind a port multiplier constitute a channel.  \r
-  \r
+  up to 16 devices on the other side. If a SATA port out of the IDE controller\r
+  is connected to a port multiplier, MaxDevices will be set to the number of SATA\r
+  devices that the port multiplier supports. Because today's port multipliers\r
+  support up to fifteen SATA devices, this number can be as large as fifteen. The IDE\r
+  bus driver is required to scan for the presence of port multipliers behind an SATA\r
+  controller and enumerate up to MaxDevices number of devices behind the port\r
+  multiplier.\r
+\r
+  In this context, the devices behind a port multiplier constitute a channel.\r
+\r

   @param[in]  This                The pointer to the EFI_IDE_CONTROLLER_INIT_PROTOCOL instance.\r
   @param[in]  Channel             Zero-based channel number.\r
   @param[in]  This                The pointer to the EFI_IDE_CONTROLLER_INIT_PROTOCOL instance.\r
   @param[in]  Channel             Zero-based channel number.\r

-  @param[out] Enabled             TRUE if this channel is enabled.  Disabled channels \r
+  @param[out] Enabled             TRUE if this channel is enabled.  Disabled channels\r

                                   are not scanned to see if any devices are present.\r
   @param[out] MaxDevices          The maximum number of IDE devices that the bus driver\r
                                   are not scanned to see if any devices are present.\r
   @param[out] MaxDevices          The maximum number of IDE devices that the bus driver\r

-                                  can expect on this channel.  For the ATA/ATAPI \r
-                                  specification, version 6, this number will either be \r
-                                  one or two. For Serial ATA (SATA) configurations with a \r
+                                  can expect on this channel.  For the ATA/ATAPI\r
+                                  specification, version 6, this number will either be\r
+                                  one or two. For Serial ATA (SATA) configurations with a\r

                                   port multiplier, this number can be as large as fifteen.\r
 \r
   @retval EFI_SUCCESS             Information was returned without any errors.\r
                                   port multiplier, this number can be as large as fifteen.\r
 \r
   @retval EFI_SUCCESS             Information was returned without any errors.\r


@@ -739,13 +739,13 @@ IdeInitGetChannelInfo (
 /**\r
   The notifications from the driver entity that it is about to enter a certain\r
   phase of the IDE channel enumeration process.\r
 /**\r
   The notifications from the driver entity that it is about to enter a certain\r
   phase of the IDE channel enumeration process.\r

-  \r
-  This function can be used to notify the IDE controller driver to perform \r
-  specific actions, including any chipset-specific initialization, so that the \r
-  chipset is ready to enter the next phase. Seven notification points are defined \r
-  at this time. \r
-  \r
-  More synchronization points may be added as required in the future.  \r
+\r
+  This function can be used to notify the IDE controller driver to perform\r
+  specific actions, including any chipset-specific initialization, so that the\r
+  chipset is ready to enter the next phase. Seven notification points are defined\r
+  at this time.\r
+\r
+  More synchronization points may be added as required in the future.\r

 \r
   @param[in] This                 The pointer to the EFI_IDE_CONTROLLER_INIT_PROTOCOL\r
                                   instance.\r
 \r
   @param[in] This                 The pointer to the EFI_IDE_CONTROLLER_INIT_PROTOCOL\r
                                   instance.\r


@@ -755,9 +755,9 @@ IdeInitGetChannelInfo (
   @retval EFI_SUCCESS             The notification was accepted without any errors.\r
   @retval EFI_UNSUPPORTED         Phase is not supported.\r
   @retval EFI_INVALID_PARAMETER   Channel is invalid (Channel >= ChannelCount).\r
   @retval EFI_SUCCESS             The notification was accepted without any errors.\r
   @retval EFI_UNSUPPORTED         Phase is not supported.\r
   @retval EFI_INVALID_PARAMETER   Channel is invalid (Channel >= ChannelCount).\r

-  @retval EFI_NOT_READY           This phase cannot be entered at this time; for \r
-                                  example, an attempt was made to enter a Phase \r
-                                  without having entered one or more previous \r
+  @retval EFI_NOT_READY           This phase cannot be entered at this time; for\r
+                                  example, an attempt was made to enter a Phase\r
+                                  without having entered one or more previous\r

                                   Phase.\r
 \r
 **/\r
                                   Phase.\r
 \r
 **/\r


@@ -775,32 +775,32 @@ IdeInitNotifyPhase (
 /**\r
   Submits the device information to the IDE controller driver.\r
 \r
 /**\r
   Submits the device information to the IDE controller driver.\r
 \r

-  This function is used by the driver entity to pass detailed information about \r
-  a particular device to the IDE controller driver. The driver entity obtains \r
+  This function is used by the driver entity to pass detailed information about\r
+  a particular device to the IDE controller driver. The driver entity obtains\r

   this information by issuing an ATA or ATAPI IDENTIFY_DEVICE command. IdentifyData\r
   this information by issuing an ATA or ATAPI IDENTIFY_DEVICE command. IdentifyData\r

-  is the pointer to the response data buffer. The IdentifyData buffer is owned \r
-  by the driver entity, and the IDE controller driver must make a local copy \r
-  of the entire buffer or parts of the buffer as needed. The original IdentifyData \r
+  is the pointer to the response data buffer. The IdentifyData buffer is owned\r
+  by the driver entity, and the IDE controller driver must make a local copy\r
+  of the entire buffer or parts of the buffer as needed. The original IdentifyData\r

   buffer pointer may not be valid when\r
   buffer pointer may not be valid when\r

-  \r
+\r

     - EFI_IDE_CONTROLLER_INIT_PROTOCOL.CalculateMode() or\r
     - EFI_IDE_CONTROLLER_INIT_PROTOCOL.DisqualifyMode() is called at a later point.\r
     - EFI_IDE_CONTROLLER_INIT_PROTOCOL.CalculateMode() or\r
     - EFI_IDE_CONTROLLER_INIT_PROTOCOL.DisqualifyMode() is called at a later point.\r

-    \r
-  The IDE controller driver may consult various fields of EFI_IDENTIFY_DATA to \r
-  compute the optimum mode for the device. These fields are not limited to the \r
-  timing information. For example, an implementation of the IDE controller driver \r
-  may examine the vendor and type/mode field to match known bad drives.  \r
-  \r
-  The driver entity may submit drive information in any order, as long as it \r
-  submits information for all the devices belonging to the enumeration group \r
+\r
+  The IDE controller driver may consult various fields of EFI_IDENTIFY_DATA to\r
+  compute the optimum mode for the device. These fields are not limited to the\r
+  timing information. For example, an implementation of the IDE controller driver\r
+  may examine the vendor and type/mode field to match known bad drives.\r
+\r
+  The driver entity may submit drive information in any order, as long as it\r
+  submits information for all the devices belonging to the enumeration group\r

   before EFI_IDE_CONTROLLER_INIT_PROTOCOL.CalculateMode() is called for any device\r
   in that enumeration group. If a device is absent, EFI_IDE_CONTROLLER_INIT_PROTOCOL.SubmitData()\r
   before EFI_IDE_CONTROLLER_INIT_PROTOCOL.CalculateMode() is called for any device\r
   in that enumeration group. If a device is absent, EFI_IDE_CONTROLLER_INIT_PROTOCOL.SubmitData()\r

-  should be called with IdentifyData set to NULL.  The IDE controller driver may \r
-  not have any other mechanism to know whether a device is present or not. Therefore, \r
-  setting IdentifyData to NULL does not constitute an error condition. \r
-  EFI_IDE_CONTROLLER_INIT_PROTOCOL.SubmitData() can be called only once for a \r
-  given (Channel, Device) pair.  \r
-    \r
+  should be called with IdentifyData set to NULL.  The IDE controller driver may\r
+  not have any other mechanism to know whether a device is present or not. Therefore,\r
+  setting IdentifyData to NULL does not constitute an error condition.\r
+  EFI_IDE_CONTROLLER_INIT_PROTOCOL.SubmitData() can be called only once for a\r
+  given (Channel, Device) pair.\r
+\r

   @param[in] This                 A pointer to the EFI_IDE_CONTROLLER_INIT_PROTOCOL instance.\r
   @param[in] Channel              Zero-based channel number.\r
   @param[in] Device               Zero-based device number on the Channel.\r
   @param[in] This                 A pointer to the EFI_IDE_CONTROLLER_INIT_PROTOCOL instance.\r
   @param[in] Channel              Zero-based channel number.\r
   @param[in] Device               Zero-based device number on the Channel.\r


@@ -853,31 +853,31 @@ IdeInitSubmitData (
 /**\r
   Disqualifies specific modes for an IDE device.\r
 \r
 /**\r
   Disqualifies specific modes for an IDE device.\r
 \r

-  This function allows the driver entity or other drivers (such as platform \r
+  This function allows the driver entity or other drivers (such as platform\r

   drivers) to reject certain timing modes and request the IDE controller driver\r
   drivers) to reject certain timing modes and request the IDE controller driver\r

-  to recalculate modes. This function allows the driver entity and the IDE \r
-  controller driver to negotiate the timings on a per-device basis. This function \r
-  is useful in the case of drives that lie about their capabilities. An example \r
-  is when the IDE device fails to accept the timing modes that are calculated \r
+  to recalculate modes. This function allows the driver entity and the IDE\r
+  controller driver to negotiate the timings on a per-device basis. This function\r
+  is useful in the case of drives that lie about their capabilities. An example\r
+  is when the IDE device fails to accept the timing modes that are calculated\r

   by the IDE controller driver based on the response to the Identify Drive command.\r
 \r
   by the IDE controller driver based on the response to the Identify Drive command.\r
 \r

-  If the driver entity does not want to limit the ATA timing modes and leave that \r
-  decision to the IDE controller driver, it can either not call this function for \r
-  the given device or call this function and set the Valid flag to FALSE for all \r
+  If the driver entity does not want to limit the ATA timing modes and leave that\r
+  decision to the IDE controller driver, it can either not call this function for\r
+  the given device or call this function and set the Valid flag to FALSE for all\r

   modes that are listed in EFI_ATA_COLLECTIVE_MODE.\r
   modes that are listed in EFI_ATA_COLLECTIVE_MODE.\r

-  \r
-  The driver entity may disqualify modes for a device in any order and any number \r
+\r
+  The driver entity may disqualify modes for a device in any order and any number\r

   of times.\r
   of times.\r

-  \r
-  This function can be called multiple times to invalidate multiple modes of the \r
-  same type (e.g., Programmed Input/Output [PIO] modes 3 and 4). See the ATA/ATAPI \r
-  specification for more information on PIO modes.  \r
-  \r
+\r
+  This function can be called multiple times to invalidate multiple modes of the\r
+  same type (e.g., Programmed Input/Output [PIO] modes 3 and 4). See the ATA/ATAPI\r
+  specification for more information on PIO modes.\r
+\r

   For Serial ATA (SATA) controllers, this member function can be used to disqualify\r
   a higher transfer rate mode on a given channel. For example, a platform driver\r
   For Serial ATA (SATA) controllers, this member function can be used to disqualify\r
   a higher transfer rate mode on a given channel. For example, a platform driver\r

-  may inform the IDE controller driver to not use second-generation (Gen2) speeds \r
+  may inform the IDE controller driver to not use second-generation (Gen2) speeds\r

   for a certain SATA drive.\r
   for a certain SATA drive.\r

-  \r
+\r

   @param[in] This                 The pointer to the EFI_IDE_CONTROLLER_INIT_PROTOCOL instance.\r
   @param[in] Channel              The zero-based channel number.\r
   @param[in] Device               The zero-based device number on the Channel.\r
   @param[in] This                 The pointer to the EFI_IDE_CONTROLLER_INIT_PROTOCOL instance.\r
   @param[in] Channel              The zero-based channel number.\r
   @param[in] Device               The zero-based device number on the Channel.\r


@@ -888,7 +888,7 @@ IdeInitSubmitData (
   @retval EFI_INVALID_PARAMETER   Channel is invalid (Channel >= ChannelCount).\r
   @retval EFI_INVALID_PARAMETER   Device is invalid.\r
   @retval EFI_INVALID_PARAMETER   IdentifyData is NULL.\r
   @retval EFI_INVALID_PARAMETER   Channel is invalid (Channel >= ChannelCount).\r
   @retval EFI_INVALID_PARAMETER   Device is invalid.\r
   @retval EFI_INVALID_PARAMETER   IdentifyData is NULL.\r

-                                \r
+\r

 **/\r
 EFI_STATUS\r
 EFIAPI\r
 **/\r
 EFI_STATUS\r
 EFIAPI\r


@@ -928,39 +928,39 @@ IdeInitDisqualifyMode (
   Returns the information about the optimum modes for the specified IDE device.\r
 \r
   This function is used by the driver entity to obtain the optimum ATA modes for\r
   Returns the information about the optimum modes for the specified IDE device.\r
 \r
   This function is used by the driver entity to obtain the optimum ATA modes for\r

-  a specific device.  The IDE controller driver takes into account the following \r
+  a specific device.  The IDE controller driver takes into account the following\r

   while calculating the mode:\r
     - The IdentifyData inputs to EFI_IDE_CONTROLLER_INIT_PROTOCOL.SubmitData()\r
     - The BadModes inputs to EFI_IDE_CONTROLLER_INIT_PROTOCOL.DisqualifyMode()\r
 \r
   while calculating the mode:\r
     - The IdentifyData inputs to EFI_IDE_CONTROLLER_INIT_PROTOCOL.SubmitData()\r
     - The BadModes inputs to EFI_IDE_CONTROLLER_INIT_PROTOCOL.DisqualifyMode()\r
 \r

-  The driver entity is required to call EFI_IDE_CONTROLLER_INIT_PROTOCOL.SubmitData() \r
-  for all the devices that belong to an enumeration group before calling \r
-  EFI_IDE_CONTROLLER_INIT_PROTOCOL.CalculateMode() for any device in the same group.  \r
-  \r
-  The IDE controller driver will use controller- and possibly platform-specific \r
-  algorithms to arrive at SupportedModes.  The IDE controller may base its \r
-  decision on user preferences and other considerations as well. This function \r
-  may be called multiple times because the driver entity may renegotiate the mode \r
+  The driver entity is required to call EFI_IDE_CONTROLLER_INIT_PROTOCOL.SubmitData()\r
+  for all the devices that belong to an enumeration group before calling\r
+  EFI_IDE_CONTROLLER_INIT_PROTOCOL.CalculateMode() for any device in the same group.\r
+\r
+  The IDE controller driver will use controller- and possibly platform-specific\r
+  algorithms to arrive at SupportedModes.  The IDE controller may base its\r
+  decision on user preferences and other considerations as well. This function\r
+  may be called multiple times because the driver entity may renegotiate the mode\r

   with the IDE controller driver using EFI_IDE_CONTROLLER_INIT_PROTOCOL.DisqualifyMode().\r
   with the IDE controller driver using EFI_IDE_CONTROLLER_INIT_PROTOCOL.DisqualifyMode().\r

-    \r
-  The driver entity may collect timing information for various devices in any \r
+\r
+  The driver entity may collect timing information for various devices in any\r

   order. The driver entity is responsible for making sure that all the dependencies\r
   order. The driver entity is responsible for making sure that all the dependencies\r

-  are satisfied. For example, the SupportedModes information for device A that \r
-  was previously returned may become stale after a call to \r
+  are satisfied. For example, the SupportedModes information for device A that\r
+  was previously returned may become stale after a call to\r

   EFI_IDE_CONTROLLER_INIT_PROTOCOL.DisqualifyMode() for device B.\r
   EFI_IDE_CONTROLLER_INIT_PROTOCOL.DisqualifyMode() for device B.\r

-  \r
-  The buffer SupportedModes is allocated by the callee because the caller does \r
-  not necessarily know the size of the buffer. The type EFI_ATA_COLLECTIVE_MODE \r
-  is defined in a way that allows for future extensibility and can be of variable \r
-  length. This memory pool should be deallocated by the caller when it is no \r
-  longer necessary.  \r
-  \r
-  The IDE controller driver for a Serial ATA (SATA) controller can use this \r
-  member function to force a lower speed (first-generation [Gen1] speeds on a \r
-  second-generation [Gen2]-capable hardware).  The IDE controller driver can \r
-  also allow the driver entity to stay with the speed that has been negotiated \r
+\r
+  The buffer SupportedModes is allocated by the callee because the caller does\r
+  not necessarily know the size of the buffer. The type EFI_ATA_COLLECTIVE_MODE\r
+  is defined in a way that allows for future extensibility and can be of variable\r
+  length. This memory pool should be deallocated by the caller when it is no\r
+  longer necessary.\r
+\r
+  The IDE controller driver for a Serial ATA (SATA) controller can use this\r
+  member function to force a lower speed (first-generation [Gen1] speeds on a\r
+  second-generation [Gen2]-capable hardware).  The IDE controller driver can\r
+  also allow the driver entity to stay with the speed that has been negotiated\r

   by the physical layer.\r
   by the physical layer.\r

-  \r
+\r

   @param[in]  This                The pointer to the EFI_IDE_CONTROLLER_INIT_PROTOCOL instance.\r
   @param[in]  Channel             A zero-based channel number.\r
   @param[in]  Device              A zero-based device number on the Channel.\r
   @param[in]  This                The pointer to the EFI_IDE_CONTROLLER_INIT_PROTOCOL instance.\r
   @param[in]  Channel             A zero-based channel number.\r
   @param[in]  Device              A zero-based device number on the Channel.\r


@@ -968,13 +968,13 @@ IdeInitDisqualifyMode (
 \r
   @retval EFI_SUCCESS             SupportedModes was returned.\r
   @retval EFI_INVALID_PARAMETER   Channel is invalid (Channel >= ChannelCount).\r
 \r
   @retval EFI_SUCCESS             SupportedModes was returned.\r
   @retval EFI_INVALID_PARAMETER   Channel is invalid (Channel >= ChannelCount).\r

-  @retval EFI_INVALID_PARAMETER   Device is invalid. \r
+  @retval EFI_INVALID_PARAMETER   Device is invalid.\r

   @retval EFI_INVALID_PARAMETER   SupportedModes is NULL.\r
   @retval EFI_INVALID_PARAMETER   SupportedModes is NULL.\r

-  @retval EFI_NOT_READY           Modes cannot be calculated due to a lack of \r
-                                  data.  This error may happen if \r
-                                  EFI_IDE_CONTROLLER_INIT_PROTOCOL.SubmitData() \r
-                                  and EFI_IDE_CONTROLLER_INIT_PROTOCOL.DisqualifyData() \r
-                                  were not called for at least one drive in the \r
+  @retval EFI_NOT_READY           Modes cannot be calculated due to a lack of\r
+                                  data.  This error may happen if\r
+                                  EFI_IDE_CONTROLLER_INIT_PROTOCOL.SubmitData()\r
+                                  and EFI_IDE_CONTROLLER_INIT_PROTOCOL.DisqualifyData()\r
+                                  were not called for at least one drive in the\r

                                   same enumeration group.\r
 \r
 **/\r
                                   same enumeration group.\r
 \r
 **/\r


@@ -1061,9 +1061,9 @@ IdeInitCalculateMode (
   Commands the IDE controller driver to program the IDE controller hardware\r
   so that the specified device can operate at the specified mode.\r
 \r
   Commands the IDE controller driver to program the IDE controller hardware\r
   so that the specified device can operate at the specified mode.\r
 \r

-  This function is used by the driver entity to instruct the IDE controller \r
-  driver to program the IDE controller hardware to the specified modes. This \r
-  function can be called only once for a particular device. For a Serial ATA \r
+  This function is used by the driver entity to instruct the IDE controller\r
+  driver to program the IDE controller hardware to the specified modes. This\r
+  function can be called only once for a particular device. For a Serial ATA\r

   (SATA) Advanced Host Controller Interface (AHCI) controller, no controller-\r
   specific programming may be required.\r
 \r
   (SATA) Advanced Host Controller Interface (AHCI) controller, no controller-\r
   specific programming may be required.\r
 \r

diff --git a/MdeModulePkg/Bus/Pci/SataControllerDxe/SataController.h b/MdeModulePkg/Bus/Pci/SataControllerDxe/SataController.h
index db2e2195993162d23e2d07186360dce6d552f940..436eff2dc673dc44c8a5c413026dde6592778068 100644 (file)
--- a/MdeModulePkg/Bus/Pci/SataControllerDxe/SataController.h
+++ b/MdeModulePkg/Bus/Pci/SataControllerDxe/SataController.h
@@ -1,7 +1,7 @@
 /** @file\r
   Header file for Sata Controller driver.\r
 \r
 /** @file\r
   Header file for Sata Controller driver.\r
 \r

-  Copyright (c) 2011 - 2016, Intel Corporation. All rights reserved.<BR>\r
+  Copyright (c) 2011 - 2018, Intel Corporation. All rights reserved.<BR>\r

   Copyright (c) 2018, ARM Ltd. All rights reserved.<BR>\r
   This program and the accompanying materials\r
   are licensed and made available under the terms and conditions of the BSD License\r
   Copyright (c) 2018, ARM Ltd. All rights reserved.<BR>\r
   This program and the accompanying materials\r
   are licensed and made available under the terms and conditions of the BSD License\r


@@ -146,7 +146,7 @@ SataControllerSupported (
   );\r
 \r
 /**\r
   );\r
 \r
 /**\r

-  This routine is called right after the .Supported() called and \r
+  This routine is called right after the .Supported() called and\r

   Start this driver on ControllerHandle.\r
 \r
   @param This                   Protocol instance pointer.\r
   Start this driver on ControllerHandle.\r
 \r
   @param This                   Protocol instance pointer.\r


@@ -173,7 +173,7 @@ SataControllerStart (
   @param This               A pointer to the EFI_DRIVER_BINDING_PROTOCOL instance.\r
   @param Controller         A handle to the device being stopped.\r
   @param NumberOfChildren   The number of child device handles in ChildHandleBuffer.\r
   @param This               A pointer to the EFI_DRIVER_BINDING_PROTOCOL instance.\r
   @param Controller         A handle to the device being stopped.\r
   @param NumberOfChildren   The number of child device handles in ChildHandleBuffer.\r

-  @param ChildHandleBuffer  An array of child handles to be freed. \r
+  @param ChildHandleBuffer  An array of child handles to be freed.\r

 \r
   @retval EFI_SUCCESS       This driver is removed from this device.\r
   @retval other             Some error occurs when removing this driver from this device.\r
 \r
   @retval EFI_SUCCESS       This driver is removed from this device.\r
   @retval other             Some error occurs when removing this driver from this device.\r


@@ -193,34 +193,34 @@ SataControllerStop (
 //\r
 /**\r
   Returns the information about the specified IDE channel.\r
 //\r
 /**\r
   Returns the information about the specified IDE channel.\r

-  \r
+\r

   This function can be used to obtain information about a particular IDE channel.\r
   This function can be used to obtain information about a particular IDE channel.\r

-  The driver entity uses this information during the enumeration process. \r
-  \r
-  If Enabled is set to FALSE, the driver entity will not scan the channel. Note \r
+  The driver entity uses this information during the enumeration process.\r
+\r
+  If Enabled is set to FALSE, the driver entity will not scan the channel. Note\r

   that it will not prevent an operating system driver from scanning the channel.\r
   that it will not prevent an operating system driver from scanning the channel.\r

-  \r
-  For most of today's controllers, MaxDevices will either be 1 or 2. For SATA \r
-  controllers, this value will always be 1. SATA configurations can contain SATA \r
+\r
+  For most of today's controllers, MaxDevices will either be 1 or 2. For SATA\r
+  controllers, this value will always be 1. SATA configurations can contain SATA\r

   port multipliers. SATA port multipliers behave like SATA bridges and can support\r
   port multipliers. SATA port multipliers behave like SATA bridges and can support\r

-  up to 16 devices on the other side. If a SATA port out of the IDE controller \r
-  is connected to a port multiplier, MaxDevices will be set to the number of SATA \r
-  devices that the port multiplier supports. Because today's port multipliers \r
-  support up to fifteen SATA devices, this number can be as large as fifteen. The IDE  \r
-  bus driver is required to scan for the presence of port multipliers behind an SATA \r
-  controller and enumerate up to MaxDevices number of devices behind the port \r
-  multiplier.    \r
-  \r
-  In this context, the devices behind a port multiplier constitute a channel.  \r
-  \r
+  up to 16 devices on the other side. If a SATA port out of the IDE controller\r
+  is connected to a port multiplier, MaxDevices will be set to the number of SATA\r
+  devices that the port multiplier supports. Because today's port multipliers\r
+  support up to fifteen SATA devices, this number can be as large as fifteen. The IDE\r
+  bus driver is required to scan for the presence of port multipliers behind an SATA\r
+  controller and enumerate up to MaxDevices number of devices behind the port\r
+  multiplier.\r
+\r
+  In this context, the devices behind a port multiplier constitute a channel.\r
+\r

   @param[in]  This                The pointer to the EFI_IDE_CONTROLLER_INIT_PROTOCOL instance.\r
   @param[in]  Channel             Zero-based channel number.\r
   @param[in]  This                The pointer to the EFI_IDE_CONTROLLER_INIT_PROTOCOL instance.\r
   @param[in]  Channel             Zero-based channel number.\r

-  @param[out] Enabled             TRUE if this channel is enabled.  Disabled channels \r
+  @param[out] Enabled             TRUE if this channel is enabled.  Disabled channels\r

                                   are not scanned to see if any devices are present.\r
   @param[out] MaxDevices          The maximum number of IDE devices that the bus driver\r
                                   are not scanned to see if any devices are present.\r
   @param[out] MaxDevices          The maximum number of IDE devices that the bus driver\r

-                                  can expect on this channel.  For the ATA/ATAPI \r
-                                  specification, version 6, this number will either be \r
-                                  one or two. For Serial ATA (SATA) configurations with a \r
+                                  can expect on this channel.  For the ATA/ATAPI\r
+                                  specification, version 6, this number will either be\r
+                                  one or two. For Serial ATA (SATA) configurations with a\r

                                   port multiplier, this number can be as large as fifteen.\r
 \r
 \r
                                   port multiplier, this number can be as large as fifteen.\r
 \r
 \r


@@ -240,13 +240,13 @@ IdeInitGetChannelInfo (
 /**\r
   The notifications from the driver entity that it is about to enter a certain\r
   phase of the IDE channel enumeration process.\r
 /**\r
   The notifications from the driver entity that it is about to enter a certain\r
   phase of the IDE channel enumeration process.\r

-  \r
-  This function can be used to notify the IDE controller driver to perform \r
-  specific actions, including any chipset-specific initialization, so that the \r
-  chipset is ready to enter the next phase. Seven notification points are defined \r
-  at this time. \r
-  \r
-  More synchronization points may be added as required in the future.  \r
+\r
+  This function can be used to notify the IDE controller driver to perform\r
+  specific actions, including any chipset-specific initialization, so that the\r
+  chipset is ready to enter the next phase. Seven notification points are defined\r
+  at this time.\r
+\r
+  More synchronization points may be added as required in the future.\r

 \r
   @param[in] This                 The pointer to the EFI_IDE_CONTROLLER_INIT_PROTOCOL\r
                                   instance.\r
 \r
   @param[in] This                 The pointer to the EFI_IDE_CONTROLLER_INIT_PROTOCOL\r
                                   instance.\r


@@ -256,9 +256,9 @@ IdeInitGetChannelInfo (
   @retval EFI_SUCCESS             The notification was accepted without any errors.\r
   @retval EFI_UNSUPPORTED         Phase is not supported.\r
   @retval EFI_INVALID_PARAMETER   Channel is invalid (Channel >= ChannelCount).\r
   @retval EFI_SUCCESS             The notification was accepted without any errors.\r
   @retval EFI_UNSUPPORTED         Phase is not supported.\r
   @retval EFI_INVALID_PARAMETER   Channel is invalid (Channel >= ChannelCount).\r

-  @retval EFI_NOT_READY           This phase cannot be entered at this time; for \r
-                                  example, an attempt was made to enter a Phase \r
-                                  without having entered one or more previous \r
+  @retval EFI_NOT_READY           This phase cannot be entered at this time; for\r
+                                  example, an attempt was made to enter a Phase\r
+                                  without having entered one or more previous\r

                                   Phase.\r
 \r
 **/\r
                                   Phase.\r
 \r
 **/\r


@@ -273,32 +273,32 @@ IdeInitNotifyPhase (
 /**\r
   Submits the device information to the IDE controller driver.\r
 \r
 /**\r
   Submits the device information to the IDE controller driver.\r
 \r

-  This function is used by the driver entity to pass detailed information about \r
-  a particular device to the IDE controller driver. The driver entity obtains \r
+  This function is used by the driver entity to pass detailed information about\r
+  a particular device to the IDE controller driver. The driver entity obtains\r

   this information by issuing an ATA or ATAPI IDENTIFY_DEVICE command. IdentifyData\r
   this information by issuing an ATA or ATAPI IDENTIFY_DEVICE command. IdentifyData\r

-  is the pointer to the response data buffer. The IdentifyData buffer is owned \r
-  by the driver entity, and the IDE controller driver must make a local copy \r
-  of the entire buffer or parts of the buffer as needed. The original IdentifyData \r
+  is the pointer to the response data buffer. The IdentifyData buffer is owned\r
+  by the driver entity, and the IDE controller driver must make a local copy\r
+  of the entire buffer or parts of the buffer as needed. The original IdentifyData\r

   buffer pointer may not be valid when\r
   buffer pointer may not be valid when\r

-  \r
+\r

     - EFI_IDE_CONTROLLER_INIT_PROTOCOL.CalculateMode() or\r
     - EFI_IDE_CONTROLLER_INIT_PROTOCOL.DisqualifyMode() is called at a later point.\r
     - EFI_IDE_CONTROLLER_INIT_PROTOCOL.CalculateMode() or\r
     - EFI_IDE_CONTROLLER_INIT_PROTOCOL.DisqualifyMode() is called at a later point.\r

-    \r
-  The IDE controller driver may consult various fields of EFI_IDENTIFY_DATA to \r
-  compute the optimum mode for the device. These fields are not limited to the \r
-  timing information. For example, an implementation of the IDE controller driver \r
-  may examine the vendor and type/mode field to match known bad drives.  \r
-  \r
-  The driver entity may submit drive information in any order, as long as it \r
-  submits information for all the devices belonging to the enumeration group \r
+\r
+  The IDE controller driver may consult various fields of EFI_IDENTIFY_DATA to\r
+  compute the optimum mode for the device. These fields are not limited to the\r
+  timing information. For example, an implementation of the IDE controller driver\r
+  may examine the vendor and type/mode field to match known bad drives.\r
+\r
+  The driver entity may submit drive information in any order, as long as it\r
+  submits information for all the devices belonging to the enumeration group\r

   before EFI_IDE_CONTROLLER_INIT_PROTOCOL.CalculateMode() is called for any device\r
   in that enumeration group. If a device is absent, EFI_IDE_CONTROLLER_INIT_PROTOCOL.SubmitData()\r
   before EFI_IDE_CONTROLLER_INIT_PROTOCOL.CalculateMode() is called for any device\r
   in that enumeration group. If a device is absent, EFI_IDE_CONTROLLER_INIT_PROTOCOL.SubmitData()\r

-  should be called with IdentifyData set to NULL.  The IDE controller driver may \r
-  not have any other mechanism to know whether a device is present or not. Therefore, \r
-  setting IdentifyData to NULL does not constitute an error condition. \r
-  EFI_IDE_CONTROLLER_INIT_PROTOCOL.SubmitData() can be called only once for a \r
-  given (Channel, Device) pair.  \r
-    \r
+  should be called with IdentifyData set to NULL.  The IDE controller driver may\r
+  not have any other mechanism to know whether a device is present or not. Therefore,\r
+  setting IdentifyData to NULL does not constitute an error condition.\r
+  EFI_IDE_CONTROLLER_INIT_PROTOCOL.SubmitData() can be called only once for a\r
+  given (Channel, Device) pair.\r
+\r

   @param[in] This                 A pointer to the EFI_IDE_CONTROLLER_INIT_PROTOCOL instance.\r
   @param[in] Channel              Zero-based channel number.\r
   @param[in] Device               Zero-based device number on the Channel.\r
   @param[in] This                 A pointer to the EFI_IDE_CONTROLLER_INIT_PROTOCOL instance.\r
   @param[in] Channel              Zero-based channel number.\r
   @param[in] Device               Zero-based device number on the Channel.\r


@@ -321,31 +321,31 @@ IdeInitSubmitData (
 /**\r
   Disqualifies specific modes for an IDE device.\r
 \r
 /**\r
   Disqualifies specific modes for an IDE device.\r
 \r

-  This function allows the driver entity or other drivers (such as platform \r
+  This function allows the driver entity or other drivers (such as platform\r

   drivers) to reject certain timing modes and request the IDE controller driver\r
   drivers) to reject certain timing modes and request the IDE controller driver\r

-  to recalculate modes. This function allows the driver entity and the IDE \r
-  controller driver to negotiate the timings on a per-device basis. This function \r
-  is useful in the case of drives that lie about their capabilities. An example \r
-  is when the IDE device fails to accept the timing modes that are calculated \r
+  to recalculate modes. This function allows the driver entity and the IDE\r
+  controller driver to negotiate the timings on a per-device basis. This function\r
+  is useful in the case of drives that lie about their capabilities. An example\r
+  is when the IDE device fails to accept the timing modes that are calculated\r

   by the IDE controller driver based on the response to the Identify Drive command.\r
 \r
   by the IDE controller driver based on the response to the Identify Drive command.\r
 \r

-  If the driver entity does not want to limit the ATA timing modes and leave that \r
-  decision to the IDE controller driver, it can either not call this function for \r
-  the given device or call this function and set the Valid flag to FALSE for all \r
+  If the driver entity does not want to limit the ATA timing modes and leave that\r
+  decision to the IDE controller driver, it can either not call this function for\r
+  the given device or call this function and set the Valid flag to FALSE for all\r

   modes that are listed in EFI_ATA_COLLECTIVE_MODE.\r
   modes that are listed in EFI_ATA_COLLECTIVE_MODE.\r

-  \r
-  The driver entity may disqualify modes for a device in any order and any number \r
+\r
+  The driver entity may disqualify modes for a device in any order and any number\r

   of times.\r
   of times.\r

-  \r
-  This function can be called multiple times to invalidate multiple modes of the \r
-  same type (e.g., Programmed Input/Output [PIO] modes 3 and 4). See the ATA/ATAPI \r
-  specification for more information on PIO modes.  \r
-  \r
+\r
+  This function can be called multiple times to invalidate multiple modes of the\r
+  same type (e.g., Programmed Input/Output [PIO] modes 3 and 4). See the ATA/ATAPI\r
+  specification for more information on PIO modes.\r
+\r

   For Serial ATA (SATA) controllers, this member function can be used to disqualify\r
   a higher transfer rate mode on a given channel. For example, a platform driver\r
   For Serial ATA (SATA) controllers, this member function can be used to disqualify\r
   a higher transfer rate mode on a given channel. For example, a platform driver\r

-  may inform the IDE controller driver to not use second-generation (Gen2) speeds \r
+  may inform the IDE controller driver to not use second-generation (Gen2) speeds\r

   for a certain SATA drive.\r
   for a certain SATA drive.\r

-  \r
+\r

   @param[in] This                 The pointer to the EFI_IDE_CONTROLLER_INIT_PROTOCOL instance.\r
   @param[in] Channel              The zero-based channel number.\r
   @param[in] Device               The zero-based device number on the Channel.\r
   @param[in] This                 The pointer to the EFI_IDE_CONTROLLER_INIT_PROTOCOL instance.\r
   @param[in] Channel              The zero-based channel number.\r
   @param[in] Device               The zero-based device number on the Channel.\r


@@ -356,7 +356,7 @@ IdeInitSubmitData (
   @retval EFI_INVALID_PARAMETER   Channel is invalid (Channel >= ChannelCount).\r
   @retval EFI_INVALID_PARAMETER   Device is invalid.\r
   @retval EFI_INVALID_PARAMETER   IdentifyData is NULL.\r
   @retval EFI_INVALID_PARAMETER   Channel is invalid (Channel >= ChannelCount).\r
   @retval EFI_INVALID_PARAMETER   Device is invalid.\r
   @retval EFI_INVALID_PARAMETER   IdentifyData is NULL.\r

-                                \r
+\r

 **/\r
 EFI_STATUS\r
 EFIAPI\r
 **/\r
 EFI_STATUS\r
 EFIAPI\r


@@ -371,39 +371,39 @@ IdeInitDisqualifyMode (
   Returns the information about the optimum modes for the specified IDE device.\r
 \r
   This function is used by the driver entity to obtain the optimum ATA modes for\r
   Returns the information about the optimum modes for the specified IDE device.\r
 \r
   This function is used by the driver entity to obtain the optimum ATA modes for\r

-  a specific device.  The IDE controller driver takes into account the following \r
+  a specific device.  The IDE controller driver takes into account the following\r

   while calculating the mode:\r
     - The IdentifyData inputs to EFI_IDE_CONTROLLER_INIT_PROTOCOL.SubmitData()\r
     - The BadModes inputs to EFI_IDE_CONTROLLER_INIT_PROTOCOL.DisqualifyMode()\r
 \r
   while calculating the mode:\r
     - The IdentifyData inputs to EFI_IDE_CONTROLLER_INIT_PROTOCOL.SubmitData()\r
     - The BadModes inputs to EFI_IDE_CONTROLLER_INIT_PROTOCOL.DisqualifyMode()\r
 \r

-  The driver entity is required to call EFI_IDE_CONTROLLER_INIT_PROTOCOL.SubmitData() \r
-  for all the devices that belong to an enumeration group before calling \r
-  EFI_IDE_CONTROLLER_INIT_PROTOCOL.CalculateMode() for any device in the same group.  \r
-  \r
-  The IDE controller driver will use controller- and possibly platform-specific \r
-  algorithms to arrive at SupportedModes.  The IDE controller may base its \r
-  decision on user preferences and other considerations as well. This function \r
-  may be called multiple times because the driver entity may renegotiate the mode \r
+  The driver entity is required to call EFI_IDE_CONTROLLER_INIT_PROTOCOL.SubmitData()\r
+  for all the devices that belong to an enumeration group before calling\r
+  EFI_IDE_CONTROLLER_INIT_PROTOCOL.CalculateMode() for any device in the same group.\r
+\r
+  The IDE controller driver will use controller- and possibly platform-specific\r
+  algorithms to arrive at SupportedModes.  The IDE controller may base its\r
+  decision on user preferences and other considerations as well. This function\r
+  may be called multiple times because the driver entity may renegotiate the mode\r

   with the IDE controller driver using EFI_IDE_CONTROLLER_INIT_PROTOCOL.DisqualifyMode().\r
   with the IDE controller driver using EFI_IDE_CONTROLLER_INIT_PROTOCOL.DisqualifyMode().\r

-    \r
-  The driver entity may collect timing information for various devices in any \r
+\r
+  The driver entity may collect timing information for various devices in any\r

   order. The driver entity is responsible for making sure that all the dependencies\r
   order. The driver entity is responsible for making sure that all the dependencies\r

-  are satisfied. For example, the SupportedModes information for device A that \r
-  was previously returned may become stale after a call to \r
+  are satisfied. For example, the SupportedModes information for device A that\r
+  was previously returned may become stale after a call to\r

   EFI_IDE_CONTROLLER_INIT_PROTOCOL.DisqualifyMode() for device B.\r
   EFI_IDE_CONTROLLER_INIT_PROTOCOL.DisqualifyMode() for device B.\r

-  \r
-  The buffer SupportedModes is allocated by the callee because the caller does \r
-  not necessarily know the size of the buffer. The type EFI_ATA_COLLECTIVE_MODE \r
-  is defined in a way that allows for future extensibility and can be of variable \r
-  length. This memory pool should be deallocated by the caller when it is no \r
-  longer necessary.  \r
-  \r
-  The IDE controller driver for a Serial ATA (SATA) controller can use this \r
-  member function to force a lower speed (first-generation [Gen1] speeds on a \r
-  second-generation [Gen2]-capable hardware).  The IDE controller driver can \r
-  also allow the driver entity to stay with the speed that has been negotiated \r
+\r
+  The buffer SupportedModes is allocated by the callee because the caller does\r
+  not necessarily know the size of the buffer. The type EFI_ATA_COLLECTIVE_MODE\r
+  is defined in a way that allows for future extensibility and can be of variable\r
+  length. This memory pool should be deallocated by the caller when it is no\r
+  longer necessary.\r
+\r
+  The IDE controller driver for a Serial ATA (SATA) controller can use this\r
+  member function to force a lower speed (first-generation [Gen1] speeds on a\r
+  second-generation [Gen2]-capable hardware).  The IDE controller driver can\r
+  also allow the driver entity to stay with the speed that has been negotiated\r

   by the physical layer.\r
   by the physical layer.\r

-  \r
+\r

   @param[in]  This                The pointer to the EFI_IDE_CONTROLLER_INIT_PROTOCOL instance.\r
   @param[in]  Channel             A zero-based channel number.\r
   @param[in]  Device              A zero-based device number on the Channel.\r
   @param[in]  This                The pointer to the EFI_IDE_CONTROLLER_INIT_PROTOCOL instance.\r
   @param[in]  Channel             A zero-based channel number.\r
   @param[in]  Device              A zero-based device number on the Channel.\r


@@ -411,13 +411,13 @@ IdeInitDisqualifyMode (
 \r
   @retval EFI_SUCCESS             SupportedModes was returned.\r
   @retval EFI_INVALID_PARAMETER   Channel is invalid (Channel >= ChannelCount).\r
 \r
   @retval EFI_SUCCESS             SupportedModes was returned.\r
   @retval EFI_INVALID_PARAMETER   Channel is invalid (Channel >= ChannelCount).\r

-  @retval EFI_INVALID_PARAMETER   Device is invalid. \r
+  @retval EFI_INVALID_PARAMETER   Device is invalid.\r

   @retval EFI_INVALID_PARAMETER   SupportedModes is NULL.\r
   @retval EFI_INVALID_PARAMETER   SupportedModes is NULL.\r

-  @retval EFI_NOT_READY           Modes cannot be calculated due to a lack of \r
-                                  data.  This error may happen if \r
-                                  EFI_IDE_CONTROLLER_INIT_PROTOCOL.SubmitData() \r
-                                  and EFI_IDE_CONTROLLER_INIT_PROTOCOL.DisqualifyData() \r
-                                  were not called for at least one drive in the \r
+  @retval EFI_NOT_READY           Modes cannot be calculated due to a lack of\r
+                                  data.  This error may happen if\r
+                                  EFI_IDE_CONTROLLER_INIT_PROTOCOL.SubmitData()\r
+                                  and EFI_IDE_CONTROLLER_INIT_PROTOCOL.DisqualifyData()\r
+                                  were not called for at least one drive in the\r

                                   same enumeration group.\r
 \r
 **/\r
                                   same enumeration group.\r
 \r
 **/\r


@@ -434,9 +434,9 @@ IdeInitCalculateMode (
   Commands the IDE controller driver to program the IDE controller hardware\r
   so that the specified device can operate at the specified mode.\r
 \r
   Commands the IDE controller driver to program the IDE controller hardware\r
   so that the specified device can operate at the specified mode.\r
 \r

-  This function is used by the driver entity to instruct the IDE controller \r
-  driver to program the IDE controller hardware to the specified modes. This \r
-  function can be called only once for a particular device. For a Serial ATA \r
+  This function is used by the driver entity to instruct the IDE controller\r
+  driver to program the IDE controller hardware to the specified modes. This\r
+  function can be called only once for a particular device. For a Serial ATA\r

   (SATA) Advanced Host Controller Interface (AHCI) controller, no controller-\r
   specific programming may be required.\r
 \r
   (SATA) Advanced Host Controller Interface (AHCI) controller, no controller-\r
   specific programming may be required.\r
 \r

diff --git a/MdeModulePkg/Bus/Pci/SataControllerDxe/SataControllerDxe.inf b/MdeModulePkg/Bus/Pci/SataControllerDxe/SataControllerDxe.inf
index 03f9fa0d1d10ca47e4d0345509edc8a2502fae9f..4fcb9678aa4dc1b4d9305c8554c45b70dd90ba09 100644 (file)
--- a/MdeModulePkg/Bus/Pci/SataControllerDxe/SataControllerDxe.inf
+++ b/MdeModulePkg/Bus/Pci/SataControllerDxe/SataControllerDxe.inf
@@ -1,15 +1,15 @@
 ## @file\r
 #  SataController driver to manage SATA compliance IDE/AHCI host controllers.\r
 #\r
 ## @file\r
 #  SataController driver to manage SATA compliance IDE/AHCI host controllers.\r
 #\r

-#  Copyright (c) 2011 - 2016, Intel Corporation. All rights reserved.<BR>\r
+#  Copyright (c) 2011 - 2018, Intel Corporation. All rights reserved.<BR>\r

 #  This program and the accompanying materials\r
 #  are licensed and made available under the terms and conditions of the BSD License\r
 #  which accompanies this distribution.  The full text of the license may be found at\r
 #  http://opensource.org/licenses/bsd-license.php\r
 #  This program and the accompanying materials\r
 #  are licensed and made available under the terms and conditions of the BSD License\r
 #  which accompanies this distribution.  The full text of the license may be found at\r
 #  http://opensource.org/licenses/bsd-license.php\r

-#  \r
+#\r

 #  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 #  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 #  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 #  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r

-#  \r
+#\r

 ##\r
 \r
 [Defines]\r
 ##\r
 \r
 [Defines]\r


@@ -26,7 +26,7 @@
 #\r
 #  VALID_ARCHITECTURES           = IA32 X64 IPF EBC ARM AARCH64\r
 #\r
 #\r
 #  VALID_ARCHITECTURES           = IA32 X64 IPF EBC ARM AARCH64\r
 #\r

-#  DRIVER_BINDING                =  gSataControllerDriverBinding                        \r
+#  DRIVER_BINDING                =  gSataControllerDriverBinding\r

 #  COMPONENT_NAME                =  gSataControllerComponentName\r
 #  COMPONENT_NAME2               =  gSataControllerComponentName2\r
 #\r
 #  COMPONENT_NAME                =  gSataControllerComponentName\r
 #  COMPONENT_NAME2               =  gSataControllerComponentName2\r
 #\r

diff --git a/MdeModulePkg/Bus/Pci/SataControllerDxe/SataControllerDxe.uni b/MdeModulePkg/Bus/Pci/SataControllerDxe/SataControllerDxe.uni
index a9563270c8028613d5c768fbbf26f7a622a49521..c02adbc863d08628edd87b7ce8248aa250646311 100644 (file)
--- a/MdeModulePkg/Bus/Pci/SataControllerDxe/SataControllerDxe.uni
+++ b/MdeModulePkg/Bus/Pci/SataControllerDxe/SataControllerDxe.uni
@@ -3,13 +3,13 @@
 //\r
 // It consumes PciIo protocol and produces IdeControllerInit protocol for upper layer use.\r
 //\r
 //\r
 // It consumes PciIo protocol and produces IdeControllerInit protocol for upper layer use.\r
 //\r

-// Copyright (c) 2016, Intel Corporation. All rights reserved.<BR>\r
+// Copyright (c) 2016 - 2018, Intel Corporation. All rights reserved.<BR>\r

 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r
 // which accompanies this distribution. The full text of the license may be found at\r
 // http://opensource.org/licenses/bsd-license.php\r
 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r
 // which accompanies this distribution. The full text of the license may be found at\r
 // http://opensource.org/licenses/bsd-license.php\r

-// \r
+//\r

 // THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 // WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 //\r
 // THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 // WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 //\r


@@ -19,4 +19,4 @@
 #string STR_MODULE_ABSTRACT             #language en-US "Responsible for managing the standard SATA controller"\r
 \r
 #string STR_MODULE_DESCRIPTION          #language en-US "Implements the IdeControllerInit protocol interface for upper layer use\n"\r
 #string STR_MODULE_ABSTRACT             #language en-US "Responsible for managing the standard SATA controller"\r
 \r
 #string STR_MODULE_DESCRIPTION          #language en-US "Implements the IdeControllerInit protocol interface for upper layer use\n"\r

- 
\ No newline at end of file
+\r

diff --git a/MdeModulePkg/Bus/Pci/SataControllerDxe/SataControllerDxeExtra.uni b/MdeModulePkg/Bus/Pci/SataControllerDxe/SataControllerDxeExtra.uni
index ed25611d2c2d4b090ec286fd12c66c3f18125e55..b88da0ed721f6f8e16b2967cb8a274c62f363961 100644 (file)
--- a/MdeModulePkg/Bus/Pci/SataControllerDxe/SataControllerDxeExtra.uni
+++ b/MdeModulePkg/Bus/Pci/SataControllerDxe/SataControllerDxeExtra.uni
@@ -1,7 +1,7 @@
 // /** @file\r
 // SataControllerDxe Localized Strings and Content\r
 //\r
 // /** @file\r
 // SataControllerDxe Localized Strings and Content\r
 //\r

-// Copyright (c) 2016, Intel Corporation. All rights reserved.<BR>\r
+// Copyright (c) 2016 - 2018, Intel Corporation. All rights reserved.<BR>\r

 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r
 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r


@@ -13,8 +13,8 @@
 //\r
 // **/\r
 \r
 //\r
 // **/\r
 \r

-#string STR_PROPERTIES_MODULE_NAME \r
-#language en-US \r
+#string STR_PROPERTIES_MODULE_NAME\r
+#language en-US\r

 "SATA Controller DXE Driver"\r
 \r
 \r
 "SATA Controller DXE Driver"\r
 \r
 \r

diff --git a/MdeModulePkg/Bus/Pci/SdMmcPciHcPei/SdMmcPciHcPei.c b/MdeModulePkg/Bus/Pci/SdMmcPciHcPei/SdMmcPciHcPei.c
index 3f4ebc40d8b381b97e0f6542fd9513278d84fc80..29a0261ac5636b5f191b39d85029dc2f1b74ed49 100644 (file)
--- a/MdeModulePkg/Bus/Pci/SdMmcPciHcPei/SdMmcPciHcPei.c
+++ b/MdeModulePkg/Bus/Pci/SdMmcPciHcPei/SdMmcPciHcPei.c
@@ -2,7 +2,7 @@
   SdMmcPciHcPei driver is used to provide platform-dependent info, mainly SD/MMC\r
   host controller MMIO base, to upper layer SD/MMC drivers.\r
 \r
   SdMmcPciHcPei driver is used to provide platform-dependent info, mainly SD/MMC\r
   host controller MMIO base, to upper layer SD/MMC drivers.\r
 \r

-  Copyright (c) 2015, Intel Corporation. All rights reserved.<BR>\r
+  Copyright (c) 2015 - 2018, Intel Corporation. All rights reserved.<BR>\r

   This program and the accompanying materials\r
   are licensed and made available under the terms and conditions of the BSD License\r
   which accompanies this distribution.  The full text of the license may be found at\r
   This program and the accompanying materials\r
   are licensed and made available under the terms and conditions of the BSD License\r
   which accompanies this distribution.  The full text of the license may be found at\r


@@ -160,7 +160,7 @@ InitializeSdMmcHcPeim (
                 //\r
                 MmioSize = Size & 0xFFFFFFF0;\r
                 PciWrite32 (PCI_LIB_ADDRESS(Bus, Device, Function, PCI_BASE_ADDRESSREG_OFFSET + 4), 0xFFFFFFFF);\r
                 //\r
                 MmioSize = Size & 0xFFFFFFF0;\r
                 PciWrite32 (PCI_LIB_ADDRESS(Bus, Device, Function, PCI_BASE_ADDRESSREG_OFFSET + 4), 0xFFFFFFFF);\r

-                Size = PciRead32 (PCI_LIB_ADDRESS(Bus, Device, Function, PCI_BASE_ADDRESSREG_OFFSET + 4));      \r
+                Size = PciRead32 (PCI_LIB_ADDRESS(Bus, Device, Function, PCI_BASE_ADDRESSREG_OFFSET + 4));\r

                 //\r
                 // Fix the length to support some spefic 64 bit BAR\r
                 //\r
                 //\r
                 // Fix the length to support some spefic 64 bit BAR\r
                 //\r

diff --git a/MdeModulePkg/Bus/Pci/SdMmcPciHcPei/SdMmcPciHcPei.inf b/MdeModulePkg/Bus/Pci/SdMmcPciHcPei/SdMmcPciHcPei.inf
index bc6ea60d6b12a2c8e319235d385b7f9bf0810062..51675f5bfb322a5f2c3f2c78fc6bdb98e95eb213 100644 (file)
--- a/MdeModulePkg/Bus/Pci/SdMmcPciHcPei/SdMmcPciHcPei.inf
+++ b/MdeModulePkg/Bus/Pci/SdMmcPciHcPei/SdMmcPciHcPei.inf
@@ -1,7 +1,7 @@
 ## @file\r
 #  Component Description File For SD/MMC Pci Host Controller Pei Module.\r
 #\r
 ## @file\r
 #  Component Description File For SD/MMC Pci Host Controller Pei Module.\r
 #\r

-#  Copyright (c) 2015, Intel Corporation. All rights reserved.<BR>\r
+#  Copyright (c) 2015 - 2018, Intel Corporation. All rights reserved.<BR>\r

 #\r
 #  This program and the accompanying materials\r
 #  are licensed and made available under the terms and conditions of the BSD License\r
 #\r
 #  This program and the accompanying materials\r
 #  are licensed and made available under the terms and conditions of the BSD License\r


@@ -53,4 +53,4 @@
   gEfiPeiMasterBootModePpiGuid AND gEfiPeiMemoryDiscoveredPpiGuid\r
 \r
 [UserExtensions.TianoCore."ExtraFiles"]\r
   gEfiPeiMasterBootModePpiGuid AND gEfiPeiMemoryDiscoveredPpiGuid\r
 \r
 [UserExtensions.TianoCore."ExtraFiles"]\r

-  SdMmcPciHcPeiExtra.uni
\ No newline at end of file
+  SdMmcPciHcPeiExtra.uni\r

diff --git a/MdeModulePkg/Bus/Pci/UfsPciHcDxe/ComponentName.c b/MdeModulePkg/Bus/Pci/UfsPciHcDxe/ComponentName.c
index 1e2db1a8760a4e2d065cea8fcfb64637730d772b..54f67832ebd9a87a6e77526eecf01dc4024cfb23 100644 (file)
--- a/MdeModulePkg/Bus/Pci/UfsPciHcDxe/ComponentName.c
+++ b/MdeModulePkg/Bus/Pci/UfsPciHcDxe/ComponentName.c
@@ -2,7 +2,7 @@
   UfsHcDxe driver produces EFI_UFS_HOST_CONTROLLER_PROTOCOL. The upper layer module\r
   uses it to query the MMIO base address of the UFS host controller.\r
 \r
   UfsHcDxe driver produces EFI_UFS_HOST_CONTROLLER_PROTOCOL. The upper layer module\r
   uses it to query the MMIO base address of the UFS host controller.\r
 \r

-  Copyright (c) 2014, Intel Corporation. All rights reserved.<BR>\r
+  Copyright (c) 2014 - 2018, Intel Corporation. All rights reserved.<BR>\r

   This program and the accompanying materials\r
   are licensed and made available under the terms and conditions of the BSD License\r
   which accompanies this distribution.  The full text of the license may be found at\r
   This program and the accompanying materials\r
   are licensed and made available under the terms and conditions of the BSD License\r
   which accompanies this distribution.  The full text of the license may be found at\r


@@ -38,7 +38,7 @@ GLOBAL_REMOVE_IF_UNREFERENCED EFI_UNICODE_STRING_TABLE mUfsHcDriverNameTable[] =
     "eng;en",\r
     L"Universal Flash Storage (UFS) Pci Host Controller Driver"\r
   },\r
     "eng;en",\r
     L"Universal Flash Storage (UFS) Pci Host Controller Driver"\r
   },\r

-  { \r
+  {\r

     NULL,\r
     NULL\r
   }\r
     NULL,\r
     NULL\r
   }\r

diff --git a/MdeModulePkg/Bus/Pci/UfsPciHcDxe/UfsPciHcDxe.c b/MdeModulePkg/Bus/Pci/UfsPciHcDxe/UfsPciHcDxe.c
index 96cf39adc1991b87abd8fa7931908d6301d875bd..65393978606a937d48a25765048e82ba637c0388 100644 (file)
--- a/MdeModulePkg/Bus/Pci/UfsPciHcDxe/UfsPciHcDxe.c
+++ b/MdeModulePkg/Bus/Pci/UfsPciHcDxe/UfsPciHcDxe.c
@@ -2,7 +2,7 @@
   UfsHcDxe driver is used to provide platform-dependent info, mainly UFS host controller\r
   MMIO base, to upper layer UFS drivers.\r
 \r
   UfsHcDxe driver is used to provide platform-dependent info, mainly UFS host controller\r
   MMIO base, to upper layer UFS drivers.\r
 \r

-  Copyright (c) 2014 - 2017, Intel Corporation. All rights reserved.<BR>\r
+  Copyright (c) 2014 - 2018, Intel Corporation. All rights reserved.<BR>\r

   This program and the accompanying materials\r
   are licensed and made available under the terms and conditions of the BSD License\r
   which accompanies this distribution.  The full text of the license may be found at\r
   This program and the accompanying materials\r
   are licensed and made available under the terms and conditions of the BSD License\r
   which accompanies this distribution.  The full text of the license may be found at\r


@@ -95,24 +95,24 @@ UfsHcGetMmioBar (
   return Status;\r
 }\r
 \r
   return Status;\r
 }\r
 \r

-/**                                                                 \r
+/**\r

   Provides the UFS controller-specific addresses needed to access system memory.\r
   Provides the UFS controller-specific addresses needed to access system memory.\r

-            \r
+\r

   @param  This                  A pointer to the EFI_UFS_HOST_CONTROLLER_PROTOCOL instance.\r
   @param  Operation             Indicates if the bus master is going to read or write to system memory.\r
   @param  HostAddress           The system memory address to map to the UFS controller.\r
   @param  NumberOfBytes         On input the number of bytes to map. On output the number of bytes\r
   @param  This                  A pointer to the EFI_UFS_HOST_CONTROLLER_PROTOCOL instance.\r
   @param  Operation             Indicates if the bus master is going to read or write to system memory.\r
   @param  HostAddress           The system memory address to map to the UFS controller.\r
   @param  NumberOfBytes         On input the number of bytes to map. On output the number of bytes\r

-                                that were mapped.                                                 \r
+                                that were mapped.\r

   @param  DeviceAddress         The resulting map address for the bus master UFS controller to use to\r
   @param  DeviceAddress         The resulting map address for the bus master UFS controller to use to\r

-                                access the hosts HostAddress.                                        \r
+                                access the hosts HostAddress.\r

   @param  Mapping               A resulting value to pass to Unmap().\r
   @param  Mapping               A resulting value to pass to Unmap().\r

-                                  \r
+\r

   @retval EFI_SUCCESS           The range was mapped for the returned NumberOfBytes.\r
   @retval EFI_SUCCESS           The range was mapped for the returned NumberOfBytes.\r

-  @retval EFI_UNSUPPORTED       The HostAddress cannot be mapped as a common buffer.                                \r
+  @retval EFI_UNSUPPORTED       The HostAddress cannot be mapped as a common buffer.\r

   @retval EFI_INVALID_PARAMETER One or more parameters are invalid.\r
   @retval EFI_OUT_OF_RESOURCES  The request could not be completed due to a lack of resources.\r
   @retval EFI_DEVICE_ERROR      The system hardware could not map the requested address.\r
   @retval EFI_INVALID_PARAMETER One or more parameters are invalid.\r
   @retval EFI_OUT_OF_RESOURCES  The request could not be completed due to a lack of resources.\r
   @retval EFI_DEVICE_ERROR      The system hardware could not map the requested address.\r

-                                   \r
+\r

 **/\r
 EFI_STATUS\r
 EFIAPI\r
 **/\r
 EFI_STATUS\r
 EFIAPI\r


@@ -140,15 +140,15 @@ UfsHcMap (
   return Status;\r
 }\r
 \r
   return Status;\r
 }\r
 \r

-/**                                                                 \r
+/**\r

   Completes the Map() operation and releases any corresponding resources.\r
   Completes the Map() operation and releases any corresponding resources.\r

-            \r
-  @param  This                  A pointer to the EFI_UFS_HOST_CONTROLLER_PROTOCOL instance.                                      \r
+\r
+  @param  This                  A pointer to the EFI_UFS_HOST_CONTROLLER_PROTOCOL instance.\r

   @param  Mapping               The mapping value returned from Map().\r
   @param  Mapping               The mapping value returned from Map().\r

-                                  \r
+\r

   @retval EFI_SUCCESS           The range was unmapped.\r
   @retval EFI_DEVICE_ERROR      The data was not committed to the target system memory.\r
   @retval EFI_SUCCESS           The range was unmapped.\r
   @retval EFI_DEVICE_ERROR      The data was not committed to the target system memory.\r

-                                   \r
+\r

 **/\r
 EFI_STATUS\r
 EFIAPI\r
 **/\r
 EFI_STATUS\r
 EFIAPI\r


@@ -172,25 +172,25 @@ UfsHcUnmap (
   return Status;\r
 }\r
 \r
   return Status;\r
 }\r
 \r

-/**                                                                 \r
+/**\r

   Allocates pages that are suitable for an EfiUfsHcOperationBusMasterCommonBuffer\r
   Allocates pages that are suitable for an EfiUfsHcOperationBusMasterCommonBuffer\r

-  mapping.                                                                       \r
-            \r
+  mapping.\r
+\r

   @param  This                  A pointer to the EFI_UFS_HOST_CONTROLLER_PROTOCOL instance.\r
   @param  Type                  This parameter is not used and must be ignored.\r
   @param  MemoryType            The type of memory to allocate, EfiBootServicesData or\r
   @param  This                  A pointer to the EFI_UFS_HOST_CONTROLLER_PROTOCOL instance.\r
   @param  Type                  This parameter is not used and must be ignored.\r
   @param  MemoryType            The type of memory to allocate, EfiBootServicesData or\r

-                                EfiRuntimeServicesData.                               \r
-  @param  Pages                 The number of pages to allocate.                                \r
+                                EfiRuntimeServicesData.\r
+  @param  Pages                 The number of pages to allocate.\r

   @param  HostAddress           A pointer to store the base system memory address of the\r
   @param  HostAddress           A pointer to store the base system memory address of the\r

-                                allocated range.                                        \r
+                                allocated range.\r

   @param  Attributes            The requested bit mask of attributes for the allocated range.\r
   @param  Attributes            The requested bit mask of attributes for the allocated range.\r

-                                  \r
+\r

   @retval EFI_SUCCESS           The requested memory pages were allocated.\r
   @retval EFI_UNSUPPORTED       Attributes is unsupported. The only legal attribute bits are\r
   @retval EFI_SUCCESS           The requested memory pages were allocated.\r
   @retval EFI_UNSUPPORTED       Attributes is unsupported. The only legal attribute bits are\r

-                                MEMORY_WRITE_COMBINE and MEMORY_CACHED.                     \r
+                                MEMORY_WRITE_COMBINE and MEMORY_CACHED.\r

   @retval EFI_INVALID_PARAMETER One or more parameters are invalid.\r
   @retval EFI_INVALID_PARAMETER One or more parameters are invalid.\r

-  @retval EFI_OUT_OF_RESOURCES  The memory pages could not be allocated.  \r
-                                   \r
+  @retval EFI_OUT_OF_RESOURCES  The memory pages could not be allocated.\r
+\r

 **/\r
 EFI_STATUS\r
 EFIAPI\r
 **/\r
 EFI_STATUS\r
 EFIAPI\r


@@ -218,17 +218,17 @@ UfsHcAllocateBuffer (
   return Status;\r
 }\r
 \r
   return Status;\r
 }\r
 \r

-/**                                                                 \r
+/**\r

   Frees memory that was allocated with AllocateBuffer().\r
   Frees memory that was allocated with AllocateBuffer().\r

-            \r
-  @param  This                  A pointer to the EFI_UFS_HOST_CONTROLLER_PROTOCOL instance.  \r
-  @param  Pages                 The number of pages to free.                                \r
-  @param  HostAddress           The base system memory address of the allocated range.                                    \r
-                                  \r
+\r
+  @param  This                  A pointer to the EFI_UFS_HOST_CONTROLLER_PROTOCOL instance.\r
+  @param  Pages                 The number of pages to free.\r
+  @param  HostAddress           The base system memory address of the allocated range.\r
+\r

   @retval EFI_SUCCESS           The requested memory pages were freed.\r
   @retval EFI_INVALID_PARAMETER The memory range specified by HostAddress and Pages\r
                                 was not allocated with AllocateBuffer().\r
   @retval EFI_SUCCESS           The requested memory pages were freed.\r
   @retval EFI_INVALID_PARAMETER The memory range specified by HostAddress and Pages\r
                                 was not allocated with AllocateBuffer().\r

-                                     \r
+\r

 **/\r
 EFI_STATUS\r
 EFIAPI\r
 **/\r
 EFI_STATUS\r
 EFIAPI\r


@@ -253,16 +253,16 @@ UfsHcFreeBuffer (
   return Status;\r
 }\r
 \r
   return Status;\r
 }\r
 \r

-/**                                                                 \r
+/**\r

   Flushes all posted write transactions from the UFS bus to attached UFS device.\r
   Flushes all posted write transactions from the UFS bus to attached UFS device.\r

-            \r
-  @param  This                  A pointer to the EFI_UFS_HOST_CONTROLLER_PROTOCOL instance.  \r
-                                  \r
+\r
+  @param  This                  A pointer to the EFI_UFS_HOST_CONTROLLER_PROTOCOL instance.\r
+\r

   @retval EFI_SUCCESS           The posted write transactions were flushed from the UFS bus\r
   @retval EFI_SUCCESS           The posted write transactions were flushed from the UFS bus\r

-                                to attached UFS device.                                      \r
+                                to attached UFS device.\r

   @retval EFI_DEVICE_ERROR      The posted write transactions were not flushed from the UFS\r
   @retval EFI_DEVICE_ERROR      The posted write transactions were not flushed from the UFS\r

-                                bus to attached UFS device due to a hardware error.                           \r
-                                     \r
+                                bus to attached UFS device due to a hardware error.\r
+\r

 **/\r
 EFI_STATUS\r
 EFIAPI\r
 **/\r
 EFI_STATUS\r
 EFIAPI\r


@@ -281,7 +281,7 @@ UfsHcFlush (
   return Status;\r
 }\r
 \r
   return Status;\r
 }\r
 \r

-/**                                                                 \r
+/**\r

   Enable a UFS bus driver to access UFS MMIO registers in the UFS Host Controller memory space.\r
 \r
   @param  This                  A pointer to the EDKII_UFS_HOST_CONTROLLER_PROTOCOL instance.\r
   Enable a UFS bus driver to access UFS MMIO registers in the UFS Host Controller memory space.\r
 \r
   @param  This                  A pointer to the EDKII_UFS_HOST_CONTROLLER_PROTOCOL instance.\r


@@ -323,7 +323,7 @@ UfsHcMmioRead (
   return Status;\r
 }\r
 \r
   return Status;\r
 }\r
 \r

-/**                                                                 \r
+/**\r

   Enable a UFS bus driver to access UFS MMIO registers in the UFS Host Controller memory space.\r
 \r
   @param  This                  A pointer to the EDKII_UFS_HOST_CONTROLLER_PROTOCOL instance.\r
   Enable a UFS bus driver to access UFS MMIO registers in the UFS Host Controller memory space.\r
 \r
   @param  This                  A pointer to the EDKII_UFS_HOST_CONTROLLER_PROTOCOL instance.\r

diff --git a/MdeModulePkg/Bus/Pci/UfsPciHcDxe/UfsPciHcDxe.h b/MdeModulePkg/Bus/Pci/UfsPciHcDxe/UfsPciHcDxe.h
index d9d977a5c9192d430cfa611bd9657dca86e6a899..a2e61d61280460c67ecf3d12dd93b02e89a6b188 100644 (file)
--- a/MdeModulePkg/Bus/Pci/UfsPciHcDxe/UfsPciHcDxe.h
+++ b/MdeModulePkg/Bus/Pci/UfsPciHcDxe/UfsPciHcDxe.h
@@ -2,7 +2,7 @@
   UfsHcDxe driver is used to provide platform-dependent info, mainly UFS host controller\r
   MMIO base, to upper layer UFS drivers.\r
 \r
   UfsHcDxe driver is used to provide platform-dependent info, mainly UFS host controller\r
   MMIO base, to upper layer UFS drivers.\r
 \r

-  Copyright (c) 2014 - 2017, Intel Corporation. All rights reserved.<BR>\r
+  Copyright (c) 2014 - 2018, Intel Corporation. All rights reserved.<BR>\r

   This program and the accompanying materials\r
   are licensed and made available under the terms and conditions of the BSD License\r
   which accompanies this distribution.  The full text of the license may be found at\r
   This program and the accompanying materials\r
   are licensed and made available under the terms and conditions of the BSD License\r
   which accompanies this distribution.  The full text of the license may be found at\r


@@ -55,7 +55,7 @@ struct _UFS_HOST_CONTROLLER_PRIVATE_DATA {
   UINT32                             Signature;\r
 \r
   EDKII_UFS_HOST_CONTROLLER_PROTOCOL UfsHc;\r
   UINT32                             Signature;\r
 \r
   EDKII_UFS_HOST_CONTROLLER_PROTOCOL UfsHc;\r

-  EFI_PCI_IO_PROTOCOL                *PciIo;  \r
+  EFI_PCI_IO_PROTOCOL                *PciIo;\r

   UINT8                              BarIndex;\r
   UINT64                             PciAttributes;\r
 };\r
   UINT8                              BarIndex;\r
   UINT64                             PciAttributes;\r
 };\r


@@ -336,24 +336,24 @@ UfsHcGetMmioBar (
      OUT UINTN                              *MmioBar\r
   );\r
 \r
      OUT UINTN                              *MmioBar\r
   );\r
 \r

-/**                                                                 \r
+/**\r

   Provides the UFS controller-specific addresses needed to access system memory.\r
   Provides the UFS controller-specific addresses needed to access system memory.\r

-            \r
+\r

   @param  This                  A pointer to the EFI_UFS_HOST_CONTROLLER_PROTOCOL instance.\r
   @param  Operation             Indicates if the bus master is going to read or write to system memory.\r
   @param  HostAddress           The system memory address to map to the UFS controller.\r
   @param  NumberOfBytes         On input the number of bytes to map. On output the number of bytes\r
   @param  This                  A pointer to the EFI_UFS_HOST_CONTROLLER_PROTOCOL instance.\r
   @param  Operation             Indicates if the bus master is going to read or write to system memory.\r
   @param  HostAddress           The system memory address to map to the UFS controller.\r
   @param  NumberOfBytes         On input the number of bytes to map. On output the number of bytes\r

-                                that were mapped.                                                 \r
+                                that were mapped.\r

   @param  DeviceAddress         The resulting map address for the bus master UFS controller to use to\r
   @param  DeviceAddress         The resulting map address for the bus master UFS controller to use to\r

-                                access the hosts HostAddress.                                        \r
+                                access the hosts HostAddress.\r

   @param  Mapping               A resulting value to pass to Unmap().\r
   @param  Mapping               A resulting value to pass to Unmap().\r

-                                  \r
+\r

   @retval EFI_SUCCESS           The range was mapped for the returned NumberOfBytes.\r
   @retval EFI_SUCCESS           The range was mapped for the returned NumberOfBytes.\r

-  @retval EFI_UNSUPPORTED       The HostAddress cannot be mapped as a common buffer.                                \r
+  @retval EFI_UNSUPPORTED       The HostAddress cannot be mapped as a common buffer.\r

   @retval EFI_INVALID_PARAMETER One or more parameters are invalid.\r
   @retval EFI_OUT_OF_RESOURCES  The request could not be completed due to a lack of resources.\r
   @retval EFI_DEVICE_ERROR      The system hardware could not map the requested address.\r
   @retval EFI_INVALID_PARAMETER One or more parameters are invalid.\r
   @retval EFI_OUT_OF_RESOURCES  The request could not be completed due to a lack of resources.\r
   @retval EFI_DEVICE_ERROR      The system hardware could not map the requested address.\r

-                                   \r
+\r

 **/\r
 EFI_STATUS\r
 EFIAPI\r
 **/\r
 EFI_STATUS\r
 EFIAPI\r


@@ -366,15 +366,15 @@ UfsHcMap (
      OUT VOID                                 **Mapping\r
   );\r
 \r
      OUT VOID                                 **Mapping\r
   );\r
 \r

-/**                                                                 \r
+/**\r

   Completes the Map() operation and releases any corresponding resources.\r
   Completes the Map() operation and releases any corresponding resources.\r

-            \r
-  @param  This                  A pointer to the EFI_UFS_HOST_CONTROLLER_PROTOCOL instance.                                      \r
+\r
+  @param  This                  A pointer to the EFI_UFS_HOST_CONTROLLER_PROTOCOL instance.\r

   @param  Mapping               The mapping value returned from Map().\r
   @param  Mapping               The mapping value returned from Map().\r

-                                  \r
+\r

   @retval EFI_SUCCESS           The range was unmapped.\r
   @retval EFI_DEVICE_ERROR      The data was not committed to the target system memory.\r
   @retval EFI_SUCCESS           The range was unmapped.\r
   @retval EFI_DEVICE_ERROR      The data was not committed to the target system memory.\r

-                                   \r
+\r

 **/\r
 EFI_STATUS\r
 EFIAPI\r
 **/\r
 EFI_STATUS\r
 EFIAPI\r


@@ -383,25 +383,25 @@ UfsHcUnmap (
   IN  VOID                                 *Mapping\r
   );\r
 \r
   IN  VOID                                 *Mapping\r
   );\r
 \r

-/**                                                                 \r
+/**\r

   Allocates pages that are suitable for an EfiUfsHcOperationBusMasterCommonBuffer\r
   Allocates pages that are suitable for an EfiUfsHcOperationBusMasterCommonBuffer\r

-  mapping.                                                                       \r
-            \r
+  mapping.\r
+\r

   @param  This                  A pointer to the EFI_UFS_HOST_CONTROLLER_PROTOCOL instance.\r
   @param  Type                  This parameter is not used and must be ignored.\r
   @param  MemoryType            The type of memory to allocate, EfiBootServicesData or\r
   @param  This                  A pointer to the EFI_UFS_HOST_CONTROLLER_PROTOCOL instance.\r
   @param  Type                  This parameter is not used and must be ignored.\r
   @param  MemoryType            The type of memory to allocate, EfiBootServicesData or\r

-                                EfiRuntimeServicesData.                               \r
-  @param  Pages                 The number of pages to allocate.                                \r
+                                EfiRuntimeServicesData.\r
+  @param  Pages                 The number of pages to allocate.\r

   @param  HostAddress           A pointer to store the base system memory address of the\r
   @param  HostAddress           A pointer to store the base system memory address of the\r

-                                allocated range.                                        \r
+                                allocated range.\r

   @param  Attributes            The requested bit mask of attributes for the allocated range.\r
   @param  Attributes            The requested bit mask of attributes for the allocated range.\r

-                                  \r
+\r

   @retval EFI_SUCCESS           The requested memory pages were allocated.\r
   @retval EFI_UNSUPPORTED       Attributes is unsupported. The only legal attribute bits are\r
   @retval EFI_SUCCESS           The requested memory pages were allocated.\r
   @retval EFI_UNSUPPORTED       Attributes is unsupported. The only legal attribute bits are\r

-                                MEMORY_WRITE_COMBINE and MEMORY_CACHED.                     \r
+                                MEMORY_WRITE_COMBINE and MEMORY_CACHED.\r

   @retval EFI_INVALID_PARAMETER One or more parameters are invalid.\r
   @retval EFI_INVALID_PARAMETER One or more parameters are invalid.\r

-  @retval EFI_OUT_OF_RESOURCES  The memory pages could not be allocated.  \r
-                                   \r
+  @retval EFI_OUT_OF_RESOURCES  The memory pages could not be allocated.\r
+\r

 **/\r
 EFI_STATUS\r
 EFIAPI\r
 **/\r
 EFI_STATUS\r
 EFIAPI\r


@@ -414,17 +414,17 @@ UfsHcAllocateBuffer (
   IN     UINT64                             Attributes\r
   );\r
 \r
   IN     UINT64                             Attributes\r
   );\r
 \r

-/**                                                                 \r
+/**\r

   Frees memory that was allocated with AllocateBuffer().\r
   Frees memory that was allocated with AllocateBuffer().\r

-            \r
-  @param  This                  A pointer to the EFI_UFS_HOST_CONTROLLER_PROTOCOL instance.  \r
-  @param  Pages                 The number of pages to free.                                \r
-  @param  HostAddress           The base system memory address of the allocated range.                                    \r
-                                  \r
+\r
+  @param  This                  A pointer to the EFI_UFS_HOST_CONTROLLER_PROTOCOL instance.\r
+  @param  Pages                 The number of pages to free.\r
+  @param  HostAddress           The base system memory address of the allocated range.\r
+\r

   @retval EFI_SUCCESS           The requested memory pages were freed.\r
   @retval EFI_INVALID_PARAMETER The memory range specified by HostAddress and Pages\r
                                 was not allocated with AllocateBuffer().\r
   @retval EFI_SUCCESS           The requested memory pages were freed.\r
   @retval EFI_INVALID_PARAMETER The memory range specified by HostAddress and Pages\r
                                 was not allocated with AllocateBuffer().\r

-                                     \r
+\r

 **/\r
 EFI_STATUS\r
 EFIAPI\r
 **/\r
 EFI_STATUS\r
 EFIAPI\r


@@ -434,16 +434,16 @@ UfsHcFreeBuffer (
   IN  VOID                                  *HostAddress\r
   );\r
 \r
   IN  VOID                                  *HostAddress\r
   );\r
 \r

-/**                                                                 \r
+/**\r

   Flushes all posted write transactions from the UFS bus to attached UFS device.\r
   Flushes all posted write transactions from the UFS bus to attached UFS device.\r

-            \r
-  @param  This                  A pointer to the EFI_UFS_HOST_CONTROLLER_PROTOCOL instance.  \r
-                                  \r
+\r
+  @param  This                  A pointer to the EFI_UFS_HOST_CONTROLLER_PROTOCOL instance.\r
+\r

   @retval EFI_SUCCESS           The posted write transactions were flushed from the UFS bus\r
   @retval EFI_SUCCESS           The posted write transactions were flushed from the UFS bus\r

-                                to attached UFS device.                                      \r
+                                to attached UFS device.\r

   @retval EFI_DEVICE_ERROR      The posted write transactions were not flushed from the UFS\r
   @retval EFI_DEVICE_ERROR      The posted write transactions were not flushed from the UFS\r

-                                bus to attached UFS device due to a hardware error.                           \r
-                                     \r
+                                bus to attached UFS device due to a hardware error.\r
+\r

 **/\r
 EFI_STATUS\r
 EFIAPI\r
 **/\r
 EFI_STATUS\r
 EFIAPI\r


@@ -451,7 +451,7 @@ UfsHcFlush (
   IN  EDKII_UFS_HOST_CONTROLLER_PROTOCOL   *This\r
   );\r
 \r
   IN  EDKII_UFS_HOST_CONTROLLER_PROTOCOL   *This\r
   );\r
 \r

-/**                                                                 \r
+/**\r

   Enable a UFS bus driver to access UFS MMIO registers in the UFS Host Controller memory space.\r
 \r
   @param  This                  A pointer to the EDKII_UFS_HOST_CONTROLLER_PROTOCOL instance.\r
   Enable a UFS bus driver to access UFS MMIO registers in the UFS Host Controller memory space.\r
 \r
   @param  This                  A pointer to the EDKII_UFS_HOST_CONTROLLER_PROTOCOL instance.\r


@@ -479,7 +479,7 @@ UfsHcMmioRead (
   IN OUT VOID                                      *Buffer\r
   );\r
 \r
   IN OUT VOID                                      *Buffer\r
   );\r
 \r

-/**                                                                 \r
+/**\r

   Enable a UFS bus driver to access UFS MMIO registers in the UFS Host Controller memory space.\r
 \r
   @param  This                  A pointer to the EDKII_UFS_HOST_CONTROLLER_PROTOCOL instance.\r
   Enable a UFS bus driver to access UFS MMIO registers in the UFS Host Controller memory space.\r
 \r
   @param  This                  A pointer to the EDKII_UFS_HOST_CONTROLLER_PROTOCOL instance.\r

diff --git a/MdeModulePkg/Bus/Pci/UfsPciHcDxe/UfsPciHcDxe.inf b/MdeModulePkg/Bus/Pci/UfsPciHcDxe/UfsPciHcDxe.inf
index c1ce9ea85120fa918f25bd01d0864f9144b6ef6c..525235635aeb14e3f921e3e8ddd7cafbb734dd8d 100644 (file)
--- a/MdeModulePkg/Bus/Pci/UfsPciHcDxe/UfsPciHcDxe.inf
+++ b/MdeModulePkg/Bus/Pci/UfsPciHcDxe/UfsPciHcDxe.inf
@@ -1,7 +1,7 @@
 ## @file\r
 #  Component Description File For Universal Flash Storage Pci Host Controller Module.\r
 #\r
 ## @file\r
 #  Component Description File For Universal Flash Storage Pci Host Controller Module.\r
 #\r

-#  Copyright (c) 2014 - 2015, Intel Corporation. All rights reserved.<BR>\r
+#  Copyright (c) 2014 - 2018, Intel Corporation. All rights reserved.<BR>\r

 #\r
 #  This program and the accompanying materials\r
 #  are licensed and made available under the terms and conditions of the BSD License\r
 #\r
 #  This program and the accompanying materials\r
 #  are licensed and made available under the terms and conditions of the BSD License\r


@@ -53,4 +53,4 @@
   gEdkiiUfsHostControllerProtocolGuid         ## BY_START\r
 \r
 [UserExtensions.TianoCore."ExtraFiles"]\r
   gEdkiiUfsHostControllerProtocolGuid         ## BY_START\r
 \r
 [UserExtensions.TianoCore."ExtraFiles"]\r

-  UfsPciHcDxeExtra.uni
\ No newline at end of file
+  UfsPciHcDxeExtra.uni\r

diff --git a/MdeModulePkg/Bus/Pci/UfsPciHcDxe/UfsPciHcDxe.uni b/MdeModulePkg/Bus/Pci/UfsPciHcDxe/UfsPciHcDxe.uni
index 009180fbe4e3f95e836d538c5f794ad229aaffad..58e06ea0b595b6f4a4dff1efee10e464f6062b95 100644 (file)
--- a/MdeModulePkg/Bus/Pci/UfsPciHcDxe/UfsPciHcDxe.uni
+++ b/MdeModulePkg/Bus/Pci/UfsPciHcDxe/UfsPciHcDxe.uni
@@ -1,13 +1,13 @@
 // /** @file\r
 // The UfsPciHcDxe driver is used by upper layer to retrieve mmio base address of managed pci-based Ufs host controller.\r
 //\r
 // /** @file\r
 // The UfsPciHcDxe driver is used by upper layer to retrieve mmio base address of managed pci-based Ufs host controller.\r
 //\r

-// Copyright (c) 2015, Intel Corporation. All rights reserved.<BR>\r
+// Copyright (c) 2015 - 2018, Intel Corporation. All rights reserved.<BR>\r

 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r
 // which accompanies this distribution. The full text of the license may be found at\r
 // http://opensource.org/licenses/bsd-license.php\r
 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r
 // which accompanies this distribution. The full text of the license may be found at\r
 // http://opensource.org/licenses/bsd-license.php\r

-// \r
+//\r

 // THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 // WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 //\r
 // THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 // WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 //\r

diff --git a/MdeModulePkg/Bus/Pci/UfsPciHcDxe/UfsPciHcDxeExtra.uni b/MdeModulePkg/Bus/Pci/UfsPciHcDxe/UfsPciHcDxeExtra.uni
index ff33ff6a06837ac6babd139a1db090c338c1263b..35fd876bce4eae9da72f3d7b97e406d45b7fa129 100644 (file)
--- a/MdeModulePkg/Bus/Pci/UfsPciHcDxe/UfsPciHcDxeExtra.uni
+++ b/MdeModulePkg/Bus/Pci/UfsPciHcDxe/UfsPciHcDxeExtra.uni
@@ -1,7 +1,7 @@
 // /** @file\r
 // UfsPciHcDxe Localized Strings and Content\r
 //\r
 // /** @file\r
 // UfsPciHcDxe Localized Strings and Content\r
 //\r

-// Copyright (c) 2015, Intel Corporation. All rights reserved.<BR>\r
+// Copyright (c) 2015 - 2018, Intel Corporation. All rights reserved.<BR>\r

 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r
 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r


@@ -13,8 +13,8 @@
 //\r
 // **/\r
 \r
 //\r
 // **/\r
 \r

-#string STR_PROPERTIES_MODULE_NAME \r
-#language en-US \r
+#string STR_PROPERTIES_MODULE_NAME\r
+#language en-US\r

 "UFS PCI-Based HC Driver"\r
 \r
 \r
 "UFS PCI-Based HC Driver"\r
 \r
 \r

diff --git a/MdeModulePkg/Bus/Pci/UfsPciHcPei/UfsPciHcPei.c b/MdeModulePkg/Bus/Pci/UfsPciHcPei/UfsPciHcPei.c
index 36325641e7e8aaaaa1e55a4516190e0c5209176b..56e4051155e2fdec5bd6c5d03e438a38be345956 100644 (file)
--- a/MdeModulePkg/Bus/Pci/UfsPciHcPei/UfsPciHcPei.c
+++ b/MdeModulePkg/Bus/Pci/UfsPciHcPei/UfsPciHcPei.c
@@ -2,7 +2,7 @@
   UfsPciHcPei driver is used to provide platform-dependent info, mainly UFS host controller\r
   MMIO base, to upper layer UFS drivers.\r
 \r
   UfsPciHcPei driver is used to provide platform-dependent info, mainly UFS host controller\r
   MMIO base, to upper layer UFS drivers.\r
 \r

-  Copyright (c) 2014, Intel Corporation. All rights reserved.<BR>\r
+  Copyright (c) 2014 - 2018, Intel Corporation. All rights reserved.<BR>\r

   This program and the accompanying materials\r
   are licensed and made available under the terms and conditions of the BSD License\r
   which accompanies this distribution.  The full text of the license may be found at\r
   This program and the accompanying materials\r
   are licensed and made available under the terms and conditions of the BSD License\r
   which accompanies this distribution.  The full text of the license may be found at\r


@@ -53,7 +53,7 @@ GetUfsHcMmioBar (
   if (ControllerId >= Private->TotalUfsHcs) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
   if (ControllerId >= Private->TotalUfsHcs) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r

-  \r
+\r

   *MmioBar = (UINTN)Private->UfsHcPciAddr[ControllerId];\r
 \r
   return EFI_SUCCESS;\r
   *MmioBar = (UINTN)Private->UfsHcPciAddr[ControllerId];\r
 \r
   return EFI_SUCCESS;\r


@@ -61,7 +61,7 @@ GetUfsHcMmioBar (
 \r
 /**\r
   The user code starts with this function.\r
 \r
 /**\r
   The user code starts with this function.\r

-  \r
+\r

   @param  FileHandle             Handle of the file being invoked.\r
   @param  PeiServices            Describes the list of possible PEI Services.\r
 \r
   @param  FileHandle             Handle of the file being invoked.\r
   @param  PeiServices            Describes the list of possible PEI Services.\r
 \r

diff --git a/MdeModulePkg/Bus/Pci/UfsPciHcPei/UfsPciHcPei.inf b/MdeModulePkg/Bus/Pci/UfsPciHcPei/UfsPciHcPei.inf
index b16935628c052b1ab6a2d047b6953869ae06d149..3535da17f089753526985ffbe20a652956fc58f7 100644 (file)
--- a/MdeModulePkg/Bus/Pci/UfsPciHcPei/UfsPciHcPei.inf
+++ b/MdeModulePkg/Bus/Pci/UfsPciHcPei/UfsPciHcPei.inf
@@ -1,7 +1,7 @@
 ## @file\r
 #  Component Description File For Universal Flash Storage Pci Host Controller Pei Module.\r
 #\r
 ## @file\r
 #  Component Description File For Universal Flash Storage Pci Host Controller Pei Module.\r
 #\r

-#  Copyright (c) 2014 - 2015, Intel Corporation. All rights reserved.<BR>\r
+#  Copyright (c) 2014 - 2018, Intel Corporation. All rights reserved.<BR>\r

 #\r
 #  This program and the accompanying materials\r
 #  are licensed and made available under the terms and conditions of the BSD License\r
 #\r
 #  This program and the accompanying materials\r
 #  are licensed and made available under the terms and conditions of the BSD License\r


@@ -53,4 +53,4 @@
   gEfiPeiMasterBootModePpiGuid AND gEfiPeiMemoryDiscoveredPpiGuid\r
 \r
 [UserExtensions.TianoCore."ExtraFiles"]\r
   gEfiPeiMasterBootModePpiGuid AND gEfiPeiMemoryDiscoveredPpiGuid\r
 \r
 [UserExtensions.TianoCore."ExtraFiles"]\r

-  UfsPciHcPeiExtra.uni
\ No newline at end of file
+  UfsPciHcPeiExtra.uni\r

diff --git a/MdeModulePkg/Bus/Pci/UfsPciHcPei/UfsPciHcPei.uni b/MdeModulePkg/Bus/Pci/UfsPciHcPei/UfsPciHcPei.uni
index 59f5d7071eedc31870f053775982682010ea78f1..f2a296830ae7b33443812bdfa85b5a73cbfaab35 100644 (file)
--- a/MdeModulePkg/Bus/Pci/UfsPciHcPei/UfsPciHcPei.uni
+++ b/MdeModulePkg/Bus/Pci/UfsPciHcPei/UfsPciHcPei.uni
@@ -2,14 +2,14 @@
 // The UfsPciHcPei driver is used by upper layer to retrieve mmio base address of managed\r
 // pci-based Ufs host controller at PEI phase.\r
 //\r
 // The UfsPciHcPei driver is used by upper layer to retrieve mmio base address of managed\r
 // pci-based Ufs host controller at PEI phase.\r
 //\r

-// Copyright (c) 2015, Intel Corporation. All rights reserved.<BR>\r
+// Copyright (c) 2015 - 2018, Intel Corporation. All rights reserved.<BR>\r

 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions\r
 // of the BSD License which accompanies this distribution.  The\r
 // full text of the license may be found at\r
 // http://opensource.org/licenses/bsd-license.php\r
 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions\r
 // of the BSD License which accompanies this distribution.  The\r
 // full text of the license may be found at\r
 // http://opensource.org/licenses/bsd-license.php\r

-// \r
+//\r

 // THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 // WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 //\r
 // THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 // WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 //\r

diff --git a/MdeModulePkg/Bus/Pci/UfsPciHcPei/UfsPciHcPeiExtra.uni b/MdeModulePkg/Bus/Pci/UfsPciHcPei/UfsPciHcPeiExtra.uni
index cb579badb71ba9d6d3e869873c5a07d8c9c1d13c..c9b22a551d65ea55cf6c9ab1040f6279fd328770 100644 (file)
--- a/MdeModulePkg/Bus/Pci/UfsPciHcPei/UfsPciHcPeiExtra.uni
+++ b/MdeModulePkg/Bus/Pci/UfsPciHcPei/UfsPciHcPeiExtra.uni
@@ -1,7 +1,7 @@
 // /** @file\r
 // UfsPciHcPei Localized Strings and Content\r
 //\r
 // /** @file\r
 // UfsPciHcPei Localized Strings and Content\r
 //\r

-// Copyright (c) 2015, Intel Corporation. All rights reserved.<BR>\r
+// Copyright (c) 2015 - 2018, Intel Corporation. All rights reserved.<BR>\r

 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions\r
 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions\r


@@ -14,8 +14,8 @@
 //\r
 // **/\r
 \r
 //\r
 // **/\r
 \r

-#string STR_PROPERTIES_MODULE_NAME \r
-#language en-US \r
+#string STR_PROPERTIES_MODULE_NAME\r
+#language en-US\r

 "UFS PCI-Based HC Module for Recovery"\r
 \r
 \r
 "UFS PCI-Based HC Module for Recovery"\r
 \r
 \r

diff --git a/MdeModulePkg/Bus/Pci/UhciDxe/Uhci.c b/MdeModulePkg/Bus/Pci/UhciDxe/Uhci.c
index 1fcc8b5f320f699b790ed3d8ad7d7e0c122d509b..246f0646f65c96af779b0e03c796aa630de80a2a 100644 (file)
--- a/MdeModulePkg/Bus/Pci/UhciDxe/Uhci.c
+++ b/MdeModulePkg/Bus/Pci/UhciDxe/Uhci.c
@@ -2,7 +2,7 @@
 \r
   The UHCI driver model and HC protocol routines.\r
 \r
 \r
   The UHCI driver model and HC protocol routines.\r
 \r

-Copyright (c) 2004 - 2015, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2004 - 2018, Intel Corporation. All rights reserved.<BR>\r

 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r


@@ -1519,7 +1519,7 @@ UhciFreeDev (
   if (Uhc->ExitBootServiceEvent != NULL) {\r
     gBS->CloseEvent (Uhc->ExitBootServiceEvent);\r
   }\r
   if (Uhc->ExitBootServiceEvent != NULL) {\r
     gBS->CloseEvent (Uhc->ExitBootServiceEvent);\r
   }\r

-  \r
+\r

   if (Uhc->MemPool != NULL) {\r
     UsbHcFreeMemPool (Uhc->MemPool);\r
   }\r
   if (Uhc->MemPool != NULL) {\r
     UsbHcFreeMemPool (Uhc->MemPool);\r
   }\r


@@ -1796,7 +1796,7 @@ UhciDriverBindingStart (
   UhciWriteReg (Uhc->PciIo, USBCMD_OFFSET, USBCMD_RS | USBCMD_MAXP);\r
 \r
   return EFI_SUCCESS;\r
   UhciWriteReg (Uhc->PciIo, USBCMD_OFFSET, USBCMD_RS | USBCMD_MAXP);\r
 \r
   return EFI_SUCCESS;\r

-  \r
+\r

 UNINSTALL_USBHC:\r
   gBS->UninstallMultipleProtocolInterfaces (\r
          Controller,\r
 UNINSTALL_USBHC:\r
   gBS->UninstallMultipleProtocolInterfaces (\r
          Controller,\r

diff --git a/MdeModulePkg/Bus/Pci/UhciDxe/Uhci.h b/MdeModulePkg/Bus/Pci/UhciDxe/Uhci.h
index fc23a75a9661e111bec206fd44ba5e9558aaecdf..e1218ffc571192353f81ff4790f5aecc72406005 100644 (file)
--- a/MdeModulePkg/Bus/Pci/UhciDxe/Uhci.h
+++ b/MdeModulePkg/Bus/Pci/UhciDxe/Uhci.h
@@ -2,7 +2,7 @@
 \r
   The definition for UHCI driver model and HC protocol routines.\r
 \r
 \r
   The definition for UHCI driver model and HC protocol routines.\r
 \r

-Copyright (c) 2004 - 2015, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2004 - 2018, Intel Corporation. All rights reserved.<BR>\r

 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r


@@ -145,7 +145,7 @@ struct _USB_HC_DEV {
   VOID                      *FrameMapping;\r
 \r
   //\r
   VOID                      *FrameMapping;\r
 \r
   //\r

-  // ExitBootServicesEvent is used to stop the EHC DMA operation \r
+  // ExitBootServicesEvent is used to stop the EHC DMA operation\r

   // after exit boot service.\r
   //\r
   EFI_EVENT                 ExitBootServiceEvent;\r
   // after exit boot service.\r
   //\r
   EFI_EVENT                 ExitBootServiceEvent;\r

diff --git a/MdeModulePkg/Bus/Pci/UhciDxe/UhciDxe.inf b/MdeModulePkg/Bus/Pci/UhciDxe/UhciDxe.inf
index 9c5ff7b6fce7e8add532fd02cf145b544b510dce..5dccd3b22ecfa0d566745c5fa014617149038c23 100644 (file)
--- a/MdeModulePkg/Bus/Pci/UhciDxe/UhciDxe.inf
+++ b/MdeModulePkg/Bus/Pci/UhciDxe/UhciDxe.inf
@@ -1,9 +1,9 @@
 ## @file\r
 ## @file\r

-#  The UhciDxe driver is responsible for managing the behavior of UHCI controller. \r
+#  The UhciDxe driver is responsible for managing the behavior of UHCI controller.\r

 #  It implements the interfaces of monitoring the status of all ports and transferring\r
 #  Control, Bulk, Interrupt and Isochronous requests to Usb1.x device\r
 #\r
 #  It implements the interfaces of monitoring the status of all ports and transferring\r
 #  Control, Bulk, Interrupt and Isochronous requests to Usb1.x device\r
 #\r

-#  Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.<BR>\r
+#  Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r

 #\r
 #  This program and the accompanying materials\r
 #  are licensed and made available under the terms and conditions of the BSD License\r
 #\r
 #  This program and the accompanying materials\r
 #  are licensed and made available under the terms and conditions of the BSD License\r


@@ -23,7 +23,7 @@
   FILE_GUID                      = 2FB92EFA-2EE0-4bae-9EB6-7464125E1EF7\r
   MODULE_TYPE                    = UEFI_DRIVER\r
   VERSION_STRING                 = 1.0\r
   FILE_GUID                      = 2FB92EFA-2EE0-4bae-9EB6-7464125E1EF7\r
   MODULE_TYPE                    = UEFI_DRIVER\r
   VERSION_STRING                 = 1.0\r

-  \r
+\r

   ENTRY_POINT                    = UhciDriverEntryPoint\r
 \r
 #\r
   ENTRY_POINT                    = UhciDriverEntryPoint\r
 \r
 #\r


@@ -31,7 +31,7 @@
 #\r
 #  VALID_ARCHITECTURES           = IA32 X64 IPF EBC ARM AARCH64\r
 #\r
 #\r
 #  VALID_ARCHITECTURES           = IA32 X64 IPF EBC ARM AARCH64\r
 #\r

-#  DRIVER_BINDING                =  gUhciDriverBinding                        \r
+#  DRIVER_BINDING                =  gUhciDriverBinding\r

 #  COMPONENT_NAME                =  gUhciComponentName\r
 #  COMPONENT_NAME2               =  gUhciComponentName2\r
 #\r
 #  COMPONENT_NAME                =  gUhciComponentName\r
 #  COMPONENT_NAME2               =  gUhciComponentName2\r
 #\r

diff --git a/MdeModulePkg/Bus/Pci/UhciDxe/UhciDxe.uni b/MdeModulePkg/Bus/Pci/UhciDxe/UhciDxe.uni
index bedde4502faa18be0b6fe9341deba14e4e5d6420..8737869183649dde51d225b35e5fef18480abd6a 100644 (file)
--- a/MdeModulePkg/Bus/Pci/UhciDxe/UhciDxe.uni
+++ b/MdeModulePkg/Bus/Pci/UhciDxe/UhciDxe.uni
@@ -4,13 +4,13 @@
 // It implements the interfaces of monitoring the status of all ports and transferring\r
 // Control, Bulk, Interrupt and Isochronous requests to Usb1.x device\r
 //\r
 // It implements the interfaces of monitoring the status of all ports and transferring\r
 // Control, Bulk, Interrupt and Isochronous requests to Usb1.x device\r
 //\r

-// Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.<BR>\r
+// Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r

 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r
 // which accompanies this distribution. The full text of the license may be found at\r
 // http://opensource.org/licenses/bsd-license.php\r
 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r
 // which accompanies this distribution. The full text of the license may be found at\r
 // http://opensource.org/licenses/bsd-license.php\r

-// \r
+//\r

 // THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 // WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 //\r
 // THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 // WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 //\r

diff --git a/MdeModulePkg/Bus/Pci/UhciDxe/UhciDxeExtra.uni b/MdeModulePkg/Bus/Pci/UhciDxe/UhciDxeExtra.uni
index af258486c7e6c9637ac2e64a941d9a259019abb6..cad96dac9767650a6e8e7215bf5b2d79721b2a92 100644 (file)
--- a/MdeModulePkg/Bus/Pci/UhciDxe/UhciDxeExtra.uni
+++ b/MdeModulePkg/Bus/Pci/UhciDxe/UhciDxeExtra.uni
@@ -1,7 +1,7 @@
 // /** @file\r
 // UhciDxe Localized Strings and Content\r
 //\r
 // /** @file\r
 // UhciDxe Localized Strings and Content\r
 //\r

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

 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r
 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r


@@ -13,8 +13,8 @@
 //\r
 // **/\r
 \r
 //\r
 // **/\r
 \r

-#string STR_PROPERTIES_MODULE_NAME \r
-#language en-US \r
+#string STR_PROPERTIES_MODULE_NAME\r
+#language en-US\r

 "UHCI DXE Driver"\r
 \r
 \r
 "UHCI DXE Driver"\r
 \r
 \r

diff --git a/MdeModulePkg/Bus/Pci/UhciPei/UhcPeim.c b/MdeModulePkg/Bus/Pci/UhciPei/UhcPeim.c
index 482c404c0eaeadec2068acaf652e18e10e440c2f..ec2daf16497589db6087d75601f3f586c33db9a1 100644 (file)
--- a/MdeModulePkg/Bus/Pci/UhciPei/UhcPeim.c
+++ b/MdeModulePkg/Bus/Pci/UhciPei/UhcPeim.c
@@ -2,8 +2,8 @@
 PEIM to produce gPeiUsbHostControllerPpiGuid based on gPeiUsbControllerPpiGuid\r
 which is used to enable recovery function from USB Drivers.\r
 \r
 PEIM to produce gPeiUsbHostControllerPpiGuid based on gPeiUsbControllerPpiGuid\r
 which is used to enable recovery function from USB Drivers.\r
 \r

-Copyright (c) 2006 - 2017, Intel Corporation. All rights reserved. <BR>\r
-  \r
+Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved. <BR>\r
+\r

 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions\r
 of the BSD License which accompanies this distribution.  The\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions\r
 of the BSD License which accompanies this distribution.  The\r


@@ -220,12 +220,12 @@ UhcPeimEntry (
 \r
 /**\r
   Submits control transfer to a target USB device.\r
 \r
 /**\r
   Submits control transfer to a target USB device.\r

-  \r
+\r

   @param  PeiServices            The pointer of EFI_PEI_SERVICES.\r
   @param  This                   The pointer of PEI_USB_HOST_CONTROLLER_PPI.\r
   @param  DeviceAddress          The target device address.\r
   @param  DeviceSpeed            Target device speed.\r
   @param  PeiServices            The pointer of EFI_PEI_SERVICES.\r
   @param  This                   The pointer of PEI_USB_HOST_CONTROLLER_PPI.\r
   @param  DeviceAddress          The target device address.\r
   @param  DeviceSpeed            Target device speed.\r

-  @param  MaximumPacketLength    Maximum packet size the default control transfer \r
+  @param  MaximumPacketLength    Maximum packet size the default control transfer\r

                                  endpoint is capable of sending or receiving.\r
   @param  Request                USB device request to send.\r
   @param  TransferDirection      Specifies the data direction for the data stage.\r
                                  endpoint is capable of sending or receiving.\r
   @param  Request                USB device request to send.\r
   @param  TransferDirection      Specifies the data direction for the data stage.\r


@@ -458,18 +458,18 @@ UhcControlTransfer (
 \r
 /**\r
   Submits bulk transfer to a bulk endpoint of a USB device.\r
 \r
 /**\r
   Submits bulk transfer to a bulk endpoint of a USB device.\r

-  \r
+\r

   @param  PeiServices           The pointer of EFI_PEI_SERVICES.\r
   @param  This                  The pointer of PEI_USB_HOST_CONTROLLER_PPI.\r
   @param  DeviceAddress         Target device address.\r
   @param  EndPointAddress       Endpoint number and its direction in bit 7.\r
   @param  PeiServices           The pointer of EFI_PEI_SERVICES.\r
   @param  This                  The pointer of PEI_USB_HOST_CONTROLLER_PPI.\r
   @param  DeviceAddress         Target device address.\r
   @param  EndPointAddress       Endpoint number and its direction in bit 7.\r

-  @param  MaximumPacketLength   Maximum packet size the endpoint is capable of \r
+  @param  MaximumPacketLength   Maximum packet size the endpoint is capable of\r

                                 sending or receiving.\r
                                 sending or receiving.\r

-  @param  Data                  Array of pointers to the buffers of data to transmit \r
+  @param  Data                  Array of pointers to the buffers of data to transmit\r

                                 from or receive into.\r
   @param  DataLength            The lenght of the data buffer.\r
   @param  DataToggle            On input, the initial data toggle for the transfer;\r
                                 from or receive into.\r
   @param  DataLength            The lenght of the data buffer.\r
   @param  DataToggle            On input, the initial data toggle for the transfer;\r

-                                On output, it is updated to to next data toggle to use of \r
+                                On output, it is updated to to next data toggle to use of\r

                                 the subsequent bulk transfer.\r
   @param  TimeOut               Indicates the maximum time, in millisecond, which the\r
                                 transfer is allowed to complete.\r
                                 the subsequent bulk transfer.\r
   @param  TimeOut               Indicates the maximum time, in millisecond, which the\r
                                 transfer is allowed to complete.\r


@@ -694,10 +694,10 @@ UhcBulkTransfer (
   Retrieves the number of root hub ports.\r
 \r
   @param[in]  PeiServices   The pointer to the PEI Services Table.\r
   Retrieves the number of root hub ports.\r
 \r
   @param[in]  PeiServices   The pointer to the PEI Services Table.\r

-  @param[in]  This          The pointer to this instance of the \r
+  @param[in]  This          The pointer to this instance of the\r

                             PEI_USB_HOST_CONTROLLER_PPI.\r
                             PEI_USB_HOST_CONTROLLER_PPI.\r

-  @param[out] PortNumber    The pointer to the number of the root hub ports.                                \r
-                                \r
+  @param[out] PortNumber    The pointer to the number of the root hub ports.\r
+\r

   @retval EFI_SUCCESS           The port number was retrieved successfully.\r
   @retval EFI_INVALID_PARAMETER PortNumber is NULL.\r
 \r
   @retval EFI_SUCCESS           The port number was retrieved successfully.\r
   @retval EFI_INVALID_PARAMETER PortNumber is NULL.\r
 \r


@@ -739,10 +739,10 @@ UhcGetRootHubPortNumber (
 \r
 /**\r
   Retrieves the current status of a USB root hub port.\r
 \r
 /**\r
   Retrieves the current status of a USB root hub port.\r

-  \r
+\r

   @param  PeiServices            The pointer of EFI_PEI_SERVICES.\r
   @param  This                   The pointer of PEI_USB_HOST_CONTROLLER_PPI.\r
   @param  PeiServices            The pointer of EFI_PEI_SERVICES.\r
   @param  This                   The pointer of PEI_USB_HOST_CONTROLLER_PPI.\r

-  @param  PortNumber             The root hub port to retrieve the state from.  \r
+  @param  PortNumber             The root hub port to retrieve the state from.\r

   @param  PortStatus             Variable to receive the port state.\r
 \r
   @retval EFI_SUCCESS            The status of the USB root hub port specified.\r
   @param  PortStatus             Variable to receive the port state.\r
 \r
   @retval EFI_SUCCESS            The status of the USB root hub port specified.\r


@@ -832,7 +832,7 @@ UhcGetRootHubPortStatus (
 \r
 /**\r
   Sets a feature for the specified root hub port.\r
 \r
 /**\r
   Sets a feature for the specified root hub port.\r

-  \r
+\r

   @param  PeiServices           The pointer of EFI_PEI_SERVICES\r
   @param  This                  The pointer of PEI_USB_HOST_CONTROLLER_PPI\r
   @param  PortNumber            Root hub port to set.\r
   @param  PeiServices           The pointer of EFI_PEI_SERVICES\r
   @param  This                  The pointer of PEI_USB_HOST_CONTROLLER_PPI\r
   @param  PortNumber            Root hub port to set.\r


@@ -908,7 +908,7 @@ UhcSetRootHubPortFeature (
 \r
 /**\r
   Clears a feature for the specified root hub port.\r
 \r
 /**\r
   Clears a feature for the specified root hub port.\r

-  \r
+\r

   @param  PeiServices           The pointer of EFI_PEI_SERVICES.\r
   @param  This                  The pointer of PEI_USB_HOST_CONTROLLER_PPI.\r
   @param  PortNumber            Specifies the root hub port whose feature\r
   @param  PeiServices           The pointer of EFI_PEI_SERVICES.\r
   @param  This                  The pointer of PEI_USB_HOST_CONTROLLER_PPI.\r
   @param  PortNumber            Specifies the root hub port whose feature\r


@@ -916,7 +916,7 @@ UhcSetRootHubPortFeature (
   @param  PortFeature           Indicates the feature selector associated with the\r
                                 feature clear request.\r
 \r
   @param  PortFeature           Indicates the feature selector associated with the\r
                                 feature clear request.\r
 \r

-  @retval EFI_SUCCESS            The feature specified by PortFeature was cleared \r
+  @retval EFI_SUCCESS            The feature specified by PortFeature was cleared\r

                                  for the USB root hub port specified by PortNumber.\r
   @retval EFI_INVALID_PARAMETER  PortNumber is invalid or PortFeature is invalid.\r
 \r
                                  for the USB root hub port specified by PortNumber.\r
   @retval EFI_INVALID_PARAMETER  PortNumber is invalid or PortFeature is invalid.\r
 \r


@@ -1131,7 +1131,7 @@ CreateFrameList (
   ASSERT (UhcDev->BulkQH != NULL);\r
 \r
   //\r
   ASSERT (UhcDev->BulkQH != NULL);\r
 \r
   //\r

-  //Set the corresponding QH pointer \r
+  //Set the corresponding QH pointer\r

   //\r
   SetQHHorizontalLinkPtr(UhcDev->ConfigQH, UhcDev->BulkQH);\r
   SetQHHorizontalQHorTDSelect (UhcDev->ConfigQH, TRUE);\r
   //\r
   SetQHHorizontalLinkPtr(UhcDev->ConfigQH, UhcDev->BulkQH);\r
   SetQHHorizontalQHorTDSelect (UhcDev->ConfigQH, TRUE);\r


@@ -1154,7 +1154,7 @@ CreateFrameList (
 \r
 /**\r
   Read a 16bit width data from Uhc HC IO space register.\r
 \r
 /**\r
   Read a 16bit width data from Uhc HC IO space register.\r

-  \r
+\r

   @param  UhcDev  The UHCI device.\r
   @param  Port    The IO space address of the register.\r
 \r
   @param  UhcDev  The UHCI device.\r
   @param  Port    The IO space address of the register.\r
 \r


@@ -1172,7 +1172,7 @@ USBReadPortW (
 \r
 /**\r
   Write a 16bit width data into Uhc HC IO space register.\r
 \r
 /**\r
   Write a 16bit width data into Uhc HC IO space register.\r

-  \r
+\r

   @param  UhcDev  The UHCI device.\r
   @param  Port    The IO space address of the register.\r
   @param  Data    The data written into the register.\r
   @param  UhcDev  The UHCI device.\r
   @param  Port    The IO space address of the register.\r
   @param  Data    The data written into the register.\r


@@ -1190,7 +1190,7 @@ USBWritePortW (
 \r
 /**\r
   Write a 32bit width data into Uhc HC IO space register.\r
 \r
 /**\r
   Write a 32bit width data into Uhc HC IO space register.\r

-  \r
+\r

   @param  UhcDev  The UHCI device.\r
   @param  Port    The IO space address of the register.\r
   @param  Data    The data written into the register.\r
   @param  UhcDev  The UHCI device.\r
   @param  Port    The IO space address of the register.\r
   @param  Data    The data written into the register.\r


@@ -1208,7 +1208,7 @@ USBWritePortDW (
 \r
 /**\r
   Clear the content of UHCI's Status Register.\r
 \r
 /**\r
   Clear the content of UHCI's Status Register.\r

-  \r
+\r

   @param  UhcDev       The UHCI device.\r
   @param  StatusAddr   The IO space address of the register.\r
 \r
   @param  UhcDev       The UHCI device.\r
   @param  StatusAddr   The IO space address of the register.\r
 \r

diff --git a/MdeModulePkg/Bus/Pci/UhciPei/UhcPeim.h b/MdeModulePkg/Bus/Pci/UhciPei/UhcPeim.h
index 9935f522cd0d37e65f2d1e292965786210070b34..33d4f2f65f05f68785cfdd7a5a107468f3a9027c 100644 (file)
--- a/MdeModulePkg/Bus/Pci/UhciPei/UhcPeim.h
+++ b/MdeModulePkg/Bus/Pci/UhciPei/UhcPeim.h
@@ -1,8 +1,8 @@
 /** @file\r
 Private Header file for Usb Host Controller PEIM\r
 \r
 /** @file\r
 Private Header file for Usb Host Controller PEIM\r
 \r

-Copyright (c) 2006 - 2017, Intel Corporation. All rights reserved.<BR>\r
-  \r
+Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r
+\r

 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions\r
 of the BSD License which accompanies this distribution.  The\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions\r
 of the BSD License which accompanies this distribution.  The\r


@@ -203,12 +203,12 @@ typedef struct {
 \r
 /**\r
   Submits control transfer to a target USB device.\r
 \r
 /**\r
   Submits control transfer to a target USB device.\r

-  \r
+\r

   @param  PeiServices            The pointer of EFI_PEI_SERVICES.\r
   @param  This                   The pointer of PEI_USB_HOST_CONTROLLER_PPI.\r
   @param  DeviceAddress          The target device address.\r
   @param  DeviceSpeed            Target device speed.\r
   @param  PeiServices            The pointer of EFI_PEI_SERVICES.\r
   @param  This                   The pointer of PEI_USB_HOST_CONTROLLER_PPI.\r
   @param  DeviceAddress          The target device address.\r
   @param  DeviceSpeed            Target device speed.\r

-  @param  MaximumPacketLength    Maximum packet size the default control transfer \r
+  @param  MaximumPacketLength    Maximum packet size the default control transfer\r

                                  endpoint is capable of sending or receiving.\r
   @param  Request                USB device request to send.\r
   @param  TransferDirection      Specifies the data direction for the data stage.\r
                                  endpoint is capable of sending or receiving.\r
   @param  Request                USB device request to send.\r
   @param  TransferDirection      Specifies the data direction for the data stage.\r


@@ -242,18 +242,18 @@ UhcControlTransfer (
 \r
 /**\r
   Submits bulk transfer to a bulk endpoint of a USB device.\r
 \r
 /**\r
   Submits bulk transfer to a bulk endpoint of a USB device.\r

-  \r
+\r

   @param  PeiServices           The pointer of EFI_PEI_SERVICES.\r
   @param  This                  The pointer of PEI_USB_HOST_CONTROLLER_PPI.\r
   @param  DeviceAddress         Target device address.\r
   @param  EndPointAddress       Endpoint number and its direction in bit 7.\r
   @param  PeiServices           The pointer of EFI_PEI_SERVICES.\r
   @param  This                  The pointer of PEI_USB_HOST_CONTROLLER_PPI.\r
   @param  DeviceAddress         Target device address.\r
   @param  EndPointAddress       Endpoint number and its direction in bit 7.\r

-  @param  MaximumPacketLength   Maximum packet size the endpoint is capable of \r
+  @param  MaximumPacketLength   Maximum packet size the endpoint is capable of\r

                                 sending or receiving.\r
                                 sending or receiving.\r

-  @param  Data                  Array of pointers to the buffers of data to transmit \r
+  @param  Data                  Array of pointers to the buffers of data to transmit\r

                                 from or receive into.\r
   @param  DataLength            The lenght of the data buffer.\r
   @param  DataToggle            On input, the initial data toggle for the transfer;\r
                                 from or receive into.\r
   @param  DataLength            The lenght of the data buffer.\r
   @param  DataToggle            On input, the initial data toggle for the transfer;\r

-                                On output, it is updated to to next data toggle to use of \r
+                                On output, it is updated to to next data toggle to use of\r

                                 the subsequent bulk transfer.\r
   @param  TimeOut               Indicates the maximum time, in millisecond, which the\r
                                 transfer is allowed to complete.\r
                                 the subsequent bulk transfer.\r
   @param  TimeOut               Indicates the maximum time, in millisecond, which the\r
                                 transfer is allowed to complete.\r


@@ -286,10 +286,10 @@ UhcBulkTransfer (
   Retrieves the number of root hub ports.\r
 \r
   @param[in]  PeiServices   The pointer to the PEI Services Table.\r
   Retrieves the number of root hub ports.\r
 \r
   @param[in]  PeiServices   The pointer to the PEI Services Table.\r

-  @param[in]  This          The pointer to this instance of the \r
+  @param[in]  This          The pointer to this instance of the\r

                             PEI_USB_HOST_CONTROLLER_PPI.\r
                             PEI_USB_HOST_CONTROLLER_PPI.\r

-  @param[out] PortNumber    The pointer to the number of the root hub ports.                                \r
-                                \r
+  @param[out] PortNumber    The pointer to the number of the root hub ports.\r
+\r

   @retval EFI_SUCCESS           The port number was retrieved successfully.\r
   @retval EFI_INVALID_PARAMETER PortNumber is NULL.\r
 \r
   @retval EFI_SUCCESS           The port number was retrieved successfully.\r
   @retval EFI_INVALID_PARAMETER PortNumber is NULL.\r
 \r


@@ -304,10 +304,10 @@ UhcGetRootHubPortNumber (
 \r
 /**\r
   Retrieves the current status of a USB root hub port.\r
 \r
 /**\r
   Retrieves the current status of a USB root hub port.\r

-  \r
+\r

   @param  PeiServices            The pointer of EFI_PEI_SERVICES.\r
   @param  This                   The pointer of PEI_USB_HOST_CONTROLLER_PPI.\r
   @param  PeiServices            The pointer of EFI_PEI_SERVICES.\r
   @param  This                   The pointer of PEI_USB_HOST_CONTROLLER_PPI.\r

-  @param  PortNumber             The root hub port to retrieve the state from.  \r
+  @param  PortNumber             The root hub port to retrieve the state from.\r

   @param  PortStatus             Variable to receive the port state.\r
 \r
   @retval EFI_SUCCESS            The status of the USB root hub port specified.\r
   @param  PortStatus             Variable to receive the port state.\r
 \r
   @retval EFI_SUCCESS            The status of the USB root hub port specified.\r


@@ -326,7 +326,7 @@ UhcGetRootHubPortStatus (
 \r
 /**\r
   Sets a feature for the specified root hub port.\r
 \r
 /**\r
   Sets a feature for the specified root hub port.\r

-  \r
+\r

   @param  PeiServices           The pointer of EFI_PEI_SERVICES\r
   @param  This                  The pointer of PEI_USB_HOST_CONTROLLER_PPI\r
   @param  PortNumber            Root hub port to set.\r
   @param  PeiServices           The pointer of EFI_PEI_SERVICES\r
   @param  This                  The pointer of PEI_USB_HOST_CONTROLLER_PPI\r
   @param  PortNumber            Root hub port to set.\r


@@ -348,7 +348,7 @@ UhcSetRootHubPortFeature (
 \r
 /**\r
   Clears a feature for the specified root hub port.\r
 \r
 /**\r
   Clears a feature for the specified root hub port.\r

-  \r
+\r

   @param  PeiServices           The pointer of EFI_PEI_SERVICES.\r
   @param  This                  The pointer of PEI_USB_HOST_CONTROLLER_PPI.\r
   @param  PortNumber            Specifies the root hub port whose feature\r
   @param  PeiServices           The pointer of EFI_PEI_SERVICES.\r
   @param  This                  The pointer of PEI_USB_HOST_CONTROLLER_PPI.\r
   @param  PortNumber            Specifies the root hub port whose feature\r


@@ -356,7 +356,7 @@ UhcSetRootHubPortFeature (
   @param  PortFeature           Indicates the feature selector associated with the\r
                                 feature clear request.\r
 \r
   @param  PortFeature           Indicates the feature selector associated with the\r
                                 feature clear request.\r
 \r

-  @retval EFI_SUCCESS            The feature specified by PortFeature was cleared \r
+  @retval EFI_SUCCESS            The feature specified by PortFeature was cleared\r

                                  for the USB root hub port specified by PortNumber.\r
   @retval EFI_INVALID_PARAMETER  PortNumber is invalid or PortFeature is invalid.\r
 \r
                                  for the USB root hub port specified by PortNumber.\r
   @retval EFI_INVALID_PARAMETER  PortNumber is invalid or PortFeature is invalid.\r
 \r


@@ -400,7 +400,7 @@ CreateFrameList (
 \r
 /**\r
   Read a 16bit width data from Uhc HC IO space register.\r
 \r
 /**\r
   Read a 16bit width data from Uhc HC IO space register.\r

-  \r
+\r

   @param  UhcDev  The UHCI device.\r
   @param  Port    The IO space address of the register.\r
 \r
   @param  UhcDev  The UHCI device.\r
   @param  Port    The IO space address of the register.\r
 \r


@@ -415,7 +415,7 @@ USBReadPortW (
 \r
 /**\r
   Write a 16bit width data into Uhc HC IO space register.\r
 \r
 /**\r
   Write a 16bit width data into Uhc HC IO space register.\r

-  \r
+\r

   @param  UhcDev  The UHCI device.\r
   @param  Port    The IO space address of the register.\r
   @param  Data    The data written into the register.\r
   @param  UhcDev  The UHCI device.\r
   @param  Port    The IO space address of the register.\r
   @param  Data    The data written into the register.\r


@@ -430,7 +430,7 @@ USBWritePortW (
 \r
 /**\r
   Write a 32bit width data into Uhc HC IO space register.\r
 \r
 /**\r
   Write a 32bit width data into Uhc HC IO space register.\r

-  \r
+\r

   @param  UhcDev  The UHCI device.\r
   @param  Port    The IO space address of the register.\r
   @param  Data    The data written into the register.\r
   @param  UhcDev  The UHCI device.\r
   @param  Port    The IO space address of the register.\r
   @param  Data    The data written into the register.\r


@@ -445,7 +445,7 @@ USBWritePortDW (
 \r
 /**\r
   Clear the content of UHCI's Status Register.\r
 \r
 /**\r
   Clear the content of UHCI's Status Register.\r

-  \r
+\r

   @param  UhcDev       The UHCI device.\r
   @param  StatusAddr   The IO space address of the register.\r
 \r
   @param  UhcDev       The UHCI device.\r
   @param  StatusAddr   The IO space address of the register.\r
 \r

diff --git a/MdeModulePkg/Bus/Pci/UhciPei/UhciPei.uni b/MdeModulePkg/Bus/Pci/UhciPei/UhciPei.uni
index ef299e441de5286e8ca1593eb3ac38ed440989e0..fb1ba01b858ab84e3e2c12d0f06ac1dc4d28d819 100644 (file)
--- a/MdeModulePkg/Bus/Pci/UhciPei/UhciPei.uni
+++ b/MdeModulePkg/Bus/Pci/UhciPei/UhciPei.uni
@@ -4,14 +4,14 @@
 // It produces gPeiUsbHostControllerPpiGuid based on gPeiUsbControllerPpiGuid which is used\r
 // to enable recovery function from USB Drivers.\r
 //\r
 // It produces gPeiUsbHostControllerPpiGuid based on gPeiUsbControllerPpiGuid which is used\r
 // to enable recovery function from USB Drivers.\r
 //\r

-// Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.<BR>\r
+// Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r

 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions\r
 // of the BSD License which accompanies this distribution.  The\r
 // full text of the license may be found at\r
 // http://opensource.org/licenses/bsd-license.php\r
 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions\r
 // of the BSD License which accompanies this distribution.  The\r
 // full text of the license may be found at\r
 // http://opensource.org/licenses/bsd-license.php\r

-// \r
+//\r

 // THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 // WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 //\r
 // THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 // WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 //\r

diff --git a/MdeModulePkg/Bus/Pci/UhciPei/UhciPeiExtra.uni b/MdeModulePkg/Bus/Pci/UhciPei/UhciPeiExtra.uni
index c000912f3ca9ad3599157ec18deea47c82bf8b84..e31ce047808687b0ee9ed1c1172579658482c28e 100644 (file)
--- a/MdeModulePkg/Bus/Pci/UhciPei/UhciPeiExtra.uni
+++ b/MdeModulePkg/Bus/Pci/UhciPei/UhciPeiExtra.uni
@@ -1,7 +1,7 @@
 // /** @file\r
 // UhciPei Localized Strings and Content\r
 //\r
 // /** @file\r
 // UhciPei Localized Strings and Content\r
 //\r

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

 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions\r
 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions\r


@@ -14,8 +14,8 @@
 //\r
 // **/\r
 \r
 //\r
 // **/\r
 \r

-#string STR_PROPERTIES_MODULE_NAME \r
-#language en-US \r
+#string STR_PROPERTIES_MODULE_NAME\r
+#language en-US\r

 "UHCI PEI Module for Recovery"\r
 \r
 \r
 "UHCI PEI Module for Recovery"\r
 \r
 \r

diff --git a/MdeModulePkg/Bus/Pci/XhciDxe/UsbHcMem.c b/MdeModulePkg/Bus/Pci/XhciDxe/UsbHcMem.c
index 7c5261cca2114afb322adaece8e6917b2b6d978e..b5840a959f866d3cc462eaad4cbbd9790f35cbe1 100644 (file)
--- a/MdeModulePkg/Bus/Pci/XhciDxe/UsbHcMem.c
+++ b/MdeModulePkg/Bus/Pci/XhciDxe/UsbHcMem.c
@@ -2,7 +2,7 @@
 \r
   Routine procedures for memory allocate/free.\r
 \r
 \r
   Routine procedures for memory allocate/free.\r
 \r

-Copyright (c) 2013 - 2016, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2013 - 2018, Intel Corporation. All rights reserved.<BR>\r

 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r


@@ -598,23 +598,23 @@ UsbHcFreeMem (
   return ;\r
 }\r
 \r
   return ;\r
 }\r
 \r

-/**  \r
+/**\r

   Allocates pages at a specified alignment that are suitable for an EfiPciIoOperationBusMasterCommonBuffer mapping.\r
   Allocates pages at a specified alignment that are suitable for an EfiPciIoOperationBusMasterCommonBuffer mapping.\r

-  \r
+\r

   If Alignment is not a power of two and Alignment is not zero, then ASSERT().\r
 \r
   @param  PciIo                 The PciIo that can be used to access the host controller.\r
   @param  Pages                 The number of pages to allocate.\r
   @param  Alignment             The requested alignment of the allocation.  Must be a power of two.\r
   @param  HostAddress           The system memory address to map to the PCI controller.\r
   If Alignment is not a power of two and Alignment is not zero, then ASSERT().\r
 \r
   @param  PciIo                 The PciIo that can be used to access the host controller.\r
   @param  Pages                 The number of pages to allocate.\r
   @param  Alignment             The requested alignment of the allocation.  Must be a power of two.\r
   @param  HostAddress           The system memory address to map to the PCI controller.\r

-  @param  DeviceAddress         The resulting map address for the bus master PCI controller to \r
+  @param  DeviceAddress         The resulting map address for the bus master PCI controller to\r

                                 use to access the hosts HostAddress.\r
   @param  Mapping               A resulting value to pass to Unmap().\r
 \r
   @retval EFI_SUCCESS           Success to allocate aligned pages.\r
   @retval EFI_INVALID_PARAMETER Pages or Alignment is not valid.\r
   @retval EFI_OUT_OF_RESOURCES  Do not have enough resources to allocate memory.\r
                                 use to access the hosts HostAddress.\r
   @param  Mapping               A resulting value to pass to Unmap().\r
 \r
   @retval EFI_SUCCESS           Success to allocate aligned pages.\r
   @retval EFI_INVALID_PARAMETER Pages or Alignment is not valid.\r
   @retval EFI_OUT_OF_RESOURCES  Do not have enough resources to allocate memory.\r

-  \r
+\r

 \r
 **/\r
 EFI_STATUS\r
 \r
 **/\r
 EFI_STATUS\r


@@ -639,11 +639,11 @@ UsbHcAllocateAlignedPages (
   // Alignment must be a power of two or zero.\r
   //\r
   ASSERT ((Alignment & (Alignment - 1)) == 0);\r
   // Alignment must be a power of two or zero.\r
   //\r
   ASSERT ((Alignment & (Alignment - 1)) == 0);\r

-  \r
+\r

   if ((Alignment & (Alignment - 1)) != 0) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
   if ((Alignment & (Alignment - 1)) != 0) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r

- \r
+\r

   if (Pages == 0) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
   if (Pages == 0) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r


@@ -657,7 +657,7 @@ UsbHcAllocateAlignedPages (
     // Make sure that Pages plus EFI_SIZE_TO_PAGES (Alignment) does not overflow.\r
     //\r
     ASSERT (RealPages > Pages);\r
     // Make sure that Pages plus EFI_SIZE_TO_PAGES (Alignment) does not overflow.\r
     //\r
     ASSERT (RealPages > Pages);\r

- \r
+\r

     Status = PciIo->AllocateBuffer (\r
                       PciIo,\r
                       AllocateAnyPages,\r
     Status = PciIo->AllocateBuffer (\r
                       PciIo,\r
                       AllocateAnyPages,\r


@@ -665,7 +665,7 @@ UsbHcAllocateAlignedPages (
                       Pages,\r
                       &Memory,\r
                       0\r
                       Pages,\r
                       &Memory,\r
                       0\r

-                      );    \r
+                      );\r

     if (EFI_ERROR (Status)) {\r
       return EFI_OUT_OF_RESOURCES;\r
     }\r
     if (EFI_ERROR (Status)) {\r
       return EFI_OUT_OF_RESOURCES;\r
     }\r


@@ -719,7 +719,7 @@ UsbHcAllocateAlignedPages (
     Status = PciIo->FreeBuffer (PciIo, Pages, (VOID *) AlignedMemory);\r
     return EFI_OUT_OF_RESOURCES;\r
   }\r
     Status = PciIo->FreeBuffer (PciIo, Pages, (VOID *) AlignedMemory);\r
     return EFI_OUT_OF_RESOURCES;\r
   }\r

-  \r
+\r

   *HostAddress = (VOID *) AlignedMemory;\r
 \r
   return EFI_SUCCESS;\r
   *HostAddress = (VOID *) AlignedMemory;\r
 \r
   return EFI_SUCCESS;\r


@@ -727,7 +727,7 @@ UsbHcAllocateAlignedPages (
 \r
 /**\r
   Frees memory that was allocated with UsbHcAllocateAlignedPages().\r
 \r
 /**\r
   Frees memory that was allocated with UsbHcAllocateAlignedPages().\r

-  \r
+\r

   @param  PciIo                 The PciIo that can be used to access the host controller.\r
   @param  HostAddress           The system memory address to map to the PCI controller.\r
   @param  Pages                 The number of 4 KB pages to free.\r
   @param  PciIo                 The PciIo that can be used to access the host controller.\r
   @param  HostAddress           The system memory address to map to the PCI controller.\r
   @param  Pages                 The number of 4 KB pages to free.\r


@@ -743,9 +743,9 @@ UsbHcFreeAlignedPages (
   )\r
 {\r
   EFI_STATUS      Status;\r
   )\r
 {\r
   EFI_STATUS      Status;\r

-  \r
+\r

   ASSERT (Pages != 0);\r
   ASSERT (Pages != 0);\r

-  \r
+\r

   Status = PciIo->Unmap (PciIo, Mapping);\r
   ASSERT_EFI_ERROR (Status);\r
 \r
   Status = PciIo->Unmap (PciIo, Mapping);\r
   ASSERT_EFI_ERROR (Status);\r
 \r


@@ -753,6 +753,6 @@ UsbHcFreeAlignedPages (
                     PciIo,\r
                     Pages,\r
                     HostAddress\r
                     PciIo,\r
                     Pages,\r
                     HostAddress\r

-                    );     \r
+                    );\r

   ASSERT_EFI_ERROR (Status);\r
 }\r
   ASSERT_EFI_ERROR (Status);\r
 }\r

diff --git a/MdeModulePkg/Bus/Pci/XhciDxe/UsbHcMem.h b/MdeModulePkg/Bus/Pci/XhciDxe/UsbHcMem.h
index 1907685ddd88c17a6b89048f72dd54aa1c1e7868..bb5fc5b5ded22715fba4299ff9038031774c70d5 100644 (file)
--- a/MdeModulePkg/Bus/Pci/XhciDxe/UsbHcMem.h
+++ b/MdeModulePkg/Bus/Pci/XhciDxe/UsbHcMem.h
@@ -2,7 +2,7 @@
 \r
   This file contains the definination for host controller memory management routines.\r
 \r
 \r
   This file contains the definination for host controller memory management routines.\r
 \r

-Copyright (c) 2013, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2013 - 2018, Intel Corporation. All rights reserved.<BR>\r

 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r


@@ -164,23 +164,23 @@ UsbHcGetHostAddrForPciAddr (
   IN UINTN                Size\r
   );\r
 \r
   IN UINTN                Size\r
   );\r
 \r

-/**  \r
+/**\r

   Allocates pages at a specified alignment that are suitable for an EfiPciIoOperationBusMasterCommonBuffer mapping.\r
   Allocates pages at a specified alignment that are suitable for an EfiPciIoOperationBusMasterCommonBuffer mapping.\r

-  \r
+\r

   If Alignment is not a power of two and Alignment is not zero, then ASSERT().\r
 \r
   @param  PciIo                 The PciIo that can be used to access the host controller.\r
   @param  Pages                 The number of pages to allocate.\r
   @param  Alignment             The requested alignment of the allocation.  Must be a power of two.\r
   @param  HostAddress           The system memory address to map to the PCI controller.\r
   If Alignment is not a power of two and Alignment is not zero, then ASSERT().\r
 \r
   @param  PciIo                 The PciIo that can be used to access the host controller.\r
   @param  Pages                 The number of pages to allocate.\r
   @param  Alignment             The requested alignment of the allocation.  Must be a power of two.\r
   @param  HostAddress           The system memory address to map to the PCI controller.\r

-  @param  DeviceAddress         The resulting map address for the bus master PCI controller to \r
+  @param  DeviceAddress         The resulting map address for the bus master PCI controller to\r

                                 use to access the hosts HostAddress.\r
   @param  Mapping               A resulting value to pass to Unmap().\r
 \r
   @retval EFI_SUCCESS           Success to allocate aligned pages.\r
   @retval EFI_INVALID_PARAMETER Pages or Alignment is not valid.\r
   @retval EFI_OUT_OF_RESOURCES  Do not have enough resources to allocate memory.\r
                                 use to access the hosts HostAddress.\r
   @param  Mapping               A resulting value to pass to Unmap().\r
 \r
   @retval EFI_SUCCESS           Success to allocate aligned pages.\r
   @retval EFI_INVALID_PARAMETER Pages or Alignment is not valid.\r
   @retval EFI_OUT_OF_RESOURCES  Do not have enough resources to allocate memory.\r

-  \r
+\r

 \r
 **/\r
 EFI_STATUS\r
 \r
 **/\r
 EFI_STATUS\r


@@ -192,10 +192,10 @@ UsbHcAllocateAlignedPages (
   OUT EFI_PHYSICAL_ADDRESS  *DeviceAddress,\r
   OUT VOID                  **Mapping\r
   );\r
   OUT EFI_PHYSICAL_ADDRESS  *DeviceAddress,\r
   OUT VOID                  **Mapping\r
   );\r

-  \r
+\r

 /**\r
   Frees memory that was allocated with UsbHcAllocateAlignedPages().\r
 /**\r
   Frees memory that was allocated with UsbHcAllocateAlignedPages().\r

-  \r
+\r

   @param  PciIo                 The PciIo that can be used to access the host controller.\r
   @param  HostAddress           The system memory address to map to the PCI controller.\r
   @param  Pages                 The number of pages to free.\r
   @param  PciIo                 The PciIo that can be used to access the host controller.\r
   @param  HostAddress           The system memory address to map to the PCI controller.\r
   @param  Pages                 The number of pages to free.\r

diff --git a/MdeModulePkg/Bus/Pci/XhciDxe/Xhci.c b/MdeModulePkg/Bus/Pci/XhciDxe/Xhci.c
index c884f4c3146c1977b2e154013d9b3fcc5a4aa209..48eccf770a35f9be5092faf11f3a2968a04230ae 100644 (file)
--- a/MdeModulePkg/Bus/Pci/XhciDxe/Xhci.c
+++ b/MdeModulePkg/Bus/Pci/XhciDxe/Xhci.c
@@ -1,7 +1,7 @@
 /** @file\r
   The XHCI controller driver.\r
 \r
 /** @file\r
   The XHCI controller driver.\r
 \r

-Copyright (c) 2011 - 2017, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2011 - 2018, Intel Corporation. All rights reserved.<BR>\r

 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r


@@ -159,7 +159,7 @@ XhcReset (
   EFI_TPL            OldTpl;\r
 \r
   Xhc = XHC_FROM_THIS (This);\r
   EFI_TPL            OldTpl;\r
 \r
   Xhc = XHC_FROM_THIS (This);\r

-  \r
+\r

   if (Xhc->DevicePath != NULL) {\r
     //\r
     // Report Status Code to indicate reset happens\r
   if (Xhc->DevicePath != NULL) {\r
     //\r
     // Report Status Code to indicate reset happens\r


@@ -169,7 +169,7 @@ XhcReset (
       (EFI_IO_BUS_USB | EFI_IOB_PC_RESET),\r
       Xhc->DevicePath\r
       );\r
       (EFI_IO_BUS_USB | EFI_IOB_PC_RESET),\r
       Xhc->DevicePath\r
       );\r

-  }  \r
+  }\r

 \r
   OldTpl = gBS->RaiseTPL (XHC_TPL);\r
 \r
 \r
   OldTpl = gBS->RaiseTPL (XHC_TPL);\r
 \r


@@ -995,7 +995,7 @@ XhcControlTransfer (
   // Hook Set_Config request from UsbBus as we need configure device endpoint.\r
   //\r
   if ((Request->Request     == USB_REQ_GET_DESCRIPTOR) &&\r
   // Hook Set_Config request from UsbBus as we need configure device endpoint.\r
   //\r
   if ((Request->Request     == USB_REQ_GET_DESCRIPTOR) &&\r

-      ((Request->RequestType == USB_REQUEST_TYPE (EfiUsbDataIn, USB_REQ_TYPE_STANDARD, USB_TARGET_DEVICE)) || \r
+      ((Request->RequestType == USB_REQUEST_TYPE (EfiUsbDataIn, USB_REQ_TYPE_STANDARD, USB_TARGET_DEVICE)) ||\r

       ((Request->RequestType == USB_REQUEST_TYPE (EfiUsbDataIn, USB_REQ_TYPE_CLASS, USB_TARGET_DEVICE))))) {\r
     DescriptorType = (UINT8)(Request->Value >> 8);\r
     if ((DescriptorType == USB_DESC_TYPE_DEVICE) && ((*DataLength == sizeof (EFI_USB_DEVICE_DESCRIPTOR)) || ((DeviceSpeed == EFI_USB_SPEED_FULL) && (*DataLength == 8)))) {\r
       ((Request->RequestType == USB_REQUEST_TYPE (EfiUsbDataIn, USB_REQ_TYPE_CLASS, USB_TARGET_DEVICE))))) {\r
     DescriptorType = (UINT8)(Request->Value >> 8);\r
     if ((DescriptorType == USB_DESC_TYPE_DEVICE) && ((*DataLength == sizeof (EFI_USB_DEVICE_DESCRIPTOR)) || ((DeviceSpeed == EFI_USB_SPEED_FULL) && (*DataLength == 8)))) {\r


@@ -1144,7 +1144,7 @@ XhcControlTransfer (
         ClearPortRequest.Length       = 0;\r
 \r
         XhcControlTransfer (\r
         ClearPortRequest.Length       = 0;\r
 \r
         XhcControlTransfer (\r

-          This, \r
+          This,\r

           DeviceAddress,\r
           DeviceSpeed,\r
           MaximumPacketLength,\r
           DeviceAddress,\r
           DeviceSpeed,\r
           MaximumPacketLength,\r

diff --git a/MdeModulePkg/Bus/Pci/XhciDxe/XhciDxe.inf b/MdeModulePkg/Bus/Pci/XhciDxe/XhciDxe.inf
index 614938ac89f6be9645c43d351cebb6605a0ddf45..9bdabd10bc6debb2db4729e29d982bbfabc71dc1 100644 (file)
--- a/MdeModulePkg/Bus/Pci/XhciDxe/XhciDxe.inf
+++ b/MdeModulePkg/Bus/Pci/XhciDxe/XhciDxe.inf
@@ -3,7 +3,7 @@
 #  It implements the interfaces of monitoring the status of all ports and transferring\r
 #  Control, Bulk, Interrupt and Isochronous requests to those attached usb LS/FS/HS/SS devices.\r
 #\r
 #  It implements the interfaces of monitoring the status of all ports and transferring\r
 #  Control, Bulk, Interrupt and Isochronous requests to those attached usb LS/FS/HS/SS devices.\r
 #\r

-#  Copyright (c) 2011 - 2014, Intel Corporation. All rights reserved.<BR>\r
+#  Copyright (c) 2011 - 2018, Intel Corporation. All rights reserved.<BR>\r

 #\r
 #  This program and the accompanying materials\r
 #  are licensed and made available under the terms and conditions of the BSD License\r
 #\r
 #  This program and the accompanying materials\r
 #  are licensed and made available under the terms and conditions of the BSD License\r


@@ -41,7 +41,7 @@
   XhciReg.c\r
   XhciSched.c\r
   UsbHcMem.c\r
   XhciReg.c\r
   XhciSched.c\r
   UsbHcMem.c\r

-  UsbHcMem.h  \r
+  UsbHcMem.h\r

   ComponentName.c\r
   ComponentName.h\r
   Xhci.h\r
   ComponentName.c\r
   ComponentName.h\r
   Xhci.h\r

diff --git a/MdeModulePkg/Bus/Pci/XhciDxe/XhciDxe.uni b/MdeModulePkg/Bus/Pci/XhciDxe/XhciDxe.uni
index 7eca8f85e02dd3b3a97221ae8a795e77d44084c7..20b49f14d6fa57d66110312f883f4da52a9eb204 100644 (file)
--- a/MdeModulePkg/Bus/Pci/XhciDxe/XhciDxe.uni
+++ b/MdeModulePkg/Bus/Pci/XhciDxe/XhciDxe.uni
@@ -4,13 +4,13 @@
 // It implements the interfaces of monitoring the status of all ports and transferring\r
 // Control, Bulk, Interrupt and Isochronous requests to those attached usb LS/FS/HS/SS devices.\r
 //\r
 // It implements the interfaces of monitoring the status of all ports and transferring\r
 // Control, Bulk, Interrupt and Isochronous requests to those attached usb LS/FS/HS/SS devices.\r
 //\r

-// Copyright (c) 2011 - 2014, Intel Corporation. All rights reserved.<BR>\r
+// Copyright (c) 2011 - 2018, Intel Corporation. All rights reserved.<BR>\r

 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r
 // which accompanies this distribution. The full text of the license may be found at\r
 // http://opensource.org/licenses/bsd-license.php\r
 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r
 // which accompanies this distribution. The full text of the license may be found at\r
 // http://opensource.org/licenses/bsd-license.php\r

-// \r
+//\r

 // THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 // WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 //\r
 // THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 // WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 //\r

diff --git a/MdeModulePkg/Bus/Pci/XhciDxe/XhciDxeExtra.uni b/MdeModulePkg/Bus/Pci/XhciDxe/XhciDxeExtra.uni
index b2969d1adbab3ab3ff143cba957955d54288aa0d..e3d23443433a9a84a346e17c017446409482b83e 100644 (file)
--- a/MdeModulePkg/Bus/Pci/XhciDxe/XhciDxeExtra.uni
+++ b/MdeModulePkg/Bus/Pci/XhciDxe/XhciDxeExtra.uni
@@ -1,7 +1,7 @@
 // /** @file\r
 // XhciDxe Localized Strings and Content\r
 //\r
 // /** @file\r
 // XhciDxe Localized Strings and Content\r
 //\r

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

 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r
 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r


@@ -13,8 +13,8 @@
 //\r
 // **/\r
 \r
 //\r
 // **/\r
 \r

-#string STR_PROPERTIES_MODULE_NAME \r
-#language en-US \r
+#string STR_PROPERTIES_MODULE_NAME\r
+#language en-US\r

 "XHCI DXE Driver"\r
 \r
 \r
 "XHCI DXE Driver"\r
 \r
 \r

diff --git a/MdeModulePkg/Bus/Pci/XhciDxe/XhciSched.c b/MdeModulePkg/Bus/Pci/XhciDxe/XhciSched.c
index 21fdcf130a5000e4e7df41ec59d9a629d53b9237..6a2ef4cd5d48270aee5f19364b5597aa5795a576 100644 (file)
--- a/MdeModulePkg/Bus/Pci/XhciDxe/XhciSched.c
+++ b/MdeModulePkg/Bus/Pci/XhciDxe/XhciSched.c
@@ -2,7 +2,7 @@
 \r
   XHCI transfer scheduling routines.\r
 \r
 \r
   XHCI transfer scheduling routines.\r
 \r

-Copyright (c) 2011 - 2017, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2011 - 2018, Intel Corporation. All rights reserved.<BR>\r

 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r


@@ -201,7 +201,7 @@ XhcFreeUrb (
   if ((Xhc == NULL) || (Urb == NULL)) {\r
     return;\r
   }\r
   if ((Xhc == NULL) || (Urb == NULL)) {\r
     return;\r
   }\r

-  \r
+\r

   if (Urb->DataMap != NULL) {\r
     Xhc->PciIo->Unmap (Xhc->PciIo, Urb->DataMap);\r
   }\r
   if (Urb->DataMap != NULL) {\r
     Xhc->PciIo->Unmap (Xhc->PciIo, Urb->DataMap);\r
   }\r


@@ -269,15 +269,15 @@ XhcCreateTransferTrb (
     } else {\r
       MapOp = EfiPciIoOperationBusMasterRead;\r
     }\r
     } else {\r
       MapOp = EfiPciIoOperationBusMasterRead;\r
     }\r

-    \r
+\r

     Len = Urb->DataLen;\r
     Status  = Xhc->PciIo->Map (Xhc->PciIo, MapOp, Urb->Data, &Len, &PhyAddr, &Map);\r
     Len = Urb->DataLen;\r
     Status  = Xhc->PciIo->Map (Xhc->PciIo, MapOp, Urb->Data, &Len, &PhyAddr, &Map);\r

-    \r
+\r

     if (EFI_ERROR (Status) || (Len != Urb->DataLen)) {\r
       DEBUG ((EFI_D_ERROR, "XhcCreateTransferTrb: Fail to map Urb->Data.\n"));\r
       return EFI_OUT_OF_RESOURCES;\r
     }\r
     if (EFI_ERROR (Status) || (Len != Urb->DataLen)) {\r
       DEBUG ((EFI_D_ERROR, "XhcCreateTransferTrb: Fail to map Urb->Data.\n"));\r
       return EFI_OUT_OF_RESOURCES;\r
     }\r

-    \r
+\r

     Urb->DataPhy  = (VOID *) ((UINTN) PhyAddr);\r
     Urb->DataMap  = Map;\r
   }\r
     Urb->DataPhy  = (VOID *) ((UINTN) PhyAddr);\r
     Urb->DataMap  = Map;\r
   }\r


@@ -469,7 +469,7 @@ XhcInitSched (
   VOID                  *Dcbaa;\r
   EFI_PHYSICAL_ADDRESS  DcbaaPhy;\r
   UINT64                CmdRing;\r
   VOID                  *Dcbaa;\r
   EFI_PHYSICAL_ADDRESS  DcbaaPhy;\r
   UINT64                CmdRing;\r

-  EFI_PHYSICAL_ADDRESS  CmdRingPhy; \r
+  EFI_PHYSICAL_ADDRESS  CmdRingPhy;\r

   UINTN                 Entries;\r
   UINT32                MaxScratchpadBufs;\r
   UINT64                *ScratchBuf;\r
   UINTN                 Entries;\r
   UINT32                MaxScratchpadBufs;\r
   UINT64                *ScratchBuf;\r


@@ -520,7 +520,7 @@ XhcInitSched (
     ScratchEntryMap = AllocateZeroPool (sizeof (UINTN) * MaxScratchpadBufs);\r
     ASSERT (ScratchEntryMap != NULL);\r
     Xhc->ScratchEntryMap = ScratchEntryMap;\r
     ScratchEntryMap = AllocateZeroPool (sizeof (UINTN) * MaxScratchpadBufs);\r
     ASSERT (ScratchEntryMap != NULL);\r
     Xhc->ScratchEntryMap = ScratchEntryMap;\r

-    \r
+\r

     //\r
     // Allocate the buffer to record the host address for each entry\r
     //\r
     //\r
     // Allocate the buffer to record the host address for each entry\r
     //\r


@@ -533,7 +533,7 @@ XhcInitSched (
                Xhc->PciIo,\r
                EFI_SIZE_TO_PAGES (MaxScratchpadBufs * sizeof (UINT64)),\r
                Xhc->PageSize,\r
                Xhc->PciIo,\r
                EFI_SIZE_TO_PAGES (MaxScratchpadBufs * sizeof (UINT64)),\r
                Xhc->PageSize,\r

-               (VOID **) &ScratchBuf, \r
+               (VOID **) &ScratchBuf,\r

                &ScratchPhy,\r
                &Xhc->ScratchMap\r
                );\r
                &ScratchPhy,\r
                &Xhc->ScratchMap\r
                );\r


@@ -659,7 +659,7 @@ XhcRecoverHaltedEndpoint (
   }\r
   Dci = XhcEndpointToDci (Urb->Ep.EpAddr, (UINT8)(Urb->Ep.Direction));\r
   ASSERT (Dci < 32);\r
   }\r
   Dci = XhcEndpointToDci (Urb->Ep.EpAddr, (UINT8)(Urb->Ep.Direction));\r
   ASSERT (Dci < 32);\r

-  \r
+\r

   DEBUG ((EFI_D_INFO, "Recovery Halted Slot = %x,Dci = %x\n", SlotId, Dci));\r
 \r
   //\r
   DEBUG ((EFI_D_INFO, "Recovery Halted Slot = %x,Dci = %x\n", SlotId, Dci));\r
 \r
   //\r


@@ -721,7 +721,7 @@ XhcDequeueTrbFromEndpoint (
   }\r
   Dci = XhcEndpointToDci (Urb->Ep.EpAddr, (UINT8)(Urb->Ep.Direction));\r
   ASSERT (Dci < 32);\r
   }\r
   Dci = XhcEndpointToDci (Urb->Ep.EpAddr, (UINT8)(Urb->Ep.Direction));\r
   ASSERT (Dci < 32);\r

-  \r
+\r

   DEBUG ((EFI_D_INFO, "Stop Slot = %x,Dci = %x\n", SlotId, Dci));\r
 \r
   //\r
   DEBUG ((EFI_D_INFO, "Stop Slot = %x,Dci = %x\n", SlotId, Dci));\r
 \r
   //\r


@@ -792,9 +792,9 @@ CreateEventRing (
   EventRing->TrbNumber        = EVENT_RING_TRB_NUMBER;\r
   EventRing->EventRingDequeue = (TRB_TEMPLATE *) EventRing->EventRingSeg0;\r
   EventRing->EventRingEnqueue = (TRB_TEMPLATE *) EventRing->EventRingSeg0;\r
   EventRing->TrbNumber        = EVENT_RING_TRB_NUMBER;\r
   EventRing->EventRingDequeue = (TRB_TEMPLATE *) EventRing->EventRingSeg0;\r
   EventRing->EventRingEnqueue = (TRB_TEMPLATE *) EventRing->EventRingSeg0;\r

-  \r
+\r

   DequeuePhy = UsbHcGetPciAddrForHostAddr (Xhc->MemPool, Buf, Size);\r
   DequeuePhy = UsbHcGetPciAddrForHostAddr (Xhc->MemPool, Buf, Size);\r

-  \r
+\r

   //\r
   // Software maintains an Event Ring Consumer Cycle State (CCS) bit, initializing it to '1'\r
   // and toggling it every time the Event Ring Dequeue Pointer wraps back to the beginning of the Event Ring.\r
   //\r
   // Software maintains an Event Ring Consumer Cycle State (CCS) bit, initializing it to '1'\r
   // and toggling it every time the Event Ring Dequeue Pointer wraps back to the beginning of the Event Ring.\r


@@ -953,7 +953,7 @@ XhcFreeSched (
 {\r
   UINT32                  Index;\r
   UINT64                  *ScratchEntry;\r
 {\r
   UINT32                  Index;\r
   UINT64                  *ScratchEntry;\r

-  \r
+\r

   if (Xhc->ScratchBuf != NULL) {\r
     ScratchEntry = Xhc->ScratchEntry;\r
     for (Index = 0; Index < Xhc->MaxScratchpadBufs; Index++) {\r
   if (Xhc->ScratchBuf != NULL) {\r
     ScratchEntry = Xhc->ScratchEntry;\r
     for (Index = 0; Index < Xhc->MaxScratchpadBufs; Index++) {\r


@@ -974,14 +974,14 @@ XhcFreeSched (
     UsbHcFreeMem (Xhc->MemPool, Xhc->CmdRing.RingSeg0, sizeof (TRB_TEMPLATE) * CMD_RING_TRB_NUMBER);\r
     Xhc->CmdRing.RingSeg0 = NULL;\r
   }\r
     UsbHcFreeMem (Xhc->MemPool, Xhc->CmdRing.RingSeg0, sizeof (TRB_TEMPLATE) * CMD_RING_TRB_NUMBER);\r
     Xhc->CmdRing.RingSeg0 = NULL;\r
   }\r

-  \r
+\r

   XhcFreeEventRing (Xhc,&Xhc->EventRing);\r
 \r
   if (Xhc->DCBAA != NULL) {\r
     UsbHcFreeMem (Xhc->MemPool, Xhc->DCBAA, (Xhc->MaxSlotsEn + 1) * sizeof(UINT64));\r
     Xhc->DCBAA = NULL;\r
   }\r
   XhcFreeEventRing (Xhc,&Xhc->EventRing);\r
 \r
   if (Xhc->DCBAA != NULL) {\r
     UsbHcFreeMem (Xhc->MemPool, Xhc->DCBAA, (Xhc->MaxSlotsEn + 1) * sizeof(UINT64));\r
     Xhc->DCBAA = NULL;\r
   }\r

-  \r
+\r

   //\r
   // Free memory pool at last\r
   //\r
   //\r
   // Free memory pool at last\r
   //\r


@@ -1132,7 +1132,7 @@ XhcCheckUrbResult (
     if ((EvtTrb->Type != TRB_TYPE_COMMAND_COMPLT_EVENT) && (EvtTrb->Type != TRB_TYPE_TRANS_EVENT)) {\r
       continue;\r
     }\r
     if ((EvtTrb->Type != TRB_TYPE_COMMAND_COMPLT_EVENT) && (EvtTrb->Type != TRB_TYPE_TRANS_EVENT)) {\r
       continue;\r
     }\r

-    \r
+\r

     //\r
     // Need convert pci device address to host address\r
     //\r
     //\r
     // Need convert pci device address to host address\r
     //\r


@@ -1149,12 +1149,12 @@ XhcCheckUrbResult (
       CheckedUrb = Xhc->PendingUrb;\r
     } else if (IsTransferRingTrb (Xhc, TRBPtr, Urb)) {\r
       CheckedUrb = Urb;\r
       CheckedUrb = Xhc->PendingUrb;\r
     } else if (IsTransferRingTrb (Xhc, TRBPtr, Urb)) {\r
       CheckedUrb = Urb;\r

-    } else if (IsAsyncIntTrb (Xhc, TRBPtr, &AsyncUrb)) {    \r
+    } else if (IsAsyncIntTrb (Xhc, TRBPtr, &AsyncUrb)) {\r

       CheckedUrb = AsyncUrb;\r
     } else {\r
       continue;\r
     }\r
       CheckedUrb = AsyncUrb;\r
     } else {\r
       continue;\r
     }\r

-  \r
+\r

     switch (EvtTrb->Completecode) {\r
       case TRB_COMPLETION_STALL_ERROR:\r
         CheckedUrb->Result  |= EFI_USB_ERR_STALL;\r
     switch (EvtTrb->Completecode) {\r
       case TRB_COMPLETION_STALL_ERROR:\r
         CheckedUrb->Result  |= EFI_USB_ERR_STALL;\r


@@ -1676,7 +1676,7 @@ XhcPollPortStatusChange (
         Status = XhcInitializeDeviceSlot64 (Xhc, ParentRouteChart, Port, RouteChart, Speed);\r
       }\r
     }\r
         Status = XhcInitializeDeviceSlot64 (Xhc, ParentRouteChart, Port, RouteChart, Speed);\r
       }\r
     }\r

-  } \r
+  }\r

 \r
   return Status;\r
 }\r
 \r
   return Status;\r
 }\r


@@ -3144,7 +3144,7 @@ XhcSetConfigCmd64 (
     if (Dci > MaxDci) {\r
       MaxDci = Dci;\r
     }\r
     if (Dci > MaxDci) {\r
       MaxDci = Dci;\r
     }\r

- \r
+\r

     IfDesc = (USB_INTERFACE_DESCRIPTOR *)((UINTN)IfDesc + IfDesc->Length);\r
   }\r
 \r
     IfDesc = (USB_INTERFACE_DESCRIPTOR *)((UINTN)IfDesc + IfDesc->Length);\r
   }\r
 \r

diff --git a/MdeModulePkg/Bus/Pci/XhciDxe/XhciSched.h b/MdeModulePkg/Bus/Pci/XhciDxe/XhciSched.h
index f40f94c1e4b711acf47b37adb4f4964cb0c129ac..097408828a1fe175b82f25b09f0c21b8e31e0f20 100644 (file)
--- a/MdeModulePkg/Bus/Pci/XhciDxe/XhciSched.h
+++ b/MdeModulePkg/Bus/Pci/XhciDxe/XhciSched.h
@@ -2,7 +2,7 @@
 \r
   This file contains the definition for XHCI host controller schedule routines.\r
 \r
 \r
   This file contains the definition for XHCI host controller schedule routines.\r
 \r

-Copyright (c) 2011 - 2017, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2011 - 2018, Intel Corporation. All rights reserved.<BR>\r

 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r


@@ -620,7 +620,7 @@ typedef struct _SLOT_CONTEXT_64 {
   UINT32                  RsvdZ9;\r
   UINT32                  RsvdZ10;\r
   UINT32                  RsvdZ11;\r
   UINT32                  RsvdZ9;\r
   UINT32                  RsvdZ10;\r
   UINT32                  RsvdZ11;\r

-  \r
+\r

   UINT32                  RsvdZ12;\r
   UINT32                  RsvdZ13;\r
   UINT32                  RsvdZ14;\r
   UINT32                  RsvdZ12;\r
   UINT32                  RsvdZ13;\r
   UINT32                  RsvdZ14;\r


@@ -688,12 +688,12 @@ typedef struct _ENDPOINT_CONTEXT_64 {
   UINT32                  RsvdZ5;\r
   UINT32                  RsvdZ6;\r
   UINT32                  RsvdZ7;\r
   UINT32                  RsvdZ5;\r
   UINT32                  RsvdZ6;\r
   UINT32                  RsvdZ7;\r

-  \r
+\r

   UINT32                  RsvdZ8;\r
   UINT32                  RsvdZ9;\r
   UINT32                  RsvdZ10;\r
   UINT32                  RsvdZ11;\r
   UINT32                  RsvdZ8;\r
   UINT32                  RsvdZ9;\r
   UINT32                  RsvdZ10;\r
   UINT32                  RsvdZ11;\r

-  \r
+\r

   UINT32                  RsvdZ12;\r
   UINT32                  RsvdZ13;\r
   UINT32                  RsvdZ14;\r
   UINT32                  RsvdZ12;\r
   UINT32                  RsvdZ13;\r
   UINT32                  RsvdZ14;\r

diff --git a/MdeModulePkg/Bus/Pci/XhciPei/XhciPei.uni b/MdeModulePkg/Bus/Pci/XhciPei/XhciPei.uni
index ee23b4b658c94358cdb474cd8bb73923f7487b06..b4d8cf30bdc3705e274331a2fa6f8320345bd645 100644 (file)
--- a/MdeModulePkg/Bus/Pci/XhciPei/XhciPei.uni
+++ b/MdeModulePkg/Bus/Pci/XhciPei/XhciPei.uni
@@ -4,14 +4,14 @@
 // It produces gPeiUsb2HostControllerPpiGuid based on gPeiUsbControllerPpiGuid\r
 // which is used to enable recovery function from USB Drivers.\r
 //\r
 // It produces gPeiUsb2HostControllerPpiGuid based on gPeiUsbControllerPpiGuid\r
 // which is used to enable recovery function from USB Drivers.\r
 //\r

-// Copyright (c) 2014, Intel Corporation. All rights reserved.<BR>\r
+// Copyright (c) 2014 - 2018, Intel Corporation. All rights reserved.<BR>\r

 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions\r
 // of the BSD License which accompanies this distribution.  The\r
 // full text of the license may be found at\r
 // http://opensource.org/licenses/bsd-license.php\r
 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions\r
 // of the BSD License which accompanies this distribution.  The\r
 // full text of the license may be found at\r
 // http://opensource.org/licenses/bsd-license.php\r

-// \r
+//\r

 // THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 // WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 //\r
 // THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 // WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 //\r

diff --git a/MdeModulePkg/Bus/Pci/XhciPei/XhciPeiExtra.uni b/MdeModulePkg/Bus/Pci/XhciPei/XhciPeiExtra.uni
index 0d0fc7a952d3a59941ff5cce6667df119443b45b..73c72eda8da01536a8b158451cf2a11a82095a92 100644 (file)
--- a/MdeModulePkg/Bus/Pci/XhciPei/XhciPeiExtra.uni
+++ b/MdeModulePkg/Bus/Pci/XhciPei/XhciPeiExtra.uni
@@ -1,7 +1,7 @@
 // /** @file\r
 // XhciPei Localized Strings and Content\r
 //\r
 // /** @file\r
 // XhciPei Localized Strings and Content\r
 //\r

-// Copyright (c) 2014, Intel Corporation. All rights reserved.<BR>\r
+// Copyright (c) 2014 - 2018, Intel Corporation. All rights reserved.<BR>\r

 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r
 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r


@@ -13,8 +13,8 @@
 //\r
 // **/\r
 \r
 //\r
 // **/\r
 \r

-#string STR_PROPERTIES_MODULE_NAME \r
-#language en-US \r
+#string STR_PROPERTIES_MODULE_NAME\r
+#language en-US\r

 "XHCI PEI Module for Recovery"\r
 \r
 \r
 "XHCI PEI Module for Recovery"\r
 \r
 \r

diff --git a/MdeModulePkg/Bus/Scsi/ScsiBusDxe/ScsiBus.c b/MdeModulePkg/Bus/Scsi/ScsiBusDxe/ScsiBus.c
index 21034aab19f7266fb37a255dff451f0cacb3ff40..11a7f2a9270a01808ce81e90883cb66191c4de5e 100644 (file)
--- a/MdeModulePkg/Bus/Scsi/ScsiBusDxe/ScsiBus.c
+++ b/MdeModulePkg/Bus/Scsi/ScsiBusDxe/ScsiBus.c
@@ -2,7 +2,7 @@
   SCSI Bus driver that layers on every SCSI Pass Thru and\r
   Extended SCSI Pass Thru protocol in the system.\r
 \r
   SCSI Bus driver that layers on every SCSI Pass Thru and\r
   Extended SCSI Pass Thru protocol in the system.\r
 \r

-Copyright (c) 2006 - 2015, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r

 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r


@@ -188,7 +188,7 @@ SCSIBusDriverBindingSupported (
   SetMem (TargetId, TARGET_MAX_BYTES, 0xFF);\r
 \r
   //\r
   SetMem (TargetId, TARGET_MAX_BYTES, 0xFF);\r
 \r
   //\r

-  // To keep backward compatibility, UEFI ExtPassThru Protocol is supported as well as \r
+  // To keep backward compatibility, UEFI ExtPassThru Protocol is supported as well as\r

   // EFI PassThru Protocol. From priority perspective, ExtPassThru Protocol is firstly\r
   // tried to open on host controller handle. If fails, then PassThru Protocol is tried instead.\r
   //\r
   // EFI PassThru Protocol. From priority perspective, ExtPassThru Protocol is firstly\r
   // tried to open on host controller handle. If fails, then PassThru Protocol is tried instead.\r
   //\r


@@ -217,7 +217,7 @@ SCSIBusDriverBindingSupported (
              &gEfiExtScsiPassThruProtocolGuid,\r
              This->DriverBindingHandle,\r
              Controller\r
              &gEfiExtScsiPassThruProtocolGuid,\r
              This->DriverBindingHandle,\r
              Controller\r

-             );      \r
+             );\r

       return EFI_SUCCESS;\r
     } else {\r
       //\r
       return EFI_SUCCESS;\r
     } else {\r
       //\r


@@ -232,7 +232,7 @@ SCSIBusDriverBindingSupported (
              &gEfiExtScsiPassThruProtocolGuid,\r
              This->DriverBindingHandle,\r
              Controller\r
              &gEfiExtScsiPassThruProtocolGuid,\r
              This->DriverBindingHandle,\r
              Controller\r

-             );      \r
+             );\r

       if (!EFI_ERROR(Status)) {\r
         return EFI_SUCCESS;\r
       }\r
       if (!EFI_ERROR(Status)) {\r
         return EFI_SUCCESS;\r
       }\r


@@ -240,7 +240,7 @@ SCSIBusDriverBindingSupported (
   }\r
 \r
   //\r
   }\r
 \r
   //\r

-  // Come here in 2 condition: \r
+  // Come here in 2 condition:\r

   // 1. ExtPassThru doesn't exist.\r
   // 2. ExtPassThru exists but RemainingDevicePath is invalid.\r
   //\r
   // 1. ExtPassThru doesn't exist.\r
   // 2. ExtPassThru exists but RemainingDevicePath is invalid.\r
   //\r


@@ -252,22 +252,22 @@ SCSIBusDriverBindingSupported (
                   Controller,\r
                   EFI_OPEN_PROTOCOL_BY_DRIVER\r
                   );\r
                   Controller,\r
                   EFI_OPEN_PROTOCOL_BY_DRIVER\r
                   );\r

-  \r
+\r

   if (Status == EFI_ALREADY_STARTED) {\r
     return EFI_SUCCESS;\r
   }\r
   if (Status == EFI_ALREADY_STARTED) {\r
     return EFI_SUCCESS;\r
   }\r

-  \r
+\r

   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r

-  \r
+\r

   //\r
   // Test RemainingDevicePath is valid or not.\r
   //\r
   if ((RemainingDevicePath != NULL) && !IsDevicePathEnd (RemainingDevicePath)) {\r
     Status = PassThru->GetTargetLun (PassThru, RemainingDevicePath, &ScsiTargetId.ScsiId.Scsi, &Lun);\r
   }\r
   //\r
   // Test RemainingDevicePath is valid or not.\r
   //\r
   if ((RemainingDevicePath != NULL) && !IsDevicePathEnd (RemainingDevicePath)) {\r
     Status = PassThru->GetTargetLun (PassThru, RemainingDevicePath, &ScsiTargetId.ScsiId.Scsi, &Lun);\r
   }\r

-  \r
+\r

   gBS->CloseProtocol (\r
          Controller,\r
          &gEfiScsiPassThruProtocolGuid,\r
   gBS->CloseProtocol (\r
          Controller,\r
          &gEfiScsiPassThruProtocolGuid,\r


@@ -325,10 +325,10 @@ SCSIBusDriverBindingStart (
   FromFirstTarget = FALSE;\r
   ExtScsiSupport  = FALSE;\r
   PassThruStatus  = EFI_SUCCESS;\r
   FromFirstTarget = FALSE;\r
   ExtScsiSupport  = FALSE;\r
   PassThruStatus  = EFI_SUCCESS;\r

-  \r
+\r

   TargetId = &ScsiTargetId.ScsiId.ExtScsi[0];\r
   SetMem (TargetId, TARGET_MAX_BYTES, 0xFF);\r
   TargetId = &ScsiTargetId.ScsiId.ExtScsi[0];\r
   SetMem (TargetId, TARGET_MAX_BYTES, 0xFF);\r

-  \r
+\r

   DevicePathStatus = gBS->OpenProtocol (\r
                             Controller,\r
                             &gEfiDevicePathProtocolGuid,\r
   DevicePathStatus = gBS->OpenProtocol (\r
                             Controller,\r
                             &gEfiDevicePathProtocolGuid,\r


@@ -348,10 +348,10 @@ SCSIBusDriverBindingStart (
     EFI_PROGRESS_CODE,\r
     (EFI_IO_BUS_SCSI | EFI_IOB_PC_INIT),\r
     ParentDevicePath\r
     EFI_PROGRESS_CODE,\r
     (EFI_IO_BUS_SCSI | EFI_IOB_PC_INIT),\r
     ParentDevicePath\r

-    );  \r
+    );\r

 \r
   //\r
 \r
   //\r

-  // To keep backward compatibility, UEFI ExtPassThru Protocol is supported as well as \r
+  // To keep backward compatibility, UEFI ExtPassThru Protocol is supported as well as\r

   // EFI PassThru Protocol. From priority perspective, ExtPassThru Protocol is firstly\r
   // tried to open on host controller handle. If fails, then PassThru Protocol is tried instead.\r
   //\r
   // EFI PassThru Protocol. From priority perspective, ExtPassThru Protocol is firstly\r
   // tried to open on host controller handle. If fails, then PassThru Protocol is tried instead.\r
   //\r


@@ -386,13 +386,13 @@ SCSIBusDriverBindingStart (
                This->DriverBindingHandle,\r
                Controller\r
                );\r
                This->DriverBindingHandle,\r
                Controller\r
                );\r

-      } \r
+      }\r

       return Status;\r
       return Status;\r

-    } \r
+    }\r

   } else {\r
     //\r
   } else {\r
     //\r

-    // Succeed to open ExtPassThru Protocol, and meanwhile open PassThru Protocol \r
-    // with BY_DRIVER if it is also present on the handle. The intent is to prevent \r
+    // Succeed to open ExtPassThru Protocol, and meanwhile open PassThru Protocol\r
+    // with BY_DRIVER if it is also present on the handle. The intent is to prevent\r

     // another SCSI Bus Driver to work on the same host handle.\r
     //\r
     ExtScsiSupport = TRUE;\r
     // another SCSI Bus Driver to work on the same host handle.\r
     //\r
     ExtScsiSupport = TRUE;\r


@@ -405,7 +405,7 @@ SCSIBusDriverBindingStart (
                             EFI_OPEN_PROTOCOL_BY_DRIVER\r
                             );\r
   }\r
                             EFI_OPEN_PROTOCOL_BY_DRIVER\r
                             );\r
   }\r

-    \r
+\r

   if (Status != EFI_ALREADY_STARTED) {\r
     //\r
     // Go through here means either ExtPassThru or PassThru Protocol is successfully opened\r
   if (Status != EFI_ALREADY_STARTED) {\r
     //\r
     // Go through here means either ExtPassThru or PassThru Protocol is successfully opened\r


@@ -423,14 +423,14 @@ SCSIBusDriverBindingStart (
     if (ScsiBusDev->ExtScsiSupport) {\r
       ScsiBusDev->ExtScsiInterface = ExtScsiInterface;\r
     } else {\r
     if (ScsiBusDev->ExtScsiSupport) {\r
       ScsiBusDev->ExtScsiInterface = ExtScsiInterface;\r
     } else {\r

-      ScsiBusDev->ScsiInterface    = ScsiInterface;    \r
+      ScsiBusDev->ScsiInterface    = ScsiInterface;\r

     }\r
 \r
     //\r
     // Install EFI_SCSI_BUS_PROTOCOL to the controller handle, So ScsiBusDev could be\r
     // retrieved on this controller handle. With ScsiBusDev, we can know which PassThru\r
     // Protocol is present on the handle, UEFI ExtPassThru Protocol or EFI PassThru Protocol.\r
     }\r
 \r
     //\r
     // Install EFI_SCSI_BUS_PROTOCOL to the controller handle, So ScsiBusDev could be\r
     // retrieved on this controller handle. With ScsiBusDev, we can know which PassThru\r
     // Protocol is present on the handle, UEFI ExtPassThru Protocol or EFI PassThru Protocol.\r

-    // \r
+    //\r

     Status = gBS->InstallProtocolInterface (\r
                     &Controller,\r
                     &gEfiCallerIdGuid,\r
     Status = gBS->InstallProtocolInterface (\r
                     &Controller,\r
                     &gEfiCallerIdGuid,\r


@@ -472,17 +472,17 @@ SCSIBusDriverBindingStart (
   Lun  = 0;\r
   if (RemainingDevicePath == NULL) {\r
     //\r
   Lun  = 0;\r
   if (RemainingDevicePath == NULL) {\r
     //\r

-    // If RemainingDevicePath is NULL, \r
+    // If RemainingDevicePath is NULL,\r

     // must enumerate all SCSI devices anyway\r
     //\r
     FromFirstTarget = TRUE;\r
   } else if (!IsDevicePathEnd (RemainingDevicePath)) {\r
     //\r
     // must enumerate all SCSI devices anyway\r
     //\r
     FromFirstTarget = TRUE;\r
   } else if (!IsDevicePathEnd (RemainingDevicePath)) {\r
     //\r

-    // If RemainingDevicePath isn't the End of Device Path Node, \r
+    // If RemainingDevicePath isn't the End of Device Path Node,\r

     // only scan the specified device by RemainingDevicePath\r
     //\r
     if (ScsiBusDev->ExtScsiSupport) {\r
     // only scan the specified device by RemainingDevicePath\r
     //\r
     if (ScsiBusDev->ExtScsiSupport) {\r

-      Status = ScsiBusDev->ExtScsiInterface->GetTargetLun (ScsiBusDev->ExtScsiInterface, RemainingDevicePath, &TargetId, &Lun);  \r
+      Status = ScsiBusDev->ExtScsiInterface->GetTargetLun (ScsiBusDev->ExtScsiInterface, RemainingDevicePath, &TargetId, &Lun);\r

     } else {\r
       Status = ScsiBusDev->ScsiInterface->GetTargetLun (ScsiBusDev->ScsiInterface, RemainingDevicePath, &ScsiTargetId.ScsiId.Scsi, &Lun);\r
     }\r
     } else {\r
       Status = ScsiBusDev->ScsiInterface->GetTargetLun (ScsiBusDev->ScsiInterface, RemainingDevicePath, &ScsiTargetId.ScsiId.Scsi, &Lun);\r
     }\r


@@ -494,7 +494,7 @@ SCSIBusDriverBindingStart (
     //\r
     // If RemainingDevicePath is the End of Device Path Node,\r
     // skip enumerate any device and return EFI_SUCESSS\r
     //\r
     // If RemainingDevicePath is the End of Device Path Node,\r
     // skip enumerate any device and return EFI_SUCESSS\r

-    // \r
+    //\r

     ScanOtherPuns = FALSE;\r
   }\r
 \r
     ScanOtherPuns = FALSE;\r
   }\r
 \r


@@ -539,11 +539,11 @@ SCSIBusDriverBindingStart (
   return EFI_SUCCESS;\r
 \r
 ErrorExit:\r
   return EFI_SUCCESS;\r
 \r
 ErrorExit:\r

-  \r
+\r

   if (ScsiBusDev != NULL) {\r
     FreePool (ScsiBusDev);\r
   }\r
   if (ScsiBusDev != NULL) {\r
     FreePool (ScsiBusDev);\r
   }\r

-  \r
+\r

   if (ExtScsiSupport) {\r
     gBS->CloseProtocol (\r
            Controller,\r
   if (ExtScsiSupport) {\r
     gBS->CloseProtocol (\r
            Controller,\r


@@ -578,7 +578,7 @@ ErrorExit:
   restrictions for this service. DisconnectController() must follow these\r
   calling restrictions. If any other agent wishes to call Stop() it must also\r
   follow these calling restrictions.\r
   restrictions for this service. DisconnectController() must follow these\r
   calling restrictions. If any other agent wishes to call Stop() it must also\r
   follow these calling restrictions.\r

-  \r
+\r

   @param  This              Protocol instance pointer.\r
   @param  ControllerHandle  Handle of device to stop driver on\r
   @param  NumberOfChildren  Number of Handles in ChildHandleBuffer. If number of\r
   @param  This              Protocol instance pointer.\r
   @param  ControllerHandle  Handle of device to stop driver on\r
   @param  NumberOfChildren  Number of Handles in ChildHandleBuffer. If number of\r


@@ -650,7 +650,7 @@ SCSIBusDriverBindingStop (
              );\r
       //\r
       // When Start() succeeds to open ExtPassThru, it always tries to open PassThru BY_DRIVER.\r
              );\r
       //\r
       // When Start() succeeds to open ExtPassThru, it always tries to open PassThru BY_DRIVER.\r

-      // Its intent is to prevent another SCSI Bus Driver from woking on the same host handle. \r
+      // Its intent is to prevent another SCSI Bus Driver from woking on the same host handle.\r

       // So Stop() needs to try to close PassThru if present here.\r
       //\r
       gBS->CloseProtocol (\r
       // So Stop() needs to try to close PassThru if present here.\r
       //\r
       gBS->CloseProtocol (\r


@@ -763,11 +763,11 @@ SCSIBusDriverBindingStop (
 \r
   @param  This          Protocol instance pointer.\r
   @param  DeviceType    A pointer to the device type information retrieved from\r
 \r
   @param  This          Protocol instance pointer.\r
   @param  DeviceType    A pointer to the device type information retrieved from\r

-                        the SCSI Controller. \r
+                        the SCSI Controller.\r

 \r
   @retval EFI_SUCCESS             Retrieves the device type information successfully.\r
   @retval EFI_INVALID_PARAMETER   The DeviceType is NULL.\r
 \r
   @retval EFI_SUCCESS             Retrieves the device type information successfully.\r
   @retval EFI_INVALID_PARAMETER   The DeviceType is NULL.\r

-  \r
+\r

 **/\r
 EFI_STATUS\r
 EFIAPI\r
 **/\r
 EFI_STATUS\r
 EFIAPI\r


@@ -833,7 +833,7 @@ ScsiGetDeviceLocation (
   @retval  EFI_DEVICE_ERROR  Errors encountered when resetting the SCSI bus.\r
   @retval  EFI_UNSUPPORTED   The bus reset operation is not supported by the\r
                              SCSI Host Controller.\r
   @retval  EFI_DEVICE_ERROR  Errors encountered when resetting the SCSI bus.\r
   @retval  EFI_UNSUPPORTED   The bus reset operation is not supported by the\r
                              SCSI Host Controller.\r

-  @retval  EFI_TIMEOUT       A timeout occurred while attempting to reset \r
+  @retval  EFI_TIMEOUT       A timeout occurred while attempting to reset\r

                              the SCSI bus.\r
 **/\r
 EFI_STATUS\r
                              the SCSI bus.\r
 **/\r
 EFI_STATUS\r


@@ -893,7 +893,7 @@ ScsiResetDevice (
     (EFI_IO_BUS_ATA_ATAPI | EFI_IOB_PC_RESET),\r
     ScsiIoDevice->ScsiBusDeviceData->DevicePath\r
     );\r
     (EFI_IO_BUS_ATA_ATAPI | EFI_IOB_PC_RESET),\r
     ScsiIoDevice->ScsiBusDeviceData->DevicePath\r
     );\r

-  \r
+\r

   CopyMem (Target,&ScsiIoDevice->Pun, TARGET_MAX_BYTES);\r
 \r
 \r
   CopyMem (Target,&ScsiIoDevice->Pun, TARGET_MAX_BYTES);\r
 \r
 \r


@@ -917,47 +917,47 @@ ScsiResetDevice (
   Sends a SCSI Request Packet to the SCSI Controller for execution.\r
 \r
   @param  This            Protocol instance pointer.\r
   Sends a SCSI Request Packet to the SCSI Controller for execution.\r
 \r
   @param  This            Protocol instance pointer.\r

-  @param  CommandPacket   The SCSI request packet to send to the SCSI \r
+  @param  CommandPacket   The SCSI request packet to send to the SCSI\r

                           Controller specified by the device handle.\r
   @param  Event           If the SCSI bus where the SCSI device is attached\r
                           Controller specified by the device handle.\r
   @param  Event           If the SCSI bus where the SCSI device is attached\r

-                          does not support non-blocking I/O, then Event is \r
-                          ignored, and blocking I/O is performed.  \r
+                          does not support non-blocking I/O, then Event is\r
+                          ignored, and blocking I/O is performed.\r

                           If Event is NULL, then blocking I/O is performed.\r
                           If Event is NULL, then blocking I/O is performed.\r

-                          If Event is not NULL and non-blocking I/O is \r
+                          If Event is not NULL and non-blocking I/O is\r

                           supported, then non-blocking I/O is performed,\r
                           and Event will be signaled when the SCSI Request\r
                           Packet completes.\r
 \r
                           supported, then non-blocking I/O is performed,\r
                           and Event will be signaled when the SCSI Request\r
                           Packet completes.\r
 \r

-  @retval EFI_SUCCESS         The SCSI Request Packet was sent by the host \r
-                              successfully, and TransferLength bytes were \r
-                              transferred to/from DataBuffer.See \r
-                              HostAdapterStatus, TargetStatus, \r
+  @retval EFI_SUCCESS         The SCSI Request Packet was sent by the host\r
+                              successfully, and TransferLength bytes were\r
+                              transferred to/from DataBuffer.See\r
+                              HostAdapterStatus, TargetStatus,\r

                               SenseDataLength, and SenseData in that order\r
                               for additional status information.\r
                               SenseDataLength, and SenseData in that order\r
                               for additional status information.\r

-  @retval EFI_BAD_BUFFER_SIZE The SCSI Request Packet was executed, \r
+  @retval EFI_BAD_BUFFER_SIZE The SCSI Request Packet was executed,\r

                               but the entire DataBuffer could not be transferred.\r
                               The actual number of bytes transferred is returned\r
                               but the entire DataBuffer could not be transferred.\r
                               The actual number of bytes transferred is returned\r

-                              in TransferLength. See HostAdapterStatus, \r
-                              TargetStatus, SenseDataLength, and SenseData in \r
+                              in TransferLength. See HostAdapterStatus,\r
+                              TargetStatus, SenseDataLength, and SenseData in\r

                               that order for additional status information.\r
                               that order for additional status information.\r

-  @retval EFI_NOT_READY       The SCSI Request Packet could not be sent because \r
-                              there are too many SCSI Command Packets already \r
+  @retval EFI_NOT_READY       The SCSI Request Packet could not be sent because\r
+                              there are too many SCSI Command Packets already\r

                               queued.The caller may retry again later.\r
                               queued.The caller may retry again later.\r

-  @retval EFI_DEVICE_ERROR    A device error occurred while attempting to send \r
-                              the SCSI Request Packet. See HostAdapterStatus, \r
-                              TargetStatus, SenseDataLength, and SenseData in \r
+  @retval EFI_DEVICE_ERROR    A device error occurred while attempting to send\r
+                              the SCSI Request Packet. See HostAdapterStatus,\r
+                              TargetStatus, SenseDataLength, and SenseData in\r

                               that order for additional status information.\r
                               that order for additional status information.\r

-  @retval EFI_INVALID_PARAMETER  The contents of CommandPacket are invalid.  \r
-                                 The SCSI Request Packet was not sent, so no \r
+  @retval EFI_INVALID_PARAMETER  The contents of CommandPacket are invalid.\r
+                                 The SCSI Request Packet was not sent, so no\r

                                  additional status information is available.\r
   @retval EFI_UNSUPPORTED     The command described by the SCSI Request Packet\r
                                  additional status information is available.\r
   @retval EFI_UNSUPPORTED     The command described by the SCSI Request Packet\r

-                              is not supported by the SCSI initiator(i.e., SCSI \r
+                              is not supported by the SCSI initiator(i.e., SCSI\r

                               Host Controller). The SCSI Request Packet was not\r
                               Host Controller). The SCSI Request Packet was not\r

-                              sent, so no additional status information is \r
+                              sent, so no additional status information is\r

                               available.\r
                               available.\r

-  @retval EFI_TIMEOUT         A timeout occurred while waiting for the SCSI \r
+  @retval EFI_TIMEOUT         A timeout occurred while waiting for the SCSI\r

                               Request Packet to execute. See HostAdapterStatus,\r
                               Request Packet to execute. See HostAdapterStatus,\r

-                              TargetStatus, SenseDataLength, and SenseData in \r
+                              TargetStatus, SenseDataLength, and SenseData in\r

                               that order for additional status information.\r
 **/\r
 EFI_STATUS\r
                               that order for additional status information.\r
 **/\r
 EFI_STATUS\r


@@ -973,10 +973,10 @@ ScsiExecuteSCSICommand (
   UINT8                                       Target[TARGET_MAX_BYTES];\r
   EFI_EVENT                                   PacketEvent;\r
   EFI_EXT_SCSI_PASS_THRU_SCSI_REQUEST_PACKET  *ExtRequestPacket;\r
   UINT8                                       Target[TARGET_MAX_BYTES];\r
   EFI_EVENT                                   PacketEvent;\r
   EFI_EXT_SCSI_PASS_THRU_SCSI_REQUEST_PACKET  *ExtRequestPacket;\r

-  SCSI_EVENT_DATA                             EventData;                                     \r
+  SCSI_EVENT_DATA                             EventData;\r

 \r
   PacketEvent = NULL;\r
 \r
   PacketEvent = NULL;\r

-  \r
+\r

   if (Packet == NULL) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
   if (Packet == NULL) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r


@@ -1258,7 +1258,7 @@ ScsiScanCreateDevice (
   return EFI_SUCCESS;\r
 \r
 ErrorExit:\r
   return EFI_SUCCESS;\r
 \r
 ErrorExit:\r

-  \r
+\r

   //\r
   // The memory space for ScsiDevicePath is allocated in\r
   // ScsiPassThru->BuildDevicePath() function; It is no longer used\r
   //\r
   // The memory space for ScsiDevicePath is allocated in\r
   // ScsiPassThru->BuildDevicePath() function; It is no longer used\r


@@ -1365,7 +1365,7 @@ DiscoverScsiDevice (
     ScsiDeviceFound = FALSE;\r
     goto Done;\r
   }\r
     ScsiDeviceFound = FALSE;\r
     goto Done;\r
   }\r

-  \r
+\r

   //\r
   // Retrieved inquiry data successfully\r
   //\r
   //\r
   // Retrieved inquiry data successfully\r
   //\r

diff --git a/MdeModulePkg/Bus/Scsi/ScsiBusDxe/ScsiBus.h b/MdeModulePkg/Bus/Scsi/ScsiBusDxe/ScsiBus.h
index babf86f2c3959e41f14567fe17b354253d9c21fc..a637042af7bb4a095ba68d91fe4a3fa383af8154 100644 (file)
--- a/MdeModulePkg/Bus/Scsi/ScsiBusDxe/ScsiBus.h
+++ b/MdeModulePkg/Bus/Scsi/ScsiBusDxe/ScsiBus.h
@@ -1,7 +1,7 @@
 /** @file\r
   Header file for SCSI Bus Driver.\r
 \r
 /** @file\r
   Header file for SCSI Bus Driver.\r
 \r

-Copyright (c) 2006 - 2013, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r

 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r


@@ -41,7 +41,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 \r
 typedef union {\r
   UINT32  Scsi;\r
 \r
 typedef union {\r
   UINT32  Scsi;\r

-  UINT8   ExtScsi[4];   \r
+  UINT8   ExtScsi[4];\r

 } SCSI_ID;\r
 \r
 typedef struct _SCSI_TARGET_ID {\r
 } SCSI_ID;\r
 \r
 typedef struct _SCSI_TARGET_ID {\r


@@ -79,7 +79,7 @@ typedef struct _EFI_SCSI_BUS_PROTOCOL {
 typedef struct _SCSI_BUS_DEVICE {\r
   UINTN                                 Signature;\r
   EFI_SCSI_BUS_PROTOCOL                 BusIdentify;\r
 typedef struct _SCSI_BUS_DEVICE {\r
   UINTN                                 Signature;\r
   EFI_SCSI_BUS_PROTOCOL                 BusIdentify;\r

-  BOOLEAN                               ExtScsiSupport; \r
+  BOOLEAN                               ExtScsiSupport;\r

   EFI_SCSI_PASS_THRU_PROTOCOL           *ScsiInterface;\r
   EFI_EXT_SCSI_PASS_THRU_PROTOCOL       *ExtScsiInterface;\r
   EFI_DEVICE_PATH_PROTOCOL              *DevicePath;\r
   EFI_SCSI_PASS_THRU_PROTOCOL           *ScsiInterface;\r
   EFI_EXT_SCSI_PASS_THRU_PROTOCOL       *ExtScsiInterface;\r
   EFI_DEVICE_PATH_PROTOCOL              *DevicePath;\r


@@ -92,7 +92,7 @@ typedef struct {
   EFI_HANDLE                         Handle;\r
   EFI_SCSI_IO_PROTOCOL               ScsiIo;\r
   EFI_DEVICE_PATH_PROTOCOL           *DevicePath;\r
   EFI_HANDLE                         Handle;\r
   EFI_SCSI_IO_PROTOCOL               ScsiIo;\r
   EFI_DEVICE_PATH_PROTOCOL           *DevicePath;\r

-  BOOLEAN                            ExtScsiSupport; \r
+  BOOLEAN                            ExtScsiSupport;\r

   EFI_SCSI_PASS_THRU_PROTOCOL        *ScsiPassThru;\r
   EFI_EXT_SCSI_PASS_THRU_PROTOCOL    *ExtScsiPassThru;\r
   SCSI_BUS_DEVICE                    *ScsiBusDeviceData;\r
   EFI_SCSI_PASS_THRU_PROTOCOL        *ScsiPassThru;\r
   EFI_EXT_SCSI_PASS_THRU_PROTOCOL    *ExtScsiPassThru;\r
   SCSI_BUS_DEVICE                    *ScsiBusDeviceData;\r


@@ -174,7 +174,7 @@ SCSIBusDriverBindingStart (
   restrictions for this service. DisconnectController() must follow these\r
   calling restrictions. If any other agent wishes to call Stop() it must also\r
   follow these calling restrictions.\r
   restrictions for this service. DisconnectController() must follow these\r
   calling restrictions. If any other agent wishes to call Stop() it must also\r
   follow these calling restrictions.\r

-  \r
+\r

   @param  This              Protocol instance pointer.\r
   @param  ControllerHandle  Handle of device to stop driver on\r
   @param  NumberOfChildren  Number of Handles in ChildHandleBuffer. If number of\r
   @param  This              Protocol instance pointer.\r
   @param  ControllerHandle  Handle of device to stop driver on\r
   @param  NumberOfChildren  Number of Handles in ChildHandleBuffer. If number of\r


@@ -327,11 +327,11 @@ ScsiBusComponentNameGetControllerName (
 \r
   @param  This          Protocol instance pointer.\r
   @param  DeviceType    A pointer to the device type information retrieved from\r
 \r
   @param  This          Protocol instance pointer.\r
   @param  DeviceType    A pointer to the device type information retrieved from\r

-                        the SCSI Controller. \r
+                        the SCSI Controller.\r

 \r
   @retval EFI_SUCCESS             Retrieves the device type information successfully.\r
   @retval EFI_INVALID_PARAMETER   The DeviceType is NULL.\r
 \r
   @retval EFI_SUCCESS             Retrieves the device type information successfully.\r
   @retval EFI_INVALID_PARAMETER   The DeviceType is NULL.\r

-  \r
+\r

 **/\r
 EFI_STATUS\r
 EFIAPI\r
 **/\r
 EFI_STATUS\r
 EFIAPI\r


@@ -370,7 +370,7 @@ ScsiGetDeviceLocation (
   @retval  EFI_DEVICE_ERROR  Errors encountered when resetting the SCSI bus.\r
   @retval  EFI_UNSUPPORTED   The bus reset operation is not supported by the\r
                              SCSI Host Controller.\r
   @retval  EFI_DEVICE_ERROR  Errors encountered when resetting the SCSI bus.\r
   @retval  EFI_UNSUPPORTED   The bus reset operation is not supported by the\r
                              SCSI Host Controller.\r

-  @retval  EFI_TIMEOUT       A timeout occurred while attempting to reset \r
+  @retval  EFI_TIMEOUT       A timeout occurred while attempting to reset\r

                              the SCSI bus.\r
 **/\r
 EFI_STATUS\r
                              the SCSI bus.\r
 **/\r
 EFI_STATUS\r


@@ -400,47 +400,47 @@ ScsiResetDevice (
   Sends a SCSI Request Packet to the SCSI Controller for execution.\r
 \r
   @param  This            Protocol instance pointer.\r
   Sends a SCSI Request Packet to the SCSI Controller for execution.\r
 \r
   @param  This            Protocol instance pointer.\r

-  @param  CommandPacket   The SCSI request packet to send to the SCSI \r
+  @param  CommandPacket   The SCSI request packet to send to the SCSI\r

                           Controller specified by the device handle.\r
   @param  Event           If the SCSI bus where the SCSI device is attached\r
                           Controller specified by the device handle.\r
   @param  Event           If the SCSI bus where the SCSI device is attached\r

-                          does not support non-blocking I/O, then Event is \r
-                          ignored, and blocking I/O is performed.  \r
+                          does not support non-blocking I/O, then Event is\r
+                          ignored, and blocking I/O is performed.\r

                           If Event is NULL, then blocking I/O is performed.\r
                           If Event is NULL, then blocking I/O is performed.\r

-                          If Event is not NULL and non-blocking I/O is \r
+                          If Event is not NULL and non-blocking I/O is\r

                           supported, then non-blocking I/O is performed,\r
                           and Event will be signaled when the SCSI Request\r
                           Packet completes.\r
 \r
                           supported, then non-blocking I/O is performed,\r
                           and Event will be signaled when the SCSI Request\r
                           Packet completes.\r
 \r

-  @retval EFI_SUCCESS         The SCSI Request Packet was sent by the host \r
-                              successfully, and TransferLength bytes were \r
-                              transferred to/from DataBuffer.See \r
-                              HostAdapterStatus, TargetStatus, \r
+  @retval EFI_SUCCESS         The SCSI Request Packet was sent by the host\r
+                              successfully, and TransferLength bytes were\r
+                              transferred to/from DataBuffer.See\r
+                              HostAdapterStatus, TargetStatus,\r

                               SenseDataLength, and SenseData in that order\r
                               for additional status information.\r
                               SenseDataLength, and SenseData in that order\r
                               for additional status information.\r

-  @retval EFI_BAD_BUFFER_SIZE The SCSI Request Packet was executed, \r
+  @retval EFI_BAD_BUFFER_SIZE The SCSI Request Packet was executed,\r

                               but the entire DataBuffer could not be transferred.\r
                               The actual number of bytes transferred is returned\r
                               but the entire DataBuffer could not be transferred.\r
                               The actual number of bytes transferred is returned\r

-                              in TransferLength. See HostAdapterStatus, \r
-                              TargetStatus, SenseDataLength, and SenseData in \r
+                              in TransferLength. See HostAdapterStatus,\r
+                              TargetStatus, SenseDataLength, and SenseData in\r

                               that order for additional status information.\r
                               that order for additional status information.\r

-  @retval EFI_NOT_READY       The SCSI Request Packet could not be sent because \r
-                              there are too many SCSI Command Packets already \r
+  @retval EFI_NOT_READY       The SCSI Request Packet could not be sent because\r
+                              there are too many SCSI Command Packets already\r

                               queued.The caller may retry again later.\r
                               queued.The caller may retry again later.\r

-  @retval EFI_DEVICE_ERROR    A device error occurred while attempting to send \r
-                              the SCSI Request Packet. See HostAdapterStatus, \r
-                              TargetStatus, SenseDataLength, and SenseData in \r
+  @retval EFI_DEVICE_ERROR    A device error occurred while attempting to send\r
+                              the SCSI Request Packet. See HostAdapterStatus,\r
+                              TargetStatus, SenseDataLength, and SenseData in\r

                               that order for additional status information.\r
                               that order for additional status information.\r

-  @retval EFI_INVALID_PARAMETER  The contents of CommandPacket are invalid.  \r
-                                 The SCSI Request Packet was not sent, so no \r
+  @retval EFI_INVALID_PARAMETER  The contents of CommandPacket are invalid.\r
+                                 The SCSI Request Packet was not sent, so no\r

                                  additional status information is available.\r
   @retval EFI_UNSUPPORTED     The command described by the SCSI Request Packet\r
                                  additional status information is available.\r
   @retval EFI_UNSUPPORTED     The command described by the SCSI Request Packet\r

-                              is not supported by the SCSI initiator(i.e., SCSI \r
+                              is not supported by the SCSI initiator(i.e., SCSI\r

                               Host Controller). The SCSI Request Packet was not\r
                               Host Controller). The SCSI Request Packet was not\r

-                              sent, so no additional status information is \r
+                              sent, so no additional status information is\r

                               available.\r
                               available.\r

-  @retval EFI_TIMEOUT         A timeout occurred while waiting for the SCSI \r
+  @retval EFI_TIMEOUT         A timeout occurred while waiting for the SCSI\r

                               Request Packet to execute. See HostAdapterStatus,\r
                               Request Packet to execute. See HostAdapterStatus,\r

-                              TargetStatus, SenseDataLength, and SenseData in \r
+                              TargetStatus, SenseDataLength, and SenseData in\r

                               that order for additional status information.\r
 **/\r
 EFI_STATUS\r
                               that order for additional status information.\r
 **/\r
 EFI_STATUS\r

diff --git a/MdeModulePkg/Bus/Scsi/ScsiBusDxe/ScsiBus.uni b/MdeModulePkg/Bus/Scsi/ScsiBusDxe/ScsiBus.uni
index d1a338ba4e175d314d740abeacbe464eb9989cfd..122c1a4625ebddb4e81a1c2378be9740e7a5ffee 100644 (file)
--- a/MdeModulePkg/Bus/Scsi/ScsiBusDxe/ScsiBus.uni
+++ b/MdeModulePkg/Bus/Scsi/ScsiBusDxe/ScsiBus.uni
@@ -4,13 +4,13 @@
 // Note that the driver will install the Device Path Protocol and SCSI I/O Protocol on\r
 // these handles.\r
 //\r
 // Note that the driver will install the Device Path Protocol and SCSI I/O Protocol on\r
 // these handles.\r
 //\r

-// Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.<BR>\r
+// Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r

 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r
 // which accompanies this distribution.  The full text of the license may be found at\r
 // http://opensource.org/licenses/bsd-license.php\r
 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r
 // which accompanies this distribution.  The full text of the license may be found at\r
 // http://opensource.org/licenses/bsd-license.php\r

-// \r
+//\r

 // THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 // WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 //\r
 // THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 // WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 //\r

diff --git a/MdeModulePkg/Bus/Scsi/ScsiBusDxe/ScsiBusDxe.inf b/MdeModulePkg/Bus/Scsi/ScsiBusDxe/ScsiBusDxe.inf
index 18ffd88d897930f86e6a27b883d76b4861a26d15..abcd2676689e85b1c95c2c5d6eeb35677867f06c 100644 (file)
--- a/MdeModulePkg/Bus/Scsi/ScsiBusDxe/ScsiBusDxe.inf
+++ b/MdeModulePkg/Bus/Scsi/ScsiBusDxe/ScsiBusDxe.inf
@@ -2,16 +2,16 @@
 #  The SCSI bus driver scans all SCSI devices and creates a device handle for each of them.\r
 #  Note that the driver will install the Device Path Protocol and SCSI I/O Protocol on\r
 #  these handles.\r
 #  The SCSI bus driver scans all SCSI devices and creates a device handle for each of them.\r
 #  Note that the driver will install the Device Path Protocol and SCSI I/O Protocol on\r
 #  these handles.\r

-#  \r
-#  Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.<BR>\r
+#\r
+#  Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r

 #  This program and the accompanying materials\r
 #  are licensed and made available under the terms and conditions of the BSD License\r
 #  which accompanies this distribution.  The full text of the license may be found at\r
 #  http://opensource.org/licenses/bsd-license.php\r
 #  This program and the accompanying materials\r
 #  are licensed and made available under the terms and conditions of the BSD License\r
 #  which accompanies this distribution.  The full text of the license may be found at\r
 #  http://opensource.org/licenses/bsd-license.php\r

-#  \r
+#\r

 #  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 #  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 #  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 #  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r

-#  \r
+#\r

 ##\r
 \r
 [Defines]\r
 ##\r
 \r
 [Defines]\r


@@ -29,7 +29,7 @@
 #\r
 #  VALID_ARCHITECTURES              =  IA32 X64 IPF EBC\r
 #\r
 #\r
 #  VALID_ARCHITECTURES              =  IA32 X64 IPF EBC\r
 #\r

-#  DRIVER_BINDING                =  gSCSIBusDriverBinding                        \r
+#  DRIVER_BINDING                =  gSCSIBusDriverBinding\r

 #  COMPONENT_NAME                =  gScsiBusComponentName\r
 #  COMPONENT_NAME2               =  gScsiBusComponentName2\r
 #\r
 #  COMPONENT_NAME                =  gScsiBusComponentName\r
 #  COMPONENT_NAME2               =  gScsiBusComponentName2\r
 #\r

diff --git a/MdeModulePkg/Bus/Scsi/ScsiBusDxe/ScsiBusExtra.uni b/MdeModulePkg/Bus/Scsi/ScsiBusDxe/ScsiBusExtra.uni
index bc09a5e327e900870c6af11330eefc9bf585b2e1..29b08bcffdf06fc812dbcb9cf5f38c177981b18c 100644 (file)
--- a/MdeModulePkg/Bus/Scsi/ScsiBusDxe/ScsiBusExtra.uni
+++ b/MdeModulePkg/Bus/Scsi/ScsiBusDxe/ScsiBusExtra.uni
@@ -1,7 +1,7 @@
 // /** @file\r
 // ScsiBus Localized Strings and Content\r
 //\r
 // /** @file\r
 // ScsiBus Localized Strings and Content\r
 //\r

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

 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r
 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r


@@ -13,8 +13,8 @@
 //\r
 // **/\r
 \r
 //\r
 // **/\r
 \r

-#string STR_PROPERTIES_MODULE_NAME \r
-#language en-US \r
+#string STR_PROPERTIES_MODULE_NAME\r
+#language en-US\r

 "SCSI Bus DXE Driver"\r
 \r
 \r
 "SCSI Bus DXE Driver"\r
 \r
 \r

diff --git a/MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ComponentName.c b/MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ComponentName.c
index 08b71d08f36b8325f91acfbd0875923ac8f3182f..f2da7af8fb3c9c7972716c13d22d1effe29a70ae 100644 (file)
--- a/MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ComponentName.c
+++ b/MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ComponentName.c
@@ -1,7 +1,7 @@
 /** @file\r
   UEFI Component Name(2) protocol implementation for SCSI disk driver.\r
 \r
 /** @file\r
   UEFI Component Name(2) protocol implementation for SCSI disk driver.\r
 \r

-Copyright (c) 2004 - 2015, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2004 - 2018, Intel Corporation. All rights reserved.<BR>\r

 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r


@@ -183,7 +183,7 @@ ScsiDiskComponentNameGetControllerName (
   if (ChildHandle != NULL) {\r
     return EFI_UNSUPPORTED;\r
   }\r
   if (ChildHandle != NULL) {\r
     return EFI_UNSUPPORTED;\r
   }\r

-  \r
+\r

   //\r
   // Make sure this driver is currently managing ControllerHandle\r
   //\r
   //\r
   // Make sure this driver is currently managing ControllerHandle\r
   //\r

diff --git a/MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDisk.c b/MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDisk.c
index 6a0a19355696001a2b14c01d1611ea8a9abe5fa4..0d63c85e44beb360e359c44b4574ef94c5976a40 100644 (file)
--- a/MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDisk.c
+++ b/MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDisk.c
@@ -1,7 +1,7 @@
 /** @file\r
   SCSI disk driver that layers on every SCSI IO protocol in the system.\r
 \r
 /** @file\r
   SCSI disk driver that layers on every SCSI IO protocol in the system.\r
 \r

-Copyright (c) 2006 - 2017, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r

 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r


@@ -79,9 +79,9 @@ FreeAlignedBuffer (
 \r
   The user code starts with this function.\r
 \r
 \r
   The user code starts with this function.\r
 \r

-  @param  ImageHandle    The firmware allocated handle for the EFI image.  \r
+  @param  ImageHandle    The firmware allocated handle for the EFI image.\r

   @param  SystemTable    A pointer to the EFI System Table.\r
   @param  SystemTable    A pointer to the EFI System Table.\r

-  \r
+\r

   @retval EFI_SUCCESS       The entry point is executed successfully.\r
   @retval other             Some error occurs when executing this entry point.\r
 \r
   @retval EFI_SUCCESS       The entry point is executed successfully.\r
   @retval other             Some error occurs when executing this entry point.\r
 \r


@@ -356,7 +356,7 @@ ScsiDiskDriverBindingStart (
           );\r
         return EFI_SUCCESS;\r
       }\r
           );\r
         return EFI_SUCCESS;\r
       }\r

-    } \r
+    }\r

   }\r
 \r
   gBS->FreePool (ScsiDiskDevice->SenseData);\r
   }\r
 \r
   gBS->FreePool (ScsiDiskDevice->SenseData);\r


@@ -368,7 +368,7 @@ ScsiDiskDriverBindingStart (
          Controller\r
          );\r
   return Status;\r
          Controller\r
          );\r
   return Status;\r

-  \r
+\r

 }\r
 \r
 \r
 }\r
 \r
 \r


@@ -380,7 +380,7 @@ ScsiDiskDriverBindingStart (
   restrictions for this service. DisconnectController() must follow these\r
   calling restrictions. If any other agent wishes to call Stop() it must\r
   also follow these calling restrictions.\r
   restrictions for this service. DisconnectController() must follow these\r
   calling restrictions. If any other agent wishes to call Stop() it must\r
   also follow these calling restrictions.\r

-  \r
+\r

   @param  This              Protocol instance pointer.\r
   @param  ControllerHandle  Handle of device to stop driver on\r
   @param  NumberOfChildren  Number of Handles in ChildHandleBuffer. If number of\r
   @param  This              Protocol instance pointer.\r
   @param  ControllerHandle  Handle of device to stop driver on\r
   @param  NumberOfChildren  Number of Handles in ChildHandleBuffer. If number of\r


@@ -1720,7 +1720,7 @@ Done:
 \r
   @param  ScsiDiskDevice    The pointer of SCSI_DISK_DEV\r
   @param  MustReadCapacity  The flag about reading device capacity\r
 \r
   @param  ScsiDiskDevice    The pointer of SCSI_DISK_DEV\r
   @param  MustReadCapacity  The flag about reading device capacity\r

-  @param  MediaChange       The pointer of flag indicates if media has changed \r
+  @param  MediaChange       The pointer of flag indicates if media has changed\r

 \r
   @retval EFI_DEVICE_ERROR  Indicates that error occurs\r
   @retval EFI_SUCCESS       Successfully to detect media\r
 \r
   @retval EFI_DEVICE_ERROR  Indicates that error occurs\r
   @retval EFI_SUCCESS       Successfully to detect media\r


@@ -1855,7 +1855,7 @@ ScsiDiskDetectMedia (
         } else {\r
           break;\r
         }\r
         } else {\r
           break;\r
         }\r

-      } else {   \r
+      } else {\r

         Retry++;\r
         if (!NeedRetry || (Retry >= MaxRetry)) {\r
           goto EXIT;\r
         Retry++;\r
         if (!NeedRetry || (Retry >= MaxRetry)) {\r
           goto EXIT;\r


@@ -2059,7 +2059,7 @@ ScsiDiskInquiryDevice (
                      EFI_SCSI_PAGE_CODE_BLOCK_LIMITS_VPD\r
                      );\r
           if (!EFI_ERROR (Status)) {\r
                      EFI_SCSI_PAGE_CODE_BLOCK_LIMITS_VPD\r
                      );\r
           if (!EFI_ERROR (Status)) {\r

-            ScsiDiskDevice->BlkIo.Media->OptimalTransferLengthGranularity = \r
+            ScsiDiskDevice->BlkIo.Media->OptimalTransferLengthGranularity =\r

               (BlockLimits->OptimalTransferLengthGranularity2 << 8) |\r
                BlockLimits->OptimalTransferLengthGranularity1;\r
 \r
               (BlockLimits->OptimalTransferLengthGranularity2 << 8) |\r
                BlockLimits->OptimalTransferLengthGranularity1;\r
 \r


@@ -2111,7 +2111,7 @@ ScsiDiskInquiryDevice (
   } else if (Status == EFI_NOT_READY) {\r
     *NeedRetry = TRUE;\r
     return EFI_DEVICE_ERROR;\r
   } else if (Status == EFI_NOT_READY) {\r
     *NeedRetry = TRUE;\r
     return EFI_DEVICE_ERROR;\r

- \r
+\r

   } else if ((Status == EFI_INVALID_PARAMETER) || (Status == EFI_UNSUPPORTED)) {\r
     *NeedRetry = FALSE;\r
     return EFI_DEVICE_ERROR;\r
   } else if ((Status == EFI_INVALID_PARAMETER) || (Status == EFI_UNSUPPORTED)) {\r
     *NeedRetry = FALSE;\r
     return EFI_DEVICE_ERROR;\r


@@ -2147,7 +2147,7 @@ ScsiDiskInquiryDevice (
     *NeedRetry = FALSE;\r
     return EFI_DEVICE_ERROR;\r
   }\r
     *NeedRetry = FALSE;\r
     return EFI_DEVICE_ERROR;\r
   }\r

-  \r
+\r

   //\r
   // if goes here, meant ScsiInquiryCommand() failed.\r
   // if ScsiDiskRequestSenseKeys() succeeds at last,\r
   //\r
   // if goes here, meant ScsiInquiryCommand() failed.\r
   // if ScsiDiskRequestSenseKeys() succeeds at last,\r


@@ -2303,7 +2303,7 @@ ScsiDiskTestUnitReady (
 \r
   @param  ScsiDiskDevice     The pointer of SCSI_DISK_DEV\r
   @param  SenseData          The pointer of EFI_SCSI_SENSE_DATA\r
 \r
   @param  ScsiDiskDevice     The pointer of SCSI_DISK_DEV\r
   @param  SenseData          The pointer of EFI_SCSI_SENSE_DATA\r

-  @param  NumberOfSenseKeys  The number of sense key  \r
+  @param  NumberOfSenseKeys  The number of sense key\r

   @param  Action             The pointer of action which indicates what is need to do next\r
 \r
   @retval EFI_DEVICE_ERROR   Indicates that error occurs\r
   @param  Action             The pointer of action which indicates what is need to do next\r
 \r
   @retval EFI_DEVICE_ERROR   Indicates that error occurs\r


@@ -2444,7 +2444,7 @@ ScsiDiskReadCapacity (
   *NeedRetry          = FALSE;\r
 \r
   //\r
   *NeedRetry          = FALSE;\r
 \r
   //\r

-  // submit Read Capacity(10) Command. If it returns capacity of FFFFFFFFh, \r
+  // submit Read Capacity(10) Command. If it returns capacity of FFFFFFFFh,\r

   // 16 byte command should be used to access large hard disk >2TB\r
   //\r
   CommandStatus = ScsiReadCapacityCommand (\r
   // 16 byte command should be used to access large hard disk >2TB\r
   //\r
   CommandStatus = ScsiReadCapacityCommand (\r


@@ -2508,12 +2508,12 @@ ScsiDiskReadCapacity (
    // go ahead to check HostAdapterStatus and TargetStatus\r
    // (EFI_TIMEOUT, EFI_DEVICE_ERROR, EFI_WARN_BUFFER_TOO_SMALL)\r
    //\r
    // go ahead to check HostAdapterStatus and TargetStatus\r
    // (EFI_TIMEOUT, EFI_DEVICE_ERROR, EFI_WARN_BUFFER_TOO_SMALL)\r
    //\r

- \r
+\r

    Status = CheckHostAdapterStatus (HostAdapterStatus);\r
    if ((Status == EFI_TIMEOUT) || (Status == EFI_NOT_READY)) {\r
      *NeedRetry = TRUE;\r
      return EFI_DEVICE_ERROR;\r
    Status = CheckHostAdapterStatus (HostAdapterStatus);\r
    if ((Status == EFI_TIMEOUT) || (Status == EFI_NOT_READY)) {\r
      *NeedRetry = TRUE;\r
      return EFI_DEVICE_ERROR;\r

- \r
+\r

    } else if (Status == EFI_DEVICE_ERROR) {\r
     //\r
     // reset the scsi channel\r
    } else if (Status == EFI_DEVICE_ERROR) {\r
     //\r
     // reset the scsi channel\r


@@ -2536,7 +2536,7 @@ ScsiDiskReadCapacity (
     *NeedRetry = FALSE;\r
     return EFI_DEVICE_ERROR;\r
   }\r
     *NeedRetry = FALSE;\r
     return EFI_DEVICE_ERROR;\r
   }\r

-  \r
+\r

   //\r
   // if goes here, meant ScsiReadCapacityCommand() failed.\r
   // if ScsiDiskRequestSenseKeys() succeeds at last,\r
   //\r
   // if goes here, meant ScsiReadCapacityCommand() failed.\r
   // if ScsiDiskRequestSenseKeys() succeeds at last,\r


@@ -2616,7 +2616,7 @@ CheckHostAdapterStatus (
   @param  TargetStatus  Target status\r
 \r
   @retval EFI_NOT_READY       Device is NOT ready.\r
   @param  TargetStatus  Target status\r
 \r
   @retval EFI_NOT_READY       Device is NOT ready.\r

-  @retval EFI_DEVICE_ERROR \r
+  @retval EFI_DEVICE_ERROR\r

   @retval EFI_SUCCESS\r
 \r
 **/\r
   @retval EFI_SUCCESS\r
 \r
 **/\r


@@ -2708,20 +2708,20 @@ ScsiDiskRequestSenseKeys (
               );\r
      if ((Status == EFI_SUCCESS) || (Status == EFI_WARN_BUFFER_TOO_SMALL)) {\r
         FallStatus = EFI_SUCCESS;\r
               );\r
      if ((Status == EFI_SUCCESS) || (Status == EFI_WARN_BUFFER_TOO_SMALL)) {\r
         FallStatus = EFI_SUCCESS;\r

-  \r
+\r

      } else if ((Status == EFI_TIMEOUT) || (Status == EFI_NOT_READY)) {\r
        *NeedRetry  = TRUE;\r
        FallStatus  = EFI_DEVICE_ERROR;\r
      } else if ((Status == EFI_TIMEOUT) || (Status == EFI_NOT_READY)) {\r
        *NeedRetry  = TRUE;\r
        FallStatus  = EFI_DEVICE_ERROR;\r

- \r
+\r

      } else if ((Status == EFI_INVALID_PARAMETER) || (Status == EFI_UNSUPPORTED)) {\r
        *NeedRetry  = FALSE;\r
        FallStatus  = EFI_DEVICE_ERROR;\r
      } else if ((Status == EFI_INVALID_PARAMETER) || (Status == EFI_UNSUPPORTED)) {\r
        *NeedRetry  = FALSE;\r
        FallStatus  = EFI_DEVICE_ERROR;\r

- \r
+\r

      } else if (Status == EFI_DEVICE_ERROR) {\r
         if (AskResetIfError) {\r
           ScsiDiskDevice->ScsiIo->ResetDevice (ScsiDiskDevice->ScsiIo);\r
         }\r
      } else if (Status == EFI_DEVICE_ERROR) {\r
         if (AskResetIfError) {\r
           ScsiDiskDevice->ScsiIo->ResetDevice (ScsiDiskDevice->ScsiIo);\r
         }\r

-  \r
+\r

         FallStatus = EFI_DEVICE_ERROR;\r
     }\r
 \r
         FallStatus = EFI_DEVICE_ERROR;\r
     }\r
 \r


@@ -2743,7 +2743,7 @@ ScsiDiskRequestSenseKeys (
     // no more sense key or number of sense keys exceeds predefined,\r
     // skip the loop.\r
     //\r
     // no more sense key or number of sense keys exceeds predefined,\r
     // skip the loop.\r
     //\r

-    if ((PtrSenseData->Sense_Key == EFI_SCSI_SK_NO_SENSE) || \r
+    if ((PtrSenseData->Sense_Key == EFI_SCSI_SK_NO_SENSE) ||\r

         (*NumberOfSenseKeys == ScsiDiskDevice->SenseDataNumber)) {\r
       SenseReq = FALSE;\r
     }\r
         (*NumberOfSenseKeys == ScsiDiskDevice->SenseDataNumber)) {\r
       SenseReq = FALSE;\r
     }\r


@@ -2777,9 +2777,9 @@ GetMediaInfo (
                                               (Capacity10->LastLba2 << 16) |\r
                                               (Capacity10->LastLba1 << 8)  |\r
                                                Capacity10->LastLba0;\r
                                               (Capacity10->LastLba2 << 16) |\r
                                               (Capacity10->LastLba1 << 8)  |\r
                                                Capacity10->LastLba0;\r

-  \r
+\r

     ScsiDiskDevice->BlkIo.Media->BlockSize = (Capacity10->BlockSize3 << 24) |\r
     ScsiDiskDevice->BlkIo.Media->BlockSize = (Capacity10->BlockSize3 << 24) |\r

-                                             (Capacity10->BlockSize2 << 16) | \r
+                                             (Capacity10->BlockSize2 << 16) |\r

                                              (Capacity10->BlockSize1 << 8)  |\r
                                               Capacity10->BlockSize0;\r
     ScsiDiskDevice->BlkIo.Media->LowestAlignedLba               = 0;\r
                                              (Capacity10->BlockSize1 << 8)  |\r
                                               Capacity10->BlockSize0;\r
     ScsiDiskDevice->BlkIo.Media->LowestAlignedLba               = 0;\r


@@ -2799,7 +2799,7 @@ GetMediaInfo (
     *Ptr   = Capacity16->LastLba7;\r
 \r
     ScsiDiskDevice->BlkIo.Media->BlockSize = (Capacity16->BlockSize3 << 24) |\r
     *Ptr   = Capacity16->LastLba7;\r
 \r
     ScsiDiskDevice->BlkIo.Media->BlockSize = (Capacity16->BlockSize3 << 24) |\r

-                                             (Capacity16->BlockSize2 << 16) | \r
+                                             (Capacity16->BlockSize2 << 16) |\r

                                              (Capacity16->BlockSize1 << 8)  |\r
                                               Capacity16->BlockSize0;\r
 \r
                                              (Capacity16->BlockSize1 << 8)  |\r
                                               Capacity16->BlockSize0;\r
 \r


@@ -2870,7 +2870,7 @@ ScsiDiskReadSectors (
 \r
   BlocksRemaining   = NumberOfBlocks;\r
   BlockSize         = ScsiDiskDevice->BlkIo.Media->BlockSize;\r
 \r
   BlocksRemaining   = NumberOfBlocks;\r
   BlockSize         = ScsiDiskDevice->BlkIo.Media->BlockSize;\r

-  \r
+\r

   //\r
   // limit the data bytes that can be transferred by one Read(10) or Read(16) Command\r
   //\r
   //\r
   // limit the data bytes that can be transferred by one Read(10) or Read(16) Command\r
   //\r


@@ -3114,7 +3114,7 @@ ScsiDiskWriteSectors (
                   &ByteCount,\r
                   Lba,\r
                   SectorCount\r
                   &ByteCount,\r
                   Lba,\r
                   SectorCount\r

-                  );         \r
+                  );\r

         }\r
       if (!EFI_ERROR (Status)) {\r
         break;\r
         }\r
       if (!EFI_ERROR (Status)) {\r
         break;\r


@@ -4994,7 +4994,7 @@ ScsiDiskIsHardwareError (
   SensePtr  = SenseData;\r
 \r
   for (Index = 0; Index < SenseCounts; Index++) {\r
   SensePtr  = SenseData;\r
 \r
   for (Index = 0; Index < SenseCounts; Index++) {\r

-    \r
+\r

     //\r
     // Sense Key is EFI_SCSI_SK_HARDWARE_ERROR (0x4)\r
     //\r
     //\r
     // Sense Key is EFI_SCSI_SK_HARDWARE_ERROR (0x4)\r
     //\r


@@ -5071,7 +5071,7 @@ ScsiDiskIsResetBefore (
   SensePtr      = SenseData;\r
 \r
   for (Index = 0; Index < SenseCounts; Index++) {\r
   SensePtr      = SenseData;\r
 \r
   for (Index = 0; Index < SenseCounts; Index++) {\r

-    \r
+\r

     //\r
     // Sense Key is EFI_SCSI_SK_UNIT_ATTENTION (0x6)\r
     // Additional Sense Code is EFI_SCSI_ASC_RESET (0x29)\r
     //\r
     // Sense Key is EFI_SCSI_SK_UNIT_ATTENTION (0x6)\r
     // Additional Sense Code is EFI_SCSI_ASC_RESET (0x29)\r


@@ -5092,7 +5092,7 @@ ScsiDiskIsResetBefore (
 \r
   @param  SenseData    The pointer of EFI_SCSI_SENSE_DATA\r
   @param  SenseCounts  The number of sense key\r
 \r
   @param  SenseData    The pointer of EFI_SCSI_SENSE_DATA\r
   @param  SenseCounts  The number of sense key\r

-  @param  RetryLater   The flag means if need a retry \r
+  @param  RetryLater   The flag means if need a retry\r

 \r
   @retval TRUE  Drive is ready.\r
   @retval FALSE Drive is NOT ready.\r
 \r
   @retval TRUE  Drive is ready.\r
   @retval FALSE Drive is NOT ready.\r


@@ -5187,7 +5187,7 @@ ScsiDiskHaveSenseKey (
   SensePtr = SenseData;\r
 \r
   for (Index = 0; Index < SenseCounts; Index++) {\r
   SensePtr = SenseData;\r
 \r
   for (Index = 0; Index < SenseCounts; Index++) {\r

-    \r
+\r

     //\r
     // Sense Key is SK_NO_SENSE (0x0)\r
     //\r
     //\r
     // Sense Key is SK_NO_SENSE (0x0)\r
     //\r


@@ -5234,18 +5234,18 @@ ReleaseScsiDiskDeviceResources (
 \r
 /**\r
   Determine if Block Io & Block Io2 should be produced.\r
 \r
 /**\r
   Determine if Block Io & Block Io2 should be produced.\r

-  \r
+\r

 \r
   @param  ChildHandle  Child Handle to retrieve Parent information.\r
 \r
   @param  ChildHandle  Child Handle to retrieve Parent information.\r

-  \r
+\r

   @retval  TRUE    Should produce Block Io & Block Io2.\r
   @retval  FALSE   Should not produce Block Io & Block Io2.\r
 \r
   @retval  TRUE    Should produce Block Io & Block Io2.\r
   @retval  FALSE   Should not produce Block Io & Block Io2.\r
 \r

-**/  \r
+**/\r

 BOOLEAN\r
 DetermineInstallBlockIo (\r
   IN  EFI_HANDLE      ChildHandle\r
 BOOLEAN\r
 DetermineInstallBlockIo (\r
   IN  EFI_HANDLE      ChildHandle\r

-  )  \r
+  )\r

 {\r
   EFI_SCSI_PASS_THRU_PROTOCOL           *ScsiPassThru;\r
   EFI_EXT_SCSI_PASS_THRU_PROTOCOL       *ExtScsiPassThru;\r
 {\r
   EFI_SCSI_PASS_THRU_PROTOCOL           *ScsiPassThru;\r
   EFI_EXT_SCSI_PASS_THRU_PROTOCOL       *ExtScsiPassThru;\r


@@ -5271,7 +5271,7 @@ DetermineInstallBlockIo (
       return TRUE;\r
     }\r
   }\r
       return TRUE;\r
     }\r
   }\r

-  \r
+\r

   return FALSE;\r
 }\r
 \r
   return FALSE;\r
 }\r
 \r


@@ -5280,23 +5280,23 @@ DetermineInstallBlockIo (
   specified by ProtocolGuid is present on a ControllerHandle and opened by\r
   ChildHandle with an attribute of EFI_OPEN_PROTOCOL_BY_CHILD_CONTROLLER.\r
   If the ControllerHandle is found, then the protocol specified by ProtocolGuid\r
   specified by ProtocolGuid is present on a ControllerHandle and opened by\r
   ChildHandle with an attribute of EFI_OPEN_PROTOCOL_BY_CHILD_CONTROLLER.\r
   If the ControllerHandle is found, then the protocol specified by ProtocolGuid\r

-  will be opened on it.  \r
-  \r
+  will be opened on it.\r
+\r

 \r
   @param  ProtocolGuid   ProtocolGuid pointer.\r
   @param  ChildHandle    Child Handle to retrieve Parent information.\r
 \r
   @param  ProtocolGuid   ProtocolGuid pointer.\r
   @param  ChildHandle    Child Handle to retrieve Parent information.\r

-  \r
-**/ \r
+\r
+**/\r

 VOID *\r
 EFIAPI\r
 GetParentProtocol (\r
   IN  EFI_GUID                          *ProtocolGuid,\r
   IN  EFI_HANDLE                        ChildHandle\r
 VOID *\r
 EFIAPI\r
 GetParentProtocol (\r
   IN  EFI_GUID                          *ProtocolGuid,\r
   IN  EFI_HANDLE                        ChildHandle\r

-  ) \r
+  )\r

 {\r
   UINTN                                 Index;\r
   UINTN                                 HandleCount;\r
 {\r
   UINTN                                 Index;\r
   UINTN                                 HandleCount;\r

-  VOID                                  *Interface;  \r
+  VOID                                  *Interface;\r

   EFI_STATUS                            Status;\r
   EFI_HANDLE                            *HandleBuffer;\r
 \r
   EFI_STATUS                            Status;\r
   EFI_HANDLE                            *HandleBuffer;\r
 \r


@@ -5316,7 +5316,7 @@ GetParentProtocol (
   }\r
 \r
   //\r
   }\r
 \r
   //\r

-  // Iterate to find who is parent handle that is opened with ProtocolGuid by ChildHandle \r
+  // Iterate to find who is parent handle that is opened with ProtocolGuid by ChildHandle\r

   //\r
   for (Index = 0; Index < HandleCount; Index++) {\r
     Status = EfiTestChildHandle (HandleBuffer[Index], ChildHandle, ProtocolGuid);\r
   //\r
   for (Index = 0; Index < HandleCount; Index++) {\r
     Status = EfiTestChildHandle (HandleBuffer[Index], ChildHandle, ProtocolGuid);\r


@@ -5331,7 +5331,7 @@ GetParentProtocol (
 \r
   gBS->FreePool (HandleBuffer);\r
   return NULL;\r
 \r
   gBS->FreePool (HandleBuffer);\r
   return NULL;\r

-} \r
+}\r

 \r
 /**\r
   Determine if EFI Erase Block Protocol should be produced.\r
 \r
 /**\r
   Determine if EFI Erase Block Protocol should be produced.\r


@@ -5468,7 +5468,7 @@ Done:
 \r
 /**\r
   Provides inquiry information for the controller type.\r
 \r
 /**\r
   Provides inquiry information for the controller type.\r

-  \r
+\r

   This function is used by the IDE bus driver to get inquiry data.  Data format\r
   of Identify data is defined by the Interface GUID.\r
 \r
   This function is used by the IDE bus driver to get inquiry data.  Data format\r
   of Identify data is defined by the Interface GUID.\r
 \r


@@ -5477,9 +5477,9 @@ Done:
   @param[in, out] InquiryDataSize   Pointer to the value for the inquiry data size.\r
 \r
   @retval EFI_SUCCESS            The command was accepted without any errors.\r
   @param[in, out] InquiryDataSize   Pointer to the value for the inquiry data size.\r
 \r
   @retval EFI_SUCCESS            The command was accepted without any errors.\r

-  @retval EFI_NOT_FOUND          Device does not support this data class \r
-  @retval EFI_DEVICE_ERROR       Error reading InquiryData from device \r
-  @retval EFI_BUFFER_TOO_SMALL   InquiryDataSize not big enough \r
+  @retval EFI_NOT_FOUND          Device does not support this data class\r
+  @retval EFI_DEVICE_ERROR       Error reading InquiryData from device\r
+  @retval EFI_BUFFER_TOO_SMALL   InquiryDataSize not big enough\r

 \r
 **/\r
 EFI_STATUS\r
 \r
 **/\r
 EFI_STATUS\r


@@ -5511,16 +5511,16 @@ ScsiDiskInfoInquiry (
   This function is used by the IDE bus driver to get identify data.  Data format\r
   of Identify data is defined by the Interface GUID.\r
 \r
   This function is used by the IDE bus driver to get identify data.  Data format\r
   of Identify data is defined by the Interface GUID.\r
 \r

-  @param[in]      This              Pointer to the EFI_DISK_INFO_PROTOCOL \r
+  @param[in]      This              Pointer to the EFI_DISK_INFO_PROTOCOL\r

                                     instance.\r
   @param[in, out] IdentifyData      Pointer to a buffer for the identify data.\r
   @param[in, out] IdentifyDataSize  Pointer to the value for the identify data\r
                                     size.\r
 \r
   @retval EFI_SUCCESS            The command was accepted without any errors.\r
                                     instance.\r
   @param[in, out] IdentifyData      Pointer to a buffer for the identify data.\r
   @param[in, out] IdentifyDataSize  Pointer to the value for the identify data\r
                                     size.\r
 \r
   @retval EFI_SUCCESS            The command was accepted without any errors.\r

-  @retval EFI_NOT_FOUND          Device does not support this data class \r
-  @retval EFI_DEVICE_ERROR       Error reading IdentifyData from device \r
-  @retval EFI_BUFFER_TOO_SMALL   IdentifyDataSize not big enough \r
+  @retval EFI_NOT_FOUND          Device does not support this data class\r
+  @retval EFI_DEVICE_ERROR       Error reading IdentifyData from device\r
+  @retval EFI_BUFFER_TOO_SMALL   IdentifyDataSize not big enough\r

 \r
 **/\r
 EFI_STATUS\r
 \r
 **/\r
 EFI_STATUS\r


@@ -5536,7 +5536,7 @@ ScsiDiskInfoIdentify (
 \r
   if (CompareGuid (&This->Interface, &gEfiDiskInfoScsiInterfaceGuid) || CompareGuid (&This->Interface, &gEfiDiskInfoUfsInterfaceGuid)) {\r
     //\r
 \r
   if (CompareGuid (&This->Interface, &gEfiDiskInfoScsiInterfaceGuid) || CompareGuid (&This->Interface, &gEfiDiskInfoUfsInterfaceGuid)) {\r
     //\r

-    // Physical SCSI bus does not support this data class. \r
+    // Physical SCSI bus does not support this data class.\r

     //\r
     return EFI_NOT_FOUND;\r
   }\r
     //\r
     return EFI_NOT_FOUND;\r
   }\r


@@ -5554,8 +5554,8 @@ ScsiDiskInfoIdentify (
 \r
 /**\r
   Provides sense data information for the controller type.\r
 \r
 /**\r
   Provides sense data information for the controller type.\r

-  \r
-  This function is used by the IDE bus driver to get sense data. \r
+\r
+  This function is used by the IDE bus driver to get sense data.\r

   Data format of Sense data is defined by the Interface GUID.\r
 \r
   @param[in]      This              Pointer to the EFI_DISK_INFO_PROTOCOL instance.\r
   Data format of Sense data is defined by the Interface GUID.\r
 \r
   @param[in]      This              Pointer to the EFI_DISK_INFO_PROTOCOL instance.\r


@@ -5585,7 +5585,7 @@ ScsiDiskInfoSenseData (
 /**\r
   This function is used by the IDE bus driver to get controller information.\r
 \r
 /**\r
   This function is used by the IDE bus driver to get controller information.\r
 \r

-  @param[in]  This         Pointer to the EFI_DISK_INFO_PROTOCOL instance. \r
+  @param[in]  This         Pointer to the EFI_DISK_INFO_PROTOCOL instance.\r

   @param[out] IdeChannel   Pointer to the Ide Channel number.  Primary or secondary.\r
   @param[out] IdeDevice    Pointer to the Ide Device number.  Master or slave.\r
 \r
   @param[out] IdeChannel   Pointer to the Ide Channel number.  Primary or secondary.\r
   @param[out] IdeDevice    Pointer to the Ide Device number.  Master or slave.\r
 \r


@@ -5626,11 +5626,11 @@ ScsiDiskInfoWhichIde (
   via SCSI Request Packet.\r
 \r
   @param  ScsiDiskDevice  The pointer of SCSI_DISK_DEV\r
   via SCSI Request Packet.\r
 \r
   @param  ScsiDiskDevice  The pointer of SCSI_DISK_DEV\r

-  \r
+\r

   @retval EFI_SUCCESS     The ATAPI device identify data were retrieved successfully.\r
   @retval others          Some error occurred during the identification that ATAPI device.\r
 \r
   @retval EFI_SUCCESS     The ATAPI device identify data were retrieved successfully.\r
   @retval others          Some error occurred during the identification that ATAPI device.\r
 \r

-**/  \r
+**/\r

 EFI_STATUS\r
 AtapiIdentifyDevice (\r
   IN OUT SCSI_DISK_DEV   *ScsiDiskDevice\r
 EFI_STATUS\r
 AtapiIdentifyDevice (\r
   IN OUT SCSI_DISK_DEV   *ScsiDiskDevice\r


@@ -5666,8 +5666,8 @@ AtapiIdentifyDevice (
 \r
   @param  ScsiDiskDevice  The pointer of SCSI_DISK_DEV.\r
   @param  ChildHandle     Child handle to install DiskInfo protocol.\r
 \r
   @param  ScsiDiskDevice  The pointer of SCSI_DISK_DEV.\r
   @param  ChildHandle     Child handle to install DiskInfo protocol.\r

-  \r
-**/  \r
+\r
+**/\r

 VOID\r
 InitializeInstallDiskInfo (\r
   IN  SCSI_DISK_DEV   *ScsiDiskDevice,\r
 VOID\r
 InitializeInstallDiskInfo (\r
   IN  SCSI_DISK_DEV   *ScsiDiskDevice,\r


@@ -5683,7 +5683,7 @@ InitializeInstallDiskInfo (
 \r
   Status = gBS->HandleProtocol (ChildHandle, &gEfiDevicePathProtocolGuid, (VOID **) &DevicePathNode);\r
   //\r
 \r
   Status = gBS->HandleProtocol (ChildHandle, &gEfiDevicePathProtocolGuid, (VOID **) &DevicePathNode);\r
   //\r

-  // Device Path protocol must be installed on the device handle. \r
+  // Device Path protocol must be installed on the device handle.\r

   //\r
   ASSERT_EFI_ERROR (Status);\r
   //\r
   //\r
   ASSERT_EFI_ERROR (Status);\r
   //\r


@@ -5715,7 +5715,7 @@ InitializeInstallDiskInfo (
             ScsiDiskDevice->Channel = AtapiDevicePath->PrimarySecondary;\r
             ScsiDiskDevice->Device = AtapiDevicePath->SlaveMaster;\r
             //\r
             ScsiDiskDevice->Channel = AtapiDevicePath->PrimarySecondary;\r
             ScsiDiskDevice->Device = AtapiDevicePath->SlaveMaster;\r
             //\r

-            // Update the DiskInfo.Interface to IDE interface GUID for the physical ATAPI device. \r
+            // Update the DiskInfo.Interface to IDE interface GUID for the physical ATAPI device.\r

             //\r
             CopyGuid (&ScsiDiskDevice->DiskInfo.Interface, &gEfiDiskInfoIdeInterfaceGuid);\r
           } else {\r
             //\r
             CopyGuid (&ScsiDiskDevice->DiskInfo.Interface, &gEfiDiskInfoIdeInterfaceGuid);\r
           } else {\r


@@ -5726,7 +5726,7 @@ InitializeInstallDiskInfo (
             ScsiDiskDevice->Channel = SataDevicePath->HBAPortNumber;\r
             ScsiDiskDevice->Device = SataDevicePath->PortMultiplierPortNumber;\r
             //\r
             ScsiDiskDevice->Channel = SataDevicePath->HBAPortNumber;\r
             ScsiDiskDevice->Device = SataDevicePath->PortMultiplierPortNumber;\r
             //\r

-            // Update the DiskInfo.Interface to AHCI interface GUID for the physical AHCI device. \r
+            // Update the DiskInfo.Interface to AHCI interface GUID for the physical AHCI device.\r

             //\r
             CopyGuid (&ScsiDiskDevice->DiskInfo.Interface, &gEfiDiskInfoAhciInterfaceGuid);\r
           }\r
             //\r
             CopyGuid (&ScsiDiskDevice->DiskInfo.Interface, &gEfiDiskInfoAhciInterfaceGuid);\r
           }\r

diff --git a/MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDisk.h b/MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDisk.h
index 6e9f032bb863af0bb4fe6f2f9528a3b1e8b3ceac..bb6232676d1d0ba6cb1d376160537929745e4ec0 100644 (file)
--- a/MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDisk.h
+++ b/MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDisk.h
@@ -1,7 +1,7 @@
 /** @file\r
   Header file for SCSI Disk Driver.\r
 \r
 /** @file\r
   Header file for SCSI Disk Driver.\r
 \r

-Copyright (c) 2004 - 2016, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2004 - 2018, Intel Corporation. All rights reserved.<BR>\r

 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r


@@ -86,7 +86,7 @@ typedef struct {
   //\r
   SCSI_UNMAP_PARAM_INFO     UnmapInfo;\r
   BOOLEAN                   BlockLimitsVpdSupported;\r
   //\r
   SCSI_UNMAP_PARAM_INFO     UnmapInfo;\r
   BOOLEAN                   BlockLimitsVpdSupported;\r

-  \r
+\r

   //\r
   // The flag indicates if 16-byte command can be used\r
   //\r
   //\r
   // The flag indicates if 16-byte command can be used\r
   //\r


@@ -251,7 +251,7 @@ ScsiDiskDriverBindingStart (
   restrictions for this service. DisconnectController() must follow these\r
   calling restrictions. If any other agent wishes to call Stop() it must\r
   also follow these calling restrictions.\r
   restrictions for this service. DisconnectController() must follow these\r
   calling restrictions. If any other agent wishes to call Stop() it must\r
   also follow these calling restrictions.\r

-  \r
+\r

   @param  This              Protocol instance pointer.\r
   @param  ControllerHandle  Handle of device to stop driver on\r
   @param  NumberOfChildren  Number of Handles in ChildHandleBuffer. If number of\r
   @param  This              Protocol instance pointer.\r
   @param  ControllerHandle  Handle of device to stop driver on\r
   @param  NumberOfChildren  Number of Handles in ChildHandleBuffer. If number of\r


@@ -646,7 +646,7 @@ ScsiDiskEraseBlocks (
 \r
 /**\r
   Provides inquiry information for the controller type.\r
 \r
 /**\r
   Provides inquiry information for the controller type.\r

-  \r
+\r

   This function is used by the IDE bus driver to get inquiry data.  Data format\r
   of Identify data is defined by the Interface GUID.\r
 \r
   This function is used by the IDE bus driver to get inquiry data.  Data format\r
   of Identify data is defined by the Interface GUID.\r
 \r


@@ -655,9 +655,9 @@ ScsiDiskEraseBlocks (
   @param[in, out] InquiryDataSize   Pointer to the value for the inquiry data size.\r
 \r
   @retval EFI_SUCCESS            The command was accepted without any errors.\r
   @param[in, out] InquiryDataSize   Pointer to the value for the inquiry data size.\r
 \r
   @retval EFI_SUCCESS            The command was accepted without any errors.\r

-  @retval EFI_NOT_FOUND          Device does not support this data class \r
-  @retval EFI_DEVICE_ERROR       Error reading InquiryData from device \r
-  @retval EFI_BUFFER_TOO_SMALL   InquiryDataSize not big enough \r
+  @retval EFI_NOT_FOUND          Device does not support this data class\r
+  @retval EFI_DEVICE_ERROR       Error reading InquiryData from device\r
+  @retval EFI_BUFFER_TOO_SMALL   InquiryDataSize not big enough\r

 \r
 **/\r
 EFI_STATUS\r
 \r
 **/\r
 EFI_STATUS\r


@@ -675,16 +675,16 @@ ScsiDiskInfoInquiry (
   This function is used by the IDE bus driver to get identify data.  Data format\r
   of Identify data is defined by the Interface GUID.\r
 \r
   This function is used by the IDE bus driver to get identify data.  Data format\r
   of Identify data is defined by the Interface GUID.\r
 \r

-  @param[in]     This               Pointer to the EFI_DISK_INFO_PROTOCOL \r
+  @param[in]     This               Pointer to the EFI_DISK_INFO_PROTOCOL\r

                                     instance.\r
   @param[in, out] IdentifyData      Pointer to a buffer for the identify data.\r
   @param[in, out] IdentifyDataSize  Pointer to the value for the identify data\r
                                     size.\r
 \r
   @retval EFI_SUCCESS            The command was accepted without any errors.\r
                                     instance.\r
   @param[in, out] IdentifyData      Pointer to a buffer for the identify data.\r
   @param[in, out] IdentifyDataSize  Pointer to the value for the identify data\r
                                     size.\r
 \r
   @retval EFI_SUCCESS            The command was accepted without any errors.\r

-  @retval EFI_NOT_FOUND          Device does not support this data class \r
-  @retval EFI_DEVICE_ERROR       Error reading IdentifyData from device \r
-  @retval EFI_BUFFER_TOO_SMALL   IdentifyDataSize not big enough \r
+  @retval EFI_NOT_FOUND          Device does not support this data class\r
+  @retval EFI_DEVICE_ERROR       Error reading IdentifyData from device\r
+  @retval EFI_BUFFER_TOO_SMALL   IdentifyDataSize not big enough\r

 \r
 **/\r
 EFI_STATUS\r
 \r
 **/\r
 EFI_STATUS\r


@@ -698,8 +698,8 @@ ScsiDiskInfoIdentify (
 \r
 /**\r
   Provides sense data information for the controller type.\r
 \r
 /**\r
   Provides sense data information for the controller type.\r

-  \r
-  This function is used by the IDE bus driver to get sense data. \r
+\r
+  This function is used by the IDE bus driver to get sense data.\r

   Data format of Sense data is defined by the Interface GUID.\r
 \r
   @param[in]      This              Pointer to the EFI_DISK_INFO_PROTOCOL instance.\r
   Data format of Sense data is defined by the Interface GUID.\r
 \r
   @param[in]      This              Pointer to the EFI_DISK_INFO_PROTOCOL instance.\r


@@ -725,7 +725,7 @@ ScsiDiskInfoSenseData (
 /**\r
   This function is used by the IDE bus driver to get controller information.\r
 \r
 /**\r
   This function is used by the IDE bus driver to get controller information.\r
 \r

-  @param[in]  This         Pointer to the EFI_DISK_INFO_PROTOCOL instance. \r
+  @param[in]  This         Pointer to the EFI_DISK_INFO_PROTOCOL instance.\r

   @param[out] IdeChannel   Pointer to the Ide Channel number.  Primary or secondary.\r
   @param[out] IdeDevice    Pointer to the Ide Device number.  Master or slave.\r
 \r
   @param[out] IdeChannel   Pointer to the Ide Channel number.  Primary or secondary.\r
   @param[out] IdeDevice    Pointer to the Ide Device number.  Master or slave.\r
 \r


@@ -747,7 +747,7 @@ ScsiDiskInfoWhichIde (
 \r
   @param  ScsiDiskDevice    The pointer of SCSI_DISK_DEV\r
   @param  MustReadCapacity  The flag about reading device capacity\r
 \r
   @param  ScsiDiskDevice    The pointer of SCSI_DISK_DEV\r
   @param  MustReadCapacity  The flag about reading device capacity\r

-  @param  MediaChange       The pointer of flag indicates if media has changed \r
+  @param  MediaChange       The pointer of flag indicates if media has changed\r

 \r
   @retval EFI_DEVICE_ERROR  Indicates that error occurs\r
   @retval EFI_SUCCESS       Successfully to detect media\r
 \r
   @retval EFI_DEVICE_ERROR  Indicates that error occurs\r
   @retval EFI_SUCCESS       Successfully to detect media\r


@@ -790,7 +790,7 @@ ScsiDiskTestUnitReady (
 \r
   @param  ScsiDiskDevice     The pointer of SCSI_DISK_DEV\r
   @param  SenseData          The pointer of EFI_SCSI_SENSE_DATA\r
 \r
   @param  ScsiDiskDevice     The pointer of SCSI_DISK_DEV\r
   @param  SenseData          The pointer of EFI_SCSI_SENSE_DATA\r

-  @param  NumberOfSenseKeys  The number of sense key  \r
+  @param  NumberOfSenseKeys  The number of sense key\r

   @param  Action             The pointer of action which indicates what is need to do next\r
 \r
   @retval EFI_DEVICE_ERROR   Indicates that error occurs\r
   @param  Action             The pointer of action which indicates what is need to do next\r
 \r
   @retval EFI_DEVICE_ERROR   Indicates that error occurs\r


@@ -849,7 +849,7 @@ CheckHostAdapterStatus (
   @param  TargetStatus  Target status\r
 \r
   @retval EFI_NOT_READY       Device is NOT ready.\r
   @param  TargetStatus  Target status\r
 \r
   @retval EFI_NOT_READY       Device is NOT ready.\r

-  @retval EFI_DEVICE_ERROR \r
+  @retval EFI_DEVICE_ERROR\r

   @retval EFI_SUCCESS\r
 \r
 **/\r
   @retval EFI_SUCCESS\r
 \r
 **/\r


@@ -1071,7 +1071,7 @@ ScsiDiskRead16 (
   IN     UINT64                StartLba,\r
   IN     UINT32                SectorCount\r
   );\r
   IN     UINT64                StartLba,\r
   IN     UINT32                SectorCount\r
   );\r

-  \r
+\r

 /**\r
   Submit Write(16) Command.\r
 \r
 /**\r
   Submit Write(16) Command.\r
 \r


@@ -1095,7 +1095,7 @@ ScsiDiskWrite16 (
   IN OUT UINT32                *DataLength,\r
   IN     UINT64                StartLba,\r
   IN     UINT32                SectorCount\r
   IN OUT UINT32                *DataLength,\r
   IN     UINT64                StartLba,\r
   IN     UINT32                SectorCount\r

-  );  \r
+  );\r

 \r
 /**\r
   Submit Async Read(10) command.\r
 \r
 /**\r
   Submit Async Read(10) command.\r


@@ -1326,7 +1326,7 @@ ScsiDiskIsResetBefore (
 \r
   @param  SenseData    The pointer of EFI_SCSI_SENSE_DATA\r
   @param  SenseCounts  The number of sense key\r
 \r
   @param  SenseData    The pointer of EFI_SCSI_SENSE_DATA\r
   @param  SenseCounts  The number of sense key\r

-  @param  RetryLater   The flag means if need a retry \r
+  @param  RetryLater   The flag means if need a retry\r

 \r
   @retval TRUE  Drive is ready.\r
   @retval FALSE Drive is NOT ready.\r
 \r
   @retval TRUE  Drive is ready.\r
   @retval FALSE Drive is NOT ready.\r


@@ -1368,14 +1368,14 @@ ReleaseScsiDiskDeviceResources (
 \r
 /**\r
   Determine if Block Io should be produced.\r
 \r
 /**\r
   Determine if Block Io should be produced.\r

-  \r
+\r

 \r
   @param  ChildHandle  Child Handle to retrieve Parent information.\r
 \r
   @param  ChildHandle  Child Handle to retrieve Parent information.\r

-  \r
+\r

   @retval  TRUE    Should produce Block Io.\r
   @retval  FALSE   Should not produce Block Io.\r
 \r
   @retval  TRUE    Should produce Block Io.\r
   @retval  FALSE   Should not produce Block Io.\r
 \r

-**/  \r
+**/\r

 BOOLEAN\r
 DetermineInstallBlockIo (\r
   IN  EFI_HANDLE      ChildHandle\r
 BOOLEAN\r
 DetermineInstallBlockIo (\r
   IN  EFI_HANDLE      ChildHandle\r


@@ -1391,26 +1391,26 @@ DetermineInstallBlockIo (
 \r
   @param  ScsiDiskDevice  The pointer of SCSI_DISK_DEV.\r
   @param  ChildHandle     Child handle to install DiskInfo protocol.\r
 \r
   @param  ScsiDiskDevice  The pointer of SCSI_DISK_DEV.\r
   @param  ChildHandle     Child handle to install DiskInfo protocol.\r

-  \r
-**/  \r
+\r
+**/\r

 VOID\r
 InitializeInstallDiskInfo (\r
   IN  SCSI_DISK_DEV   *ScsiDiskDevice,\r
   IN  EFI_HANDLE      ChildHandle\r
 VOID\r
 InitializeInstallDiskInfo (\r
   IN  SCSI_DISK_DEV   *ScsiDiskDevice,\r
   IN  EFI_HANDLE      ChildHandle\r

-  ); \r
+  );\r

 \r
 /**\r
   Search protocol database and check to see if the protocol\r
   specified by ProtocolGuid is present on a ControllerHandle and opened by\r
   ChildHandle with an attribute of EFI_OPEN_PROTOCOL_BY_CHILD_CONTROLLER.\r
   If the ControllerHandle is found, then the protocol specified by ProtocolGuid\r
 \r
 /**\r
   Search protocol database and check to see if the protocol\r
   specified by ProtocolGuid is present on a ControllerHandle and opened by\r
   ChildHandle with an attribute of EFI_OPEN_PROTOCOL_BY_CHILD_CONTROLLER.\r
   If the ControllerHandle is found, then the protocol specified by ProtocolGuid\r

-  will be opened on it.  \r
-  \r
+  will be opened on it.\r
+\r

 \r
   @param  ProtocolGuid   ProtocolGuid pointer.\r
   @param  ChildHandle    Child Handle to retrieve Parent information.\r
 \r
   @param  ProtocolGuid   ProtocolGuid pointer.\r
   @param  ChildHandle    Child Handle to retrieve Parent information.\r

-  \r
-**/ \r
+\r
+**/\r

 VOID *\r
 EFIAPI\r
 GetParentProtocol (\r
 VOID *\r
 EFIAPI\r
 GetParentProtocol (\r

diff --git a/MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDisk.uni b/MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDisk.uni
index 73f8096cf641d651ca1e98fb49989b1d36addd14..a5db55ca79ce9dce1b6d8ef4d9279745f19c16d8 100644 (file)
--- a/MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDisk.uni
+++ b/MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDisk.uni
@@ -3,13 +3,13 @@
 //\r
 // It detects the SCSI disk media and installs Block I/O Protocol on the device handle.\r
 //\r
 //\r
 // It detects the SCSI disk media and installs Block I/O Protocol on the device handle.\r
 //\r

-// Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.<BR>\r
+// Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r

 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r
 // which accompanies this distribution.  The full text of the license may be found at\r
 // http://opensource.org/licenses/bsd-license.php\r
 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r
 // which accompanies this distribution.  The full text of the license may be found at\r
 // http://opensource.org/licenses/bsd-license.php\r

-// \r
+//\r

 // THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 // WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 //\r
 // THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 // WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 //\r

diff --git a/MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDiskDxe.inf b/MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDiskDxe.inf
index 3fbc589236559e419d297ebcc1a81956e50a5cc7..397d314272ca63acddc54da41952d7c3d19e2452 100644 (file)
--- a/MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDiskDxe.inf
+++ b/MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDiskDxe.inf
@@ -2,16 +2,16 @@
 #  The Scsi Disk driver is used to retrieve the media info in the attached SCSI disk.\r
 #  It detects the SCSI disk media and installs Block I/O and Block I/O2 Protocol on\r
 #  the device handle.\r
 #  The Scsi Disk driver is used to retrieve the media info in the attached SCSI disk.\r
 #  It detects the SCSI disk media and installs Block I/O and Block I/O2 Protocol on\r
 #  the device handle.\r

-#  \r
-#  Copyright (c) 2006 - 2016, Intel Corporation. All rights reserved.<BR>\r
+#\r
+#  Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r

 #  This program and the accompanying materials\r
 #  are licensed and made available under the terms and conditions of the BSD License\r
 #  which accompanies this distribution.  The full text of the license may be found at\r
 #  http://opensource.org/licenses/bsd-license.php\r
 #  This program and the accompanying materials\r
 #  are licensed and made available under the terms and conditions of the BSD License\r
 #  which accompanies this distribution.  The full text of the license may be found at\r
 #  http://opensource.org/licenses/bsd-license.php\r

-#  \r
+#\r

 #  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 #  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 #  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 #  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r

-#  \r
+#\r

 ##\r
 \r
 [Defines]\r
 ##\r
 \r
 [Defines]\r

diff --git a/MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDiskExtra.uni b/MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDiskExtra.uni
index 2c7fdfbd671d77cbe3a78ea4a22e7e220e891db7..08b0e37d0f350836b9200f259961d27bb63009a2 100644 (file)
--- a/MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDiskExtra.uni
+++ b/MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDiskExtra.uni
@@ -1,7 +1,7 @@
 // /** @file\r
 // ScsiDisk Localized Strings and Content\r
 //\r
 // /** @file\r
 // ScsiDisk Localized Strings and Content\r
 //\r

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

 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r
 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r


@@ -13,8 +13,8 @@
 //\r
 // **/\r
 \r
 //\r
 // **/\r
 \r

-#string STR_PROPERTIES_MODULE_NAME \r
-#language en-US \r
+#string STR_PROPERTIES_MODULE_NAME\r
+#language en-US\r

 "SCSI Disk DXE Driver"\r
 \r
 \r
 "SCSI Disk DXE Driver"\r
 \r
 \r

diff --git a/MdeModulePkg/Bus/Sd/EmmcDxe/EmmcDxe.c b/MdeModulePkg/Bus/Sd/EmmcDxe/EmmcDxe.c
index 4ebced0b949751c953bf91933a3107c4ae5f892e..2ed4d2e781ad7cea43717366c70e1386987d4ec8 100644 (file)
--- a/MdeModulePkg/Bus/Sd/EmmcDxe/EmmcDxe.c
+++ b/MdeModulePkg/Bus/Sd/EmmcDxe/EmmcDxe.c
@@ -4,7 +4,7 @@
   It produces BlockIo, BlockIo2 and StorageSecurity protocols to allow upper layer\r
   access the EMMC device.\r
 \r
   It produces BlockIo, BlockIo2 and StorageSecurity protocols to allow upper layer\r
   access the EMMC device.\r
 \r

-  Copyright (c) 2015 - 2017, Intel Corporation. All rights reserved.<BR>\r
+  Copyright (c) 2015 - 2018, Intel Corporation. All rights reserved.<BR>\r

   This program and the accompanying materials\r
   are licensed and made available under the terms and conditions of the BSD License\r
   which accompanies this distribution.  The full text of the license may be found at\r
   This program and the accompanying materials\r
   are licensed and made available under the terms and conditions of the BSD License\r
   which accompanies this distribution.  The full text of the license may be found at\r


@@ -505,7 +505,7 @@ InstallProtocolOnPartition (
              Device->Private->DriverBindingHandle,\r
              Partition->Handle,\r
              EFI_OPEN_PROTOCOL_BY_CHILD_CONTROLLER\r
              Device->Private->DriverBindingHandle,\r
              Partition->Handle,\r
              EFI_OPEN_PROTOCOL_BY_CHILD_CONTROLLER\r

-             );    \r
+             );\r

     }\r
 \r
   } else {\r
     }\r
 \r
   } else {\r

diff --git a/MdeModulePkg/Bus/Ufs/UfsBlockIoPei/UfsBlockIoPei.c b/MdeModulePkg/Bus/Ufs/UfsBlockIoPei/UfsBlockIoPei.c
index 9282309e84f522cc756fb694fb66f40dbda3a563..505b92cfc1b8dbcfc37db603a4cb79b3d5a3c3bb 100644 (file)
--- a/MdeModulePkg/Bus/Ufs/UfsBlockIoPei/UfsBlockIoPei.c
+++ b/MdeModulePkg/Bus/Ufs/UfsBlockIoPei/UfsBlockIoPei.c
@@ -1,6 +1,6 @@
 /** @file\r
 \r
 /** @file\r
 \r

-  Copyright (c) 2014 - 2017, Intel Corporation. All rights reserved.<BR>\r
+  Copyright (c) 2014 - 2018, Intel Corporation. All rights reserved.<BR>\r

   This program and the accompanying materials\r
   are licensed and made available under the terms and conditions of the BSD License\r
   which accompanies this distribution.  The full text of the license may be found at\r
   This program and the accompanying materials\r
   are licensed and made available under the terms and conditions of the BSD License\r
   which accompanies this distribution.  The full text of the license may be found at\r


@@ -153,10 +153,10 @@ UFS_PEIM_HC_PRIVATE_DATA   gUfsHcPeimTemplate = {
 EFI_STATUS\r
 UfsPeimRequestSense (\r
   IN     UFS_PEIM_HC_PRIVATE_DATA        *Private,\r
 EFI_STATUS\r
 UfsPeimRequestSense (\r
   IN     UFS_PEIM_HC_PRIVATE_DATA        *Private,\r

-  IN     UINTN                           Lun,  \r
+  IN     UINTN                           Lun,\r

      OUT VOID                            *DataBuffer,\r
      OUT UINT32                          *DataBufferLength\r
      OUT VOID                            *DataBuffer,\r
      OUT UINT32                          *DataBufferLength\r

-  )  \r
+  )\r

 {\r
   UFS_SCSI_REQUEST_PACKET                Packet;\r
   UINT8                                  Cdb[UFS_SCSI_OP_LENGTH_SIX];\r
 {\r
   UFS_SCSI_REQUEST_PACKET                Packet;\r
   UINT8                                  Cdb[UFS_SCSI_OP_LENGTH_SIX];\r


@@ -201,10 +201,10 @@ UfsPeimRequestSense (
 EFI_STATUS\r
 UfsPeimTestUnitReady (\r
   IN     UFS_PEIM_HC_PRIVATE_DATA        *Private,\r
 EFI_STATUS\r
 UfsPeimTestUnitReady (\r
   IN     UFS_PEIM_HC_PRIVATE_DATA        *Private,\r

-  IN     UINTN                           Lun,  \r
+  IN     UINTN                           Lun,\r

      OUT VOID                            *SenseData,  OPTIONAL\r
      OUT UINT8                           *SenseDataLength\r
      OUT VOID                            *SenseData,  OPTIONAL\r
      OUT UINT8                           *SenseDataLength\r

-  )  \r
+  )\r

 {\r
   UFS_SCSI_REQUEST_PACKET                Packet;\r
   UINT8                                  Cdb[UFS_SCSI_OP_LENGTH_SIX];\r
 {\r
   UFS_SCSI_REQUEST_PACKET                Packet;\r
   UINT8                                  Cdb[UFS_SCSI_OP_LENGTH_SIX];\r


@@ -254,7 +254,7 @@ UfsPeimInquiry (
      OUT UINT32                       *InquiryLength,\r
      OUT VOID                         *SenseData,  OPTIONAL\r
      OUT UINT8                        *SenseDataLength\r
      OUT UINT32                       *InquiryLength,\r
      OUT VOID                         *SenseData,  OPTIONAL\r
      OUT UINT8                        *SenseDataLength\r

-  )  \r
+  )\r

 {\r
   UFS_SCSI_REQUEST_PACKET             Packet;\r
   UINT8                               Cdb[UFS_SCSI_OP_LENGTH_SIX];\r
 {\r
   UFS_SCSI_REQUEST_PACKET             Packet;\r
   UINT8                               Cdb[UFS_SCSI_OP_LENGTH_SIX];\r


@@ -311,7 +311,7 @@ UfsPeimReadCapacity (
      OUT UINT32                       *DataLength,\r
      OUT VOID                         *SenseData,  OPTIONAL\r
      OUT UINT8                        *SenseDataLength\r
      OUT UINT32                       *DataLength,\r
      OUT VOID                         *SenseData,  OPTIONAL\r
      OUT UINT8                        *SenseDataLength\r

-  )  \r
+  )\r

 {\r
   UFS_SCSI_REQUEST_PACKET             Packet;\r
   UINT8                               Cdb[UFS_SCSI_OP_LENGTH_TEN];\r
 {\r
   UFS_SCSI_REQUEST_PACKET             Packet;\r
   UINT8                               Cdb[UFS_SCSI_OP_LENGTH_TEN];\r


@@ -367,7 +367,7 @@ UfsPeimReadCapacity16 (
      OUT UINT32                       *DataLength,\r
      OUT VOID                         *SenseData,  OPTIONAL\r
      OUT UINT8                        *SenseDataLength\r
      OUT UINT32                       *DataLength,\r
      OUT VOID                         *SenseData,  OPTIONAL\r
      OUT UINT8                        *SenseDataLength\r

-  )  \r
+  )\r

 {\r
   UFS_SCSI_REQUEST_PACKET             Packet;\r
   UINT8                               Cdb[UFS_SCSI_OP_LENGTH_SIXTEEN];\r
 {\r
   UFS_SCSI_REQUEST_PACKET             Packet;\r
   UINT8                               Cdb[UFS_SCSI_OP_LENGTH_SIXTEEN];\r


@@ -429,7 +429,7 @@ UfsPeimRead10 (
      OUT UINT32                       *DataLength,\r
      OUT VOID                         *SenseData,  OPTIONAL\r
      OUT UINT8                        *SenseDataLength\r
      OUT UINT32                       *DataLength,\r
      OUT VOID                         *SenseData,  OPTIONAL\r
      OUT UINT8                        *SenseDataLength\r

-  )  \r
+  )\r

 {\r
   UFS_SCSI_REQUEST_PACKET             Packet;\r
   UINT8                               Cdb[UFS_SCSI_OP_LENGTH_TEN];\r
 {\r
   UFS_SCSI_REQUEST_PACKET             Packet;\r
   UINT8                               Cdb[UFS_SCSI_OP_LENGTH_TEN];\r


@@ -491,7 +491,7 @@ UfsPeimRead16 (
      OUT UINT32                       *DataLength,\r
      OUT VOID                         *SenseData,  OPTIONAL\r
      OUT UINT8                        *SenseDataLength\r
      OUT UINT32                       *DataLength,\r
      OUT VOID                         *SenseData,  OPTIONAL\r
      OUT UINT8                        *SenseDataLength\r

-  )  \r
+  )\r

 {\r
   UFS_SCSI_REQUEST_PACKET             Packet;\r
   UINT8                               Cdb[UFS_SCSI_OP_LENGTH_SIXTEEN];\r
 {\r
   UFS_SCSI_REQUEST_PACKET             Packet;\r
   UINT8                               Cdb[UFS_SCSI_OP_LENGTH_SIXTEEN];\r


@@ -597,16 +597,16 @@ UfsPeimParsingSenseKeys (
 /**\r
   Gets the count of block I/O devices that one specific block driver detects.\r
 \r
 /**\r
   Gets the count of block I/O devices that one specific block driver detects.\r
 \r

-  This function is used for getting the count of block I/O devices that one \r
+  This function is used for getting the count of block I/O devices that one\r

   specific block driver detects.  To the PEI ATAPI driver, it returns the number\r
   specific block driver detects.  To the PEI ATAPI driver, it returns the number\r

-  of all the detected ATAPI devices it detects during the enumeration process. \r
-  To the PEI legacy floppy driver, it returns the number of all the legacy \r
-  devices it finds during its enumeration process. If no device is detected, \r
-  then the function will return zero.  \r
-  \r
-  @param[in]  PeiServices          General-purpose services that are available \r
+  of all the detected ATAPI devices it detects during the enumeration process.\r
+  To the PEI legacy floppy driver, it returns the number of all the legacy\r
+  devices it finds during its enumeration process. If no device is detected,\r
+  then the function will return zero.\r
+\r
+  @param[in]  PeiServices          General-purpose services that are available\r

                                    to every PEIM.\r
                                    to every PEIM.\r

-  @param[in]  This                 Indicates the EFI_PEI_RECOVERY_BLOCK_IO_PPI \r
+  @param[in]  This                 Indicates the EFI_PEI_RECOVERY_BLOCK_IO_PPI\r

                                    instance.\r
   @param[out] NumberBlockDevices   The number of block I/O devices discovered.\r
 \r
                                    instance.\r
   @param[out] NumberBlockDevices   The number of block I/O devices discovered.\r
 \r


@@ -633,41 +633,41 @@ UfsBlockIoPeimGetDeviceNo (
 /**\r
   Gets a block device's media information.\r
 \r
 /**\r
   Gets a block device's media information.\r
 \r

-  This function will provide the caller with the specified block device's media \r
-  information. If the media changes, calling this function will update the media \r
+  This function will provide the caller with the specified block device's media\r
+  information. If the media changes, calling this function will update the media\r

   information accordingly.\r
 \r
   @param[in]  PeiServices   General-purpose services that are available to every\r
                             PEIM\r
   @param[in]  This          Indicates the EFI_PEI_RECOVERY_BLOCK_IO_PPI instance.\r
   information accordingly.\r
 \r
   @param[in]  PeiServices   General-purpose services that are available to every\r
                             PEIM\r
   @param[in]  This          Indicates the EFI_PEI_RECOVERY_BLOCK_IO_PPI instance.\r

-  @param[in]  DeviceIndex   Specifies the block device to which the function wants \r
-                            to talk. Because the driver that implements Block I/O \r
-                            PPIs will manage multiple block devices, the PPIs that \r
-                            want to talk to a single device must specify the \r
+  @param[in]  DeviceIndex   Specifies the block device to which the function wants\r
+                            to talk. Because the driver that implements Block I/O\r
+                            PPIs will manage multiple block devices, the PPIs that\r
+                            want to talk to a single device must specify the\r

                             device index that was assigned during the enumeration\r
                             device index that was assigned during the enumeration\r

-                            process. This index is a number from one to \r
+                            process. This index is a number from one to\r

                             NumberBlockDevices.\r
                             NumberBlockDevices.\r

-  @param[out] MediaInfo     The media information of the specified block media.  \r
-                            The caller is responsible for the ownership of this \r
+  @param[out] MediaInfo     The media information of the specified block media.\r
+                            The caller is responsible for the ownership of this\r

                             data structure.\r
 \r
                             data structure.\r
 \r

-  @par Note: \r
-      The MediaInfo structure describes an enumeration of possible block device \r
-      types.  This enumeration exists because no device paths are actually passed \r
-      across interfaces that describe the type or class of hardware that is publishing \r
+  @par Note:\r
+      The MediaInfo structure describes an enumeration of possible block device\r
+      types.  This enumeration exists because no device paths are actually passed\r
+      across interfaces that describe the type or class of hardware that is publishing\r

       the block I/O interface. This enumeration will allow for policy decisions\r
       the block I/O interface. This enumeration will allow for policy decisions\r

-      in the Recovery PEIM, such as "Try to recover from legacy floppy first, \r
-      LS-120 second, CD-ROM third." If there are multiple partitions abstracted \r
-      by a given device type, they should be reported in ascending order; this \r
-      order also applies to nested partitions, such as legacy MBR, where the \r
-      outermost partitions would have precedence in the reporting order. The \r
-      same logic applies to systems such as IDE that have precedence relationships \r
-      like "Master/Slave" or "Primary/Secondary". The master device should be \r
+      in the Recovery PEIM, such as "Try to recover from legacy floppy first,\r
+      LS-120 second, CD-ROM third." If there are multiple partitions abstracted\r
+      by a given device type, they should be reported in ascending order; this\r
+      order also applies to nested partitions, such as legacy MBR, where the\r
+      outermost partitions would have precedence in the reporting order. The\r
+      same logic applies to systems such as IDE that have precedence relationships\r
+      like "Master/Slave" or "Primary/Secondary". The master device should be\r

       reported first, the slave second.\r
       reported first, the slave second.\r

-  \r
-  @retval EFI_SUCCESS        Media information about the specified block device \r
+\r
+  @retval EFI_SUCCESS        Media information about the specified block device\r

                              was obtained successfully.\r
                              was obtained successfully.\r

-  @retval EFI_DEVICE_ERROR   Cannot get the media information due to a hardware \r
+  @retval EFI_DEVICE_ERROR   Cannot get the media information due to a hardware\r

                              error.\r
 \r
 **/\r
                              error.\r
 \r
 **/\r


@@ -687,7 +687,7 @@ UfsBlockIoPeimGetMediaInfo (
   EFI_SCSI_DISK_CAPACITY_DATA        Capacity;\r
   EFI_SCSI_DISK_CAPACITY_DATA16      Capacity16;\r
   UINTN                              DataLength;\r
   EFI_SCSI_DISK_CAPACITY_DATA        Capacity;\r
   EFI_SCSI_DISK_CAPACITY_DATA16      Capacity16;\r
   UINTN                              DataLength;\r

-  BOOLEAN                            NeedRetry;  \r
+  BOOLEAN                            NeedRetry;\r

 \r
   Private   = GET_UFS_PEIM_HC_PRIVATE_DATA_FROM_THIS (This);\r
   NeedRetry = TRUE;\r
 \r
   Private   = GET_UFS_PEIM_HC_PRIVATE_DATA_FROM_THIS (This);\r
   NeedRetry = TRUE;\r


@@ -717,7 +717,7 @@ UfsBlockIoPeimGetMediaInfo (
     if (!EFI_ERROR (Status)) {\r
       break;\r
     }\r
     if (!EFI_ERROR (Status)) {\r
       break;\r
     }\r

-  \r
+\r

     if (SenseDataLength == 0) {\r
       continue;\r
     }\r
     if (SenseDataLength == 0) {\r
       continue;\r
     }\r


@@ -763,31 +763,31 @@ UfsBlockIoPeimGetMediaInfo (
 /**\r
   Reads the requested number of blocks from the specified block device.\r
 \r
 /**\r
   Reads the requested number of blocks from the specified block device.\r
 \r

-  The function reads the requested number of blocks from the device. All the \r
+  The function reads the requested number of blocks from the device. All the\r

   blocks are read, or an error is returned. If there is no media in the device,\r
   the function returns EFI_NO_MEDIA.\r
 \r
   blocks are read, or an error is returned. If there is no media in the device,\r
   the function returns EFI_NO_MEDIA.\r
 \r

-  @param[in]  PeiServices   General-purpose services that are available to \r
+  @param[in]  PeiServices   General-purpose services that are available to\r

                             every PEIM.\r
   @param[in]  This          Indicates the EFI_PEI_RECOVERY_BLOCK_IO_PPI instance.\r
                             every PEIM.\r
   @param[in]  This          Indicates the EFI_PEI_RECOVERY_BLOCK_IO_PPI instance.\r

-  @param[in]  DeviceIndex   Specifies the block device to which the function wants \r
-                            to talk. Because the driver that implements Block I/O \r
-                            PPIs will manage multiple block devices, PPIs that \r
-                            want to talk to a single device must specify the device \r
-                            index that was assigned during the enumeration process. \r
+  @param[in]  DeviceIndex   Specifies the block device to which the function wants\r
+                            to talk. Because the driver that implements Block I/O\r
+                            PPIs will manage multiple block devices, PPIs that\r
+                            want to talk to a single device must specify the device\r
+                            index that was assigned during the enumeration process.\r

                             This index is a number from one to NumberBlockDevices.\r
   @param[in]  StartLBA      The starting logical block address (LBA) to read from\r
                             on the device\r
   @param[in]  BufferSize    The size of the Buffer in bytes. This number must be\r
                             a multiple of the intrinsic block size of the device.\r
   @param[out] Buffer        A pointer to the destination buffer for the data.\r
                             This index is a number from one to NumberBlockDevices.\r
   @param[in]  StartLBA      The starting logical block address (LBA) to read from\r
                             on the device\r
   @param[in]  BufferSize    The size of the Buffer in bytes. This number must be\r
                             a multiple of the intrinsic block size of the device.\r
   @param[out] Buffer        A pointer to the destination buffer for the data.\r

-                            The caller is responsible for the ownership of the \r
+                            The caller is responsible for the ownership of the\r

                             buffer.\r
                             buffer.\r

-                         \r
+\r

   @retval EFI_SUCCESS             The data was read correctly from the device.\r
   @retval EFI_SUCCESS             The data was read correctly from the device.\r

-  @retval EFI_DEVICE_ERROR        The device reported an error while attempting \r
+  @retval EFI_DEVICE_ERROR        The device reported an error while attempting\r

                                   to perform the read operation.\r
                                   to perform the read operation.\r

-  @retval EFI_INVALID_PARAMETER   The read request contains LBAs that are not \r
+  @retval EFI_INVALID_PARAMETER   The read request contains LBAs that are not\r

                                   valid, or the buffer is not properly aligned.\r
   @retval EFI_NO_MEDIA            There is no media in the device.\r
   @retval EFI_BAD_BUFFER_SIZE     The BufferSize parameter is not a multiple of\r
                                   valid, or the buffer is not properly aligned.\r
   @retval EFI_NO_MEDIA            There is no media in the device.\r
   @retval EFI_BAD_BUFFER_SIZE     The BufferSize parameter is not a multiple of\r


@@ -811,7 +811,7 @@ UfsBlockIoPeimReadBlocks (
   UFS_PEIM_HC_PRIVATE_DATA           *Private;\r
   EFI_SCSI_SENSE_DATA                SenseData;\r
   UINT8                              SenseDataLength;\r
   UFS_PEIM_HC_PRIVATE_DATA           *Private;\r
   EFI_SCSI_SENSE_DATA                SenseData;\r
   UINT8                              SenseDataLength;\r

-  BOOLEAN                            NeedRetry;  \r
+  BOOLEAN                            NeedRetry;\r

 \r
   Status    = EFI_SUCCESS;\r
   NeedRetry = TRUE;\r
 \r
   Status    = EFI_SUCCESS;\r
   NeedRetry = TRUE;\r


@@ -861,7 +861,7 @@ UfsBlockIoPeimReadBlocks (
     if (!EFI_ERROR (Status)) {\r
       break;\r
     }\r
     if (!EFI_ERROR (Status)) {\r
       break;\r
     }\r

-  \r
+\r

     if (SenseDataLength == 0) {\r
       continue;\r
     }\r
     if (SenseDataLength == 0) {\r
       continue;\r
     }\r


@@ -903,16 +903,16 @@ UfsBlockIoPeimReadBlocks (
 /**\r
   Gets the count of block I/O devices that one specific block driver detects.\r
 \r
 /**\r
   Gets the count of block I/O devices that one specific block driver detects.\r
 \r

-  This function is used for getting the count of block I/O devices that one \r
+  This function is used for getting the count of block I/O devices that one\r

   specific block driver detects.  To the PEI ATAPI driver, it returns the number\r
   specific block driver detects.  To the PEI ATAPI driver, it returns the number\r

-  of all the detected ATAPI devices it detects during the enumeration process. \r
-  To the PEI legacy floppy driver, it returns the number of all the legacy \r
-  devices it finds during its enumeration process. If no device is detected, \r
-  then the function will return zero.  \r
-  \r
-  @param[in]  PeiServices          General-purpose services that are available \r
+  of all the detected ATAPI devices it detects during the enumeration process.\r
+  To the PEI legacy floppy driver, it returns the number of all the legacy\r
+  devices it finds during its enumeration process. If no device is detected,\r
+  then the function will return zero.\r
+\r
+  @param[in]  PeiServices          General-purpose services that are available\r

                                    to every PEIM.\r
                                    to every PEIM.\r

-  @param[in]  This                 Indicates the EFI_PEI_RECOVERY_BLOCK_IO2_PPI \r
+  @param[in]  This                 Indicates the EFI_PEI_RECOVERY_BLOCK_IO2_PPI\r

                                    instance.\r
   @param[out] NumberBlockDevices   The number of block I/O devices discovered.\r
 \r
                                    instance.\r
   @param[out] NumberBlockDevices   The number of block I/O devices discovered.\r
 \r


@@ -939,41 +939,41 @@ UfsBlockIoPeimGetDeviceNo2 (
 /**\r
   Gets a block device's media information.\r
 \r
 /**\r
   Gets a block device's media information.\r
 \r

-  This function will provide the caller with the specified block device's media \r
-  information. If the media changes, calling this function will update the media \r
+  This function will provide the caller with the specified block device's media\r
+  information. If the media changes, calling this function will update the media\r

   information accordingly.\r
 \r
   @param[in]  PeiServices   General-purpose services that are available to every\r
                             PEIM\r
   @param[in]  This          Indicates the EFI_PEI_RECOVERY_BLOCK_IO2_PPI instance.\r
   information accordingly.\r
 \r
   @param[in]  PeiServices   General-purpose services that are available to every\r
                             PEIM\r
   @param[in]  This          Indicates the EFI_PEI_RECOVERY_BLOCK_IO2_PPI instance.\r

-  @param[in]  DeviceIndex   Specifies the block device to which the function wants \r
-                            to talk. Because the driver that implements Block I/O \r
-                            PPIs will manage multiple block devices, the PPIs that \r
-                            want to talk to a single device must specify the \r
+  @param[in]  DeviceIndex   Specifies the block device to which the function wants\r
+                            to talk. Because the driver that implements Block I/O\r
+                            PPIs will manage multiple block devices, the PPIs that\r
+                            want to talk to a single device must specify the\r

                             device index that was assigned during the enumeration\r
                             device index that was assigned during the enumeration\r

-                            process. This index is a number from one to \r
+                            process. This index is a number from one to\r

                             NumberBlockDevices.\r
                             NumberBlockDevices.\r

-  @param[out] MediaInfo     The media information of the specified block media.  \r
-                            The caller is responsible for the ownership of this \r
+  @param[out] MediaInfo     The media information of the specified block media.\r
+                            The caller is responsible for the ownership of this\r

                             data structure.\r
 \r
                             data structure.\r
 \r

-  @par Note: \r
-      The MediaInfo structure describes an enumeration of possible block device \r
-      types.  This enumeration exists because no device paths are actually passed \r
-      across interfaces that describe the type or class of hardware that is publishing \r
+  @par Note:\r
+      The MediaInfo structure describes an enumeration of possible block device\r
+      types.  This enumeration exists because no device paths are actually passed\r
+      across interfaces that describe the type or class of hardware that is publishing\r

       the block I/O interface. This enumeration will allow for policy decisions\r
       the block I/O interface. This enumeration will allow for policy decisions\r

-      in the Recovery PEIM, such as "Try to recover from legacy floppy first, \r
-      LS-120 second, CD-ROM third." If there are multiple partitions abstracted \r
-      by a given device type, they should be reported in ascending order; this \r
-      order also applies to nested partitions, such as legacy MBR, where the \r
-      outermost partitions would have precedence in the reporting order. The \r
-      same logic applies to systems such as IDE that have precedence relationships \r
-      like "Master/Slave" or "Primary/Secondary". The master device should be \r
+      in the Recovery PEIM, such as "Try to recover from legacy floppy first,\r
+      LS-120 second, CD-ROM third." If there are multiple partitions abstracted\r
+      by a given device type, they should be reported in ascending order; this\r
+      order also applies to nested partitions, such as legacy MBR, where the\r
+      outermost partitions would have precedence in the reporting order. The\r
+      same logic applies to systems such as IDE that have precedence relationships\r
+      like "Master/Slave" or "Primary/Secondary". The master device should be\r

       reported first, the slave second.\r
       reported first, the slave second.\r

-  \r
-  @retval EFI_SUCCESS        Media information about the specified block device \r
+\r
+  @retval EFI_SUCCESS        Media information about the specified block device\r

                              was obtained successfully.\r
                              was obtained successfully.\r

-  @retval EFI_DEVICE_ERROR   Cannot get the media information due to a hardware \r
+  @retval EFI_DEVICE_ERROR   Cannot get the media information due to a hardware\r

                              error.\r
 \r
 **/\r
                              error.\r
 \r
 **/\r


@@ -991,7 +991,7 @@ UfsBlockIoPeimGetMediaInfo2 (
   EFI_PEI_BLOCK_IO_MEDIA             Media;\r
 \r
   Private   = GET_UFS_PEIM_HC_PRIVATE_DATA_FROM_THIS2 (This);\r
   EFI_PEI_BLOCK_IO_MEDIA             Media;\r
 \r
   Private   = GET_UFS_PEIM_HC_PRIVATE_DATA_FROM_THIS2 (This);\r

-  \r
+\r

   Status    = UfsBlockIoPeimGetMediaInfo (\r
                 PeiServices,\r
                 &Private->BlkIoPpi,\r
   Status    = UfsBlockIoPeimGetMediaInfo (\r
                 PeiServices,\r
                 &Private->BlkIoPpi,\r


@@ -1009,31 +1009,31 @@ UfsBlockIoPeimGetMediaInfo2 (
 /**\r
   Reads the requested number of blocks from the specified block device.\r
 \r
 /**\r
   Reads the requested number of blocks from the specified block device.\r
 \r

-  The function reads the requested number of blocks from the device. All the \r
+  The function reads the requested number of blocks from the device. All the\r

   blocks are read, or an error is returned. If there is no media in the device,\r
   the function returns EFI_NO_MEDIA.\r
 \r
   blocks are read, or an error is returned. If there is no media in the device,\r
   the function returns EFI_NO_MEDIA.\r
 \r

-  @param[in]  PeiServices   General-purpose services that are available to \r
+  @param[in]  PeiServices   General-purpose services that are available to\r

                             every PEIM.\r
   @param[in]  This          Indicates the EFI_PEI_RECOVERY_BLOCK_IO2_PPI instance.\r
                             every PEIM.\r
   @param[in]  This          Indicates the EFI_PEI_RECOVERY_BLOCK_IO2_PPI instance.\r

-  @param[in]  DeviceIndex   Specifies the block device to which the function wants \r
-                            to talk. Because the driver that implements Block I/O \r
-                            PPIs will manage multiple block devices, PPIs that \r
-                            want to talk to a single device must specify the device \r
-                            index that was assigned during the enumeration process. \r
+  @param[in]  DeviceIndex   Specifies the block device to which the function wants\r
+                            to talk. Because the driver that implements Block I/O\r
+                            PPIs will manage multiple block devices, PPIs that\r
+                            want to talk to a single device must specify the device\r
+                            index that was assigned during the enumeration process.\r

                             This index is a number from one to NumberBlockDevices.\r
   @param[in]  StartLBA      The starting logical block address (LBA) to read from\r
                             on the device\r
   @param[in]  BufferSize    The size of the Buffer in bytes. This number must be\r
                             a multiple of the intrinsic block size of the device.\r
   @param[out] Buffer        A pointer to the destination buffer for the data.\r
                             This index is a number from one to NumberBlockDevices.\r
   @param[in]  StartLBA      The starting logical block address (LBA) to read from\r
                             on the device\r
   @param[in]  BufferSize    The size of the Buffer in bytes. This number must be\r
                             a multiple of the intrinsic block size of the device.\r
   @param[out] Buffer        A pointer to the destination buffer for the data.\r

-                            The caller is responsible for the ownership of the \r
+                            The caller is responsible for the ownership of the\r

                             buffer.\r
                             buffer.\r

-                         \r
+\r

   @retval EFI_SUCCESS             The data was read correctly from the device.\r
   @retval EFI_SUCCESS             The data was read correctly from the device.\r

-  @retval EFI_DEVICE_ERROR        The device reported an error while attempting \r
+  @retval EFI_DEVICE_ERROR        The device reported an error while attempting\r

                                   to perform the read operation.\r
                                   to perform the read operation.\r

-  @retval EFI_INVALID_PARAMETER   The read request contains LBAs that are not \r
+  @retval EFI_INVALID_PARAMETER   The read request contains LBAs that are not\r

                                   valid, or the buffer is not properly aligned.\r
   @retval EFI_NO_MEDIA            There is no media in the device.\r
   @retval EFI_BAD_BUFFER_SIZE     The BufferSize parameter is not a multiple of\r
                                   valid, or the buffer is not properly aligned.\r
   @retval EFI_NO_MEDIA            There is no media in the device.\r
   @retval EFI_BAD_BUFFER_SIZE     The BufferSize parameter is not a multiple of\r


@@ -1052,7 +1052,7 @@ UfsBlockIoPeimReadBlocks2 (
   )\r
 {\r
   EFI_STATUS                         Status;\r
   )\r
 {\r
   EFI_STATUS                         Status;\r

-  UFS_PEIM_HC_PRIVATE_DATA           *Private; \r
+  UFS_PEIM_HC_PRIVATE_DATA           *Private;\r

 \r
   Status    = EFI_SUCCESS;\r
   Private   = GET_UFS_PEIM_HC_PRIVATE_DATA_FROM_THIS2 (This);\r
 \r
   Status    = EFI_SUCCESS;\r
   Private   = GET_UFS_PEIM_HC_PRIVATE_DATA_FROM_THIS2 (This);\r


@@ -1118,7 +1118,7 @@ UfsEndOfPei (
 \r
 /**\r
   The user code starts with this function.\r
 \r
 /**\r
   The user code starts with this function.\r

-  \r
+\r

   @param  FileHandle             Handle of the file being invoked.\r
   @param  PeiServices            Describes the list of possible PEI Services.\r
 \r
   @param  FileHandle             Handle of the file being invoked.\r
   @param  PeiServices            Describes the list of possible PEI Services.\r
 \r


@@ -1205,8 +1205,8 @@ InitializeUfsBlockIoPeim (
 \r
     //\r
     // UFS 2.0 spec Section 13.1.3.3:\r
 \r
     //\r
     // UFS 2.0 spec Section 13.1.3.3:\r

-    // At the end of the UFS Interconnect Layer initialization on both host and device side, \r
-    // the host shall send a NOP OUT UPIU to verify that the device UTP Layer is ready. \r
+    // At the end of the UFS Interconnect Layer initialization on both host and device side,\r
+    // the host shall send a NOP OUT UPIU to verify that the device UTP Layer is ready.\r

     //\r
     Status = UfsExecNopCmds (Private);\r
     if (EFI_ERROR (Status)) {\r
     //\r
     Status = UfsExecNopCmds (Private);\r
     if (EFI_ERROR (Status)) {\r


@@ -1241,7 +1241,7 @@ InitializeUfsBlockIoPeim (
         DEBUG ((EFI_D_INFO, "Ufs %d Lun %d is enabled\n", Controller, Index));\r
       }\r
     }\r
         DEBUG ((EFI_D_INFO, "Ufs %d Lun %d is enabled\n", Controller, Index));\r
       }\r
     }\r

-    \r
+\r

     PeiServicesInstallPpi (&Private->BlkIoPpiList);\r
     PeiServicesNotifyPpi (&Private->EndOfPeiNotifyList);\r
     Controller++;\r
     PeiServicesInstallPpi (&Private->BlkIoPpiList);\r
     PeiServicesNotifyPpi (&Private->EndOfPeiNotifyList);\r
     Controller++;\r

diff --git a/MdeModulePkg/Bus/Ufs/UfsBlockIoPei/UfsBlockIoPei.h b/MdeModulePkg/Bus/Ufs/UfsBlockIoPei/UfsBlockIoPei.h
index 345947c6b1e9b446f24e9067544f9ececb54ec65..3f0d07da8b601218124d828c30b230aa34afd76b 100644 (file)
--- a/MdeModulePkg/Bus/Ufs/UfsBlockIoPei/UfsBlockIoPei.h
+++ b/MdeModulePkg/Bus/Ufs/UfsBlockIoPei/UfsBlockIoPei.h
@@ -1,6 +1,6 @@
 /** @file\r
 \r
 /** @file\r
 \r

-  Copyright (c) 2014 - 2017, Intel Corporation. All rights reserved.<BR>\r
+  Copyright (c) 2014 - 2018, Intel Corporation. All rights reserved.<BR>\r

   This program and the accompanying materials\r
   are licensed and made available under the terms and conditions of the BSD License\r
   which accompanies this distribution.  The full text of the license may be found at\r
   This program and the accompanying materials\r
   are licensed and made available under the terms and conditions of the BSD License\r
   which accompanies this distribution.  The full text of the license may be found at\r


@@ -102,7 +102,7 @@ typedef struct {
   UINT8  SenseDataLength;\r
 } UFS_SCSI_REQUEST_PACKET;\r
 \r
   UINT8  SenseDataLength;\r
 } UFS_SCSI_REQUEST_PACKET;\r
 \r

-typedef struct _UFS_PEIM_HC_PRIVATE_DATA {  \r
+typedef struct _UFS_PEIM_HC_PRIVATE_DATA {\r

   UINT32                            Signature;\r
   EFI_HANDLE                        Controller;\r
 \r
   UINT32                            Signature;\r
   EFI_HANDLE                        Controller;\r
 \r


@@ -282,16 +282,16 @@ UfsExecNopCmds (
 /**\r
   Gets the count of block I/O devices that one specific block driver detects.\r
 \r
 /**\r
   Gets the count of block I/O devices that one specific block driver detects.\r
 \r

-  This function is used for getting the count of block I/O devices that one \r
+  This function is used for getting the count of block I/O devices that one\r

   specific block driver detects.  To the PEI ATAPI driver, it returns the number\r
   specific block driver detects.  To the PEI ATAPI driver, it returns the number\r

-  of all the detected ATAPI devices it detects during the enumeration process. \r
-  To the PEI legacy floppy driver, it returns the number of all the legacy \r
-  devices it finds during its enumeration process. If no device is detected, \r
-  then the function will return zero.  \r
-  \r
-  @param[in]  PeiServices          General-purpose services that are available \r
+  of all the detected ATAPI devices it detects during the enumeration process.\r
+  To the PEI legacy floppy driver, it returns the number of all the legacy\r
+  devices it finds during its enumeration process. If no device is detected,\r
+  then the function will return zero.\r
+\r
+  @param[in]  PeiServices          General-purpose services that are available\r

                                    to every PEIM.\r
                                    to every PEIM.\r

-  @param[in]  This                 Indicates the EFI_PEI_RECOVERY_BLOCK_IO_PPI \r
+  @param[in]  This                 Indicates the EFI_PEI_RECOVERY_BLOCK_IO_PPI\r

                                    instance.\r
   @param[out] NumberBlockDevices   The number of block I/O devices discovered.\r
 \r
                                    instance.\r
   @param[out] NumberBlockDevices   The number of block I/O devices discovered.\r
 \r


@@ -309,41 +309,41 @@ UfsBlockIoPeimGetDeviceNo (
 /**\r
   Gets a block device's media information.\r
 \r
 /**\r
   Gets a block device's media information.\r
 \r

-  This function will provide the caller with the specified block device's media \r
-  information. If the media changes, calling this function will update the media \r
+  This function will provide the caller with the specified block device's media\r
+  information. If the media changes, calling this function will update the media\r

   information accordingly.\r
 \r
   @param[in]  PeiServices   General-purpose services that are available to every\r
                             PEIM\r
   @param[in]  This          Indicates the EFI_PEI_RECOVERY_BLOCK_IO_PPI instance.\r
   information accordingly.\r
 \r
   @param[in]  PeiServices   General-purpose services that are available to every\r
                             PEIM\r
   @param[in]  This          Indicates the EFI_PEI_RECOVERY_BLOCK_IO_PPI instance.\r

-  @param[in]  DeviceIndex   Specifies the block device to which the function wants \r
-                            to talk. Because the driver that implements Block I/O \r
-                            PPIs will manage multiple block devices, the PPIs that \r
-                            want to talk to a single device must specify the \r
+  @param[in]  DeviceIndex   Specifies the block device to which the function wants\r
+                            to talk. Because the driver that implements Block I/O\r
+                            PPIs will manage multiple block devices, the PPIs that\r
+                            want to talk to a single device must specify the\r

                             device index that was assigned during the enumeration\r
                             device index that was assigned during the enumeration\r

-                            process. This index is a number from one to \r
+                            process. This index is a number from one to\r

                             NumberBlockDevices.\r
                             NumberBlockDevices.\r

-  @param[out] MediaInfo     The media information of the specified block media.  \r
-                            The caller is responsible for the ownership of this \r
+  @param[out] MediaInfo     The media information of the specified block media.\r
+                            The caller is responsible for the ownership of this\r

                             data structure.\r
 \r
                             data structure.\r
 \r

-  @par Note: \r
-      The MediaInfo structure describes an enumeration of possible block device \r
-      types.  This enumeration exists because no device paths are actually passed \r
-      across interfaces that describe the type or class of hardware that is publishing \r
+  @par Note:\r
+      The MediaInfo structure describes an enumeration of possible block device\r
+      types.  This enumeration exists because no device paths are actually passed\r
+      across interfaces that describe the type or class of hardware that is publishing\r

       the block I/O interface. This enumeration will allow for policy decisions\r
       the block I/O interface. This enumeration will allow for policy decisions\r

-      in the Recovery PEIM, such as "Try to recover from legacy floppy first, \r
-      LS-120 second, CD-ROM third." If there are multiple partitions abstracted \r
-      by a given device type, they should be reported in ascending order; this \r
-      order also applies to nested partitions, such as legacy MBR, where the \r
-      outermost partitions would have precedence in the reporting order. The \r
-      same logic applies to systems such as IDE that have precedence relationships \r
-      like "Master/Slave" or "Primary/Secondary". The master device should be \r
+      in the Recovery PEIM, such as "Try to recover from legacy floppy first,\r
+      LS-120 second, CD-ROM third." If there are multiple partitions abstracted\r
+      by a given device type, they should be reported in ascending order; this\r
+      order also applies to nested partitions, such as legacy MBR, where the\r
+      outermost partitions would have precedence in the reporting order. The\r
+      same logic applies to systems such as IDE that have precedence relationships\r
+      like "Master/Slave" or "Primary/Secondary". The master device should be\r

       reported first, the slave second.\r
       reported first, the slave second.\r

-  \r
-  @retval EFI_SUCCESS        Media information about the specified block device \r
+\r
+  @retval EFI_SUCCESS        Media information about the specified block device\r

                              was obtained successfully.\r
                              was obtained successfully.\r

-  @retval EFI_DEVICE_ERROR   Cannot get the media information due to a hardware \r
+  @retval EFI_DEVICE_ERROR   Cannot get the media information due to a hardware\r

                              error.\r
 \r
 **/\r
                              error.\r
 \r
 **/\r


@@ -359,31 +359,31 @@ UfsBlockIoPeimGetMediaInfo (
 /**\r
   Reads the requested number of blocks from the specified block device.\r
 \r
 /**\r
   Reads the requested number of blocks from the specified block device.\r
 \r

-  The function reads the requested number of blocks from the device. All the \r
+  The function reads the requested number of blocks from the device. All the\r

   blocks are read, or an error is returned. If there is no media in the device,\r
   the function returns EFI_NO_MEDIA.\r
 \r
   blocks are read, or an error is returned. If there is no media in the device,\r
   the function returns EFI_NO_MEDIA.\r
 \r

-  @param[in]  PeiServices   General-purpose services that are available to \r
+  @param[in]  PeiServices   General-purpose services that are available to\r

                             every PEIM.\r
   @param[in]  This          Indicates the EFI_PEI_RECOVERY_BLOCK_IO_PPI instance.\r
                             every PEIM.\r
   @param[in]  This          Indicates the EFI_PEI_RECOVERY_BLOCK_IO_PPI instance.\r

-  @param[in]  DeviceIndex   Specifies the block device to which the function wants \r
-                            to talk. Because the driver that implements Block I/O \r
-                            PPIs will manage multiple block devices, PPIs that \r
-                            want to talk to a single device must specify the device \r
-                            index that was assigned during the enumeration process. \r
+  @param[in]  DeviceIndex   Specifies the block device to which the function wants\r
+                            to talk. Because the driver that implements Block I/O\r
+                            PPIs will manage multiple block devices, PPIs that\r
+                            want to talk to a single device must specify the device\r
+                            index that was assigned during the enumeration process.\r

                             This index is a number from one to NumberBlockDevices.\r
   @param[in]  StartLBA      The starting logical block address (LBA) to read from\r
                             on the device\r
   @param[in]  BufferSize    The size of the Buffer in bytes. This number must be\r
                             a multiple of the intrinsic block size of the device.\r
   @param[out] Buffer        A pointer to the destination buffer for the data.\r
                             This index is a number from one to NumberBlockDevices.\r
   @param[in]  StartLBA      The starting logical block address (LBA) to read from\r
                             on the device\r
   @param[in]  BufferSize    The size of the Buffer in bytes. This number must be\r
                             a multiple of the intrinsic block size of the device.\r
   @param[out] Buffer        A pointer to the destination buffer for the data.\r

-                            The caller is responsible for the ownership of the \r
+                            The caller is responsible for the ownership of the\r

                             buffer.\r
                             buffer.\r

-                         \r
+\r

   @retval EFI_SUCCESS             The data was read correctly from the device.\r
   @retval EFI_SUCCESS             The data was read correctly from the device.\r

-  @retval EFI_DEVICE_ERROR        The device reported an error while attempting \r
+  @retval EFI_DEVICE_ERROR        The device reported an error while attempting\r

                                   to perform the read operation.\r
                                   to perform the read operation.\r

-  @retval EFI_INVALID_PARAMETER   The read request contains LBAs that are not \r
+  @retval EFI_INVALID_PARAMETER   The read request contains LBAs that are not\r

                                   valid, or the buffer is not properly aligned.\r
   @retval EFI_NO_MEDIA            There is no media in the device.\r
   @retval EFI_BAD_BUFFER_SIZE     The BufferSize parameter is not a multiple of\r
                                   valid, or the buffer is not properly aligned.\r
   @retval EFI_NO_MEDIA            There is no media in the device.\r
   @retval EFI_BAD_BUFFER_SIZE     The BufferSize parameter is not a multiple of\r


@@ -404,16 +404,16 @@ UfsBlockIoPeimReadBlocks (
 /**\r
   Gets the count of block I/O devices that one specific block driver detects.\r
 \r
 /**\r
   Gets the count of block I/O devices that one specific block driver detects.\r
 \r

-  This function is used for getting the count of block I/O devices that one \r
+  This function is used for getting the count of block I/O devices that one\r

   specific block driver detects.  To the PEI ATAPI driver, it returns the number\r
   specific block driver detects.  To the PEI ATAPI driver, it returns the number\r

-  of all the detected ATAPI devices it detects during the enumeration process. \r
-  To the PEI legacy floppy driver, it returns the number of all the legacy \r
-  devices it finds during its enumeration process. If no device is detected, \r
-  then the function will return zero.  \r
-  \r
-  @param[in]  PeiServices          General-purpose services that are available \r
+  of all the detected ATAPI devices it detects during the enumeration process.\r
+  To the PEI legacy floppy driver, it returns the number of all the legacy\r
+  devices it finds during its enumeration process. If no device is detected,\r
+  then the function will return zero.\r
+\r
+  @param[in]  PeiServices          General-purpose services that are available\r

                                    to every PEIM.\r
                                    to every PEIM.\r

-  @param[in]  This                 Indicates the EFI_PEI_RECOVERY_BLOCK_IO2_PPI \r
+  @param[in]  This                 Indicates the EFI_PEI_RECOVERY_BLOCK_IO2_PPI\r

                                    instance.\r
   @param[out] NumberBlockDevices   The number of block I/O devices discovered.\r
 \r
                                    instance.\r
   @param[out] NumberBlockDevices   The number of block I/O devices discovered.\r
 \r


@@ -431,41 +431,41 @@ UfsBlockIoPeimGetDeviceNo2 (
 /**\r
   Gets a block device's media information.\r
 \r
 /**\r
   Gets a block device's media information.\r
 \r

-  This function will provide the caller with the specified block device's media \r
-  information. If the media changes, calling this function will update the media \r
+  This function will provide the caller with the specified block device's media\r
+  information. If the media changes, calling this function will update the media\r

   information accordingly.\r
 \r
   @param[in]  PeiServices   General-purpose services that are available to every\r
                             PEIM\r
   @param[in]  This          Indicates the EFI_PEI_RECOVERY_BLOCK_IO2_PPI instance.\r
   information accordingly.\r
 \r
   @param[in]  PeiServices   General-purpose services that are available to every\r
                             PEIM\r
   @param[in]  This          Indicates the EFI_PEI_RECOVERY_BLOCK_IO2_PPI instance.\r

-  @param[in]  DeviceIndex   Specifies the block device to which the function wants \r
-                            to talk. Because the driver that implements Block I/O \r
-                            PPIs will manage multiple block devices, the PPIs that \r
-                            want to talk to a single device must specify the \r
+  @param[in]  DeviceIndex   Specifies the block device to which the function wants\r
+                            to talk. Because the driver that implements Block I/O\r
+                            PPIs will manage multiple block devices, the PPIs that\r
+                            want to talk to a single device must specify the\r

                             device index that was assigned during the enumeration\r
                             device index that was assigned during the enumeration\r

-                            process. This index is a number from one to \r
+                            process. This index is a number from one to\r

                             NumberBlockDevices.\r
                             NumberBlockDevices.\r

-  @param[out] MediaInfo     The media information of the specified block media.  \r
-                            The caller is responsible for the ownership of this \r
+  @param[out] MediaInfo     The media information of the specified block media.\r
+                            The caller is responsible for the ownership of this\r

                             data structure.\r
 \r
                             data structure.\r
 \r

-  @par Note: \r
-      The MediaInfo structure describes an enumeration of possible block device \r
-      types.  This enumeration exists because no device paths are actually passed \r
-      across interfaces that describe the type or class of hardware that is publishing \r
+  @par Note:\r
+      The MediaInfo structure describes an enumeration of possible block device\r
+      types.  This enumeration exists because no device paths are actually passed\r
+      across interfaces that describe the type or class of hardware that is publishing\r

       the block I/O interface. This enumeration will allow for policy decisions\r
       the block I/O interface. This enumeration will allow for policy decisions\r

-      in the Recovery PEIM, such as "Try to recover from legacy floppy first, \r
-      LS-120 second, CD-ROM third." If there are multiple partitions abstracted \r
-      by a given device type, they should be reported in ascending order; this \r
-      order also applies to nested partitions, such as legacy MBR, where the \r
-      outermost partitions would have precedence in the reporting order. The \r
-      same logic applies to systems such as IDE that have precedence relationships \r
-      like "Master/Slave" or "Primary/Secondary". The master device should be \r
+      in the Recovery PEIM, such as "Try to recover from legacy floppy first,\r
+      LS-120 second, CD-ROM third." If there are multiple partitions abstracted\r
+      by a given device type, they should be reported in ascending order; this\r
+      order also applies to nested partitions, such as legacy MBR, where the\r
+      outermost partitions would have precedence in the reporting order. The\r
+      same logic applies to systems such as IDE that have precedence relationships\r
+      like "Master/Slave" or "Primary/Secondary". The master device should be\r

       reported first, the slave second.\r
       reported first, the slave second.\r

-  \r
-  @retval EFI_SUCCESS        Media information about the specified block device \r
+\r
+  @retval EFI_SUCCESS        Media information about the specified block device\r

                              was obtained successfully.\r
                              was obtained successfully.\r

-  @retval EFI_DEVICE_ERROR   Cannot get the media information due to a hardware \r
+  @retval EFI_DEVICE_ERROR   Cannot get the media information due to a hardware\r

                              error.\r
 \r
 **/\r
                              error.\r
 \r
 **/\r


@@ -481,31 +481,31 @@ UfsBlockIoPeimGetMediaInfo2 (
 /**\r
   Reads the requested number of blocks from the specified block device.\r
 \r
 /**\r
   Reads the requested number of blocks from the specified block device.\r
 \r

-  The function reads the requested number of blocks from the device. All the \r
+  The function reads the requested number of blocks from the device. All the\r

   blocks are read, or an error is returned. If there is no media in the device,\r
   the function returns EFI_NO_MEDIA.\r
 \r
   blocks are read, or an error is returned. If there is no media in the device,\r
   the function returns EFI_NO_MEDIA.\r
 \r

-  @param[in]  PeiServices   General-purpose services that are available to \r
+  @param[in]  PeiServices   General-purpose services that are available to\r

                             every PEIM.\r
   @param[in]  This          Indicates the EFI_PEI_RECOVERY_BLOCK_IO2_PPI instance.\r
                             every PEIM.\r
   @param[in]  This          Indicates the EFI_PEI_RECOVERY_BLOCK_IO2_PPI instance.\r

-  @param[in]  DeviceIndex   Specifies the block device to which the function wants \r
-                            to talk. Because the driver that implements Block I/O \r
-                            PPIs will manage multiple block devices, PPIs that \r
-                            want to talk to a single device must specify the device \r
-                            index that was assigned during the enumeration process. \r
+  @param[in]  DeviceIndex   Specifies the block device to which the function wants\r
+                            to talk. Because the driver that implements Block I/O\r
+                            PPIs will manage multiple block devices, PPIs that\r
+                            want to talk to a single device must specify the device\r
+                            index that was assigned during the enumeration process.\r

                             This index is a number from one to NumberBlockDevices.\r
   @param[in]  StartLBA      The starting logical block address (LBA) to read from\r
                             on the device\r
   @param[in]  BufferSize    The size of the Buffer in bytes. This number must be\r
                             a multiple of the intrinsic block size of the device.\r
   @param[out] Buffer        A pointer to the destination buffer for the data.\r
                             This index is a number from one to NumberBlockDevices.\r
   @param[in]  StartLBA      The starting logical block address (LBA) to read from\r
                             on the device\r
   @param[in]  BufferSize    The size of the Buffer in bytes. This number must be\r
                             a multiple of the intrinsic block size of the device.\r
   @param[out] Buffer        A pointer to the destination buffer for the data.\r

-                            The caller is responsible for the ownership of the \r
+                            The caller is responsible for the ownership of the\r

                             buffer.\r
                             buffer.\r

-                         \r
+\r

   @retval EFI_SUCCESS             The data was read correctly from the device.\r
   @retval EFI_SUCCESS             The data was read correctly from the device.\r

-  @retval EFI_DEVICE_ERROR        The device reported an error while attempting \r
+  @retval EFI_DEVICE_ERROR        The device reported an error while attempting\r

                                   to perform the read operation.\r
                                   to perform the read operation.\r

-  @retval EFI_INVALID_PARAMETER   The read request contains LBAs that are not \r
+  @retval EFI_INVALID_PARAMETER   The read request contains LBAs that are not\r

                                   valid, or the buffer is not properly aligned.\r
   @retval EFI_NO_MEDIA            There is no media in the device.\r
   @retval EFI_BAD_BUFFER_SIZE     The BufferSize parameter is not a multiple of\r
                                   valid, or the buffer is not properly aligned.\r
   @retval EFI_NO_MEDIA            There is no media in the device.\r
   @retval EFI_BAD_BUFFER_SIZE     The BufferSize parameter is not a multiple of\r


@@ -525,7 +525,7 @@ UfsBlockIoPeimReadBlocks2 (
 \r
 /**\r
   Initialize the memory management pool for the host controller.\r
 \r
 /**\r
   Initialize the memory management pool for the host controller.\r

-  \r
+\r

   @param  Private               The Ufs Peim driver private data.\r
 \r
   @retval EFI_SUCCESS           The memory pool is initialized.\r
   @param  Private               The Ufs Peim driver private data.\r
 \r
   @retval EFI_SUCCESS           The memory pool is initialized.\r


@@ -554,7 +554,7 @@ UfsPeimFreeMemPool (
 /**\r
   Allocate some memory from the host controller's memory pool\r
   which can be used to communicate with host controller.\r
 /**\r
   Allocate some memory from the host controller's memory pool\r
   which can be used to communicate with host controller.\r

-  \r
+\r

   @param  Pool      The host controller's memory pool.\r
   @param  Size      Size of the memory to allocate.\r
 \r
   @param  Pool      The host controller's memory pool.\r
   @param  Size      Size of the memory to allocate.\r
 \r

diff --git a/MdeModulePkg/Bus/Ufs/UfsBlockIoPei/UfsBlockIoPei.uni b/MdeModulePkg/Bus/Ufs/UfsBlockIoPei/UfsBlockIoPei.uni
index 04b9f3bfc753f0d1f93ca54e5a6cb9e7a9140bad..51184439ce7d1ff4d3577913fa8d39a77cb3488e 100644 (file)
--- a/MdeModulePkg/Bus/Ufs/UfsBlockIoPei/UfsBlockIoPei.uni
+++ b/MdeModulePkg/Bus/Ufs/UfsBlockIoPei/UfsBlockIoPei.uni
@@ -3,14 +3,14 @@
 //\r
 // The UfsBlockIoPei driver is used to support recovery from UFS device.\r
 //\r
 //\r
 // The UfsBlockIoPei driver is used to support recovery from UFS device.\r
 //\r

-// Copyright (c) 2015, Intel Corporation. All rights reserved.<BR>\r
+// Copyright (c) 2015 - 2018, Intel Corporation. All rights reserved.<BR>\r

 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions\r
 // of the BSD License which accompanies this distribution.  The\r
 // full text of the license may be found at\r
 // http://opensource.org/licenses/bsd-license.php\r
 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions\r
 // of the BSD License which accompanies this distribution.  The\r
 // full text of the license may be found at\r
 // http://opensource.org/licenses/bsd-license.php\r

-// \r
+//\r

 // THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 // WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 //\r
 // THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 // WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 //\r

diff --git a/MdeModulePkg/Bus/Ufs/UfsBlockIoPei/UfsBlockIoPeiExtra.uni b/MdeModulePkg/Bus/Ufs/UfsBlockIoPei/UfsBlockIoPeiExtra.uni
index 0ce3004afde648c455601f7cb3ce60ed72071b65..b56f0bddc4ab38e7d73de7501618073ecb08a569 100644 (file)
--- a/MdeModulePkg/Bus/Ufs/UfsBlockIoPei/UfsBlockIoPeiExtra.uni
+++ b/MdeModulePkg/Bus/Ufs/UfsBlockIoPei/UfsBlockIoPeiExtra.uni
@@ -1,7 +1,7 @@
 // /** @file\r
 // UfsBlockIoPei Localized Strings and Content\r
 //\r
 // /** @file\r
 // UfsBlockIoPei Localized Strings and Content\r
 //\r

-// Copyright (c) 2015, Intel Corporation. All rights reserved.<BR>\r
+// Copyright (c) 2015 - 2018, Intel Corporation. All rights reserved.<BR>\r

 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions\r
 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions\r


@@ -14,8 +14,8 @@
 //\r
 // **/\r
 \r
 //\r
 // **/\r
 \r

-#string STR_PROPERTIES_MODULE_NAME \r
-#language en-US \r
+#string STR_PROPERTIES_MODULE_NAME\r
+#language en-US\r

 "UFS BlockIo Peim for Recovery"\r
 \r
 \r
 "UFS BlockIo Peim for Recovery"\r
 \r
 \r

diff --git a/MdeModulePkg/Bus/Ufs/UfsBlockIoPei/UfsHcMem.c b/MdeModulePkg/Bus/Ufs/UfsBlockIoPei/UfsHcMem.c
index b9e3859b353e8de42c2226338e120477d10d5c33..d69e6e72272a608f9ca42086c3a20bfbba09dbd8 100644 (file)
--- a/MdeModulePkg/Bus/Ufs/UfsBlockIoPei/UfsHcMem.c
+++ b/MdeModulePkg/Bus/Ufs/UfsBlockIoPei/UfsHcMem.c
@@ -1,7 +1,7 @@
 /** @file\r
 \r
 /** @file\r
 \r

-Copyright (c) 2014 - 2017, Intel Corporation. All rights reserved.<BR>\r
-  \r
+Copyright (c) 2014 - 2018, Intel Corporation. All rights reserved.<BR>\r
+\r

 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions\r
 of the BSD License which accompanies this distribution.  The\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions\r
 of the BSD License which accompanies this distribution.  The\r


@@ -44,17 +44,17 @@ UfsPeimAllocMemBlock (
   }\r
 \r
   ZeroMem ((VOID*)(UINTN)TempPtr, sizeof(UFS_PEIM_MEM_BLOCK));\r
   }\r
 \r
   ZeroMem ((VOID*)(UINTN)TempPtr, sizeof(UFS_PEIM_MEM_BLOCK));\r

-  \r
+\r

   //\r
   // each bit in the bit array represents UFS_PEIM_MEM_UNIT\r
   // bytes of memory in the memory block.\r
   //\r
   ASSERT (UFS_PEIM_MEM_UNIT * 8 <= EFI_PAGE_SIZE);\r
   //\r
   // each bit in the bit array represents UFS_PEIM_MEM_UNIT\r
   // bytes of memory in the memory block.\r
   //\r
   ASSERT (UFS_PEIM_MEM_UNIT * 8 <= EFI_PAGE_SIZE);\r

-  \r
+\r

   Block = (UFS_PEIM_MEM_BLOCK*)(UINTN)TempPtr;\r
   Block->BufLen   = EFI_PAGES_TO_SIZE (Pages);\r
   Block->BitsLen  = Block->BufLen / (UFS_PEIM_MEM_UNIT * 8);\r
   Block = (UFS_PEIM_MEM_BLOCK*)(UINTN)TempPtr;\r
   Block->BufLen   = EFI_PAGES_TO_SIZE (Pages);\r
   Block->BitsLen  = Block->BufLen / (UFS_PEIM_MEM_UNIT * 8);\r

-  \r
+\r

   Status = PeiServicesAllocatePool (Block->BitsLen, &TempPtr);\r
   if (EFI_ERROR (Status)) {\r
     return NULL;\r
   Status = PeiServicesAllocatePool (Block->BitsLen, &TempPtr);\r
   if (EFI_ERROR (Status)) {\r
     return NULL;\r


@@ -158,7 +158,7 @@ UfsPeimAllocMemFromBlock (
   if (Available < Units) {\r
     return NULL;\r
   }\r
   if (Available < Units) {\r
     return NULL;\r
   }\r

-  \r
+\r

   //\r
   // Mark the memory as allocated\r
   //\r
   //\r
   // Mark the memory as allocated\r
   //\r


@@ -209,7 +209,7 @@ UfsPeimIsMemBlockEmpty (
 {\r
   UINTN                   Index;\r
 \r
 {\r
   UINTN                   Index;\r
 \r

-  \r
+\r

   for (Index = 0; Index < Block->BitsLen; Index++) {\r
     if (Block->Bits[Index] != 0) {\r
       return FALSE;\r
   for (Index = 0; Index < Block->BitsLen; Index++) {\r
     if (Block->Bits[Index] != 0) {\r
       return FALSE;\r


@@ -247,7 +247,7 @@ UfsPeimUnlinkMemBlock (
 \r
 /**\r
   Initialize the memory management pool for the host controller.\r
 \r
 /**\r
   Initialize the memory management pool for the host controller.\r

-  \r
+\r

   @param  Private               The Ufs Peim driver private data.\r
 \r
   @retval EFI_SUCCESS           The memory pool is initialized.\r
   @param  Private               The Ufs Peim driver private data.\r
 \r
   @retval EFI_SUCCESS           The memory pool is initialized.\r


@@ -265,7 +265,7 @@ UfsPeimInitMemPool (
 \r
   TempPtr = NULL;\r
   Pool    = NULL;\r
 \r
   TempPtr = NULL;\r
   Pool    = NULL;\r

-  \r
+\r

   Status = PeiServicesAllocatePool (sizeof (UFS_PEIM_MEM_POOL), &TempPtr);\r
   if (EFI_ERROR (Status)) {\r
     return EFI_OUT_OF_RESOURCES;\r
   Status = PeiServicesAllocatePool (sizeof (UFS_PEIM_MEM_POOL), &TempPtr);\r
   if (EFI_ERROR (Status)) {\r
     return EFI_OUT_OF_RESOURCES;\r


@@ -287,7 +287,7 @@ UfsPeimInitMemPool (
 \r
 /**\r
   Release the memory management pool.\r
 \r
 /**\r
   Release the memory management pool.\r

-  \r
+\r

   @param  Pool                  The memory pool to free.\r
 \r
   @retval EFI_DEVICE_ERROR      Fail to free the memory pool.\r
   @param  Pool                  The memory pool to free.\r
 \r
   @retval EFI_DEVICE_ERROR      Fail to free the memory pool.\r


@@ -320,7 +320,7 @@ UfsPeimFreeMemPool (
 /**\r
   Allocate some memory from the host controller's memory pool\r
   which can be used to communicate with host controller.\r
 /**\r
   Allocate some memory from the host controller's memory pool\r
   which can be used to communicate with host controller.\r

-  \r
+\r

   @param  Pool      The host controller's memory pool.\r
   @param  Size      Size of the memory to allocate.\r
 \r
   @param  Pool      The host controller's memory pool.\r
   @param  Size      Size of the memory to allocate.\r
 \r


@@ -377,7 +377,7 @@ UfsPeimAllocateMem (
   if (NewBlock == NULL) {\r
     return NULL;\r
   }\r
   if (NewBlock == NULL) {\r
     return NULL;\r
   }\r

-  \r
+\r

   //\r
   // Add the new memory block to the pool, then allocate memory from it\r
   //\r
   //\r
   // Add the new memory block to the pool, then allocate memory from it\r
   //\r

diff --git a/MdeModulePkg/Bus/Ufs/UfsBlockIoPei/UfsHcMem.h b/MdeModulePkg/Bus/Ufs/UfsBlockIoPei/UfsHcMem.h
index 60db0797212a8a5dee54257333aea1041eb2b103..0b95f0fe56638146553bf04b8023dd6c7b6bc36c 100644 (file)
--- a/MdeModulePkg/Bus/Ufs/UfsBlockIoPei/UfsHcMem.h
+++ b/MdeModulePkg/Bus/Ufs/UfsBlockIoPei/UfsHcMem.h
@@ -1,7 +1,7 @@
 /** @file\r
 \r
 /** @file\r
 \r

-Copyright (c) 2014 - 2017, Intel Corporation. All rights reserved.<BR>\r
-  \r
+Copyright (c) 2014 - 2018, Intel Corporation. All rights reserved.<BR>\r
+\r

 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions\r
 of the BSD License which accompanies this distribution.  The\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions\r
 of the BSD License which accompanies this distribution.  The\r


@@ -25,7 +25,7 @@ typedef struct _UFS_PEIM_MEM_BLOCK UFS_PEIM_MEM_BLOCK;
 \r
 struct _UFS_PEIM_MEM_BLOCK {\r
   UINT8                   *Bits;    // Bit array to record which unit is allocated\r
 \r
 struct _UFS_PEIM_MEM_BLOCK {\r
   UINT8                   *Bits;    // Bit array to record which unit is allocated\r

-  UINTN                   BitsLen; \r
+  UINTN                   BitsLen;\r

   UINT8                   *Buf;\r
   UINT8                   *BufHost;\r
   UINTN                   BufLen;   // Memory size in bytes\r
   UINT8                   *Buf;\r
   UINT8                   *BufHost;\r
   UINTN                   BufLen;   // Memory size in bytes\r

diff --git a/MdeModulePkg/Bus/Ufs/UfsBlockIoPei/UfsHci.c b/MdeModulePkg/Bus/Ufs/UfsBlockIoPei/UfsHci.c
index 55c780627966d53c0b7f2cecb2eb0bacf1c410a8..e36ff8c02aabb495817530fabf9f61aaa7350cf8 100644 (file)
--- a/MdeModulePkg/Bus/Ufs/UfsBlockIoPei/UfsHci.c
+++ b/MdeModulePkg/Bus/Ufs/UfsBlockIoPei/UfsHci.c
@@ -1,6 +1,6 @@
 /** @file\r
 \r
 /** @file\r
 \r

-  Copyright (c) 2014 - 2017, Intel Corporation. All rights reserved.<BR>\r
+  Copyright (c) 2014 - 2018, Intel Corporation. All rights reserved.<BR>\r

   This program and the accompanying materials\r
   are licensed and made available under the terms and conditions of the BSD License\r
   which accompanies this distribution.  The full text of the license may be found at\r
   This program and the accompanying materials\r
   are licensed and made available under the terms and conditions of the BSD License\r
   which accompanies this distribution.  The full text of the license may be found at\r


@@ -108,13 +108,13 @@ DumpUicCmdExecResult (
         break;\r
       case 0x08:\r
         DEBUG ((EFI_D_VERBOSE, "UIC configuration command fails - PEER_COMMUNICATION_FAILURE\n"));\r
         break;\r
       case 0x08:\r
         DEBUG ((EFI_D_VERBOSE, "UIC configuration command fails - PEER_COMMUNICATION_FAILURE\n"));\r

-        break; \r
+        break;\r

       case 0x09:\r
         DEBUG ((EFI_D_VERBOSE, "UIC configuration command fails - BUSY\n"));\r
         break;\r
       case 0x0A:\r
         DEBUG ((EFI_D_VERBOSE, "UIC configuration command fails - DME_FAILURE\n"));\r
       case 0x09:\r
         DEBUG ((EFI_D_VERBOSE, "UIC configuration command fails - BUSY\n"));\r
         break;\r
       case 0x0A:\r
         DEBUG ((EFI_D_VERBOSE, "UIC configuration command fails - DME_FAILURE\n"));\r

-        break;        \r
+        break;\r

       default :\r
         ASSERT (FALSE);\r
         break;\r
       default :\r
         ASSERT (FALSE);\r
         break;\r


@@ -125,7 +125,7 @@ DumpUicCmdExecResult (
         break;\r
       case 0x01:\r
         DEBUG ((EFI_D_VERBOSE, "UIC control command fails - FAILURE\n"));\r
         break;\r
       case 0x01:\r
         DEBUG ((EFI_D_VERBOSE, "UIC control command fails - FAILURE\n"));\r

-        break;     \r
+        break;\r

       default :\r
         ASSERT (FALSE);\r
         break;\r
       default :\r
         ASSERT (FALSE);\r
         break;\r


@@ -171,7 +171,7 @@ DumpQueryResponseResult (
       break;\r
     case 0xFE:\r
       DEBUG ((EFI_D_VERBOSE, "Query Response with Invalid Opcode\n"));\r
       break;\r
     case 0xFE:\r
       DEBUG ((EFI_D_VERBOSE, "Query Response with Invalid Opcode\n"));\r

-      break; \r
+      break;\r

     case 0xFF:\r
       DEBUG ((EFI_D_VERBOSE, "Query Response with General Failure\n"));\r
       break;\r
     case 0xFF:\r
       DEBUG ((EFI_D_VERBOSE, "Query Response with General Failure\n"));\r
       break;\r


@@ -243,7 +243,7 @@ UfsFillTsfOfQueryReqUpiu (
       SwapLittleEndianToBigEndian ((UINT8*)&Length, sizeof (Length));\r
       TsfBase->Length = Length;\r
     }\r
       SwapLittleEndianToBigEndian ((UINT8*)&Length, sizeof (Length));\r
       TsfBase->Length = Length;\r
     }\r

-  \r
+\r

     if (Opcode == UtpQueryFuncOpcodeWrAttr) {\r
       SwapLittleEndianToBigEndian ((UINT8*)&Value, sizeof (Value));\r
       TsfBase->Value  = Value;\r
     if (Opcode == UtpQueryFuncOpcodeWrAttr) {\r
       SwapLittleEndianToBigEndian ((UINT8*)&Value, sizeof (Value));\r
       TsfBase->Value  = Value;\r


@@ -731,7 +731,7 @@ VOID
 UfsStartExecCmd (\r
   IN  UFS_PEIM_HC_PRIVATE_DATA     *Private,\r
   IN  UINT8                        Slot\r
 UfsStartExecCmd (\r
   IN  UFS_PEIM_HC_PRIVATE_DATA     *Private,\r
   IN  UINT8                        Slot\r

-  ) \r
+  )\r

 {\r
   UINTN         UfsHcBase;\r
   UINTN         Address;\r
 {\r
   UINTN         UfsHcBase;\r
   UINTN         Address;\r


@@ -739,7 +739,7 @@ UfsStartExecCmd (
 \r
   UfsHcBase = Private->UfsHcBase;\r
 \r
 \r
   UfsHcBase = Private->UfsHcBase;\r
 \r

-  Address = UfsHcBase + UFS_HC_UTRLRSR_OFFSET;  \r
+  Address = UfsHcBase + UFS_HC_UTRLRSR_OFFSET;\r

   Data    = MmioRead32 (Address);\r
   if ((Data & UFS_HC_UTRLRSR) != UFS_HC_UTRLRSR) {\r
     MmioWrite32 (Address, UFS_HC_UTRLRSR);\r
   Data    = MmioRead32 (Address);\r
   if ((Data & UFS_HC_UTRLRSR) != UFS_HC_UTRLRSR) {\r
     MmioWrite32 (Address, UFS_HC_UTRLRSR);\r


@@ -760,7 +760,7 @@ VOID
 UfsStopExecCmd (\r
   IN  UFS_PEIM_HC_PRIVATE_DATA     *Private,\r
   IN  UINT8                        Slot\r
 UfsStopExecCmd (\r
   IN  UFS_PEIM_HC_PRIVATE_DATA     *Private,\r
   IN  UINT8                        Slot\r

-  ) \r
+  )\r

 {\r
   UINTN         UfsHcBase;\r
   UINTN         Address;\r
 {\r
   UINTN         UfsHcBase;\r
   UINTN         Address;\r


@@ -768,10 +768,10 @@ UfsStopExecCmd (
 \r
   UfsHcBase = Private->UfsHcBase;\r
 \r
 \r
   UfsHcBase = Private->UfsHcBase;\r
 \r

-  Address = UfsHcBase + UFS_HC_UTRLDBR_OFFSET;  \r
+  Address = UfsHcBase + UFS_HC_UTRLDBR_OFFSET;\r

   Data    = MmioRead32 (Address);\r
   if ((Data & (BIT0 << Slot)) != 0) {\r
   Data    = MmioRead32 (Address);\r
   if ((Data & (BIT0 << Slot)) != 0) {\r

-    Address = UfsHcBase + UFS_HC_UTRLCLR_OFFSET;  \r
+    Address = UfsHcBase + UFS_HC_UTRLCLR_OFFSET;\r

     Data    = MmioRead32 (Address);\r
     MmioWrite32 (Address, (Data & ~(BIT0 << Slot)));\r
   }\r
     Data    = MmioRead32 (Address);\r
     MmioWrite32 (Address, (Data & ~(BIT0 << Slot)));\r
   }\r


@@ -839,7 +839,7 @@ UfsRwDeviceDesc (
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r

-  \r
+\r

   Trd = ((UTP_TRD*)Private->UtpTrlBase) + Slot;\r
   //\r
   // Fill transfer request descriptor to this slot.\r
   Trd = ((UTP_TRD*)Private->UtpTrlBase) + Slot;\r
   //\r
   // Fill transfer request descriptor to this slot.\r


@@ -863,8 +863,8 @@ UfsRwDeviceDesc (
 \r
   //\r
   // Wait for the completion of the transfer request.\r
 \r
   //\r
   // Wait for the completion of the transfer request.\r

-  //  \r
-  Address = Private->UfsHcBase + UFS_HC_UTRLDBR_OFFSET;  \r
+  //\r
+  Address = Private->UfsHcBase + UFS_HC_UTRLDBR_OFFSET;\r

   Status = UfsWaitMemSet (Address, BIT0 << Slot, 0, Packet.Timeout);\r
   if (EFI_ERROR (Status)) {\r
     goto Exit;\r
   Status = UfsWaitMemSet (Address, BIT0 << Slot, 0, Packet.Timeout);\r
   if (EFI_ERROR (Status)) {\r
     goto Exit;\r


@@ -953,7 +953,7 @@ UfsRwAttributes (
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r

-  \r
+\r

   Trd = ((UTP_TRD*)Private->UtpTrlBase) + Slot;\r
   //\r
   // Fill transfer request descriptor to this slot.\r
   Trd = ((UTP_TRD*)Private->UtpTrlBase) + Slot;\r
   //\r
   // Fill transfer request descriptor to this slot.\r


@@ -977,8 +977,8 @@ UfsRwAttributes (
 \r
   //\r
   // Wait for the completion of the transfer request.\r
 \r
   //\r
   // Wait for the completion of the transfer request.\r

-  //  \r
-  Address = Private->UfsHcBase + UFS_HC_UTRLDBR_OFFSET;  \r
+  //\r
+  Address = Private->UfsHcBase + UFS_HC_UTRLDBR_OFFSET;\r

   Status = UfsWaitMemSet (Address, BIT0 << Slot, 0, Packet.Timeout);\r
   if (EFI_ERROR (Status)) {\r
     goto Exit;\r
   Status = UfsWaitMemSet (Address, BIT0 << Slot, 0, Packet.Timeout);\r
   if (EFI_ERROR (Status)) {\r
     goto Exit;\r


@@ -1091,8 +1091,8 @@ UfsRwFlags (
 \r
   //\r
   // Wait for the completion of the transfer request.\r
 \r
   //\r
   // Wait for the completion of the transfer request.\r

-  //  \r
-  Address = Private->UfsHcBase + UFS_HC_UTRLDBR_OFFSET;  \r
+  //\r
+  Address = Private->UfsHcBase + UFS_HC_UTRLDBR_OFFSET;\r

   Status = UfsWaitMemSet (Address, BIT0 << Slot, 0, Packet.Timeout);\r
   if (EFI_ERROR (Status)) {\r
     goto Exit;\r
   Status = UfsWaitMemSet (Address, BIT0 << Slot, 0, Packet.Timeout);\r
   if (EFI_ERROR (Status)) {\r
     goto Exit;\r


@@ -1249,8 +1249,8 @@ UfsExecNopCmds (
 \r
   //\r
   // Wait for the completion of the transfer request.\r
 \r
   //\r
   // Wait for the completion of the transfer request.\r

-  //  \r
-  Address = Private->UfsHcBase + UFS_HC_UTRLDBR_OFFSET;  \r
+  //\r
+  Address = Private->UfsHcBase + UFS_HC_UTRLDBR_OFFSET;\r

   Status = UfsWaitMemSet (Address, BIT0 << Slot, 0, UFS_TIMEOUT);\r
   if (EFI_ERROR (Status)) {\r
     goto Exit;\r
   Status = UfsWaitMemSet (Address, BIT0 << Slot, 0, UFS_TIMEOUT);\r
   if (EFI_ERROR (Status)) {\r
     goto Exit;\r


@@ -1335,8 +1335,8 @@ UfsExecScsiCmds (
 \r
   //\r
   // Wait for the completion of the transfer request.\r
 \r
   //\r
   // Wait for the completion of the transfer request.\r

-  //  \r
-  Address = Private->UfsHcBase + UFS_HC_UTRLDBR_OFFSET;  \r
+  //\r
+  Address = Private->UfsHcBase + UFS_HC_UTRLDBR_OFFSET;\r

   Status = UfsWaitMemSet (Address, BIT0 << Slot, 0, Packet->Timeout);\r
   if (EFI_ERROR (Status)) {\r
     goto Exit;\r
   Status = UfsWaitMemSet (Address, BIT0 << Slot, 0, Packet->Timeout);\r
   if (EFI_ERROR (Status)) {\r
     goto Exit;\r


@@ -1348,7 +1348,7 @@ UfsExecScsiCmds (
   Response     = (UTP_RESPONSE_UPIU*)(CmdDescBase + Trd->RuO * sizeof (UINT32));\r
   SenseDataLen = Response->SenseDataLen;\r
   SwapLittleEndianToBigEndian ((UINT8*)&SenseDataLen, sizeof (UINT16));\r
   Response     = (UTP_RESPONSE_UPIU*)(CmdDescBase + Trd->RuO * sizeof (UINT32));\r
   SenseDataLen = Response->SenseDataLen;\r
   SwapLittleEndianToBigEndian ((UINT8*)&SenseDataLen, sizeof (UINT16));\r

-  \r
+\r

   if ((Packet->SenseDataLength != 0) && (Packet->SenseData != NULL)) {\r
     CopyMem (Packet->SenseData, Response->SenseData, SenseDataLen);\r
     Packet->SenseDataLength = (UINT8)SenseDataLen;\r
   if ((Packet->SenseDataLength != 0) && (Packet->SenseData != NULL)) {\r
     CopyMem (Packet->SenseData, Response->SenseData, SenseDataLen);\r
     Packet->SenseDataLength = (UINT8)SenseDataLen;\r


@@ -1458,7 +1458,7 @@ UfsExecUicCommands (
 \r
   //\r
   // UFS 2.0 spec section 5.3.1 Offset:0x20 IS.Bit10 UIC Command Completion Status (UCCS)\r
 \r
   //\r
   // UFS 2.0 spec section 5.3.1 Offset:0x20 IS.Bit10 UIC Command Completion Status (UCCS)\r

-  // This bit is set to '1' by the host controller upon completion of a UIC command. \r
+  // This bit is set to '1' by the host controller upon completion of a UIC command.\r

   //\r
   Address = UfsHcBase + UFS_HC_IS_OFFSET;\r
   Data    = MmioRead32 (Address);\r
   //\r
   Address = UfsHcBase + UFS_HC_IS_OFFSET;\r
   Data    = MmioRead32 (Address);\r


@@ -1481,7 +1481,7 @@ UfsExecUicCommands (
   //\r
   // Check value of HCS.DP and make sure that there is a device attached to the Link.\r
   //\r
   //\r
   // Check value of HCS.DP and make sure that there is a device attached to the Link.\r
   //\r

-  Address = UfsHcBase + UFS_HC_STATUS_OFFSET;  \r
+  Address = UfsHcBase + UFS_HC_STATUS_OFFSET;\r

   Data    = MmioRead32 (Address);\r
   if ((Data & UFS_HC_HCS_DP) == 0) {\r
     Address = UfsHcBase + UFS_HC_IS_OFFSET;\r
   Data    = MmioRead32 (Address);\r
   if ((Data & UFS_HC_HCS_DP) == 0) {\r
     Address = UfsHcBase + UFS_HC_IS_OFFSET;\r


@@ -1614,11 +1614,11 @@ UfsInitTaskManagementRequestList (
   EFI_PHYSICAL_ADDRESS   CmdDescPhyAddr;\r
   VOID                   *CmdDescMapping;\r
   EFI_STATUS             Status;\r
   EFI_PHYSICAL_ADDRESS   CmdDescPhyAddr;\r
   VOID                   *CmdDescMapping;\r
   EFI_STATUS             Status;\r

-  \r
+\r

   //\r
   // Initial h/w and s/w context for future operations.\r
   //\r
   //\r
   // Initial h/w and s/w context for future operations.\r
   //\r

-  Address = Private->UfsHcBase + UFS_HC_CAP_OFFSET;  \r
+  Address = Private->UfsHcBase + UFS_HC_CAP_OFFSET;\r

   Data    = MmioRead32 (Address);\r
   Private->Capabilities = Data;\r
 \r
   Data    = MmioRead32 (Address);\r
   Private->Capabilities = Data;\r
 \r


@@ -1642,9 +1642,9 @@ UfsInitTaskManagementRequestList (
   // Program the UTP Task Management Request List Base Address and UTP Task Management\r
   // Request List Base Address with a 64-bit address allocated at step 6.\r
   //\r
   // Program the UTP Task Management Request List Base Address and UTP Task Management\r
   // Request List Base Address with a 64-bit address allocated at step 6.\r
   //\r

-  Address = Private->UfsHcBase + UFS_HC_UTMRLBA_OFFSET;  \r
+  Address = Private->UfsHcBase + UFS_HC_UTMRLBA_OFFSET;\r

   MmioWrite32 (Address, (UINT32)(UINTN)CmdDescPhyAddr);\r
   MmioWrite32 (Address, (UINT32)(UINTN)CmdDescPhyAddr);\r

-  Address = Private->UfsHcBase + UFS_HC_UTMRLBAU_OFFSET;  \r
+  Address = Private->UfsHcBase + UFS_HC_UTMRLBAU_OFFSET;\r

   MmioWrite32 (Address, (UINT32)RShiftU64 ((UINT64)CmdDescPhyAddr, 32));\r
   Private->UtpTmrlBase = (VOID*)(UINTN)CmdDescHost;\r
   Private->Nutmrs      = Nutmrs;\r
   MmioWrite32 (Address, (UINT32)RShiftU64 ((UINT64)CmdDescPhyAddr, 32));\r
   Private->UtpTmrlBase = (VOID*)(UINTN)CmdDescHost;\r
   Private->Nutmrs      = Nutmrs;\r


@@ -1654,7 +1654,7 @@ UfsInitTaskManagementRequestList (
   // Enable the UTP Task Management Request List by setting the UTP Task Management\r
   // Request List RunStop Register (UTMRLRSR) to '1'.\r
   //\r
   // Enable the UTP Task Management Request List by setting the UTP Task Management\r
   // Request List RunStop Register (UTMRLRSR) to '1'.\r
   //\r

-  Address = Private->UfsHcBase + UFS_HC_UTMRLRSR_OFFSET;  \r
+  Address = Private->UfsHcBase + UFS_HC_UTMRLRSR_OFFSET;\r

   MmioWrite32 (Address, UFS_HC_UTMRLRSR);\r
 \r
   return EFI_SUCCESS;\r
   MmioWrite32 (Address, UFS_HC_UTMRLRSR);\r
 \r
   return EFI_SUCCESS;\r


@@ -1681,11 +1681,11 @@ UfsInitTransferRequestList (
   EFI_PHYSICAL_ADDRESS   CmdDescPhyAddr;\r
   VOID                   *CmdDescMapping;\r
   EFI_STATUS             Status;\r
   EFI_PHYSICAL_ADDRESS   CmdDescPhyAddr;\r
   VOID                   *CmdDescMapping;\r
   EFI_STATUS             Status;\r

-  \r
+\r

   //\r
   // Initial h/w and s/w context for future operations.\r
   //\r
   //\r
   // Initial h/w and s/w context for future operations.\r
   //\r

-  Address = Private->UfsHcBase + UFS_HC_CAP_OFFSET;  \r
+  Address = Private->UfsHcBase + UFS_HC_CAP_OFFSET;\r

   Data    = MmioRead32 (Address);\r
   Private->Capabilities = Data;\r
 \r
   Data    = MmioRead32 (Address);\r
   Private->Capabilities = Data;\r
 \r


@@ -1709,19 +1709,19 @@ UfsInitTransferRequestList (
   // Program the UTP Transfer Request List Base Address and UTP Transfer Request List\r
   // Base Address with a 64-bit address allocated at step 8.\r
   //\r
   // Program the UTP Transfer Request List Base Address and UTP Transfer Request List\r
   // Base Address with a 64-bit address allocated at step 8.\r
   //\r

-  Address = Private->UfsHcBase + UFS_HC_UTRLBA_OFFSET;  \r
+  Address = Private->UfsHcBase + UFS_HC_UTRLBA_OFFSET;\r

   MmioWrite32 (Address, (UINT32)(UINTN)CmdDescPhyAddr);\r
   MmioWrite32 (Address, (UINT32)(UINTN)CmdDescPhyAddr);\r

-  Address = Private->UfsHcBase + UFS_HC_UTRLBAU_OFFSET;  \r
+  Address = Private->UfsHcBase + UFS_HC_UTRLBAU_OFFSET;\r

   MmioWrite32 (Address, (UINT32)RShiftU64 ((UINT64)CmdDescPhyAddr, 32));\r
   Private->UtpTrlBase = (VOID*)(UINTN)CmdDescHost;\r
   Private->Nutrs      = Nutrs;\r
   Private->TrlMapping = CmdDescMapping;\r
   MmioWrite32 (Address, (UINT32)RShiftU64 ((UINT64)CmdDescPhyAddr, 32));\r
   Private->UtpTrlBase = (VOID*)(UINTN)CmdDescHost;\r
   Private->Nutrs      = Nutrs;\r
   Private->TrlMapping = CmdDescMapping;\r

-  \r
+\r

   //\r
   // Enable the UTP Transfer Request List by setting the UTP Transfer Request List\r
   // RunStop Register (UTRLRSR) to '1'.\r
   //\r
   //\r
   // Enable the UTP Transfer Request List by setting the UTP Transfer Request List\r
   // RunStop Register (UTRLRSR) to '1'.\r
   //\r

-  Address = Private->UfsHcBase + UFS_HC_UTRLRSR_OFFSET;  \r
+  Address = Private->UfsHcBase + UFS_HC_UTRLRSR_OFFSET;\r

   MmioWrite32 (Address, UFS_HC_UTRLRSR);\r
 \r
   return EFI_SUCCESS;\r
   MmioWrite32 (Address, UFS_HC_UTRLRSR);\r
 \r
   return EFI_SUCCESS;\r


@@ -1803,14 +1803,14 @@ UfsControllerStop (
   // Enable the UTP Task Management Request List by setting the UTP Task Management\r
   // Request List RunStop Register (UTMRLRSR) to '1'.\r
   //\r
   // Enable the UTP Task Management Request List by setting the UTP Task Management\r
   // Request List RunStop Register (UTMRLRSR) to '1'.\r
   //\r

-  Address = Private->UfsHcBase + UFS_HC_UTMRLRSR_OFFSET;  \r
+  Address = Private->UfsHcBase + UFS_HC_UTMRLRSR_OFFSET;\r

   MmioWrite32 (Address, 0);\r
 \r
   //\r
   // Enable the UTP Transfer Request List by setting the UTP Transfer Request List\r
   // RunStop Register (UTRLRSR) to '1'.\r
   //\r
   MmioWrite32 (Address, 0);\r
 \r
   //\r
   // Enable the UTP Transfer Request List by setting the UTP Transfer Request List\r
   // RunStop Register (UTRLRSR) to '1'.\r
   //\r

-  Address = Private->UfsHcBase + UFS_HC_UTRLRSR_OFFSET;  \r
+  Address = Private->UfsHcBase + UFS_HC_UTRLRSR_OFFSET;\r

   MmioWrite32 (Address, 0);\r
 \r
   //\r
   MmioWrite32 (Address, 0);\r
 \r
   //\r

diff --git a/MdeModulePkg/Bus/Ufs/UfsBlockIoPei/UfsHci.h b/MdeModulePkg/Bus/Ufs/UfsBlockIoPei/UfsHci.h
index 0a0cf71894b9a11286c3c5b14bff4fb48dd2b7a9..69fae956ce54a8c79ebb820c7a70d7b86f390e07 100644 (file)
--- a/MdeModulePkg/Bus/Ufs/UfsBlockIoPei/UfsHci.h
+++ b/MdeModulePkg/Bus/Ufs/UfsBlockIoPei/UfsHci.h
@@ -2,7 +2,7 @@
   UfsPassThruDxe driver is used to produce EFI_EXT_SCSI_PASS_THRU protocol interface\r
   for upper layer application to execute UFS-supported SCSI cmds.\r
 \r
   UfsPassThruDxe driver is used to produce EFI_EXT_SCSI_PASS_THRU protocol interface\r
   for upper layer application to execute UFS-supported SCSI cmds.\r
 \r

-  Copyright (c) 2014, Intel Corporation. All rights reserved.<BR>\r
+  Copyright (c) 2014 - 2018, Intel Corporation. All rights reserved.<BR>\r

   This program and the accompanying materials\r
   are licensed and made available under the terms and conditions of the BSD License\r
   which accompanies this distribution.  The full text of the license may be found at\r
   This program and the accompanying materials\r
   are licensed and made available under the terms and conditions of the BSD License\r
   which accompanies this distribution.  The full text of the license may be found at\r


@@ -153,7 +153,7 @@ typedef struct {
 // UFSHCI 2.0 Spec Section 5.2.5 Offset 18h: AHIT - Auto-Hibernate Idle Timer\r
 //\r
 typedef struct {\r
 // UFSHCI 2.0 Spec Section 5.2.5 Offset 18h: AHIT - Auto-Hibernate Idle Timer\r
 //\r
 typedef struct {\r

-  UINT32 Ahitv:10;     // Auto-Hibernate Idle Timer Value \r
+  UINT32 Ahitv:10;     // Auto-Hibernate Idle Timer Value\r

   UINT32 Ts:3;         // Timer scale\r
   UINT32 Rsvd1:19;\r
 } UFS_HC_AHIT;\r
   UINT32 Ts:3;         // Timer scale\r
   UINT32 Rsvd1:19;\r
 } UFS_HC_AHIT;\r


@@ -165,19 +165,19 @@ typedef struct {
   UINT16 Utrcs:1;      // UTP Transfer Request Completion Status\r
   UINT16 Udepri:1;     // UIC DME_ENDPOINT_RESET Indication\r
   UINT16 Ue:1;         // UIC Error\r
   UINT16 Utrcs:1;      // UTP Transfer Request Completion Status\r
   UINT16 Udepri:1;     // UIC DME_ENDPOINT_RESET Indication\r
   UINT16 Ue:1;         // UIC Error\r

-  UINT16 Utms:1;       // UIC Test Mode Status \r
+  UINT16 Utms:1;       // UIC Test Mode Status\r

 \r
 \r

-  UINT16 Upms:1;       // UIC Power Mode Status \r
-  UINT16 Uhxs:1;       // UIC Hibernate Exit Status \r
-  UINT16 Uhes:1;       // UIC Hibernate Enter Status \r
-  UINT16 Ulls:1;       // UIC Link Lost Status \r
+  UINT16 Upms:1;       // UIC Power Mode Status\r
+  UINT16 Uhxs:1;       // UIC Hibernate Exit Status\r
+  UINT16 Uhes:1;       // UIC Hibernate Enter Status\r
+  UINT16 Ulls:1;       // UIC Link Lost Status\r

 \r
 \r

-  UINT16 Ulss:1;       // UIC Link Startup Status \r
-  UINT16 Utmrcs:1;     // UTP Task  Management Request Completion Status \r
-  UINT16 Uccs:1;       // UIC Command Completion Status \r
-  UINT16 Dfes:1;       // Device Fatal Error Status  \r
+  UINT16 Ulss:1;       // UIC Link Startup Status\r
+  UINT16 Utmrcs:1;     // UTP Task  Management Request Completion Status\r
+  UINT16 Uccs:1;       // UIC Command Completion Status\r
+  UINT16 Dfes:1;       // Device Fatal Error Status\r

 \r
 \r

-  UINT16 Utpes:1;      // UTP Error Status  \r
+  UINT16 Utpes:1;      // UTP Error Status\r

   UINT16 Rsvd1:3;\r
 \r
   UINT16 Hcfes:1;      // Host Controller Fatal Error Status\r
   UINT16 Rsvd1:3;\r
 \r
   UINT16 Hcfes:1;      // Host Controller Fatal Error Status\r


@@ -194,9 +194,9 @@ typedef struct {
   UINT16 Uee:1;        // UIC Error Enable\r
   UINT16 Utmse:1;      // UIC Test Mode Status Enable\r
 \r
   UINT16 Uee:1;        // UIC Error Enable\r
   UINT16 Utmse:1;      // UIC Test Mode Status Enable\r
 \r

-  UINT16 Upmse:1;      // UIC Power Mode Status Enable \r
+  UINT16 Upmse:1;      // UIC Power Mode Status Enable\r

   UINT16 Uhxse:1;      // UIC Hibernate Exit Status Enable\r
   UINT16 Uhxse:1;      // UIC Hibernate Exit Status Enable\r

-  UINT16 Uhese:1;      // UIC Hibernate Enter Status Enable \r
+  UINT16 Uhese:1;      // UIC Hibernate Enter Status Enable\r

   UINT16 Ullse:1;      // UIC Link Lost Status Enable\r
 \r
   UINT16 Ulsse:1;      // UIC Link Startup Status Enable\r
   UINT16 Ullse:1;      // UIC Link Lost Status Enable\r
 \r
   UINT16 Ulsse:1;      // UIC Link Startup Status Enable\r


@@ -450,22 +450,22 @@ typedef struct {
   //\r
   UINT32 Rsvd6:7;\r
   UINT32 UcdBa:25;            /* UTP Command Descriptor Base Address */\r
   //\r
   UINT32 Rsvd6:7;\r
   UINT32 UcdBa:25;            /* UTP Command Descriptor Base Address */\r

-  \r
+\r

   //\r
   // DW5\r
   //\r
   UINT32 UcdBaU;              /* UTP Command Descriptor Base Address Upper 32-bits */\r
   //\r
   // DW5\r
   //\r
   UINT32 UcdBaU;              /* UTP Command Descriptor Base Address Upper 32-bits */\r

- \r
+\r

   //\r
   // DW6\r
   //\r
   //\r
   // DW6\r
   //\r

-  UINT16 RuL;                 /* Response UPIU Length */  \r
+  UINT16 RuL;                 /* Response UPIU Length */\r

   UINT16 RuO;                 /* Response UPIU Offset */\r
 \r
   //\r
   // DW7\r
   //\r
   UINT16 RuO;                 /* Response UPIU Offset */\r
 \r
   //\r
   // DW7\r
   //\r

-  UINT16 PrdtL;               /* PRDT Length */  \r
+  UINT16 PrdtL;               /* PRDT Length */\r

   UINT16 PrdtO;               /* PRDT Offset */\r
 } UTP_TRD;\r
 \r
   UINT16 PrdtO;               /* PRDT Offset */\r
 } UTP_TRD;\r
 \r


@@ -475,12 +475,12 @@ typedef struct {
   //\r
   UINT32 Rsvd1:2;\r
   UINT32 DbAddr:30;           /* Data Base Address */\r
   //\r
   UINT32 Rsvd1:2;\r
   UINT32 DbAddr:30;           /* Data Base Address */\r

-  \r
+\r

   //\r
   // DW1\r
   //\r
   UINT32 DbAddrU;             /* Data Base Address Upper 32-bits */\r
   //\r
   // DW1\r
   //\r
   UINT32 DbAddrU;             /* Data Base Address Upper 32-bits */\r

- \r
+\r

   //\r
   // DW2\r
   //\r
   //\r
   // DW2\r
   //\r


@@ -846,7 +846,7 @@ typedef struct {
   // DW4 - DW11\r
   //\r
   UTP_TM_REQ_UPIU TmReq;      /* Task Management Request UPIU */\r
   // DW4 - DW11\r
   //\r
   UTP_TM_REQ_UPIU TmReq;      /* Task Management Request UPIU */\r

-  \r
+\r

   //\r
   // DW12 - DW19\r
   //\r
   //\r
   // DW12 - DW19\r
   //\r


@@ -972,7 +972,7 @@ typedef struct {
 typedef enum {\r
   UfsUtpQueryResponseSuccess             = 0x00,\r
   UfsUtpQueryResponseParamNotReadable    = 0xF6,\r
 typedef enum {\r
   UfsUtpQueryResponseSuccess             = 0x00,\r
   UfsUtpQueryResponseParamNotReadable    = 0xF6,\r

-  UfsUtpQueryResponseParamNotWriteable   = 0xF7,  \r
+  UfsUtpQueryResponseParamNotWriteable   = 0xF7,\r

   UfsUtpQueryResponseParamAlreadyWritten = 0xF8,\r
   UfsUtpQueryResponseInvalidLen          = 0xF9,\r
   UfsUtpQueryResponseInvalidVal          = 0xFA,\r
   UfsUtpQueryResponseParamAlreadyWritten = 0xF8,\r
   UfsUtpQueryResponseInvalidLen          = 0xF9,\r
   UfsUtpQueryResponseInvalidVal          = 0xFA,\r


@@ -1305,7 +1305,7 @@ typedef enum {
   UfsFlagPurgeEn         = 0x06,\r
   UfsFlagPhyResRemoval   = 0x08,\r
   UfsFlagBusyRtc         = 0x09,\r
   UfsFlagPurgeEn         = 0x06,\r
   UfsFlagPhyResRemoval   = 0x08,\r
   UfsFlagBusyRtc         = 0x09,\r

-  UfsFlagPermDisFwUpdate = 0x0B    \r
+  UfsFlagPermDisFwUpdate = 0x0B\r

 } UFS_FLAGS_IDN;\r
 \r
 //\r
 } UFS_FLAGS_IDN;\r
 \r
 //\r

diff --git a/MdeModulePkg/Bus/Ufs/UfsPassThruDxe/ComponentName.c b/MdeModulePkg/Bus/Ufs/UfsPassThruDxe/ComponentName.c
index 7da21110e3560a45f8143c82d75c8ab5fc1b9feb..35ead3656748bedb39c6dfa69ebeba84aab34885 100644 (file)
--- a/MdeModulePkg/Bus/Ufs/UfsPassThruDxe/ComponentName.c
+++ b/MdeModulePkg/Bus/Ufs/UfsPassThruDxe/ComponentName.c
@@ -1,13 +1,13 @@
 /** @file\r
 \r
 /** @file\r
 \r

-  Copyright (c) 2014, Intel Corporation. All rights reserved.<BR>\r
-  This program and the accompanying materials                          \r
-  are licensed and made available under the terms and conditions of the BSD License         \r
-  which accompanies this distribution.  The full text of the license may be found at        \r
-  http://opensource.org/licenses/bsd-license.php                                            \r
+  Copyright (c) 2014 - 2018, Intel Corporation. All rights reserved.<BR>\r
+  This program and the accompanying materials\r
+  are licensed and made available under the terms and conditions of the BSD License\r
+  which accompanies this distribution.  The full text of the license may be found at\r
+  http://opensource.org/licenses/bsd-license.php\r

 \r
 \r

-  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     \r
-  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             \r
+  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
+  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r

 \r
 **/\r
 #include "UfsPassThru.h"\r
 \r
 **/\r
 #include "UfsPassThru.h"\r


@@ -32,18 +32,18 @@ GLOBAL_REMOVE_IF_UNREFERENCED EFI_COMPONENT_NAME2_PROTOCOL gUfsPassThruComponent
 \r
 \r
 GLOBAL_REMOVE_IF_UNREFERENCED EFI_UNICODE_STRING_TABLE mUfsPassThruDriverNameTable[] = {\r
 \r
 \r
 GLOBAL_REMOVE_IF_UNREFERENCED EFI_UNICODE_STRING_TABLE mUfsPassThruDriverNameTable[] = {\r

-  { \r
+  {\r

     "eng;en",\r
     L"Universal Flash Storage (UFS) Pass Thru Driver"\r
   },\r
     "eng;en",\r
     L"Universal Flash Storage (UFS) Pass Thru Driver"\r
   },\r

-  { \r
+  {\r

     NULL,\r
     NULL\r
   }\r
 };\r
 \r
 GLOBAL_REMOVE_IF_UNREFERENCED EFI_UNICODE_STRING_TABLE mUfsPassThruControllerNameTable[] = {\r
     NULL,\r
     NULL\r
   }\r
 };\r
 \r
 GLOBAL_REMOVE_IF_UNREFERENCED EFI_UNICODE_STRING_TABLE mUfsPassThruControllerNameTable[] = {\r

-  { \r
+  {\r

     "eng;en",\r
     L"Universal Flash Storage (UFS) Host Controller"\r
   },\r
     "eng;en",\r
     L"Universal Flash Storage (UFS) Host Controller"\r
   },\r

diff --git a/MdeModulePkg/Bus/Ufs/UfsPassThruDxe/UfsPassThru.c b/MdeModulePkg/Bus/Ufs/UfsPassThruDxe/UfsPassThru.c
index e24eb40333be558cf50cc0cdb1d5b72444f51630..ea329618dcf88193d05ecb0cd4c4fae483eb5499 100644 (file)
--- a/MdeModulePkg/Bus/Ufs/UfsPassThruDxe/UfsPassThru.c
+++ b/MdeModulePkg/Bus/Ufs/UfsPassThruDxe/UfsPassThru.c
@@ -1,6 +1,6 @@
 /** @file\r
 \r
 /** @file\r
 \r

-  Copyright (c) 2014 - 2017, Intel Corporation. All rights reserved.<BR>\r
+  Copyright (c) 2014 - 2018, Intel Corporation. All rights reserved.<BR>\r

   This program and the accompanying materials\r
   are licensed and made available under the terms and conditions of the BSD License\r
   which accompanies this distribution.  The full text of the license may be found at\r
   This program and the accompanying materials\r
   are licensed and made available under the terms and conditions of the BSD License\r
   which accompanies this distribution.  The full text of the license may be found at\r


@@ -18,7 +18,7 @@
 //\r
 UFS_PASS_THRU_PRIVATE_DATA gUfsPassThruTemplate = {\r
   UFS_PASS_THRU_SIG,              // Signature\r
 //\r
 UFS_PASS_THRU_PRIVATE_DATA gUfsPassThruTemplate = {\r
   UFS_PASS_THRU_SIG,              // Signature\r

-  NULL,                           // Handle  \r
+  NULL,                           // Handle\r

   {                               // ExtScsiPassThruMode\r
     0xFFFFFFFF,\r
     EFI_EXT_SCSI_PASS_THRU_ATTRIBUTES_PHYSICAL | EFI_EXT_SCSI_PASS_THRU_ATTRIBUTES_LOGICAL | EFI_EXT_SCSI_PASS_THRU_ATTRIBUTES_NONBLOCKIO,\r
   {                               // ExtScsiPassThruMode\r
     0xFFFFFFFF,\r
     EFI_EXT_SCSI_PASS_THRU_ATTRIBUTES_PHYSICAL | EFI_EXT_SCSI_PASS_THRU_ATTRIBUTES_LOGICAL | EFI_EXT_SCSI_PASS_THRU_ATTRIBUTES_NONBLOCKIO,\r


@@ -209,7 +209,7 @@ UfsPassThruPassThru (
     if ((Private->Luns.BitMask & (BIT0 << Index)) == 0) {\r
       continue;\r
     }\r
     if ((Private->Luns.BitMask & (BIT0 << Index)) == 0) {\r
       continue;\r
     }\r

-  \r
+\r

     if (Private->Luns.Lun[Index] == UfsLun) {\r
       break;\r
     }\r
     if (Private->Luns.Lun[Index] == UfsLun) {\r
       break;\r
     }\r


@@ -413,7 +413,7 @@ UfsPassThruBuildDevicePath (
     if ((Private->Luns.BitMask & (BIT0 << Index)) == 0) {\r
       continue;\r
     }\r
     if ((Private->Luns.BitMask & (BIT0 << Index)) == 0) {\r
       continue;\r
     }\r

-  \r
+\r

     if (Private->Luns.Lun[Index] == UfsLun) {\r
       break;\r
     }\r
     if (Private->Luns.Lun[Index] == UfsLun) {\r
       break;\r
     }\r


@@ -504,7 +504,7 @@ UfsPassThruGetTargetLun (
     if ((Private->Luns.BitMask & (BIT0 << Index)) == 0) {\r
       continue;\r
     }\r
     if ((Private->Luns.BitMask & (BIT0 << Index)) == 0) {\r
       continue;\r
     }\r

-  \r
+\r

     if (Private->Luns.Lun[Index] == UfsLun) {\r
       break;\r
     }\r
     if (Private->Luns.Lun[Index] == UfsLun) {\r
       break;\r
     }\r


@@ -730,7 +730,7 @@ UfsPassThruDriverBindingSupported (
         This->DriverBindingHandle,\r
         Controller\r
         );\r
         This->DriverBindingHandle,\r
         Controller\r
         );\r

-        \r
+\r

   return EFI_SUCCESS;\r
 }\r
 \r
   return EFI_SUCCESS;\r
 }\r
 \r


@@ -883,8 +883,8 @@ UfsPassThruDriverBindingStart (
 \r
   //\r
   // UFS 2.0 spec Section 13.1.3.3:\r
 \r
   //\r
   // UFS 2.0 spec Section 13.1.3.3:\r

-  // At the end of the UFS Interconnect Layer initialization on both host and device side, \r
-  // the host shall send a NOP OUT UPIU to verify that the device UTP Layer is ready. \r
+  // At the end of the UFS Interconnect Layer initialization on both host and device side,\r
+  // the host shall send a NOP OUT UPIU to verify that the device UTP Layer is ready.\r

   //\r
   Status = UfsExecNopCmds (Private);\r
   if (EFI_ERROR (Status)) {\r
   //\r
   Status = UfsExecNopCmds (Private);\r
   if (EFI_ERROR (Status)) {\r


@@ -955,7 +955,7 @@ UfsPassThruDriverBindingStart (
 Error:\r
   if (Private != NULL) {\r
     if (Private->TmrlMapping != NULL) {\r
 Error:\r
   if (Private != NULL) {\r
     if (Private->TmrlMapping != NULL) {\r

-      UfsHc->Unmap (UfsHc, Private->TmrlMapping);  \r
+      UfsHc->Unmap (UfsHc, Private->TmrlMapping);\r

     }\r
     if (Private->UtpTmrlBase != NULL) {\r
       UfsHc->FreeBuffer (UfsHc, EFI_SIZE_TO_PAGES (Private->Nutmrs * sizeof (UTP_TMRD)), Private->UtpTmrlBase);\r
     }\r
     if (Private->UtpTmrlBase != NULL) {\r
       UfsHc->FreeBuffer (UfsHc, EFI_SIZE_TO_PAGES (Private->Nutmrs * sizeof (UTP_TMRD)), Private->UtpTmrlBase);\r

diff --git a/MdeModulePkg/Bus/Ufs/UfsPassThruDxe/UfsPassThru.h b/MdeModulePkg/Bus/Ufs/UfsPassThruDxe/UfsPassThru.h
index 6c7198325839d67cfcad9c24a77d0e841e925525..b8937842b80be5ce887b0d86dae440a6ebb978c1 100644 (file)
--- a/MdeModulePkg/Bus/Ufs/UfsPassThruDxe/UfsPassThru.h
+++ b/MdeModulePkg/Bus/Ufs/UfsPassThruDxe/UfsPassThru.h
@@ -1,6 +1,6 @@
 /** @file\r
 \r
 /** @file\r
 \r

-  Copyright (c) 2014 - 2017, Intel Corporation. All rights reserved.<BR>\r
+  Copyright (c) 2014 - 2018, Intel Corporation. All rights reserved.<BR>\r

   This program and the accompanying materials\r
   are licensed and made available under the terms and conditions of the BSD License\r
   which accompanies this distribution.  The full text of the license may be found at\r
   This program and the accompanying materials\r
   are licensed and made available under the terms and conditions of the BSD License\r
   which accompanies this distribution.  The full text of the license may be found at\r


@@ -35,7 +35,7 @@
 #define UFS_PASS_THRU_SIG           SIGNATURE_32 ('U', 'F', 'S', 'P')\r
 \r
 //\r
 #define UFS_PASS_THRU_SIG           SIGNATURE_32 ('U', 'F', 'S', 'P')\r
 \r
 //\r

-// Lun 0~7 is for 8 common luns. \r
+// Lun 0~7 is for 8 common luns.\r

 // Lun 8~11 is for those 4 well known luns (Refer to UFS 2.0 spec Table 10.58 for details):\r
 //  Lun 8:  REPORT LUNS\r
 //  Lun 9:  UFS DEVICE\r
 // Lun 8~11 is for those 4 well known luns (Refer to UFS 2.0 spec Table 10.58 for details):\r
 //  Lun 8:  REPORT LUNS\r
 //  Lun 9:  UFS DEVICE\r


@@ -59,7 +59,7 @@ typedef struct {
   for(Entry = (ListHead)->ForwardLink, NextEntry = Entry->ForwardLink;\\r
       Entry != (ListHead); Entry = NextEntry, NextEntry = Entry->ForwardLink)\r
 \r
   for(Entry = (ListHead)->ForwardLink, NextEntry = Entry->ForwardLink;\\r
       Entry != (ListHead); Entry = NextEntry, NextEntry = Entry->ForwardLink)\r
 \r

-typedef struct _UFS_PASS_THRU_PRIVATE_DATA {  \r
+typedef struct _UFS_PASS_THRU_PRIVATE_DATA {\r

   UINT32                              Signature;\r
   EFI_HANDLE                          Handle;\r
   EFI_EXT_SCSI_PASS_THRU_MODE         ExtScsiPassThruMode;\r
   UINT32                              Signature;\r
   EFI_HANDLE                          Handle;\r
   EFI_EXT_SCSI_PASS_THRU_MODE         ExtScsiPassThruMode;\r

diff --git a/MdeModulePkg/Bus/Ufs/UfsPassThruDxe/UfsPassThru.uni b/MdeModulePkg/Bus/Ufs/UfsPassThruDxe/UfsPassThru.uni
index 85c16c10747e659e439a7fd4659a81dd6bfd864f..1addc23773ba816ede4554932580144f00af768a 100644 (file)
--- a/MdeModulePkg/Bus/Ufs/UfsPassThruDxe/UfsPassThru.uni
+++ b/MdeModulePkg/Bus/Ufs/UfsPassThruDxe/UfsPassThru.uni
@@ -1,16 +1,16 @@
 // /** @file\r
 // /** @file\r

-// The UfsPassThruDxe driver is used to provide support on accessing UFS device. \r
+// The UfsPassThruDxe driver is used to provide support on accessing UFS device.\r

 //\r
 // It produces an EFI_EXT_SCSI_PASS_THRU_PROTOCOL interface for upper layer to send\r
 // SCSI cmd to UFS device.\r
 //\r
 //\r
 // It produces an EFI_EXT_SCSI_PASS_THRU_PROTOCOL interface for upper layer to send\r
 // SCSI cmd to UFS device.\r
 //\r

-// Copyright (c) 2015, Intel Corporation. All rights reserved.<BR>\r
+// Copyright (c) 2015 - 2018, Intel Corporation. All rights reserved.<BR>\r

 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r
 // which accompanies this distribution.  The full text of the license may be found at\r
 // http://opensource.org/licenses/bsd-license.php\r
 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r
 // which accompanies this distribution.  The full text of the license may be found at\r
 // http://opensource.org/licenses/bsd-license.php\r

-// \r
+//\r

 // THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 // WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 //\r
 // THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 // WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 //\r

diff --git a/MdeModulePkg/Bus/Ufs/UfsPassThruDxe/UfsPassThruDxe.inf b/MdeModulePkg/Bus/Ufs/UfsPassThruDxe/UfsPassThruDxe.inf
index 467c533cebf3d4c26efaced2bbe2af00b0968497..93b64240208ae37aff12402584cb533ebfc638ac 100644 (file)
--- a/MdeModulePkg/Bus/Ufs/UfsPassThruDxe/UfsPassThruDxe.inf
+++ b/MdeModulePkg/Bus/Ufs/UfsPassThruDxe/UfsPassThruDxe.inf
@@ -1,7 +1,7 @@
 ## @file\r
 # Description file for the Universal Flash Storage (UFS) Pass Thru driver.\r
 #\r
 ## @file\r
 # Description file for the Universal Flash Storage (UFS) Pass Thru driver.\r
 #\r

-# Copyright (c) 2014 - 2017, Intel Corporation. All rights reserved.<BR>\r
+# Copyright (c) 2014 - 2018, Intel Corporation. All rights reserved.<BR>\r

 #\r
 #  This program and the accompanying materials\r
 #  are licensed and made available under the terms and conditions of the BSD License\r
 #\r
 #  This program and the accompanying materials\r
 #  are licensed and made available under the terms and conditions of the BSD License\r


@@ -28,8 +28,8 @@
 #\r
 #  VALID_ARCHITECTURES           = IA32 X64 IPF EBC\r
 #\r
 #\r
 #  VALID_ARCHITECTURES           = IA32 X64 IPF EBC\r
 #\r

-#  DRIVER_BINDING                =  gUfsPassThruDriverBinding              \r
-#  COMPONENT_NAME                =  gUfsPassThruComponentName              \r
+#  DRIVER_BINDING                =  gUfsPassThruDriverBinding\r
+#  COMPONENT_NAME                =  gUfsPassThruComponentName\r

 #\r
 \r
 [Sources]\r
 #\r
 \r
 [Sources]\r

diff --git a/MdeModulePkg/Bus/Ufs/UfsPassThruDxe/UfsPassThruExtra.uni b/MdeModulePkg/Bus/Ufs/UfsPassThruDxe/UfsPassThruExtra.uni
index 4f188f06108d44617fdbaca691c07d5e9588776e..2c8bd01d5d62f2f20a637c260d501e71348427d1 100644 (file)
--- a/MdeModulePkg/Bus/Ufs/UfsPassThruDxe/UfsPassThruExtra.uni
+++ b/MdeModulePkg/Bus/Ufs/UfsPassThruDxe/UfsPassThruExtra.uni
@@ -1,7 +1,7 @@
 // /** @file\r
 // UfsPassThruDxe Localized Strings and Content\r
 //\r
 // /** @file\r
 // UfsPassThruDxe Localized Strings and Content\r
 //\r

-// Copyright (c) 2015, Intel Corporation. All rights reserved.<BR>\r
+// Copyright (c) 2015 - 2018, Intel Corporation. All rights reserved.<BR>\r

 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r
 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r


@@ -13,8 +13,8 @@
 //\r
 // **/\r
 \r
 //\r
 // **/\r
 \r

-#string STR_PROPERTIES_MODULE_NAME \r
-#language en-US \r
+#string STR_PROPERTIES_MODULE_NAME\r
+#language en-US\r

 "UFS PassThru UEFI Driver"\r
 \r
 \r
 "UFS PassThru UEFI Driver"\r
 \r
 \r

diff --git a/MdeModulePkg/Bus/Ufs/UfsPassThruDxe/UfsPassThruHci.c b/MdeModulePkg/Bus/Ufs/UfsPassThruDxe/UfsPassThruHci.c
index 4b7df745014e486d1881e857d9741c391b729689..e868c8c07e1f801e1dbbe3a512d8690c81a0dc6a 100644 (file)
--- a/MdeModulePkg/Bus/Ufs/UfsPassThruDxe/UfsPassThruHci.c
+++ b/MdeModulePkg/Bus/Ufs/UfsPassThruDxe/UfsPassThruHci.c
@@ -2,7 +2,7 @@
   UfsPassThruDxe driver is used to produce EFI_EXT_SCSI_PASS_THRU protocol interface\r
   for upper layer application to execute UFS-supported SCSI cmds.\r
 \r
   UfsPassThruDxe driver is used to produce EFI_EXT_SCSI_PASS_THRU protocol interface\r
   for upper layer application to execute UFS-supported SCSI cmds.\r
 \r

-  Copyright (c) 2014 - 2017, Intel Corporation. All rights reserved.<BR>\r
+  Copyright (c) 2014 - 2018, Intel Corporation. All rights reserved.<BR>\r

   This program and the accompanying materials\r
   are licensed and made available under the terms and conditions of the BSD License\r
   which accompanies this distribution.  The full text of the license may be found at\r
   This program and the accompanying materials\r
   are licensed and made available under the terms and conditions of the BSD License\r
   which accompanies this distribution.  The full text of the license may be found at\r


@@ -179,13 +179,13 @@ DumpUicCmdExecResult (
         break;\r
       case 0x08:\r
         DEBUG ((DEBUG_VERBOSE, "UIC configuration command fails - PEER_COMMUNICATION_FAILURE\n"));\r
         break;\r
       case 0x08:\r
         DEBUG ((DEBUG_VERBOSE, "UIC configuration command fails - PEER_COMMUNICATION_FAILURE\n"));\r

-        break; \r
+        break;\r

       case 0x09:\r
         DEBUG ((DEBUG_VERBOSE, "UIC configuration command fails - BUSY\n"));\r
         break;\r
       case 0x0A:\r
         DEBUG ((DEBUG_VERBOSE, "UIC configuration command fails - DME_FAILURE\n"));\r
       case 0x09:\r
         DEBUG ((DEBUG_VERBOSE, "UIC configuration command fails - BUSY\n"));\r
         break;\r
       case 0x0A:\r
         DEBUG ((DEBUG_VERBOSE, "UIC configuration command fails - DME_FAILURE\n"));\r

-        break;        \r
+        break;\r

       default :\r
         ASSERT (FALSE);\r
         break;\r
       default :\r
         ASSERT (FALSE);\r
         break;\r


@@ -196,7 +196,7 @@ DumpUicCmdExecResult (
         break;\r
       case 0x01:\r
         DEBUG ((DEBUG_VERBOSE, "UIC control command fails - FAILURE\n"));\r
         break;\r
       case 0x01:\r
         DEBUG ((DEBUG_VERBOSE, "UIC control command fails - FAILURE\n"));\r

-        break;     \r
+        break;\r

       default :\r
         ASSERT (FALSE);\r
         break;\r
       default :\r
         ASSERT (FALSE);\r
         break;\r


@@ -242,7 +242,7 @@ DumpQueryResponseResult (
       break;\r
     case 0xFE:\r
       DEBUG ((DEBUG_VERBOSE, "Query Response with Invalid Opcode\n"));\r
       break;\r
     case 0xFE:\r
       DEBUG ((DEBUG_VERBOSE, "Query Response with Invalid Opcode\n"));\r

-      break; \r
+      break;\r

     case 0xFF:\r
       DEBUG ((DEBUG_VERBOSE, "Query Response with General Failure\n"));\r
       break;\r
     case 0xFF:\r
       DEBUG ((DEBUG_VERBOSE, "Query Response with General Failure\n"));\r
       break;\r


@@ -314,7 +314,7 @@ UfsFillTsfOfQueryReqUpiu (
       SwapLittleEndianToBigEndian ((UINT8*)&Length, sizeof (Length));\r
       TsfBase->Length = Length;\r
     }\r
       SwapLittleEndianToBigEndian ((UINT8*)&Length, sizeof (Length));\r
       TsfBase->Length = Length;\r
     }\r

-  \r
+\r

     if (Opcode == UtpQueryFuncOpcodeWrAttr) {\r
       SwapLittleEndianToBigEndian ((UINT8*)&Value, sizeof (Value));\r
       TsfBase->Value  = Value;\r
     if (Opcode == UtpQueryFuncOpcodeWrAttr) {\r
       SwapLittleEndianToBigEndian ((UINT8*)&Value, sizeof (Value));\r
       TsfBase->Value  = Value;\r


@@ -790,7 +790,7 @@ EFI_STATUS
 UfsStartExecCmd (\r
   IN  UFS_PASS_THRU_PRIVATE_DATA   *Private,\r
   IN  UINT8                        Slot\r
 UfsStartExecCmd (\r
   IN  UFS_PASS_THRU_PRIVATE_DATA   *Private,\r
   IN  UINT8                        Slot\r

-  ) \r
+  )\r

 {\r
   UINT32        Data;\r
   EFI_STATUS    Status;\r
 {\r
   UINT32        Data;\r
   EFI_STATUS    Status;\r


@@ -826,7 +826,7 @@ EFI_STATUS
 UfsStopExecCmd (\r
   IN  UFS_PASS_THRU_PRIVATE_DATA   *Private,\r
   IN  UINT8                        Slot\r
 UfsStopExecCmd (\r
   IN  UFS_PASS_THRU_PRIVATE_DATA   *Private,\r
   IN  UINT8                        Slot\r

-  ) \r
+  )\r

 {\r
   UINT32        Data;\r
   EFI_STATUS    Status;\r
 {\r
   UINT32        Data;\r
   EFI_STATUS    Status;\r


@@ -940,7 +940,7 @@ UfsSendDmRequestRetry (
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r

-  \r
+\r

   Trd = ((UTP_TRD*)Private->UtpTrlBase) + Slot;\r
   //\r
   // Fill transfer request descriptor to this slot.\r
   Trd = ((UTP_TRD*)Private->UtpTrlBase) + Slot;\r
   //\r
   // Fill transfer request descriptor to this slot.\r


@@ -1337,7 +1337,7 @@ UfsExecNopCmds (
 \r
   //\r
   // Wait for the completion of the transfer request.\r
 \r
   //\r
   // Wait for the completion of the transfer request.\r

-  //  \r
+  //\r

   Status = UfsWaitMemSet (Private, UFS_HC_UTRLDBR_OFFSET, BIT0 << Slot, 0, UFS_TIMEOUT);\r
   if (EFI_ERROR (Status)) {\r
     goto Exit;\r
   Status = UfsWaitMemSet (Private, UFS_HC_UTRLDBR_OFFSET, BIT0 << Slot, 0, UFS_TIMEOUT);\r
   if (EFI_ERROR (Status)) {\r
     goto Exit;\r


@@ -1503,7 +1503,7 @@ UfsExecScsiCmds (
 \r
   //\r
   // Wait for the completion of the transfer request.\r
 \r
   //\r
   // Wait for the completion of the transfer request.\r

-  // \r
+  //\r

   Status = UfsWaitMemSet (Private, UFS_HC_UTRLDBR_OFFSET, BIT0 << TransReq->Slot, 0, Packet->Timeout);\r
   if (EFI_ERROR (Status)) {\r
     goto Exit;\r
   Status = UfsWaitMemSet (Private, UFS_HC_UTRLDBR_OFFSET, BIT0 << TransReq->Slot, 0, Packet->Timeout);\r
   if (EFI_ERROR (Status)) {\r
     goto Exit;\r


@@ -1516,7 +1516,7 @@ UfsExecScsiCmds (
   ASSERT (Response != NULL);\r
   SenseDataLen = Response->SenseDataLen;\r
   SwapLittleEndianToBigEndian ((UINT8*)&SenseDataLen, sizeof (UINT16));\r
   ASSERT (Response != NULL);\r
   SenseDataLen = Response->SenseDataLen;\r
   SwapLittleEndianToBigEndian ((UINT8*)&SenseDataLen, sizeof (UINT16));\r

-  \r
+\r

   if ((Packet->SenseDataLength != 0) && (Packet->SenseData != NULL)) {\r
     CopyMem (Packet->SenseData, Response->SenseData, SenseDataLen);\r
     Packet->SenseDataLength = (UINT8)SenseDataLen;\r
   if ((Packet->SenseDataLength != 0) && (Packet->SenseData != NULL)) {\r
     CopyMem (Packet->SenseData, Response->SenseData, SenseDataLen);\r
     Packet->SenseDataLength = (UINT8)SenseDataLen;\r


@@ -1649,7 +1649,7 @@ UfsExecUicCommands (
 \r
   //\r
   // UFS 2.0 spec section 5.3.1 Offset:0x20 IS.Bit10 UIC Command Completion Status (UCCS)\r
 \r
   //\r
   // UFS 2.0 spec section 5.3.1 Offset:0x20 IS.Bit10 UIC Command Completion Status (UCCS)\r

-  // This bit is set to '1' by the host controller upon completion of a UIC command. \r
+  // This bit is set to '1' by the host controller upon completion of a UIC command.\r

   //\r
   Status  = UfsWaitMemSet (Private, UFS_HC_IS_OFFSET, UFS_HC_IS_UCCS, UFS_HC_IS_UCCS, UFS_TIMEOUT);\r
   if (EFI_ERROR (Status)) {\r
   //\r
   Status  = UfsWaitMemSet (Private, UFS_HC_IS_OFFSET, UFS_HC_IS_UCCS, UFS_HC_IS_UCCS, UFS_TIMEOUT);\r
   if (EFI_ERROR (Status)) {\r


@@ -1907,7 +1907,7 @@ UfsInitTaskManagementRequestList (
   EFI_PHYSICAL_ADDRESS   CmdDescPhyAddr;\r
   VOID                   *CmdDescMapping;\r
   EFI_STATUS             Status;\r
   EFI_PHYSICAL_ADDRESS   CmdDescPhyAddr;\r
   VOID                   *CmdDescMapping;\r
   EFI_STATUS             Status;\r

-  \r
+\r

   //\r
   // Initial h/w and s/w context for future operations.\r
   //\r
   //\r
   // Initial h/w and s/w context for future operations.\r
   //\r


@@ -1978,7 +1978,7 @@ UfsInitTransferRequestList (
   UINT8                  Nutrs;\r
   VOID                   *CmdDescHost;\r
   EFI_PHYSICAL_ADDRESS   CmdDescPhyAddr;\r
   UINT8                  Nutrs;\r
   VOID                   *CmdDescHost;\r
   EFI_PHYSICAL_ADDRESS   CmdDescPhyAddr;\r

-  VOID                   *CmdDescMapping;  \r
+  VOID                   *CmdDescMapping;\r

   EFI_STATUS             Status;\r
 \r
   //\r
   EFI_STATUS             Status;\r
 \r
   //\r


@@ -2019,7 +2019,7 @@ UfsInitTransferRequestList (
   }\r
 \r
   Private->UtpTrlBase = CmdDescHost;\r
   }\r
 \r
   Private->UtpTrlBase = CmdDescHost;\r

-  Private->Nutrs      = Nutrs;  \r
+  Private->Nutrs      = Nutrs;\r

   Private->TrlMapping = CmdDescMapping;\r
 \r
   //\r
   Private->TrlMapping = CmdDescMapping;\r
 \r
   //\r

diff --git a/MdeModulePkg/Bus/Ufs/UfsPassThruDxe/UfsPassThruHci.h b/MdeModulePkg/Bus/Ufs/UfsPassThruDxe/UfsPassThruHci.h
index 0a0cf71894b9a11286c3c5b14bff4fb48dd2b7a9..69fae956ce54a8c79ebb820c7a70d7b86f390e07 100644 (file)
--- a/MdeModulePkg/Bus/Ufs/UfsPassThruDxe/UfsPassThruHci.h
+++ b/MdeModulePkg/Bus/Ufs/UfsPassThruDxe/UfsPassThruHci.h
@@ -2,7 +2,7 @@
   UfsPassThruDxe driver is used to produce EFI_EXT_SCSI_PASS_THRU protocol interface\r
   for upper layer application to execute UFS-supported SCSI cmds.\r
 \r
   UfsPassThruDxe driver is used to produce EFI_EXT_SCSI_PASS_THRU protocol interface\r
   for upper layer application to execute UFS-supported SCSI cmds.\r
 \r

-  Copyright (c) 2014, Intel Corporation. All rights reserved.<BR>\r
+  Copyright (c) 2014 - 2018, Intel Corporation. All rights reserved.<BR>\r

   This program and the accompanying materials\r
   are licensed and made available under the terms and conditions of the BSD License\r
   which accompanies this distribution.  The full text of the license may be found at\r
   This program and the accompanying materials\r
   are licensed and made available under the terms and conditions of the BSD License\r
   which accompanies this distribution.  The full text of the license may be found at\r


@@ -153,7 +153,7 @@ typedef struct {
 // UFSHCI 2.0 Spec Section 5.2.5 Offset 18h: AHIT - Auto-Hibernate Idle Timer\r
 //\r
 typedef struct {\r
 // UFSHCI 2.0 Spec Section 5.2.5 Offset 18h: AHIT - Auto-Hibernate Idle Timer\r
 //\r
 typedef struct {\r

-  UINT32 Ahitv:10;     // Auto-Hibernate Idle Timer Value \r
+  UINT32 Ahitv:10;     // Auto-Hibernate Idle Timer Value\r

   UINT32 Ts:3;         // Timer scale\r
   UINT32 Rsvd1:19;\r
 } UFS_HC_AHIT;\r
   UINT32 Ts:3;         // Timer scale\r
   UINT32 Rsvd1:19;\r
 } UFS_HC_AHIT;\r


@@ -165,19 +165,19 @@ typedef struct {
   UINT16 Utrcs:1;      // UTP Transfer Request Completion Status\r
   UINT16 Udepri:1;     // UIC DME_ENDPOINT_RESET Indication\r
   UINT16 Ue:1;         // UIC Error\r
   UINT16 Utrcs:1;      // UTP Transfer Request Completion Status\r
   UINT16 Udepri:1;     // UIC DME_ENDPOINT_RESET Indication\r
   UINT16 Ue:1;         // UIC Error\r

-  UINT16 Utms:1;       // UIC Test Mode Status \r
+  UINT16 Utms:1;       // UIC Test Mode Status\r

 \r
 \r

-  UINT16 Upms:1;       // UIC Power Mode Status \r
-  UINT16 Uhxs:1;       // UIC Hibernate Exit Status \r
-  UINT16 Uhes:1;       // UIC Hibernate Enter Status \r
-  UINT16 Ulls:1;       // UIC Link Lost Status \r
+  UINT16 Upms:1;       // UIC Power Mode Status\r
+  UINT16 Uhxs:1;       // UIC Hibernate Exit Status\r
+  UINT16 Uhes:1;       // UIC Hibernate Enter Status\r
+  UINT16 Ulls:1;       // UIC Link Lost Status\r

 \r
 \r

-  UINT16 Ulss:1;       // UIC Link Startup Status \r
-  UINT16 Utmrcs:1;     // UTP Task  Management Request Completion Status \r
-  UINT16 Uccs:1;       // UIC Command Completion Status \r
-  UINT16 Dfes:1;       // Device Fatal Error Status  \r
+  UINT16 Ulss:1;       // UIC Link Startup Status\r
+  UINT16 Utmrcs:1;     // UTP Task  Management Request Completion Status\r
+  UINT16 Uccs:1;       // UIC Command Completion Status\r
+  UINT16 Dfes:1;       // Device Fatal Error Status\r

 \r
 \r

-  UINT16 Utpes:1;      // UTP Error Status  \r
+  UINT16 Utpes:1;      // UTP Error Status\r

   UINT16 Rsvd1:3;\r
 \r
   UINT16 Hcfes:1;      // Host Controller Fatal Error Status\r
   UINT16 Rsvd1:3;\r
 \r
   UINT16 Hcfes:1;      // Host Controller Fatal Error Status\r


@@ -194,9 +194,9 @@ typedef struct {
   UINT16 Uee:1;        // UIC Error Enable\r
   UINT16 Utmse:1;      // UIC Test Mode Status Enable\r
 \r
   UINT16 Uee:1;        // UIC Error Enable\r
   UINT16 Utmse:1;      // UIC Test Mode Status Enable\r
 \r

-  UINT16 Upmse:1;      // UIC Power Mode Status Enable \r
+  UINT16 Upmse:1;      // UIC Power Mode Status Enable\r

   UINT16 Uhxse:1;      // UIC Hibernate Exit Status Enable\r
   UINT16 Uhxse:1;      // UIC Hibernate Exit Status Enable\r

-  UINT16 Uhese:1;      // UIC Hibernate Enter Status Enable \r
+  UINT16 Uhese:1;      // UIC Hibernate Enter Status Enable\r

   UINT16 Ullse:1;      // UIC Link Lost Status Enable\r
 \r
   UINT16 Ulsse:1;      // UIC Link Startup Status Enable\r
   UINT16 Ullse:1;      // UIC Link Lost Status Enable\r
 \r
   UINT16 Ulsse:1;      // UIC Link Startup Status Enable\r


@@ -450,22 +450,22 @@ typedef struct {
   //\r
   UINT32 Rsvd6:7;\r
   UINT32 UcdBa:25;            /* UTP Command Descriptor Base Address */\r
   //\r
   UINT32 Rsvd6:7;\r
   UINT32 UcdBa:25;            /* UTP Command Descriptor Base Address */\r

-  \r
+\r

   //\r
   // DW5\r
   //\r
   UINT32 UcdBaU;              /* UTP Command Descriptor Base Address Upper 32-bits */\r
   //\r
   // DW5\r
   //\r
   UINT32 UcdBaU;              /* UTP Command Descriptor Base Address Upper 32-bits */\r

- \r
+\r

   //\r
   // DW6\r
   //\r
   //\r
   // DW6\r
   //\r

-  UINT16 RuL;                 /* Response UPIU Length */  \r
+  UINT16 RuL;                 /* Response UPIU Length */\r

   UINT16 RuO;                 /* Response UPIU Offset */\r
 \r
   //\r
   // DW7\r
   //\r
   UINT16 RuO;                 /* Response UPIU Offset */\r
 \r
   //\r
   // DW7\r
   //\r

-  UINT16 PrdtL;               /* PRDT Length */  \r
+  UINT16 PrdtL;               /* PRDT Length */\r

   UINT16 PrdtO;               /* PRDT Offset */\r
 } UTP_TRD;\r
 \r
   UINT16 PrdtO;               /* PRDT Offset */\r
 } UTP_TRD;\r
 \r


@@ -475,12 +475,12 @@ typedef struct {
   //\r
   UINT32 Rsvd1:2;\r
   UINT32 DbAddr:30;           /* Data Base Address */\r
   //\r
   UINT32 Rsvd1:2;\r
   UINT32 DbAddr:30;           /* Data Base Address */\r

-  \r
+\r

   //\r
   // DW1\r
   //\r
   UINT32 DbAddrU;             /* Data Base Address Upper 32-bits */\r
   //\r
   // DW1\r
   //\r
   UINT32 DbAddrU;             /* Data Base Address Upper 32-bits */\r

- \r
+\r

   //\r
   // DW2\r
   //\r
   //\r
   // DW2\r
   //\r


@@ -846,7 +846,7 @@ typedef struct {
   // DW4 - DW11\r
   //\r
   UTP_TM_REQ_UPIU TmReq;      /* Task Management Request UPIU */\r
   // DW4 - DW11\r
   //\r
   UTP_TM_REQ_UPIU TmReq;      /* Task Management Request UPIU */\r

-  \r
+\r

   //\r
   // DW12 - DW19\r
   //\r
   //\r
   // DW12 - DW19\r
   //\r


@@ -972,7 +972,7 @@ typedef struct {
 typedef enum {\r
   UfsUtpQueryResponseSuccess             = 0x00,\r
   UfsUtpQueryResponseParamNotReadable    = 0xF6,\r
 typedef enum {\r
   UfsUtpQueryResponseSuccess             = 0x00,\r
   UfsUtpQueryResponseParamNotReadable    = 0xF6,\r

-  UfsUtpQueryResponseParamNotWriteable   = 0xF7,  \r
+  UfsUtpQueryResponseParamNotWriteable   = 0xF7,\r

   UfsUtpQueryResponseParamAlreadyWritten = 0xF8,\r
   UfsUtpQueryResponseInvalidLen          = 0xF9,\r
   UfsUtpQueryResponseInvalidVal          = 0xFA,\r
   UfsUtpQueryResponseParamAlreadyWritten = 0xF8,\r
   UfsUtpQueryResponseInvalidLen          = 0xF9,\r
   UfsUtpQueryResponseInvalidVal          = 0xFA,\r


@@ -1305,7 +1305,7 @@ typedef enum {
   UfsFlagPurgeEn         = 0x06,\r
   UfsFlagPhyResRemoval   = 0x08,\r
   UfsFlagBusyRtc         = 0x09,\r
   UfsFlagPurgeEn         = 0x06,\r
   UfsFlagPhyResRemoval   = 0x08,\r
   UfsFlagBusyRtc         = 0x09,\r

-  UfsFlagPermDisFwUpdate = 0x0B    \r
+  UfsFlagPermDisFwUpdate = 0x0B\r

 } UFS_FLAGS_IDN;\r
 \r
 //\r
 } UFS_FLAGS_IDN;\r
 \r
 //\r

diff --git a/MdeModulePkg/Bus/Usb/UsbBotPei/BotPeim.c b/MdeModulePkg/Bus/Usb/UsbBotPei/BotPeim.c
index 55c4a537fa55e294bf653d25760a689d73deb115..e483660161100accc4fcf5b97202ce12dca60aa4 100644 (file)
--- a/MdeModulePkg/Bus/Usb/UsbBotPei/BotPeim.c
+++ b/MdeModulePkg/Bus/Usb/UsbBotPei/BotPeim.c
@@ -1,8 +1,8 @@
 /** @file\r
 BOT Transportation implementation.\r
 \r
 /** @file\r
 BOT Transportation implementation.\r
 \r

-Copyright (c) 2006, Intel Corporation. All rights reserved.<BR>\r
-  \r
+Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r
+\r

 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions\r
 of the BSD License which accompanies this distribution.  The\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions\r
 of the BSD License which accompanies this distribution.  The\r

diff --git a/MdeModulePkg/Bus/Usb/UsbBotPei/BotPeim.h b/MdeModulePkg/Bus/Usb/UsbBotPei/BotPeim.h
index 07235c397b6def56159a82e65d488d4eb800fc10..81275562e1010692df664c97d6d79384f8664bd0 100644 (file)
--- a/MdeModulePkg/Bus/Usb/UsbBotPei/BotPeim.h
+++ b/MdeModulePkg/Bus/Usb/UsbBotPei/BotPeim.h
@@ -1,8 +1,8 @@
 /** @file\r
 BOT Transportation implementation.\r
 \r
 /** @file\r
 BOT Transportation implementation.\r
 \r

-Copyright (c) 2006, Intel Corporation. All rights reserved.<BR>\r
-  \r
+Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r
+\r

 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions\r
 of the BSD License which accompanies this distribution.  The\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions\r
 of the BSD License which accompanies this distribution.  The\r


@@ -173,7 +173,7 @@ PeiUsbRead10 (
   IN  UINTN             NumberOfBlocks\r
   );\r
 \r
   IN  UINTN             NumberOfBlocks\r
   );\r
 \r

-/**  \r
+/**\r

   Check if there is media according to sense data.\r
 \r
   @param  SenseData   Pointer to sense data.\r
   Check if there is media according to sense data.\r
 \r
   @param  SenseData   Pointer to sense data.\r


@@ -189,7 +189,7 @@ IsNoMedia (
   IN  UINTN                 SenseCounts\r
   );\r
 \r
   IN  UINTN                 SenseCounts\r
   );\r
 \r

-/**  \r
+/**\r

   Check if there is media error according to sense data.\r
 \r
   @param  SenseData   Pointer to sense data.\r
   Check if there is media error according to sense data.\r
 \r
   @param  SenseData   Pointer to sense data.\r


@@ -205,7 +205,7 @@ IsMediaError (
   IN  UINTN                 SenseCounts\r
   );\r
 \r
   IN  UINTN                 SenseCounts\r
   );\r
 \r

-/**  \r
+/**\r

   Check if media is changed according to sense data.\r
 \r
   @param  SenseData   Pointer to sense data.\r
   Check if media is changed according to sense data.\r
 \r
   @param  SenseData   Pointer to sense data.\r

diff --git a/MdeModulePkg/Bus/Usb/UsbBotPei/PeiAtapi.c b/MdeModulePkg/Bus/Usb/UsbBotPei/PeiAtapi.c
index 72bde756eb9684b8e156578240c3b71508d7e5e5..6873350c419a14a8a9d1af1bfac600e4896eec03 100644 (file)
--- a/MdeModulePkg/Bus/Usb/UsbBotPei/PeiAtapi.c
+++ b/MdeModulePkg/Bus/Usb/UsbBotPei/PeiAtapi.c
@@ -1,8 +1,8 @@
 /** @file\r
 Pei USB ATATPI command implementations.\r
 \r
 /** @file\r
 Pei USB ATATPI command implementations.\r
 \r

-Copyright (c) 1999 - 2017, Intel Corporation. All rights reserved.<BR>\r
-  \r
+Copyright (c) 1999 - 2018, Intel Corporation. All rights reserved.<BR>\r
+\r

 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions\r
 of the BSD License which accompanies this distribution.  The\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions\r
 of the BSD License which accompanies this distribution.  The\r


@@ -475,7 +475,7 @@ PeiUsbRead10 (
   return Status;\r
 }\r
 \r
   return Status;\r
 }\r
 \r

-/**  \r
+/**\r

   Check if there is media according to sense data.\r
 \r
   @param  SenseData   Pointer to sense data.\r
   Check if there is media according to sense data.\r
 \r
   @param  SenseData   Pointer to sense data.\r


@@ -526,7 +526,7 @@ IsNoMedia (
   return NoMedia;\r
 }\r
 \r
   return NoMedia;\r
 }\r
 \r

-/**  \r
+/**\r

   Check if there is media error according to sense data.\r
 \r
   @param  SenseData   Pointer to sense data.\r
   Check if there is media error according to sense data.\r
 \r
   @param  SenseData   Pointer to sense data.\r


@@ -603,7 +603,7 @@ IsMediaError (
   return Error;\r
 }\r
 \r
   return Error;\r
 }\r
 \r

-/**  \r
+/**\r

   Check if media is changed according to sense data.\r
 \r
   @param  SenseData   Pointer to sense data.\r
   Check if media is changed according to sense data.\r
 \r
   @param  SenseData   Pointer to sense data.\r

diff --git a/MdeModulePkg/Bus/Usb/UsbBotPei/PeiUsbLib.c b/MdeModulePkg/Bus/Usb/UsbBotPei/PeiUsbLib.c
index 46c1a0644458e3a989899757410acb1fa5e33888..4f20c711442cfdf2ddfafdf1f841d671a3c44f3b 100644 (file)
--- a/MdeModulePkg/Bus/Usb/UsbBotPei/PeiUsbLib.c
+++ b/MdeModulePkg/Bus/Usb/UsbBotPei/PeiUsbLib.c
@@ -1,8 +1,8 @@
 /** @file\r
 Common Libarary  for PEI USB.\r
 \r
 /** @file\r
 Common Libarary  for PEI USB.\r
 \r

-Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.<BR>\r
-  \r
+Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r
+\r

 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions\r
 of the BSD License which accompanies this distribution.  The\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions\r
 of the BSD License which accompanies this distribution.  The\r

diff --git a/MdeModulePkg/Bus/Usb/UsbBotPei/PeiUsbLib.h b/MdeModulePkg/Bus/Usb/UsbBotPei/PeiUsbLib.h
index eafccfdbf87fd1a5dd7521b7ef276b17e4dba2bb..6d39b764eb86f16f4843900b96930fc959b65307 100644 (file)
--- a/MdeModulePkg/Bus/Usb/UsbBotPei/PeiUsbLib.h
+++ b/MdeModulePkg/Bus/Usb/UsbBotPei/PeiUsbLib.h
@@ -1,8 +1,8 @@
 /** @file\r
 Common Libarary  for PEI USB.\r
 \r
 /** @file\r
 Common Libarary  for PEI USB.\r
 \r

-Copyright (c) 1999 - 2010, Intel Corporation. All rights reserved.<BR>\r
-  \r
+Copyright (c) 1999 - 2018, Intel Corporation. All rights reserved.<BR>\r
+\r

 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions\r
 of the BSD License which accompanies this distribution.  The\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions\r
 of the BSD License which accompanies this distribution.  The\r


@@ -34,7 +34,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #define USB_DEV_SET_FEATURE_REQ_TYPE_D      0x00 // Receiver : Device\r
 #define USB_DEV_SET_FEATURE_REQ_TYPE_I      0x01 // Receiver : Interface\r
 #define USB_DEV_SET_FEATURE_REQ_TYPE_E      0x02 // Receiver : Endpoint\r
 #define USB_DEV_SET_FEATURE_REQ_TYPE_D      0x00 // Receiver : Device\r
 #define USB_DEV_SET_FEATURE_REQ_TYPE_I      0x01 // Receiver : Interface\r
 #define USB_DEV_SET_FEATURE_REQ_TYPE_E      0x02 // Receiver : Endpoint\r

- \r
+\r

 #define USB_DEV_SET_ADDRESS                 0x05\r
 #define USB_DEV_SET_ADDRESS_REQ_TYPE        0x00\r
 \r
 #define USB_DEV_SET_ADDRESS                 0x05\r
 #define USB_DEV_SET_ADDRESS_REQ_TYPE        0x00\r
 \r

diff --git a/MdeModulePkg/Bus/Usb/UsbBotPei/UsbBotPei.uni b/MdeModulePkg/Bus/Usb/UsbBotPei/UsbBotPei.uni
index 30d49d5c41fa08035498e57f2dceaaac7135d5af..2477a14b1f0a991ffce4b6d5a82783142347de19 100644 (file)
--- a/MdeModulePkg/Bus/Usb/UsbBotPei/UsbBotPei.uni
+++ b/MdeModulePkg/Bus/Usb/UsbBotPei/UsbBotPei.uni
@@ -3,14 +3,14 @@
 //\r
 // The USB mass storage device PEIM driver is used to support recovery from USB devices.\r
 //\r
 //\r
 // The USB mass storage device PEIM driver is used to support recovery from USB devices.\r
 //\r

-// Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.<BR>\r
+// Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r

 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions\r
 // of the BSD License which accompanies this distribution.  The\r
 // full text of the license may be found at\r
 // http://opensource.org/licenses/bsd-license.php\r
 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions\r
 // of the BSD License which accompanies this distribution.  The\r
 // full text of the license may be found at\r
 // http://opensource.org/licenses/bsd-license.php\r

-// \r
+//\r

 // THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 // WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 //\r
 // THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 // WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 //\r

diff --git a/MdeModulePkg/Bus/Usb/UsbBotPei/UsbBotPeiExtra.uni b/MdeModulePkg/Bus/Usb/UsbBotPei/UsbBotPeiExtra.uni
index 3e6eb63e02b585c2efd2b3f0264dc797360be1df..402a6ee00f42c2656bf55636db693ba7287f8c50 100644 (file)
--- a/MdeModulePkg/Bus/Usb/UsbBotPei/UsbBotPeiExtra.uni
+++ b/MdeModulePkg/Bus/Usb/UsbBotPei/UsbBotPeiExtra.uni
@@ -1,7 +1,7 @@
 // /** @file\r
 // UsbBotPei Localized Strings and Content\r
 //\r
 // /** @file\r
 // UsbBotPei Localized Strings and Content\r
 //\r

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

 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions\r
 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions\r


@@ -14,8 +14,8 @@
 //\r
 // **/\r
 \r
 //\r
 // **/\r
 \r

-#string STR_PROPERTIES_MODULE_NAME \r
-#language en-US \r
+#string STR_PROPERTIES_MODULE_NAME\r
+#language en-US\r

 "USB PEI Module for Recovery"\r
 \r
 \r
 "USB PEI Module for Recovery"\r
 \r
 \r

diff --git a/MdeModulePkg/Bus/Usb/UsbBotPei/UsbBotPeim.c b/MdeModulePkg/Bus/Usb/UsbBotPei/UsbBotPeim.c
index 5e1830665222566850d2cd1974df35eb9e970466..d53727defc84d611bb3064060310f4d70974572b 100644 (file)
--- a/MdeModulePkg/Bus/Usb/UsbBotPei/UsbBotPeim.c
+++ b/MdeModulePkg/Bus/Usb/UsbBotPei/UsbBotPeim.c
@@ -1,7 +1,7 @@
 /** @file\r
 \r
 /** @file\r
 \r

-Copyright (c) 2006 - 2015, Intel Corporation. All rights reserved.<BR>\r
-  \r
+Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r
+\r

 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions\r
 of the BSD License which accompanies this distribution.  The\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions\r
 of the BSD License which accompanies this distribution.  The\r


@@ -69,8 +69,8 @@ PeiBotDetectMedia (
   );\r
 \r
 /**\r
   );\r
 \r
 /**\r

-  Initializes the Usb Bot. \r
-  \r
+  Initializes the Usb Bot.\r
+\r

   @param  FileHandle  Handle of the file being invoked.\r
   @param  PeiServices Describes the list of possible PEI Services.\r
 \r
   @param  FileHandle  Handle of the file being invoked.\r
   @param  PeiServices Describes the list of possible PEI Services.\r
 \r


@@ -119,8 +119,8 @@ PeimInitializeUsbBot (
 }\r
 \r
 /**\r
 }\r
 \r
 /**\r

-  UsbIo installation notification function. \r
-  \r
+  UsbIo installation notification function.\r
+\r

   This function finds out all the current USB IO PPIs in the system and add them\r
   into private data.\r
 \r
   This function finds out all the current USB IO PPIs in the system and add them\r
   into private data.\r
 \r


@@ -292,16 +292,16 @@ InitUsbBot (
 /**\r
   Gets the count of block I/O devices that one specific block driver detects.\r
 \r
 /**\r
   Gets the count of block I/O devices that one specific block driver detects.\r
 \r

-  This function is used for getting the count of block I/O devices that one \r
+  This function is used for getting the count of block I/O devices that one\r

   specific block driver detects.  To the PEI ATAPI driver, it returns the number\r
   specific block driver detects.  To the PEI ATAPI driver, it returns the number\r

-  of all the detected ATAPI devices it detects during the enumeration process. \r
-  To the PEI legacy floppy driver, it returns the number of all the legacy \r
-  devices it finds during its enumeration process. If no device is detected, \r
-  then the function will return zero.  \r
-  \r
-  @param[in]  PeiServices          General-purpose services that are available \r
+  of all the detected ATAPI devices it detects during the enumeration process.\r
+  To the PEI legacy floppy driver, it returns the number of all the legacy\r
+  devices it finds during its enumeration process. If no device is detected,\r
+  then the function will return zero.\r
+\r
+  @param[in]  PeiServices          General-purpose services that are available\r

                                    to every PEIM.\r
                                    to every PEIM.\r

-  @param[in]  This                 Indicates the EFI_PEI_RECOVERY_BLOCK_IO_PPI \r
+  @param[in]  This                 Indicates the EFI_PEI_RECOVERY_BLOCK_IO_PPI\r

                                    instance.\r
   @param[out] NumberBlockDevices   The number of block I/O devices discovered.\r
 \r
                                    instance.\r
   @param[out] NumberBlockDevices   The number of block I/O devices discovered.\r
 \r


@@ -326,27 +326,27 @@ BotGetNumberOfBlockDevices (
 /**\r
   Gets a block device's media information.\r
 \r
 /**\r
   Gets a block device's media information.\r
 \r

-  This function will provide the caller with the specified block device's media \r
-  information. If the media changes, calling this function will update the media \r
+  This function will provide the caller with the specified block device's media\r
+  information. If the media changes, calling this function will update the media\r

   information accordingly.\r
 \r
   @param[in]  PeiServices   General-purpose services that are available to every\r
                             PEIM\r
   @param[in]  This          Indicates the EFI_PEI_RECOVERY_BLOCK_IO_PPI instance.\r
   information accordingly.\r
 \r
   @param[in]  PeiServices   General-purpose services that are available to every\r
                             PEIM\r
   @param[in]  This          Indicates the EFI_PEI_RECOVERY_BLOCK_IO_PPI instance.\r

-  @param[in]  DeviceIndex   Specifies the block device to which the function wants \r
-                            to talk. Because the driver that implements Block I/O \r
-                            PPIs will manage multiple block devices, the PPIs that \r
-                            want to talk to a single device must specify the \r
+  @param[in]  DeviceIndex   Specifies the block device to which the function wants\r
+                            to talk. Because the driver that implements Block I/O\r
+                            PPIs will manage multiple block devices, the PPIs that\r
+                            want to talk to a single device must specify the\r

                             device index that was assigned during the enumeration\r
                             device index that was assigned during the enumeration\r

-                            process. This index is a number from one to \r
+                            process. This index is a number from one to\r

                             NumberBlockDevices.\r
                             NumberBlockDevices.\r

-  @param[out] MediaInfo     The media information of the specified block media.  \r
-                            The caller is responsible for the ownership of this \r
+  @param[out] MediaInfo     The media information of the specified block media.\r
+                            The caller is responsible for the ownership of this\r

                             data structure.\r
                             data structure.\r

-  \r
-  @retval EFI_SUCCESS        Media information about the specified block device \r
+\r
+  @retval EFI_SUCCESS        Media information about the specified block device\r

                              was obtained successfully.\r
                              was obtained successfully.\r

-  @retval EFI_DEVICE_ERROR   Cannot get the media information due to a hardware \r
+  @retval EFI_DEVICE_ERROR   Cannot get the media information due to a hardware\r

                              error.\r
 \r
 **/\r
                              error.\r
 \r
 **/\r


@@ -393,31 +393,31 @@ BotGetMediaInfo (
 /**\r
   Reads the requested number of blocks from the specified block device.\r
 \r
 /**\r
   Reads the requested number of blocks from the specified block device.\r
 \r

-  The function reads the requested number of blocks from the device. All the \r
+  The function reads the requested number of blocks from the device. All the\r

   blocks are read, or an error is returned. If there is no media in the device,\r
   the function returns EFI_NO_MEDIA.\r
 \r
   blocks are read, or an error is returned. If there is no media in the device,\r
   the function returns EFI_NO_MEDIA.\r
 \r

-  @param[in]  PeiServices   General-purpose services that are available to \r
+  @param[in]  PeiServices   General-purpose services that are available to\r

                             every PEIM.\r
   @param[in]  This          Indicates the EFI_PEI_RECOVERY_BLOCK_IO_PPI instance.\r
                             every PEIM.\r
   @param[in]  This          Indicates the EFI_PEI_RECOVERY_BLOCK_IO_PPI instance.\r

-  @param[in]  DeviceIndex   Specifies the block device to which the function wants \r
-                            to talk. Because the driver that implements Block I/O \r
-                            PPIs will manage multiple block devices, the PPIs that \r
-                            want to talk to a single device must specify the device \r
-                            index that was assigned during the enumeration process. \r
+  @param[in]  DeviceIndex   Specifies the block device to which the function wants\r
+                            to talk. Because the driver that implements Block I/O\r
+                            PPIs will manage multiple block devices, the PPIs that\r
+                            want to talk to a single device must specify the device\r
+                            index that was assigned during the enumeration process.\r

                             This index is a number from one to NumberBlockDevices.\r
   @param[in]  StartLBA      The starting logical block address (LBA) to read from\r
                             on the device\r
   @param[in]  BufferSize    The size of the Buffer in bytes. This number must be\r
                             a multiple of the intrinsic block size of the device.\r
   @param[out] Buffer        A pointer to the destination buffer for the data.\r
                             This index is a number from one to NumberBlockDevices.\r
   @param[in]  StartLBA      The starting logical block address (LBA) to read from\r
                             on the device\r
   @param[in]  BufferSize    The size of the Buffer in bytes. This number must be\r
                             a multiple of the intrinsic block size of the device.\r
   @param[out] Buffer        A pointer to the destination buffer for the data.\r

-                            The caller is responsible for the ownership of the \r
+                            The caller is responsible for the ownership of the\r

                             buffer.\r
                             buffer.\r

-                         \r
+\r

   @retval EFI_SUCCESS             The data was read correctly from the device.\r
   @retval EFI_SUCCESS             The data was read correctly from the device.\r

-  @retval EFI_DEVICE_ERROR        The device reported an error while attempting \r
+  @retval EFI_DEVICE_ERROR        The device reported an error while attempting\r

                                   to perform the read operation.\r
                                   to perform the read operation.\r

-  @retval EFI_INVALID_PARAMETER   The read request contains LBAs that are not \r
+  @retval EFI_INVALID_PARAMETER   The read request contains LBAs that are not\r

                                   valid, or the buffer is not properly aligned.\r
   @retval EFI_NO_MEDIA            There is no media in the device.\r
   @retval EFI_BAD_BUFFER_SIZE     The BufferSize parameter is not a multiple of\r
                                   valid, or the buffer is not properly aligned.\r
   @retval EFI_NO_MEDIA            There is no media in the device.\r
   @retval EFI_BAD_BUFFER_SIZE     The BufferSize parameter is not a multiple of\r

diff --git a/MdeModulePkg/Bus/Usb/UsbBotPei/UsbBotPeim.h b/MdeModulePkg/Bus/Usb/UsbBotPei/UsbBotPeim.h
index 3ae8c67b3553138b76eaf8f8a810a52188abd438..692147ed62e5adb190d5da21856e08a35acbae67 100644 (file)
--- a/MdeModulePkg/Bus/Usb/UsbBotPei/UsbBotPeim.h
+++ b/MdeModulePkg/Bus/Usb/UsbBotPei/UsbBotPeim.h
@@ -1,8 +1,8 @@
 /** @file\r
 Usb BOT Peim definition.\r
 \r
 /** @file\r
 Usb BOT Peim definition.\r
 \r

-Copyright (c) 2006 - 2015, Intel Corporation. All rights reserved.<BR>\r
-  \r
+Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r
+\r

 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions\r
 of the BSD License which accompanies this distribution.  The\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions\r
 of the BSD License which accompanies this distribution.  The\r


@@ -34,16 +34,16 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 /**\r
   Gets the count of block I/O devices that one specific block driver detects.\r
 \r
 /**\r
   Gets the count of block I/O devices that one specific block driver detects.\r
 \r

-  This function is used for getting the count of block I/O devices that one \r
+  This function is used for getting the count of block I/O devices that one\r

   specific block driver detects.  To the PEI ATAPI driver, it returns the number\r
   specific block driver detects.  To the PEI ATAPI driver, it returns the number\r

-  of all the detected ATAPI devices it detects during the enumeration process. \r
-  To the PEI legacy floppy driver, it returns the number of all the legacy \r
-  devices it finds during its enumeration process. If no device is detected, \r
-  then the function will return zero.  \r
-  \r
-  @param[in]  PeiServices          General-purpose services that are available \r
+  of all the detected ATAPI devices it detects during the enumeration process.\r
+  To the PEI legacy floppy driver, it returns the number of all the legacy\r
+  devices it finds during its enumeration process. If no device is detected,\r
+  then the function will return zero.\r
+\r
+  @param[in]  PeiServices          General-purpose services that are available\r

                                    to every PEIM.\r
                                    to every PEIM.\r

-  @param[in]  This                 Indicates the EFI_PEI_RECOVERY_BLOCK_IO_PPI \r
+  @param[in]  This                 Indicates the EFI_PEI_RECOVERY_BLOCK_IO_PPI\r

                                    instance.\r
   @param[out] NumberBlockDevices   The number of block I/O devices discovered.\r
 \r
                                    instance.\r
   @param[out] NumberBlockDevices   The number of block I/O devices discovered.\r
 \r


@@ -61,27 +61,27 @@ BotGetNumberOfBlockDevices (
 /**\r
   Gets a block device's media information.\r
 \r
 /**\r
   Gets a block device's media information.\r
 \r

-  This function will provide the caller with the specified block device's media \r
-  information. If the media changes, calling this function will update the media \r
+  This function will provide the caller with the specified block device's media\r
+  information. If the media changes, calling this function will update the media\r

   information accordingly.\r
 \r
   @param[in]  PeiServices   General-purpose services that are available to every\r
                             PEIM\r
   @param[in]  This          Indicates the EFI_PEI_RECOVERY_BLOCK_IO_PPI instance.\r
   information accordingly.\r
 \r
   @param[in]  PeiServices   General-purpose services that are available to every\r
                             PEIM\r
   @param[in]  This          Indicates the EFI_PEI_RECOVERY_BLOCK_IO_PPI instance.\r

-  @param[in]  DeviceIndex   Specifies the block device to which the function wants \r
-                            to talk. Because the driver that implements Block I/O \r
-                            PPIs will manage multiple block devices, the PPIs that \r
-                            want to talk to a single device must specify the \r
+  @param[in]  DeviceIndex   Specifies the block device to which the function wants\r
+                            to talk. Because the driver that implements Block I/O\r
+                            PPIs will manage multiple block devices, the PPIs that\r
+                            want to talk to a single device must specify the\r

                             device index that was assigned during the enumeration\r
                             device index that was assigned during the enumeration\r

-                            process. This index is a number from one to \r
+                            process. This index is a number from one to\r

                             NumberBlockDevices.\r
                             NumberBlockDevices.\r

-  @param[out] MediaInfo     The media information of the specified block media.  \r
-                            The caller is responsible for the ownership of this \r
+  @param[out] MediaInfo     The media information of the specified block media.\r
+                            The caller is responsible for the ownership of this\r

                             data structure.\r
 \r
                             data structure.\r
 \r

-  @retval EFI_SUCCESS        Media information about the specified block device \r
+  @retval EFI_SUCCESS        Media information about the specified block device\r

                              was obtained successfully.\r
                              was obtained successfully.\r

-  @retval EFI_DEVICE_ERROR   Cannot get the media information due to a hardware \r
+  @retval EFI_DEVICE_ERROR   Cannot get the media information due to a hardware\r

                              error.\r
 \r
 **/\r
                              error.\r
 \r
 **/\r


@@ -97,31 +97,31 @@ BotGetMediaInfo (
 /**\r
   Reads the requested number of blocks from the specified block device.\r
 \r
 /**\r
   Reads the requested number of blocks from the specified block device.\r
 \r

-  The function reads the requested number of blocks from the device. All the \r
+  The function reads the requested number of blocks from the device. All the\r

   blocks are read, or an error is returned. If there is no media in the device,\r
   the function returns EFI_NO_MEDIA.\r
 \r
   blocks are read, or an error is returned. If there is no media in the device,\r
   the function returns EFI_NO_MEDIA.\r
 \r

-  @param[in]  PeiServices   General-purpose services that are available to \r
+  @param[in]  PeiServices   General-purpose services that are available to\r

                             every PEIM.\r
   @param[in]  This          Indicates the EFI_PEI_RECOVERY_BLOCK_IO_PPI instance.\r
                             every PEIM.\r
   @param[in]  This          Indicates the EFI_PEI_RECOVERY_BLOCK_IO_PPI instance.\r

-  @param[in]  DeviceIndex   Specifies the block device to which the function wants \r
-                            to talk. Because the driver that implements Block I/O \r
-                            PPIs will manage multiple block devices, the PPIs that \r
-                            want to talk to a single device must specify the device \r
-                            index that was assigned during the enumeration process. \r
+  @param[in]  DeviceIndex   Specifies the block device to which the function wants\r
+                            to talk. Because the driver that implements Block I/O\r
+                            PPIs will manage multiple block devices, the PPIs that\r
+                            want to talk to a single device must specify the device\r
+                            index that was assigned during the enumeration process.\r

                             This index is a number from one to NumberBlockDevices.\r
   @param[in]  StartLBA      The starting logical block address (LBA) to read from\r
                             on the device\r
   @param[in]  BufferSize    The size of the Buffer in bytes. This number must be\r
                             a multiple of the intrinsic block size of the device.\r
   @param[out] Buffer        A pointer to the destination buffer for the data.\r
                             This index is a number from one to NumberBlockDevices.\r
   @param[in]  StartLBA      The starting logical block address (LBA) to read from\r
                             on the device\r
   @param[in]  BufferSize    The size of the Buffer in bytes. This number must be\r
                             a multiple of the intrinsic block size of the device.\r
   @param[out] Buffer        A pointer to the destination buffer for the data.\r

-                            The caller is responsible for the ownership of the \r
+                            The caller is responsible for the ownership of the\r

                             buffer.\r
 \r
   @retval EFI_SUCCESS             The data was read correctly from the device.\r
                             buffer.\r
 \r
   @retval EFI_SUCCESS             The data was read correctly from the device.\r

-  @retval EFI_DEVICE_ERROR        The device reported an error while attempting \r
+  @retval EFI_DEVICE_ERROR        The device reported an error while attempting\r

                                   to perform the read operation.\r
                                   to perform the read operation.\r

-  @retval EFI_INVALID_PARAMETER   The read request contains LBAs that are not \r
+  @retval EFI_INVALID_PARAMETER   The read request contains LBAs that are not\r

                                   valid, or the buffer is not properly aligned.\r
   @retval EFI_NO_MEDIA            There is no media in the device.\r
   @retval EFI_BAD_BUFFER_SIZE     The BufferSize parameter is not a multiple of\r
                                   valid, or the buffer is not properly aligned.\r
   @retval EFI_NO_MEDIA            There is no media in the device.\r
   @retval EFI_BAD_BUFFER_SIZE     The BufferSize parameter is not a multiple of\r

diff --git a/MdeModulePkg/Bus/Usb/UsbBotPei/UsbPeim.h b/MdeModulePkg/Bus/Usb/UsbBotPei/UsbPeim.h
index c62b99d4a180cb174179ce163613999f35241f2a..ec2c4ff35170f0c584f39f6cc9a46020000aaa04 100644 (file)
--- a/MdeModulePkg/Bus/Usb/UsbBotPei/UsbPeim.h
+++ b/MdeModulePkg/Bus/Usb/UsbBotPei/UsbPeim.h
@@ -1,8 +1,8 @@
 /** @file\r
 Usb Peim definition.\r
 \r
 /** @file\r
 Usb Peim definition.\r
 \r

-Copyright (c) 2006 - 2015, Intel Corporation. All rights reserved.<BR>\r
-  \r
+Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r
+\r

 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions\r
 of the BSD License which accompanies this distribution.  The\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions\r
 of the BSD License which accompanies this distribution.  The\r

diff --git a/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbBus.c b/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbBus.c
index 7c58fe8d36a26a67dea4d3f9712f17fd88b27b7b..26821c28eef59d86ccba718bbb8a57e4f8abe500 100644 (file)
--- a/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbBus.c
+++ b/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbBus.c
@@ -2,7 +2,7 @@
 \r
     Usb Bus Driver Binding and Bus IO Protocol.\r
 \r
 \r
     Usb Bus Driver Binding and Bus IO Protocol.\r
 \r

-Copyright (c) 2004 - 2017, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2004 - 2018, Intel Corporation. All rights reserved.<BR>\r

 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r


@@ -862,7 +862,7 @@ UsbIoPortReset (
   Dev->Address = DevAddress;\r
 \r
   gBS->Stall (USB_SET_DEVICE_ADDRESS_STALL);\r
   Dev->Address = DevAddress;\r
 \r
   gBS->Stall (USB_SET_DEVICE_ADDRESS_STALL);\r

-  \r
+\r

   if (EFI_ERROR (Status)) {\r
     //\r
     // It may fail due to device disconnection or other reasons.\r
   if (EFI_ERROR (Status)) {\r
     //\r
     // It may fail due to device disconnection or other reasons.\r


@@ -1036,7 +1036,7 @@ UsbBusBuildProtocol (
   RootIf->Signature       = USB_INTERFACE_SIGNATURE;\r
   RootIf->Device          = RootHub;\r
   RootIf->DevicePath      = UsbBus->DevicePath;\r
   RootIf->Signature       = USB_INTERFACE_SIGNATURE;\r
   RootIf->Device          = RootHub;\r
   RootIf->DevicePath      = UsbBus->DevicePath;\r

-  \r
+\r

   //\r
   // Report Status Code here since we will enumerate the USB devices\r
   //\r
   //\r
   // Report Status Code here since we will enumerate the USB devices\r
   //\r


@@ -1045,7 +1045,7 @@ UsbBusBuildProtocol (
     (EFI_IO_BUS_USB | EFI_IOB_PC_DETECT),\r
     UsbBus->DevicePath\r
     );\r
     (EFI_IO_BUS_USB | EFI_IOB_PC_DETECT),\r
     UsbBus->DevicePath\r
     );\r

-  \r
+\r

   Status                  = mUsbRootHubApi.Init (RootIf);\r
 \r
   if (EFI_ERROR (Status)) {\r
   Status                  = mUsbRootHubApi.Init (RootIf);\r
 \r
   if (EFI_ERROR (Status)) {\r


@@ -1157,7 +1157,7 @@ UsbBusControllerDriverSupported (
   //\r
   if (RemainingDevicePath != NULL) {\r
     //\r
   //\r
   if (RemainingDevicePath != NULL) {\r
     //\r

-    // Check if RemainingDevicePath is the End of Device Path Node, \r
+    // Check if RemainingDevicePath is the End of Device Path Node,\r

     // if yes, go on checking other conditions\r
     //\r
     if (!IsDevicePathEnd (RemainingDevicePath)) {\r
     // if yes, go on checking other conditions\r
     //\r
     if (!IsDevicePathEnd (RemainingDevicePath)) {\r


@@ -1166,13 +1166,13 @@ UsbBusControllerDriverSupported (
       // check its validation\r
       //\r
       DevicePathNode.DevPath = RemainingDevicePath;\r
       // check its validation\r
       //\r
       DevicePathNode.DevPath = RemainingDevicePath;\r

-      \r
+\r

       if ((DevicePathNode.DevPath->Type    != MESSAGING_DEVICE_PATH) ||\r
           (DevicePathNode.DevPath->SubType != MSG_USB_DP &&\r
            DevicePathNode.DevPath->SubType != MSG_USB_CLASS_DP\r
            && DevicePathNode.DevPath->SubType != MSG_USB_WWID_DP\r
            )) {\r
       if ((DevicePathNode.DevPath->Type    != MESSAGING_DEVICE_PATH) ||\r
           (DevicePathNode.DevPath->SubType != MSG_USB_DP &&\r
            DevicePathNode.DevPath->SubType != MSG_USB_CLASS_DP\r
            && DevicePathNode.DevPath->SubType != MSG_USB_WWID_DP\r
            )) {\r

-      \r
+\r

         return EFI_UNSUPPORTED;\r
       }\r
     }\r
         return EFI_UNSUPPORTED;\r
       }\r
     }\r


@@ -1208,7 +1208,7 @@ UsbBusControllerDriverSupported (
     if (Status == EFI_ALREADY_STARTED) {\r
       return EFI_SUCCESS;\r
     }\r
     if (Status == EFI_ALREADY_STARTED) {\r
       return EFI_SUCCESS;\r
     }\r

-  \r
+\r

     if (EFI_ERROR (Status)) {\r
       return Status;\r
     }\r
     if (EFI_ERROR (Status)) {\r
       return Status;\r
     }\r


@@ -1235,7 +1235,7 @@ UsbBusControllerDriverSupported (
            Controller\r
            );\r
   }\r
            Controller\r
            );\r
   }\r

- \r
+\r

   //\r
   // Open the EFI Device Path protocol needed to perform the supported test\r
   //\r
   //\r
   // Open the EFI Device Path protocol needed to perform the supported test\r
   //\r


@@ -1362,7 +1362,7 @@ UsbBusControllerDriverStart (
         //\r
         // If RemainingDevicePath is the End of Device Path Node,\r
         // skip enumerate any device and return EFI_SUCESSS\r
         //\r
         // If RemainingDevicePath is the End of Device Path Node,\r
         // skip enumerate any device and return EFI_SUCESSS\r

-        // \r
+        //\r

         return EFI_SUCCESS;\r
       }\r
     }\r
         return EFI_SUCCESS;\r
       }\r
     }\r

diff --git a/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbBus.h b/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbBus.h
index 9ede83ab7e611b09922c8d2653d73ac07140d4ff..be82e25879f137d84fa5f6403b082f9818144c7e 100644 (file)
--- a/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbBus.h
+++ b/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbBus.h
@@ -2,7 +2,7 @@
 \r
     Usb Bus Driver Binding and Bus IO Protocol.\r
 \r
 \r
     Usb Bus Driver Binding and Bus IO Protocol.\r
 \r

-Copyright (c) 2004 - 2012, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2004 - 2018, Intel Corporation. All rights reserved.<BR>\r

 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r


@@ -123,7 +123,7 @@ typedef struct _USB_HUB_API    USB_HUB_API;
 \r
 //\r
 // Send general device request timeout.\r
 \r
 //\r
 // Send general device request timeout.\r

-// \r
+//\r

 // The USB Specification 2.0, section 11.24.1 recommends a value of\r
 // 50 milliseconds.  We use a value of 500 milliseconds to work\r
 // around slower hubs and devices.\r
 // The USB Specification 2.0, section 11.24.1 recommends a value of\r
 // 50 milliseconds.  We use a value of 500 milliseconds to work\r
 // around slower hubs and devices.\r

diff --git a/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbBusDxe.inf b/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbBusDxe.inf
index b7b30cc937ef2eeda4729ed6ef8bfb98785871e4..30d59adb34e96086a3c6b1ec70a7d497fc4c1c4a 100644 (file)
--- a/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbBusDxe.inf
+++ b/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbBusDxe.inf
@@ -1,7 +1,7 @@
 ## @file\r
 #  The Usb Bus Dxe driver is used to enumerate and manage all attached usb devices.\r
 #\r
 ## @file\r
 #  The Usb Bus Dxe driver is used to enumerate and manage all attached usb devices.\r
 #\r

-#  Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.<BR>\r
+#  Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r

 #\r
 #  This program and the accompanying materials\r
 #  are licensed and made available under the terms and conditions of the BSD License\r
 #\r
 #  This program and the accompanying materials\r
 #  are licensed and made available under the terms and conditions of the BSD License\r


@@ -29,7 +29,7 @@
 #\r
 #  VALID_ARCHITECTURES           = IA32 X64 IPF EBC ARM AARCH64\r
 #\r
 #\r
 #  VALID_ARCHITECTURES           = IA32 X64 IPF EBC ARM AARCH64\r
 #\r

-#  DRIVER_BINDING                =  mUsbBusDriverBinding                        \r
+#  DRIVER_BINDING                =  mUsbBusDriverBinding\r

 #  COMPONENT_NAME                =  mUsbBusComponentName\r
 #  COMPONENT_NAME2               =  mUsbBusComponentName2\r
 #\r
 #  COMPONENT_NAME                =  mUsbBusComponentName\r
 #  COMPONENT_NAME2               =  mUsbBusComponentName2\r
 #\r


@@ -66,7 +66,7 @@
   gEfiUsbIoProtocolGuid                         ## BY_START\r
   ## TO_START\r
   ## BY_START\r
   gEfiUsbIoProtocolGuid                         ## BY_START\r
   ## TO_START\r
   ## BY_START\r

-  gEfiDevicePathProtocolGuid                    \r
+  gEfiDevicePathProtocolGuid\r

   gEfiUsb2HcProtocolGuid                        ## TO_START\r
   gEfiUsbHcProtocolGuid                         ## TO_START\r
 \r
   gEfiUsb2HcProtocolGuid                        ## TO_START\r
   gEfiUsbHcProtocolGuid                         ## TO_START\r
 \r

diff --git a/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbBusDxe.uni b/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbBusDxe.uni
index f147a0d37f15b1e78859c8abcfc0c166c4ec9aa8..1339fb1ff7bba788c9c71b2093ff4581bad933f3 100644 (file)
--- a/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbBusDxe.uni
+++ b/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbBusDxe.uni
@@ -3,13 +3,13 @@
 //\r
 // The USB Bus DXE driver is used to enumerate and manage all attached USB devices.\r
 //\r
 //\r
 // The USB Bus DXE driver is used to enumerate and manage all attached USB devices.\r
 //\r

-// Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.<BR>\r
+// Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r

 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r
 // which accompanies this distribution. The full text of the license may be found at\r
 // http://opensource.org/licenses/bsd-license.php\r
 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r
 // which accompanies this distribution. The full text of the license may be found at\r
 // http://opensource.org/licenses/bsd-license.php\r

-// \r
+//\r

 // THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 // WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 //\r
 // THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 // WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 //\r

diff --git a/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbBusDxeExtra.uni b/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbBusDxeExtra.uni
index 6b92980c8347e989e0c3d1f4b8951c9bac82e9e0..c62565449a3075afccad16ce2bdf6db7d53287d7 100644 (file)
--- a/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbBusDxeExtra.uni
+++ b/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbBusDxeExtra.uni
@@ -1,7 +1,7 @@
 // /** @file\r
 // UsbBusDxe Localized Strings and Content\r
 //\r
 // /** @file\r
 // UsbBusDxe Localized Strings and Content\r
 //\r

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

 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r
 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r


@@ -13,8 +13,8 @@
 //\r
 // **/\r
 \r
 //\r
 // **/\r
 \r

-#string STR_PROPERTIES_MODULE_NAME \r
-#language en-US \r
+#string STR_PROPERTIES_MODULE_NAME\r
+#language en-US\r

 "USB Bus DXE Driver"\r
 \r
 \r
 "USB Bus DXE Driver"\r
 \r
 \r

diff --git a/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbDesc.c b/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbDesc.c
index fba60dae16d72b3e27e61ba86dff462f0901e4f1..061e4622e82b25c9a21c467ded70c3eeb30031f5 100644 (file)
--- a/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbDesc.c
+++ b/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbDesc.c
@@ -2,7 +2,7 @@
 \r
     Manage Usb Descriptor List\r
 \r
 \r
     Manage Usb Descriptor List\r
 \r

-Copyright (c) 2007 - 2016, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2007 - 2018, Intel Corporation. All rights reserved.<BR>\r

 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r


@@ -361,7 +361,7 @@ UsbParseConfigDesc (
   Len     -= Consumed;\r
 \r
   //\r
   Len     -= Consumed;\r
 \r
   //\r

-  // Make allowances for devices that return extra data at the \r
+  // Make allowances for devices that return extra data at the\r

   // end of their config descriptors\r
   //\r
   while (Len >= sizeof (EFI_USB_INTERFACE_DESCRIPTOR)) {\r
   // end of their config descriptors\r
   //\r
   while (Len >= sizeof (EFI_USB_INTERFACE_DESCRIPTOR)) {\r


@@ -689,7 +689,7 @@ UsbBuildLangTable (
 \r
   Max   = (Desc->Length - 2) / 2;\r
   Max   = MIN(Max, USB_MAX_LANG_ID);\r
 \r
   Max   = (Desc->Length - 2) / 2;\r
   Max   = MIN(Max, USB_MAX_LANG_ID);\r

-  \r
+\r

   Point = Desc->String;\r
   for (Index = 0; Index < Max; Index++) {\r
     UsbDev->LangId[Index] = *Point;\r
   Point = Desc->String;\r
   for (Index = 0; Index < Max; Index++) {\r
     UsbDev->LangId[Index] = *Point;\r

diff --git a/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbEnumer.c b/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbEnumer.c
index 62645d9bdedbce5c19a156a9e33c09dc6c945056..13edbeeec5fd9fddcfe4ae8c0eec1ee7fde075cb 100644 (file)
--- a/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbEnumer.c
+++ b/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbEnumer.c
@@ -2,7 +2,7 @@
 \r
     Usb bus enumeration support.\r
 \r
 \r
     Usb bus enumeration support.\r
 \r

-Copyright (c) 2007 - 2017, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2007 - 2018, Intel Corporation. All rights reserved.<BR>\r

 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r


@@ -33,9 +33,9 @@ UsbGetEndpointDesc (
   USB_ENDPOINT_DESC       *EpDesc;\r
   UINT8                   Index;\r
   UINT8                   NumEndpoints;\r
   USB_ENDPOINT_DESC       *EpDesc;\r
   UINT8                   Index;\r
   UINT8                   NumEndpoints;\r

-  \r
+\r

   NumEndpoints = UsbIf->IfSetting->Desc.NumEndpoints;\r
   NumEndpoints = UsbIf->IfSetting->Desc.NumEndpoints;\r

-  \r
+\r

   for (Index = 0; Index < NumEndpoints; Index++) {\r
     EpDesc = UsbIf->IfSetting->Endpoints[Index];\r
 \r
   for (Index = 0; Index < NumEndpoints; Index++) {\r
     EpDesc = UsbIf->IfSetting->Endpoints[Index];\r
 \r


@@ -279,7 +279,7 @@ UsbConnectDriver (
     // twisted TPL used. It should be no problem for us to connect\r
     // or disconnect at CALLBACK.\r
     //\r
     // twisted TPL used. It should be no problem for us to connect\r
     // or disconnect at CALLBACK.\r
     //\r

-    \r
+\r

     //\r
     // Only recursively wanted usb child device\r
     //\r
     //\r
     // Only recursively wanted usb child device\r
     //\r


@@ -493,13 +493,13 @@ UsbDisconnectDriver (
     if (!EFI_ERROR (Status)) {\r
       UsbIf->IsManaged = FALSE;\r
     }\r
     if (!EFI_ERROR (Status)) {\r
       UsbIf->IsManaged = FALSE;\r
     }\r

-    \r
+\r

     DEBUG (( EFI_D_INFO, "UsbDisconnectDriver: TPL after disconnect is %d, %d\n", (UINT32)UsbGetCurrentTpl(), Status));\r
     ASSERT (UsbGetCurrentTpl () == TPL_CALLBACK);\r
 \r
     gBS->RaiseTPL (OldTpl);\r
   }\r
     DEBUG (( EFI_D_INFO, "UsbDisconnectDriver: TPL after disconnect is %d, %d\n", (UINT32)UsbGetCurrentTpl(), Status));\r
     ASSERT (UsbGetCurrentTpl () == TPL_CALLBACK);\r
 \r
     gBS->RaiseTPL (OldTpl);\r
   }\r

-  \r
+\r

   return Status;\r
 }\r
 \r
   return Status;\r
 }\r
 \r


@@ -524,7 +524,7 @@ UsbRemoveConfig (
   // Remove each interface of the device\r
   //\r
   ReturnStatus = EFI_SUCCESS;\r
   // Remove each interface of the device\r
   //\r
   ReturnStatus = EFI_SUCCESS;\r

-  for (Index = 0; Index < Device->NumOfInterface; Index++) {    \r
+  for (Index = 0; Index < Device->NumOfInterface; Index++) {\r

     ASSERT (Index < USB_MAX_INTERFACE);\r
     UsbIf = Device->Interfaces[Index];\r
 \r
     ASSERT (Index < USB_MAX_INTERFACE);\r
     UsbIf = Device->Interfaces[Index];\r
 \r


@@ -683,11 +683,11 @@ UsbEnumerateNewDev (
 \r
   Parent  = HubIf->Device;\r
   Bus     = Parent->Bus;\r
 \r
   Parent  = HubIf->Device;\r
   Bus     = Parent->Bus;\r

-  HubApi  = HubIf->HubApi;  \r
+  HubApi  = HubIf->HubApi;\r

   Address = Bus->MaxDevices;\r
 \r
   gBS->Stall (USB_WAIT_PORT_STABLE_STALL);\r
   Address = Bus->MaxDevices;\r
 \r
   gBS->Stall (USB_WAIT_PORT_STABLE_STALL);\r

-  \r
+\r

   //\r
   // Hub resets the device for at least 10 milliseconds.\r
   // Host learns device speed. If device is of low/full speed\r
   //\r
   // Hub resets the device for at least 10 milliseconds.\r
   // Host learns device speed. If device is of low/full speed\r


@@ -698,7 +698,7 @@ UsbEnumerateNewDev (
     Status = HubApi->ResetPort (HubIf, Port);\r
     if (EFI_ERROR (Status)) {\r
       DEBUG ((EFI_D_ERROR, "UsbEnumerateNewDev: failed to reset port %d - %r\n", Port, Status));\r
     Status = HubApi->ResetPort (HubIf, Port);\r
     if (EFI_ERROR (Status)) {\r
       DEBUG ((EFI_D_ERROR, "UsbEnumerateNewDev: failed to reset port %d - %r\n", Port, Status));\r

-  \r
+\r

       return Status;\r
     }\r
     DEBUG (( EFI_D_INFO, "UsbEnumerateNewDev: hub port %d is reset\n", Port));\r
       return Status;\r
     }\r
     DEBUG (( EFI_D_INFO, "UsbEnumerateNewDev: hub port %d is reset\n", Port));\r


@@ -927,60 +927,60 @@ UsbEnumeratePort (
   // connect/disconnect. Other three events are: ENABLE, SUSPEND, RESET.\r
   // ENABLE/RESET is used to reset port. SUSPEND isn't supported.\r
   //\r
   // connect/disconnect. Other three events are: ENABLE, SUSPEND, RESET.\r
   // ENABLE/RESET is used to reset port. SUSPEND isn't supported.\r
   //\r

-  \r
-  if (USB_BIT_IS_SET (PortState.PortChangeStatus, USB_PORT_STAT_C_OVERCURRENT)) {     \r
+\r
+  if (USB_BIT_IS_SET (PortState.PortChangeStatus, USB_PORT_STAT_C_OVERCURRENT)) {\r

 \r
     if (USB_BIT_IS_SET (PortState.PortStatus, USB_PORT_STAT_OVERCURRENT)) {\r
       //\r
       // Case1:\r
 \r
     if (USB_BIT_IS_SET (PortState.PortStatus, USB_PORT_STAT_OVERCURRENT)) {\r
       //\r
       // Case1:\r

-      //   Both OverCurrent and OverCurrentChange set, means over current occurs, \r
+      //   Both OverCurrent and OverCurrentChange set, means over current occurs,\r

       //   which probably is caused by short circuit. It has to wait system hardware\r
       //   to perform recovery.\r
       //\r
       DEBUG (( EFI_D_ERROR, "UsbEnumeratePort: Critical Over Current\n", Port));\r
       return EFI_DEVICE_ERROR;\r
       //   which probably is caused by short circuit. It has to wait system hardware\r
       //   to perform recovery.\r
       //\r
       DEBUG (( EFI_D_ERROR, "UsbEnumeratePort: Critical Over Current\n", Port));\r
       return EFI_DEVICE_ERROR;\r

-      \r
-    } \r
+\r
+    }\r

     //\r
     // Case2:\r
     //\r
     // Case2:\r

-    //   Only OverCurrentChange set, means system has been recoveried from \r
+    //   Only OverCurrentChange set, means system has been recoveried from\r

     //   over current. As a result, all ports are nearly power-off, so\r
     //   over current. As a result, all ports are nearly power-off, so\r

-    //   it's necessary to detach and enumerate all ports again. \r
+    //   it's necessary to detach and enumerate all ports again.\r

     //\r
     //\r

-    DEBUG (( EFI_D_ERROR, "UsbEnumeratePort: 2.0 device Recovery Over Current\n", Port)); \r
+    DEBUG (( EFI_D_ERROR, "UsbEnumeratePort: 2.0 device Recovery Over Current\n", Port));\r

   }\r
 \r
   }\r
 \r

-  if (USB_BIT_IS_SET (PortState.PortChangeStatus, USB_PORT_STAT_C_ENABLE)) {  \r
+  if (USB_BIT_IS_SET (PortState.PortChangeStatus, USB_PORT_STAT_C_ENABLE)) {\r

     //\r
     // Case3:\r
     //   1.1 roothub port reg doesn't reflect over-current state, while its counterpart\r
     //\r
     // Case3:\r
     //   1.1 roothub port reg doesn't reflect over-current state, while its counterpart\r

-    //   on 2.0 roothub does. When over-current has influence on 1.1 device, the port \r
+    //   on 2.0 roothub does. When over-current has influence on 1.1 device, the port\r

     //   would be disabled, so it's also necessary to detach and enumerate again.\r
     //\r
     DEBUG (( EFI_D_ERROR, "UsbEnumeratePort: 1.1 device Recovery Over Current\n", Port));\r
   }\r
     //   would be disabled, so it's also necessary to detach and enumerate again.\r
     //\r
     DEBUG (( EFI_D_ERROR, "UsbEnumeratePort: 1.1 device Recovery Over Current\n", Port));\r
   }\r

-  \r
+\r

   if (USB_BIT_IS_SET (PortState.PortChangeStatus, USB_PORT_STAT_C_CONNECTION)) {\r
     //\r
     // Case4:\r
   if (USB_BIT_IS_SET (PortState.PortChangeStatus, USB_PORT_STAT_C_CONNECTION)) {\r
     //\r
     // Case4:\r

-    //   Device connected or disconnected normally. \r
+    //   Device connected or disconnected normally.\r

     //\r
     DEBUG ((EFI_D_INFO, "UsbEnumeratePort: Device Connect/Disconnect Normally\n", Port));\r
   }\r
 \r
     //\r
     DEBUG ((EFI_D_INFO, "UsbEnumeratePort: Device Connect/Disconnect Normally\n", Port));\r
   }\r
 \r

-  // \r
+  //\r

   // Following as the above cases, it's safety to remove and create again.\r
   //\r
   Child = UsbFindChild (HubIf, Port);\r
   // Following as the above cases, it's safety to remove and create again.\r
   //\r
   Child = UsbFindChild (HubIf, Port);\r

-  \r
+\r

   if (Child != NULL) {\r
     DEBUG (( EFI_D_INFO, "UsbEnumeratePort: device at port %d removed from root hub %p\n", Port, HubIf));\r
     UsbRemoveDevice (Child);\r
   }\r
   if (Child != NULL) {\r
     DEBUG (( EFI_D_INFO, "UsbEnumeratePort: device at port %d removed from root hub %p\n", Port, HubIf));\r
     UsbRemoveDevice (Child);\r
   }\r

-  \r
+\r

   if (USB_BIT_IS_SET (PortState.PortStatus, USB_PORT_STAT_CONNECTION)) {\r
     //\r
   if (USB_BIT_IS_SET (PortState.PortStatus, USB_PORT_STAT_CONNECTION)) {\r
     //\r

-    // Now, new device connected, enumerate and configure the device \r
+    // Now, new device connected, enumerate and configure the device\r

     //\r
     DEBUG (( EFI_D_INFO, "UsbEnumeratePort: new device connected at port %d\n", Port));\r
     if (USB_BIT_IS_SET (PortState.PortChangeStatus, USB_PORT_STAT_C_RESET)) {\r
     //\r
     DEBUG (( EFI_D_INFO, "UsbEnumeratePort: new device connected at port %d\n", Port));\r
     if (USB_BIT_IS_SET (PortState.PortChangeStatus, USB_PORT_STAT_C_RESET)) {\r


@@ -988,11 +988,11 @@ UsbEnumeratePort (
     } else {\r
       Status = UsbEnumerateNewDev (HubIf, Port, TRUE);\r
     }\r
     } else {\r
       Status = UsbEnumerateNewDev (HubIf, Port, TRUE);\r
     }\r

-  \r
+\r

   } else {\r
     DEBUG (( EFI_D_INFO, "UsbEnumeratePort: device disconnected event on port %d\n", Port));\r
   }\r
   } else {\r
     DEBUG (( EFI_D_INFO, "UsbEnumeratePort: device disconnected event on port %d\n", Port));\r
   }\r

-  \r
+\r

   HubApi->ClearPortChange (HubIf, Port);\r
   return Status;\r
 }\r
   HubApi->ClearPortChange (HubIf, Port);\r
   return Status;\r
 }\r


@@ -1017,7 +1017,7 @@ UsbHubEnumeration (
   UINT8                   Bit;\r
   UINT8                   Index;\r
   USB_DEVICE              *Child;\r
   UINT8                   Bit;\r
   UINT8                   Index;\r
   USB_DEVICE              *Child;\r

-  \r
+\r

   ASSERT (Context != NULL);\r
 \r
   HubIf = (USB_INTERFACE *) Context;\r
   ASSERT (Context != NULL);\r
 \r
   HubIf = (USB_INTERFACE *) Context;\r


@@ -1082,7 +1082,7 @@ UsbRootHubEnumeration (
       DEBUG (( EFI_D_INFO, "UsbEnumeratePort: The device disconnect fails at port %d from root hub %p, try again\n", Index, RootHub));\r
       UsbRemoveDevice (Child);\r
     }\r
       DEBUG (( EFI_D_INFO, "UsbEnumeratePort: The device disconnect fails at port %d from root hub %p, try again\n", Index, RootHub));\r
       UsbRemoveDevice (Child);\r
     }\r

-    \r
+\r

     UsbEnumeratePort (RootHub, Index);\r
   }\r
 }\r
     UsbEnumeratePort (RootHub, Index);\r
   }\r
 }\r

diff --git a/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbHub.c b/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbHub.c
index a962f76638e8bd5512e35d118e00a1cd4a051135..2ce5726e632d5f7694a737a9cc9b7f3a248ffa15 100644 (file)
--- a/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbHub.c
+++ b/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbHub.c
@@ -2,7 +2,7 @@
 \r
     Unified interface for RootHub and Hub.\r
 \r
 \r
     Unified interface for RootHub and Hub.\r
 \r

-Copyright (c) 2007 - 2018, Intel Corporation. All rights reserved.<BR> \r
+Copyright (c) 2007 - 2018, Intel Corporation. All rights reserved.<BR>\r

 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r


@@ -716,10 +716,10 @@ UsbHubInit (
     Depth = (UINT16)(HubIf->Device->Tier - 1);\r
     DEBUG ((EFI_D_INFO, "UsbHubInit: Set Hub Depth as 0x%x\n", Depth));\r
     UsbHubCtrlSetHubDepth (HubIf->Device, Depth);\r
     Depth = (UINT16)(HubIf->Device->Tier - 1);\r
     DEBUG ((EFI_D_INFO, "UsbHubInit: Set Hub Depth as 0x%x\n", Depth));\r
     UsbHubCtrlSetHubDepth (HubIf->Device, Depth);\r

-    \r
+\r

     for (Index = 0; Index < HubDesc->NumPorts; Index++) {\r
       UsbHubCtrlSetPortFeature (HubIf->Device, Index, USB_HUB_PORT_REMOTE_WAKE_MASK);\r
     for (Index = 0; Index < HubDesc->NumPorts; Index++) {\r
       UsbHubCtrlSetPortFeature (HubIf->Device, Index, USB_HUB_PORT_REMOTE_WAKE_MASK);\r

-    }    \r
+    }\r

   } else {\r
     //\r
     // Feed power to all the hub ports. It should be ok\r
   } else {\r
     //\r
     // Feed power to all the hub ports. It should be ok\r

diff --git a/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbHub.h b/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbHub.h
index fe9f1f74c751ccc3649644b4e184b100671cc04f..4cf8f1f9b17a3ca193f635e0f54bfe9bc5ae1d50 100644 (file)
--- a/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbHub.h
+++ b/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbHub.h
@@ -96,7 +96,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #define USB_HUB_SUBCLASS_CODE       0x00\r
 \r
 //\r
 #define USB_HUB_SUBCLASS_CODE       0x00\r
 \r
 //\r

-// Host software return timeout if port status doesn't change \r
+// Host software return timeout if port status doesn't change\r

 // after 500ms(LOOP * STALL = 5000 * 0.1ms), set by experience\r
 //\r
 #define USB_WAIT_PORT_STS_CHANGE_LOOP  5000\r
 // after 500ms(LOOP * STALL = 5000 * 0.1ms), set by experience\r
 //\r
 #define USB_WAIT_PORT_STS_CHANGE_LOOP  5000\r

diff --git a/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbUtility.c b/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbUtility.c
index 75d9b03af0cbab24b404757c53d9f5900062b729..e9b5fefb9ad796291c91acad4e8d6e92a3c79a35 100644 (file)
--- a/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbUtility.c
+++ b/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbUtility.c
@@ -2,7 +2,7 @@
 \r
     Wrapper function for usb host controller interface.\r
 \r
 \r
     Wrapper function for usb host controller interface.\r
 \r

-Copyright (c) 2007 - 2017, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2007 - 2018, Intel Corporation. All rights reserved.<BR>\r

 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r


@@ -1163,7 +1163,7 @@ UsbBusAddWantedUsbIoDP (
     DevicePathPtr = DuplicateDevicePath ((EFI_DEVICE_PATH_PROTOCOL *) &mAllUsbClassDevicePath);\r
   } else if (!IsDevicePathEnd (RemainingDevicePath)) {\r
     //\r
     DevicePathPtr = DuplicateDevicePath ((EFI_DEVICE_PATH_PROTOCOL *) &mAllUsbClassDevicePath);\r
   } else if (!IsDevicePathEnd (RemainingDevicePath)) {\r
     //\r

-    // If RemainingDevicePath isn't the End of Device Path Node, \r
+    // If RemainingDevicePath isn't the End of Device Path Node,\r

     // Create new Usb device path according to the usb part in remaining device path\r
     //\r
     DevicePathPtr = GetUsbDPFromFullDP (RemainingDevicePath);\r
     // Create new Usb device path according to the usb part in remaining device path\r
     //\r
     DevicePathPtr = GetUsbDPFromFullDP (RemainingDevicePath);\r


@@ -1171,7 +1171,7 @@ UsbBusAddWantedUsbIoDP (
     //\r
     // If RemainingDevicePath is the End of Device Path Node,\r
     // skip enumerate any device and return EFI_SUCESSS\r
     //\r
     // If RemainingDevicePath is the End of Device Path Node,\r
     // skip enumerate any device and return EFI_SUCESSS\r

-    // \r
+    //\r

     return EFI_SUCCESS;\r
   }\r
 \r
     return EFI_SUCCESS;\r
   }\r
 \r

diff --git a/MdeModulePkg/Bus/Usb/UsbBusPei/HubPeim.c b/MdeModulePkg/Bus/Usb/UsbBusPei/HubPeim.c
index ac930ee8ea0046615108aad77762141748306404..806602511c6fba2f20409655bbd271ed3c5c3a5f 100644 (file)
--- a/MdeModulePkg/Bus/Usb/UsbBusPei/HubPeim.c
+++ b/MdeModulePkg/Bus/Usb/UsbBusPei/HubPeim.c
@@ -2,7 +2,7 @@
 Usb Hub Request Support In PEI Phase\r
 \r
 Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r
 Usb Hub Request Support In PEI Phase\r
 \r
 Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r

-  \r
+\r

 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions\r
 of the BSD License which accompanies this distribution.  The\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions\r
 of the BSD License which accompanies this distribution.  The\r


@@ -440,7 +440,7 @@ PeiDoHubConfig (
   HubDescriptor = (EFI_USB_HUB_DESCRIPTOR *) HubDescBuffer;\r
 \r
   //\r
   HubDescriptor = (EFI_USB_HUB_DESCRIPTOR *) HubDescBuffer;\r
 \r
   //\r

-  // Get the hub descriptor \r
+  // Get the hub descriptor\r

   //\r
   Status = PeiUsbHubReadDesc (\r
             PeiServices,\r
   //\r
   Status = PeiUsbHubReadDesc (\r
             PeiServices,\r

diff --git a/MdeModulePkg/Bus/Usb/UsbBusPei/HubPeim.h b/MdeModulePkg/Bus/Usb/UsbBusPei/HubPeim.h
index 341f6f32e3d0530dfa7a6870cc226f132dd442c9..385a14ec0d15817070e0e8c6d7f10869d77842a8 100644 (file)
--- a/MdeModulePkg/Bus/Usb/UsbBusPei/HubPeim.h
+++ b/MdeModulePkg/Bus/Usb/UsbBusPei/HubPeim.h
@@ -2,7 +2,7 @@
 Constants definitions for Usb Hub Peim\r
 \r
 Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r
 Constants definitions for Usb Hub Peim\r
 \r
 Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r

-  \r
+\r

 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions\r
 of the BSD License which accompanies this distribution.  The\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions\r
 of the BSD License which accompanies this distribution.  The\r

diff --git a/MdeModulePkg/Bus/Usb/UsbBusPei/PeiUsbLib.c b/MdeModulePkg/Bus/Usb/UsbBusPei/PeiUsbLib.c
index 42be13ac3b7c2e0497256302829d014372ece321..c5e599e2f77babb9fd8d94d84cc981ff761d4db3 100644 (file)
--- a/MdeModulePkg/Bus/Usb/UsbBusPei/PeiUsbLib.c
+++ b/MdeModulePkg/Bus/Usb/UsbBusPei/PeiUsbLib.c
@@ -1,8 +1,8 @@
 /** @file\r
 Common Libarary for PEI USB\r
 \r
 /** @file\r
 Common Libarary for PEI USB\r
 \r

-Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved. <BR>\r
-  \r
+Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved. <BR>\r
+\r

 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions\r
 of the BSD License which accompanies this distribution.  The\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions\r
 of the BSD License which accompanies this distribution.  The\r

diff --git a/MdeModulePkg/Bus/Usb/UsbBusPei/PeiUsbLib.h b/MdeModulePkg/Bus/Usb/UsbBusPei/PeiUsbLib.h
index 1ace89fbc3fd5414546eb05f8b599e85659e3ed8..35f47a35ecf5064d37873740e99374da45c98b93 100644 (file)
--- a/MdeModulePkg/Bus/Usb/UsbBusPei/PeiUsbLib.h
+++ b/MdeModulePkg/Bus/Usb/UsbBusPei/PeiUsbLib.h
@@ -1,8 +1,8 @@
 /** @file\r
 Common Libarary for PEI USB\r
 \r
 /** @file\r
 Common Libarary for PEI USB\r
 \r

-Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved. <BR>\r
-  \r
+Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved. <BR>\r
+\r

 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions\r
 of the BSD License which accompanies this distribution.  The\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions\r
 of the BSD License which accompanies this distribution.  The\r

diff --git a/MdeModulePkg/Bus/Usb/UsbBusPei/UsbBusPei.inf b/MdeModulePkg/Bus/Usb/UsbBusPei/UsbBusPei.inf
index 734619a2fab6bb6ec2dcff9114bb2de8d59f3937..0d81bf8dc2c0eb2b3f19e8bbc4a4c498cc2aeb86 100644 (file)
--- a/MdeModulePkg/Bus/Usb/UsbBusPei/UsbBusPei.inf
+++ b/MdeModulePkg/Bus/Usb/UsbBusPei/UsbBusPei.inf
@@ -1,7 +1,7 @@
 ## @file\r
 # The Usb Bus Peim driver is used to support recovery from usb device.\r
 #\r
 ## @file\r
 # The Usb Bus Peim driver is used to support recovery from usb device.\r
 #\r

-# Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.<BR>\r
+# Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r

 #\r
 # This program and the accompanying materials\r
 # are licensed and made available under the terms and conditions\r
 #\r
 # This program and the accompanying materials\r
 # are licensed and made available under the terms and conditions\r


@@ -54,7 +54,7 @@
 \r
 [Pcd]\r
   gEfiMdePkgTokenSpaceGuid.PcdUsbTransferTimeoutValue  ## CONSUMES\r
 \r
 [Pcd]\r
   gEfiMdePkgTokenSpaceGuid.PcdUsbTransferTimeoutValue  ## CONSUMES\r

-  \r
+\r

 [Ppis]\r
   gPeiUsbIoPpiGuid                              ## PRODUCES\r
   gPeiUsbHostControllerPpiGuid                  ## SOMETIMES_CONSUMES\r
 [Ppis]\r
   gPeiUsbIoPpiGuid                              ## PRODUCES\r
   gPeiUsbHostControllerPpiGuid                  ## SOMETIMES_CONSUMES\r

diff --git a/MdeModulePkg/Bus/Usb/UsbBusPei/UsbBusPei.uni b/MdeModulePkg/Bus/Usb/UsbBusPei/UsbBusPei.uni
index bd18fdbfec24951c8d2fdb285a93eb541af44919..672c6761a5a1487fd22931354f975ec52b3060ad 100644 (file)
--- a/MdeModulePkg/Bus/Usb/UsbBusPei/UsbBusPei.uni
+++ b/MdeModulePkg/Bus/Usb/UsbBusPei/UsbBusPei.uni
@@ -3,14 +3,14 @@
 //\r
 // The USB Bus PEIM driver is used to support recovery from USB devices.\r
 //\r
 //\r
 // The USB Bus PEIM driver is used to support recovery from USB devices.\r
 //\r

-// Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.<BR>\r
+// Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r

 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions\r
 // of the BSD License which accompanies this distribution.  The\r
 // full text of the license may be found at\r
 // http://opensource.org/licenses/bsd-license.php\r
 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions\r
 // of the BSD License which accompanies this distribution.  The\r
 // full text of the license may be found at\r
 // http://opensource.org/licenses/bsd-license.php\r

-// \r
+//\r

 // THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 // WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 //\r
 // THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 // WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 //\r

diff --git a/MdeModulePkg/Bus/Usb/UsbBusPei/UsbBusPeiExtra.uni b/MdeModulePkg/Bus/Usb/UsbBusPei/UsbBusPeiExtra.uni
index a84da95a47cfe88330b76d1f82200034bfe10144..4b784a3b0cc41982ed32eb92b84dd07bb30879cd 100644 (file)
--- a/MdeModulePkg/Bus/Usb/UsbBusPei/UsbBusPeiExtra.uni
+++ b/MdeModulePkg/Bus/Usb/UsbBusPei/UsbBusPeiExtra.uni
@@ -1,7 +1,7 @@
 // /** @file\r
 // UsbBusPei Localized Strings and Content\r
 //\r
 // /** @file\r
 // UsbBusPei Localized Strings and Content\r
 //\r

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

 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions\r
 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions\r


@@ -14,8 +14,8 @@
 //\r
 // **/\r
 \r
 //\r
 // **/\r
 \r

-#string STR_PROPERTIES_MODULE_NAME \r
-#language en-US \r
+#string STR_PROPERTIES_MODULE_NAME\r
+#language en-US\r

 "USB Bus PEI Module for Recovery"\r
 \r
 \r
 "USB Bus PEI Module for Recovery"\r
 \r
 \r

diff --git a/MdeModulePkg/Bus/Usb/UsbBusPei/UsbIoPeim.c b/MdeModulePkg/Bus/Usb/UsbBusPei/UsbIoPeim.c
index d13a7ee0a336fc9240f2e6b5982f070ee73c7821..5c659401ae84f1bf908fbae5f3e9adc516db193a 100644 (file)
--- a/MdeModulePkg/Bus/Usb/UsbBusPei/UsbIoPeim.c
+++ b/MdeModulePkg/Bus/Usb/UsbBusPei/UsbIoPeim.c
@@ -1,8 +1,8 @@
 /** @file\r
 The module is used to implement Usb Io PPI interfaces.\r
 \r
 /** @file\r
 The module is used to implement Usb Io PPI interfaces.\r
 \r

-Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved. <BR>\r
-  \r
+Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved. <BR>\r
+\r

 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions\r
 of the BSD License which accompanies this distribution.  The\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions\r
 of the BSD License which accompanies this distribution.  The\r


@@ -19,7 +19,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 \r
 /**\r
   Submits control transfer to a target USB device.\r
 \r
 /**\r
   Submits control transfer to a target USB device.\r

-  \r
+\r

   @param  PeiServices            The pointer of EFI_PEI_SERVICES.\r
   @param  This                   The pointer of PEI_USB_IO_PPI.\r
   @param  Request                USB device request to send.\r
   @param  PeiServices            The pointer of EFI_PEI_SERVICES.\r
   @param  This                   The pointer of PEI_USB_IO_PPI.\r
   @param  Request                USB device request to send.\r


@@ -132,11 +132,11 @@ PeiUsbControlTransfer (
 \r
 /**\r
   Submits bulk transfer to a bulk endpoint of a USB device.\r
 \r
 /**\r
   Submits bulk transfer to a bulk endpoint of a USB device.\r

-  \r
+\r

   @param  PeiServices           The pointer of EFI_PEI_SERVICES.\r
   @param  This                  The pointer of PEI_USB_IO_PPI.\r
   @param  DeviceEndpoint        Endpoint number and its direction in bit 7.\r
   @param  PeiServices           The pointer of EFI_PEI_SERVICES.\r
   @param  This                  The pointer of PEI_USB_IO_PPI.\r
   @param  DeviceEndpoint        Endpoint number and its direction in bit 7.\r

-  @param  Data                  A pointer to the buffer of data to transmit \r
+  @param  Data                  A pointer to the buffer of data to transmit\r

                                 from or receive into.\r
   @param  DataLength            The lenght of the data buffer.\r
   @param  Timeout               Indicates the maximum time, in millisecond, which the\r
                                 from or receive into.\r
   @param  DataLength            The lenght of the data buffer.\r
   @param  Timeout               Indicates the maximum time, in millisecond, which the\r

diff --git a/MdeModulePkg/Bus/Usb/UsbBusPei/UsbPeim.c b/MdeModulePkg/Bus/Usb/UsbBusPei/UsbPeim.c
index a4bb4d7aa72d8d696ab98f5db1629f684595d40e..10d5232e59f745a0fd9b8c6739edc4b0ac61d5f1 100644 (file)
--- a/MdeModulePkg/Bus/Usb/UsbBusPei/UsbPeim.c
+++ b/MdeModulePkg/Bus/Usb/UsbBusPei/UsbPeim.c
@@ -1,8 +1,8 @@
 /** @file\r
 The module to produce Usb Bus PPI.\r
 \r
 /** @file\r
 The module to produce Usb Bus PPI.\r
 \r

-Copyright (c) 2006 - 2016, Intel Corporation. All rights reserved.<BR>\r
-  \r
+Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r
+\r

 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions\r
 of the BSD License which accompanies this distribution.  The\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions\r
 of the BSD License which accompanies this distribution.  The\r


@@ -37,7 +37,7 @@ EFI_PEI_PPI_DESCRIPTOR mUsbIoPpiList = {
 \r
 /**\r
   The enumeration routine to detect device change.\r
 \r
 /**\r
   The enumeration routine to detect device change.\r

-  \r
+\r

   @param  PeiServices            Describes the list of possible PEI Services.\r
   @param  UsbHcPpi               The pointer of PEI_USB_HOST_CONTROLLER_PPI instance.\r
   @param  Usb2HcPpi              The pointer of PEI_USB2_HOST_CONTROLLER_PPI instance.\r
   @param  PeiServices            Describes the list of possible PEI Services.\r
   @param  UsbHcPpi               The pointer of PEI_USB_HOST_CONTROLLER_PPI instance.\r
   @param  Usb2HcPpi              The pointer of PEI_USB2_HOST_CONTROLLER_PPI instance.\r


@@ -56,7 +56,7 @@ PeiUsbEnumeration (
 \r
 /**\r
   Configure new detected usb device.\r
 \r
 /**\r
   Configure new detected usb device.\r

-  \r
+\r

   @param  PeiServices            Describes the list of possible PEI Services.\r
   @param  PeiUsbDevice           The pointer of PEI_USB_DEVICE instance.\r
   @param  Port                   The port to be configured.\r
   @param  PeiServices            Describes the list of possible PEI Services.\r
   @param  PeiUsbDevice           The pointer of PEI_USB_DEVICE instance.\r
   @param  Port                   The port to be configured.\r


@@ -77,7 +77,7 @@ PeiConfigureUsbDevice (
 \r
 /**\r
   Get all configurations from a detected usb device.\r
 \r
 /**\r
   Get all configurations from a detected usb device.\r

-  \r
+\r

   @param  PeiServices            Describes the list of possible PEI Services.\r
   @param  PeiUsbDevice           The pointer of PEI_USB_DEVICE instance.\r
 \r
   @param  PeiServices            Describes the list of possible PEI Services.\r
   @param  PeiUsbDevice           The pointer of PEI_USB_DEVICE instance.\r
 \r


@@ -94,7 +94,7 @@ PeiUsbGetAllConfiguration (
 \r
 /**\r
   Get the start position of next wanted descriptor.\r
 \r
 /**\r
   Get the start position of next wanted descriptor.\r

-  \r
+\r

   @param  Buffer            Buffer containing data to parse.\r
   @param  Length            Buffer length.\r
   @param  DescType          Descriptor type.\r
   @param  Buffer            Buffer containing data to parse.\r
   @param  Length            Buffer length.\r
   @param  DescType          Descriptor type.\r


@@ -116,7 +116,7 @@ GetExpectedDescriptor (
 \r
 /**\r
   The entrypoint of the module, it will enumerate all HCs.\r
 \r
 /**\r
   The entrypoint of the module, it will enumerate all HCs.\r

-  \r
+\r

   @param  FileHandle             Handle of the file being invoked.\r
   @param  PeiServices            Describes the list of possible PEI Services.\r
 \r
   @param  FileHandle             Handle of the file being invoked.\r
   @param  PeiServices            Describes the list of possible PEI Services.\r
 \r


@@ -142,7 +142,7 @@ PeimInitializeUsb (
   }\r
 \r
   //\r
   }\r
 \r
   //\r

-  // gPeiUsbHostControllerPpiGuid and gPeiUsb2HostControllerPpiGuid should not \r
+  // gPeiUsbHostControllerPpiGuid and gPeiUsb2HostControllerPpiGuid should not\r

   // be produced at the same time\r
   //\r
   Index = 0;\r
   // be produced at the same time\r
   //\r
   Index = 0;\r


@@ -176,18 +176,18 @@ PeimInitializeUsb (
                  Index,\r
                  NULL,\r
                  (VOID **) &Usb2HcPpi\r
                  Index,\r
                  NULL,\r
                  (VOID **) &Usb2HcPpi\r

-                 );    \r
+                 );\r

       if (EFI_ERROR (Status)) {\r
         //\r
         // No more host controller, break out\r
         //\r
         break;\r
       if (EFI_ERROR (Status)) {\r
         //\r
         // No more host controller, break out\r
         //\r
         break;\r

-      }   \r
-      PeiUsbEnumeration ((EFI_PEI_SERVICES **) PeiServices, NULL, Usb2HcPpi);   \r
+      }\r
+      PeiUsbEnumeration ((EFI_PEI_SERVICES **) PeiServices, NULL, Usb2HcPpi);\r

       Index++;\r
     }\r
   }\r
       Index++;\r
     }\r
   }\r

-  \r
+\r

   if (Index == 0) {\r
     return EFI_UNSUPPORTED;\r
   }\r
   if (Index == 0) {\r
     return EFI_UNSUPPORTED;\r
   }\r


@@ -198,7 +198,7 @@ PeimInitializeUsb (
 /**\r
   The Hub Enumeration just scans the hub ports one time. It also\r
   doesn't support hot-plug.\r
 /**\r
   The Hub Enumeration just scans the hub ports one time. It also\r
   doesn't support hot-plug.\r

-  \r
+\r

   @param  PeiServices            Describes the list of possible PEI Services.\r
   @param  PeiUsbDevice           The pointer of PEI_USB_DEVICE instance.\r
   @param  CurrentAddress         The DeviceAddress of usb device.\r
   @param  PeiServices            Describes the list of possible PEI Services.\r
   @param  PeiUsbDevice           The pointer of PEI_USB_DEVICE instance.\r
   @param  CurrentAddress         The DeviceAddress of usb device.\r


@@ -289,13 +289,13 @@ PeiHubEnumeration (
         NewPeiUsbDevice->IsHub            = 0x0;\r
         NewPeiUsbDevice->DownStreamPortNo = 0x0;\r
 \r
         NewPeiUsbDevice->IsHub            = 0x0;\r
         NewPeiUsbDevice->DownStreamPortNo = 0x0;\r
 \r

-        if (((PortStatus.PortChangeStatus & USB_PORT_STAT_C_RESET) == 0) || \r
+        if (((PortStatus.PortChangeStatus & USB_PORT_STAT_C_RESET) == 0) ||\r

              ((PortStatus.PortStatus & (USB_PORT_STAT_CONNECTION | USB_PORT_STAT_ENABLE)) == 0)) {\r
           //\r
              ((PortStatus.PortStatus & (USB_PORT_STAT_CONNECTION | USB_PORT_STAT_ENABLE)) == 0)) {\r
           //\r

-          // If the port already has reset change flag and is connected and enabled, skip the port reset logic. \r
+          // If the port already has reset change flag and is connected and enabled, skip the port reset logic.\r

           //\r
           PeiResetHubPort (PeiServices, UsbIoPpi, (UINT8)(Index + 1));\r
           //\r
           PeiResetHubPort (PeiServices, UsbIoPpi, (UINT8)(Index + 1));\r

-  \r
+\r

           PeiHubGetPortStatus (\r
              PeiServices,\r
              UsbIoPpi,\r
           PeiHubGetPortStatus (\r
              PeiServices,\r
              UsbIoPpi,\r


@@ -406,7 +406,7 @@ PeiHubEnumeration (
 \r
 /**\r
   The enumeration routine to detect device change.\r
 \r
 /**\r
   The enumeration routine to detect device change.\r

-  \r
+\r

   @param  PeiServices            Describes the list of possible PEI Services.\r
   @param  UsbHcPpi               The pointer of PEI_USB_HOST_CONTROLLER_PPI instance.\r
   @param  Usb2HcPpi              The pointer of PEI_USB2_HOST_CONTROLLER_PPI instance.\r
   @param  PeiServices            Describes the list of possible PEI Services.\r
   @param  UsbHcPpi               The pointer of PEI_USB_HOST_CONTROLLER_PPI instance.\r
   @param  Usb2HcPpi              The pointer of PEI_USB2_HOST_CONTROLLER_PPI instance.\r


@@ -440,7 +440,7 @@ PeiUsbEnumeration (
                 PeiServices,\r
                 Usb2HcPpi,\r
                 (UINT8 *) &NumOfRootPort\r
                 PeiServices,\r
                 Usb2HcPpi,\r
                 (UINT8 *) &NumOfRootPort\r

-                );    \r
+                );\r

   } else if (UsbHcPpi != NULL) {\r
     UsbHcPpi->GetRootHubPortNumber (\r
                 PeiServices,\r
   } else if (UsbHcPpi != NULL) {\r
     UsbHcPpi->GetRootHubPortNumber (\r
                 PeiServices,\r


@@ -464,7 +464,7 @@ PeiUsbEnumeration (
                   Usb2HcPpi,\r
                   (UINT8) Index,\r
                   &PortStatus\r
                   Usb2HcPpi,\r
                   (UINT8) Index,\r
                   &PortStatus\r

-                  );      \r
+                  );\r

     } else {\r
       UsbHcPpi->GetRootHubPortStatus (\r
                   PeiServices,\r
     } else {\r
       UsbHcPpi->GetRootHubPortStatus (\r
                   PeiServices,\r


@@ -515,10 +515,10 @@ PeiUsbEnumeration (
         PeiUsbDevice->IsHub             = 0x0;\r
         PeiUsbDevice->DownStreamPortNo  = 0x0;\r
 \r
         PeiUsbDevice->IsHub             = 0x0;\r
         PeiUsbDevice->DownStreamPortNo  = 0x0;\r
 \r

-        if (((PortStatus.PortChangeStatus & USB_PORT_STAT_C_RESET) == 0) || \r
+        if (((PortStatus.PortChangeStatus & USB_PORT_STAT_C_RESET) == 0) ||\r

              ((PortStatus.PortStatus & (USB_PORT_STAT_CONNECTION | USB_PORT_STAT_ENABLE)) == 0)) {\r
           //\r
              ((PortStatus.PortStatus & (USB_PORT_STAT_CONNECTION | USB_PORT_STAT_ENABLE)) == 0)) {\r
           //\r

-          // If the port already has reset change flag and is connected and enabled, skip the port reset logic. \r
+          // If the port already has reset change flag and is connected and enabled, skip the port reset logic.\r

           //\r
           ResetRootPort (\r
             PeiServices,\r
           //\r
           ResetRootPort (\r
             PeiServices,\r


@@ -550,7 +550,7 @@ PeiUsbEnumeration (
                         Usb2HcPpi,\r
                         (UINT8) Index,\r
                         EfiUsbPortResetChange\r
                         Usb2HcPpi,\r
                         (UINT8) Index,\r
                         EfiUsbPortResetChange\r

-                        );        \r
+                        );\r

           } else {\r
             UsbHcPpi->ClearRootHubPortFeature (\r
                         PeiServices,\r
           } else {\r
             UsbHcPpi->ClearRootHubPortFeature (\r
                         PeiServices,\r


@@ -650,7 +650,7 @@ PeiUsbEnumeration (
 \r
 /**\r
   Configure new detected usb device.\r
 \r
 /**\r
   Configure new detected usb device.\r

-  \r
+\r

   @param  PeiServices            Describes the list of possible PEI Services.\r
   @param  PeiUsbDevice           The pointer of PEI_USB_DEVICE instance.\r
   @param  Port                   The port to be configured.\r
   @param  PeiServices            Describes the list of possible PEI Services.\r
   @param  PeiUsbDevice           The pointer of PEI_USB_DEVICE instance.\r
   @param  Port                   The port to be configured.\r


@@ -767,7 +767,7 @@ PeiConfigureUsbDevice (
 \r
 /**\r
   Get all configurations from a detected usb device.\r
 \r
 /**\r
   Get all configurations from a detected usb device.\r

-  \r
+\r

   @param  PeiServices            Describes the list of possible PEI Services.\r
   @param  PeiUsbDevice           The pointer of PEI_USB_DEVICE instance.\r
 \r
   @param  PeiServices            Describes the list of possible PEI Services.\r
   @param  PeiUsbDevice           The pointer of PEI_USB_DEVICE instance.\r
 \r


@@ -920,7 +920,7 @@ PeiUsbGetAllConfiguration (
 \r
 /**\r
   Get the start position of next wanted descriptor.\r
 \r
 /**\r
   Get the start position of next wanted descriptor.\r

-  \r
+\r

   @param  Buffer            Buffer containing data to parse.\r
   @param  Length            Buffer length.\r
   @param  DescType          Descriptor type.\r
   @param  Buffer            Buffer containing data to parse.\r
   @param  Length            Buffer length.\r
   @param  DescType          Descriptor type.\r


@@ -998,7 +998,7 @@ GetExpectedDescriptor (
 \r
 /**\r
   Send reset signal over the given root hub port.\r
 \r
 /**\r
   Send reset signal over the given root hub port.\r

-  \r
+\r

   @param  PeiServices       Describes the list of possible PEI Services.\r
   @param  UsbHcPpi          The pointer of PEI_USB_HOST_CONTROLLER_PPI instance.\r
   @param  Usb2HcPpi         The pointer of PEI_USB2_HOST_CONTROLLER_PPI instance.\r
   @param  PeiServices       Describes the list of possible PEI Services.\r
   @param  UsbHcPpi          The pointer of PEI_USB_HOST_CONTROLLER_PPI instance.\r
   @param  Usb2HcPpi         The pointer of PEI_USB2_HOST_CONTROLLER_PPI instance.\r


@@ -1022,7 +1022,7 @@ ResetRootPort (
 \r
   if (Usb2HcPpi != NULL) {\r
     MicroSecondDelay (200 * 1000);\r
 \r
   if (Usb2HcPpi != NULL) {\r
     MicroSecondDelay (200 * 1000);\r

-    \r
+\r

     //\r
     // reset root port\r
     //\r
     //\r
     // reset root port\r
     //\r


@@ -1032,12 +1032,12 @@ ResetRootPort (
                          PortNum,\r
                          EfiUsbPortReset\r
                          );\r
                          PortNum,\r
                          EfiUsbPortReset\r
                          );\r

-    \r
+\r

     if (EFI_ERROR (Status)) {\r
       DEBUG ((EFI_D_ERROR, "SetRootHubPortFeature EfiUsbPortReset Failed\n"));\r
       return;\r
     }\r
     if (EFI_ERROR (Status)) {\r
       DEBUG ((EFI_D_ERROR, "SetRootHubPortFeature EfiUsbPortReset Failed\n"));\r
       return;\r
     }\r

-    \r
+\r

     //\r
     // Drive the reset signal for at least 50ms. Check USB 2.0 Spec\r
     // section 7.1.7.5 for timing requirements.\r
     //\r
     // Drive the reset signal for at least 50ms. Check USB 2.0 Spec\r
     // section 7.1.7.5 for timing requirements.\r


@@ -1053,7 +1053,7 @@ ResetRootPort (
                          PortNum,\r
                          EfiUsbPortReset\r
                          );\r
                          PortNum,\r
                          EfiUsbPortReset\r
                          );\r

-    \r
+\r

     if (EFI_ERROR (Status)) {\r
       DEBUG ((EFI_D_ERROR, "ClearRootHubPortFeature EfiUsbPortReset Failed\n"));\r
       return;\r
     if (EFI_ERROR (Status)) {\r
       DEBUG ((EFI_D_ERROR, "ClearRootHubPortFeature EfiUsbPortReset Failed\n"));\r
       return;\r


@@ -1073,7 +1073,7 @@ ResetRootPort (
                             Usb2HcPpi,\r
                             PortNum,\r
                             &PortStatus\r
                             Usb2HcPpi,\r
                             PortNum,\r
                             &PortStatus\r

-                            ); \r
+                            );\r

       if (EFI_ERROR (Status)) {\r
         return;\r
       }\r
       if (EFI_ERROR (Status)) {\r
         return;\r
       }\r


@@ -1103,7 +1103,7 @@ ResetRootPort (
                 PortNum,\r
                 EfiUsbPortConnectChange\r
                 );\r
                 PortNum,\r
                 EfiUsbPortConnectChange\r
                 );\r

-    \r
+\r

     //\r
     // Set port enable\r
     //\r
     //\r
     // Set port enable\r
     //\r


@@ -1113,18 +1113,18 @@ ResetRootPort (
                 PortNum,\r
                 EfiUsbPortEnable\r
                 );\r
                 PortNum,\r
                 EfiUsbPortEnable\r
                 );\r

-    \r
+\r

     Usb2HcPpi->ClearRootHubPortFeature (\r
                 PeiServices,\r
                 Usb2HcPpi,\r
                 PortNum,\r
                 EfiUsbPortEnableChange\r
                 );\r
     Usb2HcPpi->ClearRootHubPortFeature (\r
                 PeiServices,\r
                 Usb2HcPpi,\r
                 PortNum,\r
                 EfiUsbPortEnableChange\r
                 );\r

-    \r
+\r

     MicroSecondDelay ((RetryIndex + 1) * 50 * 1000);\r
   } else {\r
     MicroSecondDelay (200 * 1000);\r
     MicroSecondDelay ((RetryIndex + 1) * 50 * 1000);\r
   } else {\r
     MicroSecondDelay (200 * 1000);\r

-    \r
+\r

     //\r
     // reset root port\r
     //\r
     //\r
     // reset root port\r
     //\r


@@ -1134,18 +1134,18 @@ ResetRootPort (
                          PortNum,\r
                          EfiUsbPortReset\r
                          );\r
                          PortNum,\r
                          EfiUsbPortReset\r
                          );\r

-    \r
+\r

     if (EFI_ERROR (Status)) {\r
       DEBUG ((EFI_D_ERROR, "SetRootHubPortFeature EfiUsbPortReset Failed\n"));\r
       return;\r
     }\r
     if (EFI_ERROR (Status)) {\r
       DEBUG ((EFI_D_ERROR, "SetRootHubPortFeature EfiUsbPortReset Failed\n"));\r
       return;\r
     }\r

-    \r
+\r

     //\r
     // Drive the reset signal for at least 50ms. Check USB 2.0 Spec\r
     // section 7.1.7.5 for timing requirements.\r
     //\r
     MicroSecondDelay (USB_SET_ROOT_PORT_RESET_STALL);\r
     //\r
     // Drive the reset signal for at least 50ms. Check USB 2.0 Spec\r
     // section 7.1.7.5 for timing requirements.\r
     //\r
     MicroSecondDelay (USB_SET_ROOT_PORT_RESET_STALL);\r

-    \r
+\r

     //\r
     // clear reset root port\r
     //\r
     //\r
     // clear reset root port\r
     //\r


@@ -1155,12 +1155,12 @@ ResetRootPort (
                          PortNum,\r
                          EfiUsbPortReset\r
                          );\r
                          PortNum,\r
                          EfiUsbPortReset\r
                          );\r

-    \r
+\r

     if (EFI_ERROR (Status)) {\r
       DEBUG ((EFI_D_ERROR, "ClearRootHubPortFeature EfiUsbPortReset Failed\n"));\r
       return;\r
     }\r
     if (EFI_ERROR (Status)) {\r
       DEBUG ((EFI_D_ERROR, "ClearRootHubPortFeature EfiUsbPortReset Failed\n"));\r
       return;\r
     }\r

-    \r
+\r

     MicroSecondDelay (USB_CLR_ROOT_PORT_RESET_STALL);\r
 \r
     //\r
     MicroSecondDelay (USB_CLR_ROOT_PORT_RESET_STALL);\r
 \r
     //\r


@@ -1175,7 +1175,7 @@ ResetRootPort (
                            UsbHcPpi,\r
                            PortNum,\r
                            &PortStatus\r
                            UsbHcPpi,\r
                            PortNum,\r
                            &PortStatus\r

-                           ); \r
+                           );\r

       if (EFI_ERROR (Status)) {\r
         return;\r
       }\r
       if (EFI_ERROR (Status)) {\r
         return;\r
       }\r


@@ -1205,7 +1205,7 @@ ResetRootPort (
                 PortNum,\r
                 EfiUsbPortConnectChange\r
                 );\r
                 PortNum,\r
                 EfiUsbPortConnectChange\r
                 );\r

-    \r
+\r

     //\r
     // Set port enable\r
     //\r
     //\r
     // Set port enable\r
     //\r


@@ -1215,14 +1215,14 @@ ResetRootPort (
                 PortNum,\r
                 EfiUsbPortEnable\r
                 );\r
                 PortNum,\r
                 EfiUsbPortEnable\r
                 );\r

-    \r
+\r

     UsbHcPpi->ClearRootHubPortFeature (\r
                 PeiServices,\r
                 UsbHcPpi,\r
                 PortNum,\r
                 EfiUsbPortEnableChange\r
                 );\r
     UsbHcPpi->ClearRootHubPortFeature (\r
                 PeiServices,\r
                 UsbHcPpi,\r
                 PortNum,\r
                 EfiUsbPortEnableChange\r
                 );\r

-    \r
+\r

     MicroSecondDelay ((RetryIndex + 1) * 50 * 1000);\r
   }\r
   return;\r
     MicroSecondDelay ((RetryIndex + 1) * 50 * 1000);\r
   }\r
   return;\r

diff --git a/MdeModulePkg/Bus/Usb/UsbBusPei/UsbPeim.h b/MdeModulePkg/Bus/Usb/UsbBusPei/UsbPeim.h
index dff8eeb2026d2b1ec7e4bc81ee61197a4b7a120c..161097453717ea19a2a6f4a487617d29b0c50c53 100644 (file)
--- a/MdeModulePkg/Bus/Usb/UsbBusPei/UsbPeim.h
+++ b/MdeModulePkg/Bus/Usb/UsbBusPei/UsbPeim.h
@@ -1,8 +1,8 @@
 /** @file\r
 Usb Peim definition.\r
 \r
 /** @file\r
 Usb Peim definition.\r
 \r

-Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved. <BR>\r
-  \r
+Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved. <BR>\r
+\r

 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions\r
 of the BSD License which accompanies this distribution.  The\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions\r
 of the BSD License which accompanies this distribution.  The\r


@@ -88,7 +88,7 @@ typedef struct {
 #define USB_WAIT_PORT_STS_CHANGE_STALL  (100)\r
 \r
 //\r
 #define USB_WAIT_PORT_STS_CHANGE_STALL  (100)\r
 \r
 //\r

-// Host software return timeout if port status doesn't change \r
+// Host software return timeout if port status doesn't change\r

 // after 500ms(LOOP * STALL = 5000 * 0.1ms), set by experience\r
 //\r
 #define USB_WAIT_PORT_STS_CHANGE_LOOP   5000\r
 // after 500ms(LOOP * STALL = 5000 * 0.1ms), set by experience\r
 //\r
 #define USB_WAIT_PORT_STS_CHANGE_LOOP   5000\r


@@ -112,7 +112,7 @@ typedef struct {
 \r
 /**\r
   Submits control transfer to a target USB device.\r
 \r
 /**\r
   Submits control transfer to a target USB device.\r

-  \r
+\r

   @param  PeiServices            The pointer of EFI_PEI_SERVICES.\r
   @param  This                   The pointer of PEI_USB_IO_PPI.\r
   @param  Request                USB device request to send.\r
   @param  PeiServices            The pointer of EFI_PEI_SERVICES.\r
   @param  This                   The pointer of PEI_USB_IO_PPI.\r
   @param  Request                USB device request to send.\r


@@ -144,11 +144,11 @@ PeiUsbControlTransfer (
 \r
 /**\r
   Submits bulk transfer to a bulk endpoint of a USB device.\r
 \r
 /**\r
   Submits bulk transfer to a bulk endpoint of a USB device.\r

-  \r
+\r

   @param  PeiServices           The pointer of EFI_PEI_SERVICES.\r
   @param  This                  The pointer of PEI_USB_IO_PPI.\r
   @param  DeviceEndpoint        Endpoint number and its direction in bit 7.\r
   @param  PeiServices           The pointer of EFI_PEI_SERVICES.\r
   @param  This                  The pointer of PEI_USB_IO_PPI.\r
   @param  DeviceEndpoint        Endpoint number and its direction in bit 7.\r

-  @param  Data                  A pointer to the buffer of data to transmit \r
+  @param  Data                  A pointer to the buffer of data to transmit\r

                                 from or receive into.\r
   @param  DataLength            The lenght of the data buffer.\r
   @param  Timeout               Indicates the maximum time, in millisecond, which the\r
                                 from or receive into.\r
   @param  DataLength            The lenght of the data buffer.\r
   @param  Timeout               Indicates the maximum time, in millisecond, which the\r


@@ -233,7 +233,7 @@ PeiUsbPortReset (
 \r
 /**\r
   Send reset signal over the given root hub port.\r
 \r
 /**\r
   Send reset signal over the given root hub port.\r

-  \r
+\r

   @param  PeiServices       Describes the list of possible PEI Services.\r
   @param  UsbHcPpi          The pointer of PEI_USB_HOST_CONTROLLER_PPI instance.\r
   @param  Usb2HcPpi         The pointer of PEI_USB2_HOST_CONTROLLER_PPI instance.\r
   @param  PeiServices       Describes the list of possible PEI Services.\r
   @param  UsbHcPpi          The pointer of PEI_USB_HOST_CONTROLLER_PPI instance.\r
   @param  Usb2HcPpi         The pointer of PEI_USB2_HOST_CONTROLLER_PPI instance.\r

diff --git a/MdeModulePkg/Bus/Usb/UsbKbDxe/EfiKey.c b/MdeModulePkg/Bus/Usb/UsbKbDxe/EfiKey.c
index 722350f6093ea53c1beb2faa3dee470a92e3ebb4..40f839994211531a54203ce9c0078fc5da370977 100644 (file)
--- a/MdeModulePkg/Bus/Usb/UsbKbDxe/EfiKey.c
+++ b/MdeModulePkg/Bus/Usb/UsbKbDxe/EfiKey.c
@@ -765,9 +765,9 @@ USBKeyboardWaitForKey (
 \r
   //\r
   // Enter critical section\r
 \r
   //\r
   // Enter critical section\r

-  //  \r
+  //\r

   OldTpl = gBS->RaiseTPL (TPL_NOTIFY);\r
   OldTpl = gBS->RaiseTPL (TPL_NOTIFY);\r

-  \r
+\r

   //\r
   // WaitforKey doesn't suppor the partial key.\r
   // Considering if the partial keystroke is enabled, there maybe a partial\r
   //\r
   // WaitforKey doesn't suppor the partial key.\r
   // Considering if the partial keystroke is enabled, there maybe a partial\r


@@ -1223,7 +1223,7 @@ KeyNotifyProcessHandler (
   while (TRUE) {\r
     //\r
     // Enter critical section\r
   while (TRUE) {\r
     //\r
     // Enter critical section\r

-    //  \r
+    //\r

     OldTpl = gBS->RaiseTPL (TPL_NOTIFY);\r
     Status = Dequeue (&UsbKeyboardDevice->EfiKeyQueueForNotify, &KeyData, sizeof (KeyData));\r
     //\r
     OldTpl = gBS->RaiseTPL (TPL_NOTIFY);\r
     Status = Dequeue (&UsbKeyboardDevice->EfiKeyQueueForNotify, &KeyData, sizeof (KeyData));\r
     //\r

diff --git a/MdeModulePkg/Bus/Usb/UsbKbDxe/UsbKbDxe.inf b/MdeModulePkg/Bus/Usb/UsbKbDxe/UsbKbDxe.inf
index 7939a1857df1e6ae353ac8d73786a53c556ec207..41f0d9ab9bf8488b32ae182acbc24860f7b6adcc 100644 (file)
--- a/MdeModulePkg/Bus/Usb/UsbKbDxe/UsbKbDxe.inf
+++ b/MdeModulePkg/Bus/Usb/UsbKbDxe/UsbKbDxe.inf
@@ -12,7 +12,7 @@
 # 2. Universal Serial Bus HID Usage Tables, ver 1.12\r
 # 3. UEFI Specification, v2.1\r
 #\r
 # 2. Universal Serial Bus HID Usage Tables, ver 1.12\r
 # 3. UEFI Specification, v2.1\r
 #\r

-# Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.<BR>\r
+# Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r

 #\r
 #  This program and the accompanying materials\r
 #  are licensed and made available under the terms and conditions of the BSD License\r
 #\r
 #  This program and the accompanying materials\r
 #  are licensed and made available under the terms and conditions of the BSD License\r


@@ -39,7 +39,7 @@
 #\r
 #  VALID_ARCHITECTURES           = IA32 X64 IPF EBC ARM AARCH64\r
 #\r
 #\r
 #  VALID_ARCHITECTURES           = IA32 X64 IPF EBC ARM AARCH64\r
 #\r

-#  DRIVER_BINDING                =  gUsbKeyboardDriverBinding                        \r
+#  DRIVER_BINDING                =  gUsbKeyboardDriverBinding\r

 #  COMPONENT_NAME                =  gUsbKeyboardComponentName\r
 #  COMPONENT_NAME2               =  gUsbKeyboardComponentName2\r
 #\r
 #  COMPONENT_NAME                =  gUsbKeyboardComponentName\r
 #  COMPONENT_NAME2               =  gUsbKeyboardComponentName2\r
 #\r


@@ -87,7 +87,7 @@
   # Otherwise, USB keyboard module tries to use its carried default layout.\r
   #\r
   gEfiHiiDatabaseProtocolGuid                   ## SOMETIMES_CONSUMES\r
   # Otherwise, USB keyboard module tries to use its carried default layout.\r
   #\r
   gEfiHiiDatabaseProtocolGuid                   ## SOMETIMES_CONSUMES\r

-  \r
+\r

 [FeaturePcd]\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdDisableDefaultKeyboardLayoutInUsbKbDriver ## CONSUMES\r
 \r
 [FeaturePcd]\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdDisableDefaultKeyboardLayoutInUsbKbDriver ## CONSUMES\r
 \r

diff --git a/MdeModulePkg/Bus/Usb/UsbKbDxe/UsbKbDxe.uni b/MdeModulePkg/Bus/Usb/UsbKbDxe/UsbKbDxe.uni
index 7dcbf1235313b1aa9bad7d2227a3203562f19e46..9bf6c3e9504564eeb0fc53fa887e8e8d7fad4588 100644 (file)
--- a/MdeModulePkg/Bus/Usb/UsbKbDxe/UsbKbDxe.uni
+++ b/MdeModulePkg/Bus/Usb/UsbKbDxe/UsbKbDxe.uni
@@ -12,13 +12,13 @@
 // 2. Universal Serial Bus HID Usage Tables, ver 1.12\r
 // 3. UEFI Specification, v2.1\r
 //\r
 // 2. Universal Serial Bus HID Usage Tables, ver 1.12\r
 // 3. UEFI Specification, v2.1\r
 //\r

-// Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.<BR>\r
+// Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r

 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r
 // which accompanies this distribution. The full text of the license may be found at\r
 // http://opensource.org/licenses/bsd-license.php\r
 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r
 // which accompanies this distribution. The full text of the license may be found at\r
 // http://opensource.org/licenses/bsd-license.php\r

-// \r
+//\r

 // THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 // WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 //\r
 // THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 // WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 //\r

diff --git a/MdeModulePkg/Bus/Usb/UsbKbDxe/UsbKbDxeExtra.uni b/MdeModulePkg/Bus/Usb/UsbKbDxe/UsbKbDxeExtra.uni
index 6a76634878b352d4a2085912c64f411c4eaacc9a..fe4c747d5a1eaf8c976cd5fd36eff4c70062711d 100644 (file)
--- a/MdeModulePkg/Bus/Usb/UsbKbDxe/UsbKbDxeExtra.uni
+++ b/MdeModulePkg/Bus/Usb/UsbKbDxe/UsbKbDxeExtra.uni
@@ -1,7 +1,7 @@
 // /** @file\r
 // UsbKbDxe Localized Strings and Content\r
 //\r
 // /** @file\r
 // UsbKbDxe Localized Strings and Content\r
 //\r

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

 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r
 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r


@@ -13,8 +13,8 @@
 //\r
 // **/\r
 \r
 //\r
 // **/\r
 \r

-#string STR_PROPERTIES_MODULE_NAME \r
-#language en-US \r
+#string STR_PROPERTIES_MODULE_NAME\r
+#language en-US\r

 "USB Keyboard DXE Driver"\r
 \r
 \r
 "USB Keyboard DXE Driver"\r
 \r
 \r

diff --git a/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMass.h b/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMass.h
index ebfb254de6dfab9dd80303768a15e7a7c13f60b7..7dd7871dc37a3344705acc4bc15441544459e584 100644 (file)
--- a/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMass.h
+++ b/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMass.h
@@ -1,8 +1,8 @@
 /** @file\r
 /** @file\r

-  Definition of USB Mass Storage Class and its value, USB Mass Transport Protocol, \r
+  Definition of USB Mass Storage Class and its value, USB Mass Transport Protocol,\r

   and other common definitions.\r
 \r
   and other common definitions.\r
 \r

-Copyright (c) 2007 - 2014, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2007 - 2018, Intel Corporation. All rights reserved.<BR>\r

 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r

diff --git a/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassBoot.c b/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassBoot.c
index 3bf6e6a81f3c122dcfdc4819a26c4e365fea3d64..dd5950c54c291ba09ad11651ed5175ad73f650c2 100644 (file)
--- a/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassBoot.c
+++ b/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassBoot.c
@@ -224,7 +224,7 @@ UsbBootExecCmd (
   If the device isn't ready, wait for it. If the device is ready\r
   and error occurs, retry the command again until it exceeds the\r
   limit of retrial times.\r
   If the device isn't ready, wait for it. If the device is ready\r
   and error occurs, retry the command again until it exceeds the\r
   limit of retrial times.\r

-  \r
+\r

   @param  UsbMass                The device to issue commands to\r
   @param  Cmd                    The command to execute\r
   @param  CmdLen                 The length of the command\r
   @param  UsbMass                The device to issue commands to\r
   @param  Cmd                    The command to execute\r
   @param  CmdLen                 The length of the command\r


@@ -412,7 +412,7 @@ UsbBootInquiry (
   @retval EFI_SUCCESS            The disk geometry is successfully retrieved.\r
   @retval EFI_NOT_READY          The returned block size is zero.\r
   @retval Other                  READ CAPACITY 16 bytes command execution failed.\r
   @retval EFI_SUCCESS            The disk geometry is successfully retrieved.\r
   @retval EFI_NOT_READY          The returned block size is zero.\r
   @retval Other                  READ CAPACITY 16 bytes command execution failed.\r

- \r
+\r

 **/\r
 EFI_STATUS\r
 UsbBootReadCapacity16 (\r
 **/\r
 EFI_STATUS\r
 UsbBootReadCapacity16 (\r


@@ -442,7 +442,7 @@ UsbBootReadCapacity16 (
   ZeroMem ((CapacityCmd + 2), 8);\r
 \r
   CapacityCmd[13] = sizeof (CapacityData);\r
   ZeroMem ((CapacityCmd + 2), 8);\r
 \r
   CapacityCmd[13] = sizeof (CapacityData);\r

-  \r
+\r

   Status = UsbBootExecCmdWithRetry (\r
              UsbMass,\r
              CapacityCmd,\r
   Status = UsbBootExecCmdWithRetry (\r
              UsbMass,\r
              CapacityCmd,\r


@@ -464,13 +464,13 @@ UsbBootReadCapacity16 (
   Media->LastBlock    = SwapBytes64 (ReadUnaligned64 ((CONST UINT64 *) &(CapacityData.LastLba7)));\r
 \r
   BlockSize           = SwapBytes32 (ReadUnaligned32 ((CONST UINT32 *) &(CapacityData.BlockSize3)));\r
   Media->LastBlock    = SwapBytes64 (ReadUnaligned64 ((CONST UINT64 *) &(CapacityData.LastLba7)));\r
 \r
   BlockSize           = SwapBytes32 (ReadUnaligned32 ((CONST UINT32 *) &(CapacityData.BlockSize3)));\r

-  \r
+\r

   Media->LowestAlignedLba = (CapacityData.LowestAlignLogic2 << 8) |\r
                              CapacityData.LowestAlignLogic1;\r
   Media->LogicalBlocksPerPhysicalBlock  = (1 << CapacityData.LogicPerPhysical);\r
   if (BlockSize == 0) {\r
     //\r
   Media->LowestAlignedLba = (CapacityData.LowestAlignLogic2 << 8) |\r
                              CapacityData.LowestAlignLogic1;\r
   Media->LogicalBlocksPerPhysicalBlock  = (1 << CapacityData.LogicPerPhysical);\r
   if (BlockSize == 0) {\r
     //\r

-    //  Get sense data  \r
+    //  Get sense data\r

     //\r
     return UsbBootRequestSense (UsbMass);\r
   } else {\r
     //\r
     return UsbBootRequestSense (UsbMass);\r
   } else {\r


@@ -494,7 +494,7 @@ UsbBootReadCapacity16 (
   @retval EFI_SUCCESS            The disk geometry is successfully retrieved.\r
   @retval EFI_NOT_READY          The returned block size is zero.\r
   @retval Other                  READ CAPACITY command execution failed.\r
   @retval EFI_SUCCESS            The disk geometry is successfully retrieved.\r
   @retval EFI_NOT_READY          The returned block size is zero.\r
   @retval Other                  READ CAPACITY command execution failed.\r

- \r
+\r

 **/\r
 EFI_STATUS\r
 UsbBootReadCapacity (\r
 **/\r
 EFI_STATUS\r
 UsbBootReadCapacity (\r


@@ -538,7 +538,7 @@ UsbBootReadCapacity (
   BlockSize           = SwapBytes32 (ReadUnaligned32 ((CONST UINT32 *) CapacityData.BlockLen));\r
   if (BlockSize == 0) {\r
     //\r
   BlockSize           = SwapBytes32 (ReadUnaligned32 ((CONST UINT32 *) CapacityData.BlockLen));\r
   if (BlockSize == 0) {\r
     //\r

-    //  Get sense data  \r
+    //  Get sense data\r

     //\r
     return UsbBootRequestSense (UsbMass);\r
   } else {\r
     //\r
     return UsbBootRequestSense (UsbMass);\r
   } else {\r

diff --git a/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassBoot.h b/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassBoot.h
index f8a0708350c70dbd1fc6f74f4f662e1a56a05c56..d4042e320ddc0eac255b0e19800f8bfb0ef01ca1 100644 (file)
--- a/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassBoot.h
+++ b/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassBoot.h
@@ -2,7 +2,7 @@
   Definition of the command set of USB Mass Storage Specification\r
   for Bootability, Revision 1.0.\r
 \r
   Definition of the command set of USB Mass Storage Specification\r
   for Bootability, Revision 1.0.\r
 \r

-Copyright (c) 2007 - 2017, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2007 - 2018, Intel Corporation. All rights reserved.<BR>\r

 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r


@@ -21,7 +21,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 // INQUIRY/REQUEST_SENSE are "No Timeout Commands" as specified\r
 // by Multi-Media Commands (MMC) set.\r
 // Others are "Group 1 Timeout Commands". That is,\r
 // INQUIRY/REQUEST_SENSE are "No Timeout Commands" as specified\r
 // by Multi-Media Commands (MMC) set.\r
 // Others are "Group 1 Timeout Commands". That is,\r

-// they should be retried if driver is ready. \r
+// they should be retried if driver is ready.\r

 //\r
 #define USB_BOOT_INQUIRY_OPCODE         0x12\r
 #define USB_BOOT_REQUEST_SENSE_OPCODE   0x03\r
 //\r
 #define USB_BOOT_INQUIRY_OPCODE         0x12\r
 #define USB_BOOT_REQUEST_SENSE_OPCODE   0x03\r


@@ -82,17 +82,17 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 //\r
 // Mass command timeout, refers to specification[USB20-9.2.6.1]\r
 //\r
 //\r
 // Mass command timeout, refers to specification[USB20-9.2.6.1]\r
 //\r

-// USB2.0 Spec define the up-limit timeout 5s for all command. USB floppy, \r
-// USB CD-Rom and iPod devices are much slower than USB key when reponse \r
+// USB2.0 Spec define the up-limit timeout 5s for all command. USB floppy,\r
+// USB CD-Rom and iPod devices are much slower than USB key when reponse\r

 // most of commands, So we set 5s as timeout here.\r
 // most of commands, So we set 5s as timeout here.\r

-// \r
+//\r

 #define USB_BOOT_GENERAL_CMD_TIMEOUT    (5 * USB_MASS_1_SECOND)\r
 \r
 //\r
 // The required commands are INQUIRY, READ CAPACITY, TEST UNIT READY,\r
 // READ10, WRITE10, and REQUEST SENSE. The BLOCK_IO protocol uses LBA\r
 // so it isn't necessary to issue MODE SENSE / READ FORMAT CAPACITY\r
 #define USB_BOOT_GENERAL_CMD_TIMEOUT    (5 * USB_MASS_1_SECOND)\r
 \r
 //\r
 // The required commands are INQUIRY, READ CAPACITY, TEST UNIT READY,\r
 // READ10, WRITE10, and REQUEST SENSE. The BLOCK_IO protocol uses LBA\r
 // so it isn't necessary to issue MODE SENSE / READ FORMAT CAPACITY\r

-// command to retrieve the disk gemotrics. \r
+// command to retrieve the disk gemotrics.\r

 //\r
 #pragma pack(1)\r
 typedef struct {\r
 //\r
 #pragma pack(1)\r
 typedef struct {\r

diff --git a/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassBot.c b/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassBot.c
index 477bfa79528bdff4c472b3875c3ce18ec3a2fe66..3bd18b2a3e952b1eda0c054f52a578683f8b5c25 100644 (file)
--- a/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassBot.c
+++ b/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassBot.c
@@ -2,7 +2,7 @@
   Implementation of the USB mass storage Bulk-Only Transport protocol,\r
   according to USB Mass Storage Class Bulk-Only Transport, Revision 1.0.\r
 \r
   Implementation of the USB mass storage Bulk-Only Transport protocol,\r
   according to USB Mass Storage Class Bulk-Only Transport, Revision 1.0.\r
 \r

-Copyright (c) 2007 - 2017, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2007 - 2018, Intel Corporation. All rights reserved.<BR>\r

 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r


@@ -272,7 +272,7 @@ UsbBotDataTransfer (
                             );\r
   if (EFI_ERROR (Status)) {\r
     if (USB_IS_ERROR (Result, EFI_USB_ERR_STALL)) {\r
                             );\r
   if (EFI_ERROR (Status)) {\r
     if (USB_IS_ERROR (Result, EFI_USB_ERR_STALL)) {\r

-      DEBUG ((EFI_D_INFO, "UsbBotDataTransfer: (%r)\n", Status));      \r
+      DEBUG ((EFI_D_INFO, "UsbBotDataTransfer: (%r)\n", Status));\r

       DEBUG ((EFI_D_INFO, "UsbBotDataTransfer: DataIn Stall\n"));\r
       UsbClearEndpointStall (UsbBot->UsbIo, Endpoint->EndpointAddress);\r
     } else if (USB_IS_ERROR (Result, EFI_USB_ERR_NAK)) {\r
       DEBUG ((EFI_D_INFO, "UsbBotDataTransfer: DataIn Stall\n"));\r
       UsbClearEndpointStall (UsbBot->UsbIo, Endpoint->EndpointAddress);\r
     } else if (USB_IS_ERROR (Result, EFI_USB_ERR_NAK)) {\r

diff --git a/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassBot.h b/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassBot.h
index 502c6703bfcae94488c1e4de6b24f296d8c0ae15..9bc007f93c8663f203582d6c03ebc8a36b60d9eb 100644 (file)
--- a/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassBot.h
+++ b/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassBot.h
@@ -3,7 +3,7 @@
   based on the "Universal Serial Bus Mass Storage Class Bulk-Only\r
   Transport" Revision 1.0, September 31, 1999.\r
 \r
   based on the "Universal Serial Bus Mass Storage Class Bulk-Only\r
   Transport" Revision 1.0, September 31, 1999.\r
 \r

-Copyright (c) 2007 - 2011, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2007 - 2018, Intel Corporation. All rights reserved.<BR>\r

 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r


@@ -43,7 +43,7 @@ extern USB_MASS_TRANSPORT mUsbBotTransport;
 \r
 //\r
 // Usb Bot wait device reset complete, set by experience\r
 \r
 //\r
 // Usb Bot wait device reset complete, set by experience\r

-//  \r
+//\r

 #define USB_BOT_RESET_DEVICE_STALL  (100 * USB_MASS_1_MILLISECOND)\r
 \r
 //\r
 #define USB_BOT_RESET_DEVICE_STALL  (100 * USB_MASS_1_MILLISECOND)\r
 \r
 //\r

diff --git a/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassCbi.c b/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassCbi.c
index 3f6201d053cd371ae5ed4818645585440ec916eb..44e377bb8f927be8e3778ad8e3caf57b8b7a9203 100644 (file)
--- a/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassCbi.c
+++ b/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassCbi.c
@@ -4,7 +4,7 @@
   Notice: it is being obsoleted by the standard body in favor of the BOT\r
   (Bulk-Only Transport).\r
 \r
   Notice: it is being obsoleted by the standard body in favor of the BOT\r
   (Bulk-Only Transport).\r
 \r

-Copyright (c) 2007 - 2011, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2007 - 2018, Intel Corporation. All rights reserved.<BR>\r

 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r


@@ -147,7 +147,7 @@ UsbCbiInit (
   } else {\r
     FreePool (UsbCbi);\r
   }\r
   } else {\r
     FreePool (UsbCbi);\r
   }\r

- \r
+\r

   return EFI_SUCCESS;\r
 \r
 ON_ERROR:\r
   return EFI_SUCCESS;\r
 \r
 ON_ERROR:\r

diff --git a/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassCbi.h b/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassCbi.h
index b414a46fdece28c9c59d9d639d98fe54c4e38463..70be9296c7f0887f5570b9652f471fe6742fcd25 100644 (file)
--- a/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassCbi.h
+++ b/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassCbi.h
@@ -2,7 +2,7 @@
   Defination for the USB mass storage Control/Bulk/Interrupt (CBI) transport,\r
   according to USB Mass Storage Class Control/Bulk/Interrupt (CBI) Transport, Revision 1.1.\r
 \r
   Defination for the USB mass storage Control/Bulk/Interrupt (CBI) transport,\r
   according to USB Mass Storage Class Control/Bulk/Interrupt (CBI) Transport, Revision 1.1.\r
 \r

-Copyright (c) 2007 - 2011, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2007 - 2018, Intel Corporation. All rights reserved.<BR>\r

 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r


@@ -27,7 +27,7 @@ extern USB_MASS_TRANSPORT mUsbCbi1Transport;
 #define USB_CBI_MAX_RETRY             3\r
 //\r
 // Time to wait for USB CBI reset to complete, set by experience\r
 #define USB_CBI_MAX_RETRY             3\r
 //\r
 // Time to wait for USB CBI reset to complete, set by experience\r

-//  \r
+//\r

 #define USB_CBI_RESET_DEVICE_STALL    (50 * USB_MASS_1_MILLISECOND)\r
 //\r
 // USB CBI transport timeout, set by experience\r
 #define USB_CBI_RESET_DEVICE_STALL    (50 * USB_MASS_1_MILLISECOND)\r
 //\r
 // USB CBI transport timeout, set by experience\r

diff --git a/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassDiskInfo.c b/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassDiskInfo.c
index 1fa8543e2b0ba9eaf3511ddb468883b7c1306555..e0f9b4b49ca7d6baaef7af9a06bd54ae28489f3e 100644 (file)
--- a/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassDiskInfo.c
+++ b/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassDiskInfo.c
@@ -1,7 +1,7 @@
 /** @file\r
   This file is used to implement the EFI_DISK_INFO_PROTOCOL interface.\r
 \r
 /** @file\r
   This file is used to implement the EFI_DISK_INFO_PROTOCOL interface.\r
 \r

-Copyright (c) 2011, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2011 - 2018, Intel Corporation. All rights reserved.<BR>\r

 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r


@@ -26,7 +26,7 @@ EFI_DISK_INFO_PROTOCOL gUsbDiskInfoProtocolTemplate = {
   Initialize the installation of DiskInfo protocol.\r
 \r
   This function prepares for the installation of DiskInfo protocol on the child handle.\r
   Initialize the installation of DiskInfo protocol.\r
 \r
   This function prepares for the installation of DiskInfo protocol on the child handle.\r

-  By default, it installs DiskInfo protocol with USB interface GUID. \r
+  By default, it installs DiskInfo protocol with USB interface GUID.\r

 \r
   @param[in]  UsbMass  The pointer of USB_MASS_DEVICE.\r
 \r
 \r
   @param[in]  UsbMass  The pointer of USB_MASS_DEVICE.\r
 \r


@@ -42,7 +42,7 @@ InitializeDiskInfo (
 \r
 /**\r
   Provides inquiry information for the controller type.\r
 \r
 /**\r
   Provides inquiry information for the controller type.\r

-  \r
+\r

   This function is used to get inquiry data.  Data format\r
   of Identify data is defined by the Interface GUID.\r
 \r
   This function is used to get inquiry data.  Data format\r
   of Identify data is defined by the Interface GUID.\r
 \r


@@ -51,9 +51,9 @@ InitializeDiskInfo (
   @param[in, out] InquiryDataSize   Pointer to the value for the inquiry data size.\r
 \r
   @retval EFI_SUCCESS            The command was accepted without any errors.\r
   @param[in, out] InquiryDataSize   Pointer to the value for the inquiry data size.\r
 \r
   @retval EFI_SUCCESS            The command was accepted without any errors.\r

-  @retval EFI_NOT_FOUND          Device does not support this data class \r
-  @retval EFI_DEVICE_ERROR       Error reading InquiryData from device \r
-  @retval EFI_BUFFER_TOO_SMALL   InquiryDataSize not big enough \r
+  @retval EFI_NOT_FOUND          Device does not support this data class\r
+  @retval EFI_DEVICE_ERROR       Error reading InquiryData from device\r
+  @retval EFI_BUFFER_TOO_SMALL   InquiryDataSize not big enough\r

 \r
 **/\r
 EFI_STATUS\r
 \r
 **/\r
 EFI_STATUS\r


@@ -85,16 +85,16 @@ UsbDiskInfoInquiry (
   This function is used to get identify data.  Data format\r
   of Identify data is defined by the Interface GUID.\r
 \r
   This function is used to get identify data.  Data format\r
   of Identify data is defined by the Interface GUID.\r
 \r

-  @param[in]      This              Pointer to the EFI_DISK_INFO_PROTOCOL \r
+  @param[in]      This              Pointer to the EFI_DISK_INFO_PROTOCOL\r

                                     instance.\r
   @param[in, out] IdentifyData      Pointer to a buffer for the identify data.\r
   @param[in, out] IdentifyDataSize  Pointer to the value for the identify data\r
                                     size.\r
 \r
   @retval EFI_SUCCESS            The command was accepted without any errors.\r
                                     instance.\r
   @param[in, out] IdentifyData      Pointer to a buffer for the identify data.\r
   @param[in, out] IdentifyDataSize  Pointer to the value for the identify data\r
                                     size.\r
 \r
   @retval EFI_SUCCESS            The command was accepted without any errors.\r

-  @retval EFI_NOT_FOUND          Device does not support this data class \r
-  @retval EFI_DEVICE_ERROR       Error reading IdentifyData from device \r
-  @retval EFI_BUFFER_TOO_SMALL   IdentifyDataSize not big enough \r
+  @retval EFI_NOT_FOUND          Device does not support this data class\r
+  @retval EFI_DEVICE_ERROR       Error reading IdentifyData from device\r
+  @retval EFI_BUFFER_TOO_SMALL   IdentifyDataSize not big enough\r

 \r
 **/\r
 EFI_STATUS\r
 \r
 **/\r
 EFI_STATUS\r


@@ -110,8 +110,8 @@ UsbDiskInfoIdentify (
 \r
 /**\r
   Provides sense data information for the controller type.\r
 \r
 /**\r
   Provides sense data information for the controller type.\r

-  \r
-  This function is used to get sense data. \r
+\r
+  This function is used to get sense data.\r

   Data format of Sense data is defined by the Interface GUID.\r
 \r
   @param[in]      This              Pointer to the EFI_DISK_INFO_PROTOCOL instance.\r
   Data format of Sense data is defined by the Interface GUID.\r
 \r
   @param[in]      This              Pointer to the EFI_DISK_INFO_PROTOCOL instance.\r


@@ -141,7 +141,7 @@ UsbDiskInfoSenseData (
 /**\r
   This function is used to get controller information.\r
 \r
 /**\r
   This function is used to get controller information.\r
 \r

-  @param[in]  This         Pointer to the EFI_DISK_INFO_PROTOCOL instance. \r
+  @param[in]  This         Pointer to the EFI_DISK_INFO_PROTOCOL instance.\r

   @param[out] IdeChannel   Pointer to the Ide Channel number.  Primary or secondary.\r
   @param[out] IdeDevice    Pointer to the Ide Device number.  Master or slave.\r
 \r
   @param[out] IdeChannel   Pointer to the Ide Channel number.  Primary or secondary.\r
   @param[out] IdeDevice    Pointer to the Ide Device number.  Master or slave.\r
 \r

diff --git a/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassDiskInfo.h b/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassDiskInfo.h
index e0a32ca8ee24a95869f5af842691392ef6cc04d4..c206040e785984d47f1ec084c24bf955029bb617 100644 (file)
--- a/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassDiskInfo.h
+++ b/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassDiskInfo.h
@@ -1,7 +1,7 @@
 /** @file\r
   Header file for EFI_DISK_INFO_PROTOCOL interface.\r
 \r
 /** @file\r
   Header file for EFI_DISK_INFO_PROTOCOL interface.\r
 \r

-Copyright (c) 2011, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2011 - 2018, Intel Corporation. All rights reserved.<BR>\r

 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r


@@ -19,7 +19,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   Initialize the installation of DiskInfo protocol.\r
 \r
   This function prepares for the installation of DiskInfo protocol on the child handle.\r
   Initialize the installation of DiskInfo protocol.\r
 \r
   This function prepares for the installation of DiskInfo protocol on the child handle.\r

-  By default, it installs DiskInfo protocol with USB interface GUID. \r
+  By default, it installs DiskInfo protocol with USB interface GUID.\r

 \r
   @param  UsbMass  The pointer of USB_MASS_DEVICE.\r
 \r
 \r
   @param  UsbMass  The pointer of USB_MASS_DEVICE.\r
 \r


@@ -32,7 +32,7 @@ InitializeDiskInfo (
 \r
 /**\r
   Provides inquiry information for the controller type.\r
 \r
 /**\r
   Provides inquiry information for the controller type.\r

-  \r
+\r

   This function is used to get inquiry data.  Data format\r
   of Identify data is defined by the Interface GUID.\r
 \r
   This function is used to get inquiry data.  Data format\r
   of Identify data is defined by the Interface GUID.\r
 \r


@@ -41,9 +41,9 @@ InitializeDiskInfo (
   @param[in, out] InquiryDataSize   Pointer to the value for the inquiry data size.\r
 \r
   @retval EFI_SUCCESS            The command was accepted without any errors.\r
   @param[in, out] InquiryDataSize   Pointer to the value for the inquiry data size.\r
 \r
   @retval EFI_SUCCESS            The command was accepted without any errors.\r

-  @retval EFI_NOT_FOUND          Device does not support this data class \r
-  @retval EFI_DEVICE_ERROR       Error reading InquiryData from device \r
-  @retval EFI_BUFFER_TOO_SMALL   InquiryDataSize not big enough \r
+  @retval EFI_NOT_FOUND          Device does not support this data class\r
+  @retval EFI_DEVICE_ERROR       Error reading InquiryData from device\r
+  @retval EFI_BUFFER_TOO_SMALL   InquiryDataSize not big enough\r

 \r
 **/\r
 EFI_STATUS\r
 \r
 **/\r
 EFI_STATUS\r


@@ -60,16 +60,16 @@ UsbDiskInfoInquiry (
   This function is used to get identify data.  Data format\r
   of Identify data is defined by the Interface GUID.\r
 \r
   This function is used to get identify data.  Data format\r
   of Identify data is defined by the Interface GUID.\r
 \r

-  @param[in]      This              Pointer to the EFI_DISK_INFO_PROTOCOL \r
+  @param[in]      This              Pointer to the EFI_DISK_INFO_PROTOCOL\r

                                     instance.\r
   @param[in, out] IdentifyData      Pointer to a buffer for the identify data.\r
   @param[in, out] IdentifyDataSize  Pointer to the value for the identify data\r
                                     size.\r
 \r
   @retval EFI_SUCCESS            The command was accepted without any errors.\r
                                     instance.\r
   @param[in, out] IdentifyData      Pointer to a buffer for the identify data.\r
   @param[in, out] IdentifyDataSize  Pointer to the value for the identify data\r
                                     size.\r
 \r
   @retval EFI_SUCCESS            The command was accepted without any errors.\r

-  @retval EFI_NOT_FOUND          Device does not support this data class \r
-  @retval EFI_DEVICE_ERROR       Error reading IdentifyData from device \r
-  @retval EFI_BUFFER_TOO_SMALL   IdentifyDataSize not big enough \r
+  @retval EFI_NOT_FOUND          Device does not support this data class\r
+  @retval EFI_DEVICE_ERROR       Error reading IdentifyData from device\r
+  @retval EFI_BUFFER_TOO_SMALL   IdentifyDataSize not big enough\r

 \r
 **/\r
 EFI_STATUS\r
 \r
 **/\r
 EFI_STATUS\r


@@ -82,8 +82,8 @@ UsbDiskInfoIdentify (
 \r
 /**\r
   Provides sense data information for the controller type.\r
 \r
 /**\r
   Provides sense data information for the controller type.\r

-  \r
-  This function is used to get sense data. \r
+\r
+  This function is used to get sense data.\r

   Data format of Sense data is defined by the Interface GUID.\r
 \r
   @param[in]      This              Pointer to the EFI_DISK_INFO_PROTOCOL instance.\r
   Data format of Sense data is defined by the Interface GUID.\r
 \r
   @param[in]      This              Pointer to the EFI_DISK_INFO_PROTOCOL instance.\r


@@ -110,7 +110,7 @@ UsbDiskInfoSenseData (
 /**\r
   This function is used to get controller information.\r
 \r
 /**\r
   This function is used to get controller information.\r
 \r

-  @param[in]  This         Pointer to the EFI_DISK_INFO_PROTOCOL instance. \r
+  @param[in]  This         Pointer to the EFI_DISK_INFO_PROTOCOL instance.\r

   @param[out] IdeChannel   Pointer to the Ide Channel number.  Primary or secondary.\r
   @param[out] IdeDevice    Pointer to the Ide Device number.  Master or slave.\r
 \r
   @param[out] IdeChannel   Pointer to the Ide Channel number.  Primary or secondary.\r
   @param[out] IdeDevice    Pointer to the Ide Device number.  Master or slave.\r
 \r

diff --git a/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassImpl.c b/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassImpl.c
index 448bcc2f80ac800caba3028a1be84ec0a16a992e..62bf3c588306fd7ebb193c567efe14f471aa9f30 100644 (file)
--- a/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassImpl.c
+++ b/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassImpl.c
@@ -16,7 +16,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 \r
 #define USB_MASS_TRANSPORT_COUNT    3\r
 //\r
 \r
 #define USB_MASS_TRANSPORT_COUNT    3\r
 //\r

-// Array of USB transport interfaces. \r
+// Array of USB transport interfaces.\r

 //\r
 USB_MASS_TRANSPORT *mUsbMassTransport[USB_MASS_TRANSPORT_COUNT] = {\r
   &mUsbCbi0Transport,\r
 //\r
 USB_MASS_TRANSPORT *mUsbMassTransport[USB_MASS_TRANSPORT_COUNT] = {\r
   &mUsbCbi0Transport,\r


@@ -36,7 +36,7 @@ EFI_DRIVER_BINDING_PROTOCOL gUSBMassDriverBinding = {
 /**\r
   Reset the block device.\r
 \r
 /**\r
   Reset the block device.\r
 \r

-  This function implements EFI_BLOCK_IO_PROTOCOL.Reset(). \r
+  This function implements EFI_BLOCK_IO_PROTOCOL.Reset().\r

   It resets the block device hardware.\r
   ExtendedVerification is ignored in this implementation.\r
 \r
   It resets the block device hardware.\r
   ExtendedVerification is ignored in this implementation.\r
 \r


@@ -76,7 +76,7 @@ UsbMassReset (
 /**\r
   Reads the requested number of blocks from the device.\r
 \r
 /**\r
   Reads the requested number of blocks from the device.\r
 \r

-  This function implements EFI_BLOCK_IO_PROTOCOL.ReadBlocks(). \r
+  This function implements EFI_BLOCK_IO_PROTOCOL.ReadBlocks().\r

   It reads the requested number of blocks from the device.\r
   All the blocks are read, or an error is returned.\r
 \r
   It reads the requested number of blocks from the device.\r
   All the blocks are read, or an error is returned.\r
 \r


@@ -191,7 +191,7 @@ ON_EXIT:
 /**\r
   Writes a specified number of blocks to the device.\r
 \r
 /**\r
   Writes a specified number of blocks to the device.\r
 \r

-  This function implements EFI_BLOCK_IO_PROTOCOL.WriteBlocks(). \r
+  This function implements EFI_BLOCK_IO_PROTOCOL.WriteBlocks().\r

   It writes a specified number of blocks to the device.\r
   All blocks are written, or an error is returned.\r
 \r
   It writes a specified number of blocks to the device.\r
   All blocks are written, or an error is returned.\r
 \r


@@ -295,7 +295,7 @@ UsbMassWriteBlocks (
     Status = UsbBootWriteBlocks16 (UsbMass, Lba, TotalBlock, Buffer);\r
   } else {\r
     Status = UsbBootWriteBlocks (UsbMass, (UINT32) Lba, TotalBlock, Buffer);\r
     Status = UsbBootWriteBlocks16 (UsbMass, Lba, TotalBlock, Buffer);\r
   } else {\r
     Status = UsbBootWriteBlocks (UsbMass, (UINT32) Lba, TotalBlock, Buffer);\r

-  }  \r
+  }\r

 \r
   if (EFI_ERROR (Status)) {\r
     DEBUG ((EFI_D_ERROR, "UsbMassWriteBlocks: UsbBootWriteBlocks (%r) -> Reset\n", Status));\r
 \r
   if (EFI_ERROR (Status)) {\r
     DEBUG ((EFI_D_ERROR, "UsbMassWriteBlocks: UsbBootWriteBlocks (%r) -> Reset\n", Status));\r


@@ -402,7 +402,7 @@ UsbMassInitTransport (
   EFI_USB_INTERFACE_DESCRIPTOR  Interface;\r
   UINT8                         Index;\r
   EFI_STATUS                    Status;\r
   EFI_USB_INTERFACE_DESCRIPTOR  Interface;\r
   UINT8                         Index;\r
   EFI_STATUS                    Status;\r

- \r
+\r

   Status = gBS->OpenProtocol (\r
                   Controller,\r
                   &gEfiUsbIoProtocolGuid,\r
   Status = gBS->OpenProtocol (\r
                   Controller,\r
                   &gEfiUsbIoProtocolGuid,\r


@@ -415,12 +415,12 @@ UsbMassInitTransport (
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r

-  \r
+\r

   Status = UsbIo->UsbGetInterfaceDescriptor (UsbIo, &Interface);\r
   if (EFI_ERROR (Status)) {\r
     goto ON_EXIT;\r
   }\r
   Status = UsbIo->UsbGetInterfaceDescriptor (UsbIo, &Interface);\r
   if (EFI_ERROR (Status)) {\r
     goto ON_EXIT;\r
   }\r

-  \r
+\r

   Status = EFI_UNSUPPORTED;\r
 \r
   //\r
   Status = EFI_UNSUPPORTED;\r
 \r
   //\r


@@ -443,7 +443,7 @@ UsbMassInitTransport (
   }\r
 \r
   //\r
   }\r
 \r
   //\r

-  // For BOT device, try to get its max LUN. \r
+  // For BOT device, try to get its max LUN.\r

   // If max LUN is 0, then it is a non-lun device.\r
   // Otherwise, it is a multi-lun device.\r
   //\r
   // If max LUN is 0, then it is a non-lun device.\r
   // Otherwise, it is a multi-lun device.\r
   //\r


@@ -458,7 +458,7 @@ ON_EXIT:
          This->DriverBindingHandle,\r
          Controller\r
          );\r
          This->DriverBindingHandle,\r
          Controller\r
          );\r

-  return Status;  \r
+  return Status;\r

 }\r
 \r
 /**\r
 }\r
 \r
 /**\r


@@ -495,14 +495,14 @@ UsbMassInitMultiLun (
   ASSERT (MaxLun > 0);\r
   ReturnStatus = EFI_NOT_FOUND;\r
 \r
   ASSERT (MaxLun > 0);\r
   ReturnStatus = EFI_NOT_FOUND;\r
 \r

-  for (Index = 0; Index <= MaxLun; Index++) { \r
+  for (Index = 0; Index <= MaxLun; Index++) {\r

 \r
     DEBUG ((EFI_D_INFO, "UsbMassInitMultiLun: Start to initialize No.%d logic unit\n", Index));\r
 \r
     DEBUG ((EFI_D_INFO, "UsbMassInitMultiLun: Start to initialize No.%d logic unit\n", Index));\r

-    \r
+\r

     UsbIo   = NULL;\r
     UsbMass = AllocateZeroPool (sizeof (USB_MASS_DEVICE));\r
     ASSERT (UsbMass != NULL);\r
     UsbIo   = NULL;\r
     UsbMass = AllocateZeroPool (sizeof (USB_MASS_DEVICE));\r
     ASSERT (UsbMass != NULL);\r

-      \r
+\r

     UsbMass->Signature            = USB_MASS_SIGNATURE;\r
     UsbMass->UsbIo                = UsbIo;\r
     UsbMass->BlockIo.Media        = &UsbMass->BlockIoMedia;\r
     UsbMass->Signature            = USB_MASS_SIGNATURE;\r
     UsbMass->UsbIo                = UsbIo;\r
     UsbMass->BlockIo.Media        = &UsbMass->BlockIoMedia;\r


@@ -514,7 +514,7 @@ UsbMassInitMultiLun (
     UsbMass->Transport            = Transport;\r
     UsbMass->Context              = Context;\r
     UsbMass->Lun                  = Index;\r
     UsbMass->Transport            = Transport;\r
     UsbMass->Context              = Context;\r
     UsbMass->Lun                  = Index;\r

-    \r
+\r

     //\r
     // Initialize the media parameter data for EFI_BLOCK_IO_MEDIA of Block I/O Protocol.\r
     //\r
     //\r
     // Initialize the media parameter data for EFI_BLOCK_IO_MEDIA of Block I/O Protocol.\r
     //\r


@@ -531,11 +531,11 @@ UsbMassInitMultiLun (
     LunNode.Header.Type    = MESSAGING_DEVICE_PATH;\r
     LunNode.Header.SubType = MSG_DEVICE_LOGICAL_UNIT_DP;\r
     LunNode.Lun            = UsbMass->Lun;\r
     LunNode.Header.Type    = MESSAGING_DEVICE_PATH;\r
     LunNode.Header.SubType = MSG_DEVICE_LOGICAL_UNIT_DP;\r
     LunNode.Lun            = UsbMass->Lun;\r

-  \r
+\r

     SetDevicePathNodeLength (&LunNode.Header, sizeof (LunNode));\r
     SetDevicePathNodeLength (&LunNode.Header, sizeof (LunNode));\r

-  \r
+\r

     UsbMass->DevicePath = AppendDevicePathNode (DevicePath, &LunNode.Header);\r
     UsbMass->DevicePath = AppendDevicePathNode (DevicePath, &LunNode.Header);\r

-  \r
+\r

     if (UsbMass->DevicePath == NULL) {\r
       DEBUG ((EFI_D_ERROR, "UsbMassInitMultiLun: failed to create device logic unit device path\n"));\r
       Status = EFI_OUT_OF_RESOURCES;\r
     if (UsbMass->DevicePath == NULL) {\r
       DEBUG ((EFI_D_ERROR, "UsbMassInitMultiLun: failed to create device logic unit device path\n"));\r
       Status = EFI_OUT_OF_RESOURCES;\r


@@ -558,7 +558,7 @@ UsbMassInitMultiLun (
                     &UsbMass->DiskInfo,\r
                     NULL\r
                     );\r
                     &UsbMass->DiskInfo,\r
                     NULL\r
                     );\r

-    \r
+\r

     if (EFI_ERROR (Status)) {\r
       DEBUG ((EFI_D_ERROR, "UsbMassInitMultiLun: InstallMultipleProtocolInterfaces (%r)\n", Status));\r
       FreePool (UsbMass->DevicePath);\r
     if (EFI_ERROR (Status)) {\r
       DEBUG ((EFI_D_ERROR, "UsbMassInitMultiLun: InstallMultipleProtocolInterfaces (%r)\n", Status));\r
       FreePool (UsbMass->DevicePath);\r


@@ -597,7 +597,7 @@ UsbMassInitMultiLun (
     ReturnStatus = EFI_SUCCESS;\r
     DEBUG ((EFI_D_INFO, "UsbMassInitMultiLun: Success to initialize No.%d logic unit\n", Index));\r
   }\r
     ReturnStatus = EFI_SUCCESS;\r
     DEBUG ((EFI_D_INFO, "UsbMassInitMultiLun: Success to initialize No.%d logic unit\n", Index));\r
   }\r

-  \r
+\r

   return ReturnStatus;\r
 }\r
 \r
   return ReturnStatus;\r
 }\r
 \r


@@ -642,7 +642,7 @@ UsbMassInitNonLun (
     DEBUG ((EFI_D_ERROR, "UsbMassInitNonLun: OpenUsbIoProtocol By Driver (%r)\n", Status));\r
     goto ON_ERROR;\r
   }\r
     DEBUG ((EFI_D_ERROR, "UsbMassInitNonLun: OpenUsbIoProtocol By Driver (%r)\n", Status));\r
     goto ON_ERROR;\r
   }\r

-  \r
+\r

   UsbMass->Signature            = USB_MASS_SIGNATURE;\r
   UsbMass->Controller           = Controller;\r
   UsbMass->UsbIo                = UsbIo;\r
   UsbMass->Signature            = USB_MASS_SIGNATURE;\r
   UsbMass->Controller           = Controller;\r
   UsbMass->UsbIo                = UsbIo;\r


@@ -654,7 +654,7 @@ UsbMassInitNonLun (
   UsbMass->OpticalStorage       = FALSE;\r
   UsbMass->Transport            = Transport;\r
   UsbMass->Context              = Context;\r
   UsbMass->OpticalStorage       = FALSE;\r
   UsbMass->Transport            = Transport;\r
   UsbMass->Context              = Context;\r

-  \r
+\r

   //\r
   // Initialize the media parameter data for EFI_BLOCK_IO_MEDIA of Block I/O Protocol.\r
   //\r
   //\r
   // Initialize the media parameter data for EFI_BLOCK_IO_MEDIA of Block I/O Protocol.\r
   //\r


@@ -663,7 +663,7 @@ UsbMassInitNonLun (
     DEBUG ((EFI_D_ERROR, "UsbMassInitNonLun: UsbMassInitMedia (%r)\n", Status));\r
     goto ON_ERROR;\r
   }\r
     DEBUG ((EFI_D_ERROR, "UsbMassInitNonLun: UsbMassInitMedia (%r)\n", Status));\r
     goto ON_ERROR;\r
   }\r

-    \r
+\r

   InitializeDiskInfo (UsbMass);\r
 \r
   Status = gBS->InstallMultipleProtocolInterfaces (\r
   InitializeDiskInfo (UsbMass);\r
 \r
   Status = gBS->InstallMultipleProtocolInterfaces (\r


@@ -692,7 +692,7 @@ ON_ERROR:
            Controller\r
            );\r
   }\r
            Controller\r
            );\r
   }\r

-  return Status;  \r
+  return Status;\r

 }\r
 \r
 \r
 }\r
 \r
 \r


@@ -804,7 +804,7 @@ USBMassDriverBindingStart (
   VOID                          *Context;\r
   UINT8                         MaxLun;\r
   EFI_STATUS                    Status;\r
   VOID                          *Context;\r
   UINT8                         MaxLun;\r
   EFI_STATUS                    Status;\r

-  EFI_USB_IO_PROTOCOL           *UsbIo; \r
+  EFI_USB_IO_PROTOCOL           *UsbIo;\r

   EFI_TPL                       OldTpl;\r
 \r
   OldTpl = gBS->RaiseTPL (TPL_CALLBACK);\r
   EFI_TPL                       OldTpl;\r
 \r
   OldTpl = gBS->RaiseTPL (TPL_CALLBACK);\r


@@ -824,7 +824,7 @@ USBMassDriverBindingStart (
     // Initialize data for device that does not support multiple LUNSs.\r
     //\r
     Status = UsbMassInitNonLun (This, Controller, Transport, Context);\r
     // Initialize data for device that does not support multiple LUNSs.\r
     //\r
     Status = UsbMassInitNonLun (This, Controller, Transport, Context);\r

-    if (EFI_ERROR (Status)) { \r
+    if (EFI_ERROR (Status)) {\r

       DEBUG ((EFI_D_ERROR, "USBMassDriverBindingStart: UsbMassInitNonLun (%r)\n", Status));\r
     }\r
   } else {\r
       DEBUG ((EFI_D_ERROR, "USBMassDriverBindingStart: UsbMassInitNonLun (%r)\n", Status));\r
     }\r
   } else {\r


@@ -839,7 +839,7 @@ USBMassDriverBindingStart (
                     Controller,\r
                     EFI_OPEN_PROTOCOL_BY_DRIVER\r
                     );\r
                     Controller,\r
                     EFI_OPEN_PROTOCOL_BY_DRIVER\r
                     );\r

-  \r
+\r

     if (EFI_ERROR (Status)) {\r
       DEBUG ((EFI_D_ERROR, "USBMassDriverBindingStart: OpenDevicePathProtocol By Driver (%r)\n", Status));\r
       goto Exit;\r
     if (EFI_ERROR (Status)) {\r
       DEBUG ((EFI_D_ERROR, "USBMassDriverBindingStart: OpenDevicePathProtocol By Driver (%r)\n", Status));\r
       goto Exit;\r


@@ -853,7 +853,7 @@ USBMassDriverBindingStart (
                     Controller,\r
                     EFI_OPEN_PROTOCOL_BY_DRIVER\r
                     );\r
                     Controller,\r
                     EFI_OPEN_PROTOCOL_BY_DRIVER\r
                     );\r

-  \r
+\r

     if (EFI_ERROR (Status)) {\r
       DEBUG ((EFI_D_ERROR, "USBMassDriverBindingStart: OpenUsbIoProtocol By Driver (%r)\n", Status));\r
       gBS->CloseProtocol (\r
     if (EFI_ERROR (Status)) {\r
       DEBUG ((EFI_D_ERROR, "USBMassDriverBindingStart: OpenUsbIoProtocol By Driver (%r)\n", Status));\r
       gBS->CloseProtocol (\r


@@ -941,7 +941,7 @@ USBMassDriverBindingStop (
                     Controller,\r
                     EFI_OPEN_PROTOCOL_GET_PROTOCOL\r
                     );\r
                     Controller,\r
                     EFI_OPEN_PROTOCOL_GET_PROTOCOL\r
                     );\r

-  \r
+\r

     if (EFI_ERROR(Status)) {\r
       //\r
       // This is a 2nd type handle(multi-lun root), it needs to close devicepath\r
     if (EFI_ERROR(Status)) {\r
       //\r
       // This is a 2nd type handle(multi-lun root), it needs to close devicepath\r


@@ -962,13 +962,13 @@ USBMassDriverBindingStop (
       DEBUG ((EFI_D_INFO, "Success to stop multi-lun root handle\n"));\r
       return EFI_SUCCESS;\r
     }\r
       DEBUG ((EFI_D_INFO, "Success to stop multi-lun root handle\n"));\r
       return EFI_SUCCESS;\r
     }\r

-    \r
+\r

     //\r
     // This is a 1st type handle(non-multi-lun), which only needs to uninstall\r
     // Block I/O Protocol, close USB I/O Protocol and free mass device.\r
     //\r
     UsbMass = USB_MASS_DEVICE_FROM_BLOCK_IO (BlockIo);\r
     //\r
     // This is a 1st type handle(non-multi-lun), which only needs to uninstall\r
     // Block I/O Protocol, close USB I/O Protocol and free mass device.\r
     //\r
     UsbMass = USB_MASS_DEVICE_FROM_BLOCK_IO (BlockIo);\r

-  \r
+\r

     //\r
     // Uninstall Block I/O protocol from the device handle,\r
     // then call the transport protocol to stop itself.\r
     //\r
     // Uninstall Block I/O protocol from the device handle,\r
     // then call the transport protocol to stop itself.\r


@@ -984,24 +984,24 @@ USBMassDriverBindingStop (
     if (EFI_ERROR (Status)) {\r
       return Status;\r
     }\r
     if (EFI_ERROR (Status)) {\r
       return Status;\r
     }\r

-  \r
+\r

     gBS->CloseProtocol (\r
           Controller,\r
           &gEfiUsbIoProtocolGuid,\r
           This->DriverBindingHandle,\r
           Controller\r
           );\r
     gBS->CloseProtocol (\r
           Controller,\r
           &gEfiUsbIoProtocolGuid,\r
           This->DriverBindingHandle,\r
           Controller\r
           );\r

-  \r
+\r

     UsbMass->Transport->CleanUp (UsbMass->Context);\r
     FreePool (UsbMass);\r
     UsbMass->Transport->CleanUp (UsbMass->Context);\r
     FreePool (UsbMass);\r

-    \r
+\r

     DEBUG ((EFI_D_INFO, "Success to stop non-multi-lun root handle\n"));\r
     return EFI_SUCCESS;\r
     DEBUG ((EFI_D_INFO, "Success to stop non-multi-lun root handle\n"));\r
     return EFI_SUCCESS;\r

-  } \r
+  }\r

 \r
   //\r
   // This is a 3rd type handle(multi-lun), which needs uninstall\r
 \r
   //\r
   // This is a 3rd type handle(multi-lun), which needs uninstall\r

-  // Block I/O Protocol and Device Path Protocol, close USB I/O Protocol and \r
+  // Block I/O Protocol and Device Path Protocol, close USB I/O Protocol and\r

   // free mass device for all children.\r
   //\r
   AllChildrenStopped = TRUE;\r
   // free mass device for all children.\r
   //\r
   AllChildrenStopped = TRUE;\r


@@ -1030,7 +1030,7 @@ USBMassDriverBindingStop (
            This->DriverBindingHandle,\r
            ChildHandleBuffer[Index]\r
            );\r
            This->DriverBindingHandle,\r
            ChildHandleBuffer[Index]\r
            );\r

-  \r
+\r

     Status = gBS->UninstallMultipleProtocolInterfaces (\r
                     ChildHandleBuffer[Index],\r
                     &gEfiDevicePathProtocolGuid,\r
     Status = gBS->UninstallMultipleProtocolInterfaces (\r
                     ChildHandleBuffer[Index],\r
                     &gEfiDevicePathProtocolGuid,\r


@@ -1041,14 +1041,14 @@ USBMassDriverBindingStop (
                     &UsbMass->DiskInfo,\r
                     NULL\r
                     );\r
                     &UsbMass->DiskInfo,\r
                     NULL\r
                     );\r

-    \r
+\r

     if (EFI_ERROR (Status)) {\r
       //\r
       // Fail to uninstall Block I/O Protocol and Device Path Protocol, so re-open USB I/O Protocol by child.\r
       //\r
       AllChildrenStopped = FALSE;\r
       DEBUG ((EFI_D_ERROR, "Fail to stop No.%d multi-lun child handle when uninstalling blockio and devicepath\n", (UINT32)Index));\r
     if (EFI_ERROR (Status)) {\r
       //\r
       // Fail to uninstall Block I/O Protocol and Device Path Protocol, so re-open USB I/O Protocol by child.\r
       //\r
       AllChildrenStopped = FALSE;\r
       DEBUG ((EFI_D_ERROR, "Fail to stop No.%d multi-lun child handle when uninstalling blockio and devicepath\n", (UINT32)Index));\r

-      \r
+\r

       gBS->OpenProtocol (\r
              Controller,\r
              &gEfiUsbIoProtocolGuid,\r
       gBS->OpenProtocol (\r
              Controller,\r
              &gEfiUsbIoProtocolGuid,\r


@@ -1071,7 +1071,7 @@ USBMassDriverBindingStop (
   if (!AllChildrenStopped) {\r
     return EFI_DEVICE_ERROR;\r
   }\r
   if (!AllChildrenStopped) {\r
     return EFI_DEVICE_ERROR;\r
   }\r

-  \r
+\r

   DEBUG ((EFI_D_INFO, "Success to stop all %d multi-lun children handles\n", (UINT32) NumberOfChildren));\r
   return EFI_SUCCESS;\r
 }\r
   DEBUG ((EFI_D_INFO, "Success to stop all %d multi-lun children handles\n", (UINT32) NumberOfChildren));\r
   return EFI_SUCCESS;\r
 }\r

diff --git a/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassImpl.h b/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassImpl.h
index 0f013c1ad749a9d6a1be013b73ec66e8241a0bf3..b17d88e3977b11ce1e25c5666a939b23fbc41ad5 100644 (file)
--- a/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassImpl.h
+++ b/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassImpl.h
@@ -2,7 +2,7 @@
   Definitions of functions for Driver Binding Protocol and Block I/O Protocol,\r
   and other internal definitions.\r
 \r
   Definitions of functions for Driver Binding Protocol and Block I/O Protocol,\r
   and other internal definitions.\r
 \r

-Copyright (c) 2007 - 2011, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2007 - 2018, Intel Corporation. All rights reserved.<BR>\r

 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r


@@ -107,7 +107,7 @@ USBMassDriverBindingStop (
 /**\r
   Reset the block device.\r
 \r
 /**\r
   Reset the block device.\r
 \r

-  This function implements EFI_BLOCK_IO_PROTOCOL.Reset(). \r
+  This function implements EFI_BLOCK_IO_PROTOCOL.Reset().\r

   It resets the block device hardware.\r
   ExtendedVerification is ignored in this implementation.\r
 \r
   It resets the block device hardware.\r
   ExtendedVerification is ignored in this implementation.\r
 \r


@@ -129,7 +129,7 @@ UsbMassReset (
 /**\r
   Reads the requested number of blocks from the device.\r
 \r
 /**\r
   Reads the requested number of blocks from the device.\r
 \r

-  This function implements EFI_BLOCK_IO_PROTOCOL.ReadBlocks(). \r
+  This function implements EFI_BLOCK_IO_PROTOCOL.ReadBlocks().\r

   It reads the requested number of blocks from the device.\r
   All the blocks are read, or an error is returned.\r
 \r
   It reads the requested number of blocks from the device.\r
   All the blocks are read, or an error is returned.\r
 \r


@@ -163,7 +163,7 @@ UsbMassReadBlocks (
 /**\r
   Writes a specified number of blocks to the device.\r
 \r
 /**\r
   Writes a specified number of blocks to the device.\r
 \r

-  This function implements EFI_BLOCK_IO_PROTOCOL.WriteBlocks(). \r
+  This function implements EFI_BLOCK_IO_PROTOCOL.WriteBlocks().\r

   It writes a specified number of blocks to the device.\r
   All blocks are written, or an error is returned.\r
 \r
   It writes a specified number of blocks to the device.\r
   All blocks are written, or an error is returned.\r
 \r

diff --git a/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassStorageDxe.inf b/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassStorageDxe.inf
index 26d15c7679bf1e794473514efb1f13ac5c7fed3e..1fdd43443f12374f0a0c1be1cd02d86c45bf108d 100644 (file)
--- a/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassStorageDxe.inf
+++ b/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassStorageDxe.inf
@@ -13,7 +13,7 @@
 # 3. USB Mass Storage Class Bulk-Only Transport, Revision 1.0.\r
 # 4. UEFI Specification, v2.1\r
 #\r
 # 3. USB Mass Storage Class Bulk-Only Transport, Revision 1.0.\r
 # 4. UEFI Specification, v2.1\r
 #\r

-# Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.<BR>\r
+# Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r

 #\r
 #  This program and the accompanying materials\r
 #  are licensed and made available under the terms and conditions of the BSD License\r
 #\r
 #  This program and the accompanying materials\r
 #  are licensed and made available under the terms and conditions of the BSD License\r


@@ -40,7 +40,7 @@
 #\r
 #  VALID_ARCHITECTURES           = IA32 X64 IPF EBC\r
 #\r
 #\r
 #  VALID_ARCHITECTURES           = IA32 X64 IPF EBC\r
 #\r

-#  DRIVER_BINDING                =  gUSBMassDriverBinding                        \r
+#  DRIVER_BINDING                =  gUSBMassDriverBinding\r

 #  COMPONENT_NAME                =  gUsbMassStorageComponentName\r
 #  COMPONENT_NAME2               =  gUsbMassStorageComponentName2\r
 #\r
 #  COMPONENT_NAME                =  gUsbMassStorageComponentName\r
 #  COMPONENT_NAME2               =  gUsbMassStorageComponentName2\r
 #\r

diff --git a/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassStorageDxe.uni b/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassStorageDxe.uni
index 80960be0a50a09cd17a0351f03d310840179da41..b29a4bfcac7701fed798faf2f52d52b82a47aca5 100644 (file)
--- a/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassStorageDxe.uni
+++ b/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassStorageDxe.uni
@@ -13,13 +13,13 @@
 // 3. USB Mass Storage Class Bulk-Only Transport, Revision 1.0.\r
 // 4. UEFI Specification, v2.1\r
 //\r
 // 3. USB Mass Storage Class Bulk-Only Transport, Revision 1.0.\r
 // 4. UEFI Specification, v2.1\r
 //\r

-// Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.<BR>\r
+// Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r

 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r
 // which accompanies this distribution. The full text of the license may be found at\r
 // http://opensource.org/licenses/bsd-license.php\r
 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r
 // which accompanies this distribution. The full text of the license may be found at\r
 // http://opensource.org/licenses/bsd-license.php\r

-// \r
+//\r

 // THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 // WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 //\r
 // THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 // WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 //\r

diff --git a/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassStorageDxeExtra.uni b/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassStorageDxeExtra.uni
index 4e09a8d3e17546fda3a1bcd05a60cccaa76dc5fe..c3cba65c8fd3bb1309d21f47a9ba131f89897dbc 100644 (file)
--- a/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassStorageDxeExtra.uni
+++ b/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassStorageDxeExtra.uni
@@ -1,7 +1,7 @@
 // /** @file\r
 // UsbMassStorageDxe Localized Strings and Content\r
 //\r
 // /** @file\r
 // UsbMassStorageDxe Localized Strings and Content\r
 //\r

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

 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r
 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r


@@ -13,8 +13,8 @@
 //\r
 // **/\r
 \r
 //\r
 // **/\r
 \r

-#string STR_PROPERTIES_MODULE_NAME \r
-#language en-US \r
+#string STR_PROPERTIES_MODULE_NAME\r
+#language en-US\r

 "USB Mass Storage DXE Driver"\r
 \r
 \r
 "USB Mass Storage DXE Driver"\r
 \r
 \r

diff --git a/MdeModulePkg/Bus/Usb/UsbMouseAbsolutePointerDxe/UsbMouseAbsolutePointer.c b/MdeModulePkg/Bus/Usb/UsbMouseAbsolutePointerDxe/UsbMouseAbsolutePointer.c
index 9fe92441b819512c1a70553c94d9d3003c800336..965195ca34b496a032187f10d9f2add6b0fc3a4b 100644 (file)
--- a/MdeModulePkg/Bus/Usb/UsbMouseAbsolutePointerDxe/UsbMouseAbsolutePointer.c
+++ b/MdeModulePkg/Bus/Usb/UsbMouseAbsolutePointerDxe/UsbMouseAbsolutePointer.c
@@ -1,7 +1,7 @@
 /** @file\r
   USB Mouse Driver that manages USB mouse and produces Absolute Pointer Protocol.\r
 \r
 /** @file\r
   USB Mouse Driver that manages USB mouse and produces Absolute Pointer Protocol.\r
 \r

-Copyright (c) 2004 - 2016, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2004 - 2018, Intel Corporation. All rights reserved.<BR>\r

 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r


@@ -91,7 +91,7 @@ USBMouseAbsolutePointerDriverBindingSupported (
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r

-  \r
+\r

   //\r
   // Use the USB I/O Protocol interface to check whether Controller is\r
   // a mouse device that can be managed by this driver.\r
   //\r
   // Use the USB I/O Protocol interface to check whether Controller is\r
   // a mouse device that can be managed by this driver.\r


@@ -100,14 +100,14 @@ USBMouseAbsolutePointerDriverBindingSupported (
   if (!IsUsbMouse (UsbIo)) {\r
     Status = EFI_UNSUPPORTED;\r
   }\r
   if (!IsUsbMouse (UsbIo)) {\r
     Status = EFI_UNSUPPORTED;\r
   }\r

-  \r
+\r

   gBS->CloseProtocol (\r
         Controller,\r
         &gEfiUsbIoProtocolGuid,\r
         This->DriverBindingHandle,\r
         Controller\r
         );\r
   gBS->CloseProtocol (\r
         Controller,\r
         &gEfiUsbIoProtocolGuid,\r
         This->DriverBindingHandle,\r
         Controller\r
         );\r

-        \r
+\r

   return Status;\r
 }\r
 \r
   return Status;\r
 }\r
 \r


@@ -161,12 +161,12 @@ USBMouseAbsolutePointerDriverBindingStart (
                   (VOID **) &UsbIo,\r
                   This->DriverBindingHandle,\r
                   Controller,\r
                   (VOID **) &UsbIo,\r
                   This->DriverBindingHandle,\r
                   Controller,\r

-                  EFI_OPEN_PROTOCOL_BY_DRIVER                  \r
+                  EFI_OPEN_PROTOCOL_BY_DRIVER\r

                   );\r
   if (EFI_ERROR (Status)) {\r
     goto ErrorExit1;\r
   }\r
                   );\r
   if (EFI_ERROR (Status)) {\r
     goto ErrorExit1;\r
   }\r

-  \r
+\r

   UsbMouseAbsolutePointerDevice = AllocateZeroPool (sizeof (USB_MOUSE_ABSOLUTE_POINTER_DEV));\r
   ASSERT (UsbMouseAbsolutePointerDevice != NULL);\r
 \r
   UsbMouseAbsolutePointerDevice = AllocateZeroPool (sizeof (USB_MOUSE_ABSOLUTE_POINTER_DEV));\r
   ASSERT (UsbMouseAbsolutePointerDevice != NULL);\r
 \r


@@ -271,8 +271,8 @@ USBMouseAbsolutePointerDriverBindingStart (
   // Initialize and install EFI Absolute Pointer Protocol.\r
   //\r
   UsbMouseAbsolutePointerDevice->AbsolutePointerProtocol.GetState = GetMouseAbsolutePointerState;\r
   // Initialize and install EFI Absolute Pointer Protocol.\r
   //\r
   UsbMouseAbsolutePointerDevice->AbsolutePointerProtocol.GetState = GetMouseAbsolutePointerState;\r

-  UsbMouseAbsolutePointerDevice->AbsolutePointerProtocol.Reset   = UsbMouseAbsolutePointerReset;\r
-  UsbMouseAbsolutePointerDevice->AbsolutePointerProtocol.Mode    = &UsbMouseAbsolutePointerDevice->Mode;\r
+  UsbMouseAbsolutePointerDevice->AbsolutePointerProtocol.Reset    = UsbMouseAbsolutePointerReset;\r
+  UsbMouseAbsolutePointerDevice->AbsolutePointerProtocol.Mode    = &UsbMouseAbsolutePointerDevice->Mode;\r

 \r
   Status = gBS->CreateEvent (\r
                   EVT_NOTIFY_WAIT,\r
 \r
   Status = gBS->CreateEvent (\r
                   EVT_NOTIFY_WAIT,\r


@@ -470,7 +470,7 @@ USBMouseAbsolutePointerDriverBindingStop (
   // Free all resources.\r
   //\r
   gBS->CloseEvent (UsbMouseAbsolutePointerDevice->AbsolutePointerProtocol.WaitForInput);\r
   // Free all resources.\r
   //\r
   gBS->CloseEvent (UsbMouseAbsolutePointerDevice->AbsolutePointerProtocol.WaitForInput);\r

-  \r
+\r

   if (UsbMouseAbsolutePointerDevice->DelayedRecoveryEvent != NULL) {\r
     gBS->CloseEvent (UsbMouseAbsolutePointerDevice->DelayedRecoveryEvent);\r
     UsbMouseAbsolutePointerDevice->DelayedRecoveryEvent = NULL;\r
   if (UsbMouseAbsolutePointerDevice->DelayedRecoveryEvent != NULL) {\r
     gBS->CloseEvent (UsbMouseAbsolutePointerDevice->DelayedRecoveryEvent);\r
     UsbMouseAbsolutePointerDevice->DelayedRecoveryEvent = NULL;\r


@@ -596,7 +596,7 @@ InitializeUsbMouseDevice (
 \r
   Total = 0;\r
   Start = FALSE;\r
 \r
   Total = 0;\r
   Start = FALSE;\r

-  Head  = (USB_DESC_HEAD *)Buf;  \r
+  Head  = (USB_DESC_HEAD *)Buf;\r

   MouseHidDesc = NULL;\r
 \r
   //\r
   MouseHidDesc = NULL;\r
 \r
   //\r


@@ -784,7 +784,7 @@ OnMouseInterruptComplete (
 \r
     //\r
     // Delete & Submit this interrupt again\r
 \r
     //\r
     // Delete & Submit this interrupt again\r

-    // Handler of DelayedRecoveryEvent triggered by timer will re-submit the interrupt. \r
+    // Handler of DelayedRecoveryEvent triggered by timer will re-submit the interrupt.\r

     //\r
     UsbIo->UsbAsyncInterruptTransfer (\r
              UsbIo,\r
     //\r
     UsbIo->UsbAsyncInterruptTransfer (\r
              UsbIo,\r


@@ -856,15 +856,15 @@ OnMouseInterruptComplete (
 /**\r
   Retrieves the current state of a pointer device.\r
 \r
 /**\r
   Retrieves the current state of a pointer device.\r
 \r

-  @param  This                  A pointer to the EFI_ABSOLUTE_POINTER_PROTOCOL instance.                                   \r
+  @param  This                  A pointer to the EFI_ABSOLUTE_POINTER_PROTOCOL instance.\r

   @param  MouseState            A pointer to the state information on the pointer device.\r
 \r
   @retval EFI_SUCCESS           The state of the pointer device was returned in State.\r
   @retval EFI_NOT_READY         The state of the pointer device has not changed since the last call to\r
   @param  MouseState            A pointer to the state information on the pointer device.\r
 \r
   @retval EFI_SUCCESS           The state of the pointer device was returned in State.\r
   @retval EFI_NOT_READY         The state of the pointer device has not changed since the last call to\r

-                                GetState().                                                           \r
+                                GetState().\r

   @retval EFI_DEVICE_ERROR      A device error occurred while attempting to retrieve the pointer device's\r
   @retval EFI_DEVICE_ERROR      A device error occurred while attempting to retrieve the pointer device's\r

-                                current state.                                                           \r
-  @retval EFI_INVALID_PARAMETER State is NULL.                                                           \r
+                                current state.\r
+  @retval EFI_INVALID_PARAMETER State is NULL.\r

 \r
 **/\r
 EFI_STATUS\r
 \r
 **/\r
 EFI_STATUS\r

diff --git a/MdeModulePkg/Bus/Usb/UsbMouseAbsolutePointerDxe/UsbMouseAbsolutePointer.h b/MdeModulePkg/Bus/Usb/UsbMouseAbsolutePointerDxe/UsbMouseAbsolutePointer.h
index 08b8d56dd8f7e2d4a5328b6d95cc4632bcd64959..b1ea7d2b748c1d464b6dad96f442151b4f808061 100644 (file)
--- a/MdeModulePkg/Bus/Usb/UsbMouseAbsolutePointerDxe/UsbMouseAbsolutePointer.h
+++ b/MdeModulePkg/Bus/Usb/UsbMouseAbsolutePointerDxe/UsbMouseAbsolutePointer.h
@@ -1,7 +1,7 @@
 /** @file\r
   Helper routine and corresponding data struct used by USB Mouse Absolute Pointer Driver.\r
 \r
 /** @file\r
   Helper routine and corresponding data struct used by USB Mouse Absolute Pointer Driver.\r
 \r

-Copyright (c) 2004 - 2012, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2004 - 2018, Intel Corporation. All rights reserved.<BR>\r

 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r


@@ -311,15 +311,15 @@ UsbMouseAbsolutePointerComponentNameGetControllerName (
 /**\r
   Retrieves the current state of a pointer device.\r
 \r
 /**\r
   Retrieves the current state of a pointer device.\r
 \r

-  @param  This                  A pointer to the EFI_ABSOLUTE_POINTER_PROTOCOL instance.                                   \r
+  @param  This                  A pointer to the EFI_ABSOLUTE_POINTER_PROTOCOL instance.\r

   @param  MouseState            A pointer to the state information on the pointer device.\r
 \r
   @retval EFI_SUCCESS           The state of the pointer device was returned in State.\r
   @retval EFI_NOT_READY         The state of the pointer device has not changed since the last call to\r
   @param  MouseState            A pointer to the state information on the pointer device.\r
 \r
   @retval EFI_SUCCESS           The state of the pointer device was returned in State.\r
   @retval EFI_NOT_READY         The state of the pointer device has not changed since the last call to\r

-                                GetState().                                                           \r
+                                GetState().\r

   @retval EFI_DEVICE_ERROR      A device error occurred while attempting to retrieve the pointer device's\r
   @retval EFI_DEVICE_ERROR      A device error occurred while attempting to retrieve the pointer device's\r

-                                current state.                                                           \r
-  @retval EFI_INVALID_PARAMETER State is NULL.                                                           \r
+                                current state.\r
+  @retval EFI_INVALID_PARAMETER State is NULL.\r

 \r
 **/\r
 EFI_STATUS\r
 \r
 **/\r
 EFI_STATUS\r

diff --git a/MdeModulePkg/Bus/Usb/UsbMouseAbsolutePointerDxe/UsbMouseAbsolutePointerDxe.inf b/MdeModulePkg/Bus/Usb/UsbMouseAbsolutePointerDxe/UsbMouseAbsolutePointerDxe.inf
index af10382d525a6d01c9b6238a61fc3826b542669d..10e74b9783073ac3cd9cba2b5e9d9046849f1090 100644 (file)
--- a/MdeModulePkg/Bus/Usb/UsbMouseAbsolutePointerDxe/UsbMouseAbsolutePointerDxe.inf
+++ b/MdeModulePkg/Bus/Usb/UsbMouseAbsolutePointerDxe/UsbMouseAbsolutePointerDxe.inf
@@ -9,7 +9,7 @@
 # 1. Universal Serial Bus HID Firmware Specification, ver 1.11\r
 # 2. UEFI Specification, v2.1\r
 #\r
 # 1. Universal Serial Bus HID Firmware Specification, ver 1.11\r
 # 2. UEFI Specification, v2.1\r
 #\r

-# Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.<BR>\r
+# Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r

 #\r
 #  This program and the accompanying materials\r
 #  are licensed and made available under the terms and conditions of the BSD License\r
 #\r
 #  This program and the accompanying materials\r
 #  are licensed and made available under the terms and conditions of the BSD License\r


@@ -36,7 +36,7 @@
 #\r
 #  VALID_ARCHITECTURES           = IA32 X64 IPF EBC\r
 #\r
 #\r
 #  VALID_ARCHITECTURES           = IA32 X64 IPF EBC\r
 #\r

-#  DRIVER_BINDING                =  gUsbMouseAbsolutePointerDriverBinding                        \r
+#  DRIVER_BINDING                =  gUsbMouseAbsolutePointerDriverBinding\r

 #  COMPONENT_NAME                =  gUsbMouseAbsolutePointerComponentName\r
 #  COMPONENT_NAME2               =  gUsbMouseAbsolutePointerComponentName2\r
 #\r
 #  COMPONENT_NAME                =  gUsbMouseAbsolutePointerComponentName\r
 #  COMPONENT_NAME2               =  gUsbMouseAbsolutePointerComponentName2\r
 #\r

diff --git a/MdeModulePkg/Bus/Usb/UsbMouseAbsolutePointerDxe/UsbMouseAbsolutePointerDxe.uni b/MdeModulePkg/Bus/Usb/UsbMouseAbsolutePointerDxe/UsbMouseAbsolutePointerDxe.uni
index f3d1b1d64d70f3922a298bdd0c9636079189275e..327021327d9dafb36c6899703c5f67eebb8ad10c 100644 (file)
--- a/MdeModulePkg/Bus/Usb/UsbMouseAbsolutePointerDxe/UsbMouseAbsolutePointerDxe.uni
+++ b/MdeModulePkg/Bus/Usb/UsbMouseAbsolutePointerDxe/UsbMouseAbsolutePointerDxe.uni
@@ -9,13 +9,13 @@
 // 1. Universal Serial Bus HID Firmware Specification, ver 1.11\r
 // 2. UEFI Specification, v2.1\r
 //\r
 // 1. Universal Serial Bus HID Firmware Specification, ver 1.11\r
 // 2. UEFI Specification, v2.1\r
 //\r

-// Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.<BR>\r
+// Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r

 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r
 // which accompanies this distribution. The full text of the license may be found at\r
 // http://opensource.org/licenses/bsd-license.php\r
 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r
 // which accompanies this distribution. The full text of the license may be found at\r
 // http://opensource.org/licenses/bsd-license.php\r

-// \r
+//\r

 // THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 // WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 //\r
 // THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 // WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 //\r

diff --git a/MdeModulePkg/Bus/Usb/UsbMouseAbsolutePointerDxe/UsbMouseAbsolutePointerDxeExtra.uni b/MdeModulePkg/Bus/Usb/UsbMouseAbsolutePointerDxe/UsbMouseAbsolutePointerDxeExtra.uni
index ea9f4d9659dcc30f215d22363db0e9cae2e19a46..ab9b12ab99df10f066868085b1144e16ff415985 100644 (file)
--- a/MdeModulePkg/Bus/Usb/UsbMouseAbsolutePointerDxe/UsbMouseAbsolutePointerDxeExtra.uni
+++ b/MdeModulePkg/Bus/Usb/UsbMouseAbsolutePointerDxe/UsbMouseAbsolutePointerDxeExtra.uni
@@ -1,7 +1,7 @@
 // /** @file\r
 // UsbMouseAbsolutePointerDxe Localized Strings and Content\r
 //\r
 // /** @file\r
 // UsbMouseAbsolutePointerDxe Localized Strings and Content\r
 //\r

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

 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r
 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r


@@ -13,8 +13,8 @@
 //\r
 // **/\r
 \r
 //\r
 // **/\r
 \r

-#string STR_PROPERTIES_MODULE_NAME \r
-#language en-US \r
+#string STR_PROPERTIES_MODULE_NAME\r
+#language en-US\r

 "USB Tablet Pointer DXE Driver"\r
 \r
 \r
 "USB Tablet Pointer DXE Driver"\r
 \r
 \r

diff --git a/MdeModulePkg/Bus/Usb/UsbMouseDxe/MouseHid.c b/MdeModulePkg/Bus/Usb/UsbMouseDxe/MouseHid.c
index ec6a420c14351749ad6353b4bb0e727b5c7191b2..2594b7b2f0cb395b15f8557a97317d821d0cab68 100644 (file)
--- a/MdeModulePkg/Bus/Usb/UsbMouseDxe/MouseHid.c
+++ b/MdeModulePkg/Bus/Usb/UsbMouseDxe/MouseHid.c
@@ -1,7 +1,7 @@
 /** @file\r
   Helper functions to parse HID report descriptor and items.\r
 \r
 /** @file\r
   Helper functions to parse HID report descriptor and items.\r
 \r

-Copyright (c) 2004 - 2010, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2004 - 2018, Intel Corporation. All rights reserved.<BR>\r

 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r


@@ -160,7 +160,7 @@ GetItemData (
   There are three item types: Main, Global, and Local.\r
   This function parses these types of HID items according\r
   to tag info.\r
   There are three item types: Main, Global, and Local.\r
   This function parses these types of HID items according\r
   to tag info.\r

-  \r
+\r

   @param  UsbMouse          The instance of USB_MOUSE_DEV\r
   @param  HidItem           The HID item to parse\r
 \r
   @param  UsbMouse          The instance of USB_MOUSE_DEV\r
   @param  HidItem           The HID item to parse\r
 \r

diff --git a/MdeModulePkg/Bus/Usb/UsbMouseDxe/UsbMouse.c b/MdeModulePkg/Bus/Usb/UsbMouseDxe/UsbMouse.c
index 0ad5616d966113ad42b7cac7a7fda17a31789f95..9324994975bc01b55301442ed069cb83c5f69b66 100644 (file)
--- a/MdeModulePkg/Bus/Usb/UsbMouseDxe/UsbMouse.c
+++ b/MdeModulePkg/Bus/Usb/UsbMouseDxe/UsbMouse.c
@@ -1,7 +1,7 @@
 /** @file\r
   USB Mouse Driver that manages USB mouse and produces Simple Pointer Protocol.\r
 \r
 /** @file\r
   USB Mouse Driver that manages USB mouse and produces Simple Pointer Protocol.\r
 \r

-Copyright (c) 2004 - 2012, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2004 - 2018, Intel Corporation. All rights reserved.<BR>\r

 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r


@@ -335,7 +335,7 @@ USBMouseDriverBindingStart (
            );\r
     goto ErrorExit;\r
   }\r
            );\r
     goto ErrorExit;\r
   }\r

-  \r
+\r

   UsbMouseDevice->ControllerNameTable = NULL;\r
   AddUnicodeString2 (\r
     "eng",\r
   UsbMouseDevice->ControllerNameTable = NULL;\r
   AddUnicodeString2 (\r
     "eng",\r


@@ -596,7 +596,7 @@ InitializeUsbMouseDevice (
 \r
   Total = 0;\r
   Start = FALSE;\r
 \r
   Total = 0;\r
   Start = FALSE;\r

-  Head  = (USB_DESC_HEAD *)Buf;  \r
+  Head  = (USB_DESC_HEAD *)Buf;\r

   MouseHidDesc = NULL;\r
 \r
   //\r
   MouseHidDesc = NULL;\r
 \r
   //\r


@@ -782,7 +782,7 @@ OnMouseInterruptComplete (
 \r
     //\r
     // Delete & Submit this interrupt again\r
 \r
     //\r
     // Delete & Submit this interrupt again\r

-    // Handler of DelayedRecoveryEvent triggered by timer will re-submit the interrupt. \r
+    // Handler of DelayedRecoveryEvent triggered by timer will re-submit the interrupt.\r

     //\r
     UsbIo->UsbAsyncInterruptTransfer (\r
              UsbIo,\r
     //\r
     UsbIo->UsbAsyncInterruptTransfer (\r
              UsbIo,\r


@@ -839,16 +839,16 @@ OnMouseInterruptComplete (
 \r
 /**\r
   Retrieves the current state of a pointer device.\r
 \r
 /**\r
   Retrieves the current state of a pointer device.\r

-    \r
-  @param  This                  A pointer to the EFI_SIMPLE_POINTER_PROTOCOL instance.                                   \r
+\r
+  @param  This                  A pointer to the EFI_SIMPLE_POINTER_PROTOCOL instance.\r

   @param  MouseState            A pointer to the state information on the pointer device.\r
   @param  MouseState            A pointer to the state information on the pointer device.\r

-                                \r
+\r

   @retval EFI_SUCCESS           The state of the pointer device was returned in State.\r
   @retval EFI_NOT_READY         The state of the pointer device has not changed since the last call to\r
   @retval EFI_SUCCESS           The state of the pointer device was returned in State.\r
   @retval EFI_NOT_READY         The state of the pointer device has not changed since the last call to\r

-                                GetState().                                                           \r
+                                GetState().\r

   @retval EFI_DEVICE_ERROR      A device error occurred while attempting to retrieve the pointer device's\r
   @retval EFI_DEVICE_ERROR      A device error occurred while attempting to retrieve the pointer device's\r

-                                current state.                                                           \r
-  @retval EFI_INVALID_PARAMETER MouseState is NULL.                                                           \r
+                                current state.\r
+  @retval EFI_INVALID_PARAMETER MouseState is NULL.\r

 \r
 **/\r
 EFI_STATUS\r
 \r
 **/\r
 EFI_STATUS\r


@@ -892,13 +892,13 @@ GetMouseState (
 }\r
 \r
 \r
 }\r
 \r
 \r

-/**                                                                 \r
+/**\r

   Resets the pointer device hardware.\r
   Resets the pointer device hardware.\r

-  \r
+\r

   @param  This                  A pointer to the EFI_SIMPLE_POINTER_PROTOCOL instance.\r
   @param  ExtendedVerification  Indicates that the driver may perform a more exhaustive\r
                                 verification operation of the device during reset.\r
   @param  This                  A pointer to the EFI_SIMPLE_POINTER_PROTOCOL instance.\r
   @param  ExtendedVerification  Indicates that the driver may perform a more exhaustive\r
                                 verification operation of the device during reset.\r

-                                \r
+\r

   @retval EFI_SUCCESS           The device was reset.\r
   @retval EFI_DEVICE_ERROR      The device is not functioning correctly and could not be reset.\r
 \r
   @retval EFI_SUCCESS           The device was reset.\r
   @retval EFI_DEVICE_ERROR      The device is not functioning correctly and could not be reset.\r
 \r


@@ -937,7 +937,7 @@ UsbMouseReset (
 \r
   @param  Event        Event to be signaled when there's input from mouse.\r
   @param  Context      Points to USB_MOUSE_DEV instance.\r
 \r
   @param  Event        Event to be signaled when there's input from mouse.\r
   @param  Context      Points to USB_MOUSE_DEV instance.\r

- \r
+\r

 **/\r
 VOID\r
 EFIAPI\r
 **/\r
 VOID\r
 EFIAPI\r

diff --git a/MdeModulePkg/Bus/Usb/UsbMouseDxe/UsbMouse.h b/MdeModulePkg/Bus/Usb/UsbMouseDxe/UsbMouse.h
index 0dab9de11d8f1d3a592d9159b51e49d3c736e20f..b0484d93babff68e5f897a15329b78f90d41e23e 100644 (file)
--- a/MdeModulePkg/Bus/Usb/UsbMouseDxe/UsbMouse.h
+++ b/MdeModulePkg/Bus/Usb/UsbMouseDxe/UsbMouse.h
@@ -1,7 +1,7 @@
 /** @file\r
   Helper routine and corresponding data struct used by USB Mouse Driver.\r
 \r
 /** @file\r
   Helper routine and corresponding data struct used by USB Mouse Driver.\r
 \r

-Copyright (c) 2004 - 2012, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2004 - 2018, Intel Corporation. All rights reserved.<BR>\r

 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r


@@ -310,16 +310,16 @@ UsbMouseComponentNameGetControllerName (
 \r
 /**\r
   Retrieves the current state of a pointer device.\r
 \r
 /**\r
   Retrieves the current state of a pointer device.\r

-    \r
-  @param  This                  A pointer to the EFI_SIMPLE_POINTER_PROTOCOL instance.                                   \r
+\r
+  @param  This                  A pointer to the EFI_SIMPLE_POINTER_PROTOCOL instance.\r

   @param  MouseState            A pointer to the state information on the pointer device.\r
   @param  MouseState            A pointer to the state information on the pointer device.\r

-                                \r
+\r

   @retval EFI_SUCCESS           The state of the pointer device was returned in State.\r
   @retval EFI_NOT_READY         The state of the pointer device has not changed since the last call to\r
   @retval EFI_SUCCESS           The state of the pointer device was returned in State.\r
   @retval EFI_NOT_READY         The state of the pointer device has not changed since the last call to\r

-                                GetState().                                                           \r
+                                GetState().\r

   @retval EFI_DEVICE_ERROR      A device error occurred while attempting to retrieve the pointer device's\r
   @retval EFI_DEVICE_ERROR      A device error occurred while attempting to retrieve the pointer device's\r

-                                current state.                                                           \r
-  @retval EFI_INVALID_PARAMETER MouseState is NULL.                                                           \r
+                                current state.\r
+  @retval EFI_INVALID_PARAMETER MouseState is NULL.\r

 \r
 **/\r
 EFI_STATUS\r
 \r
 **/\r
 EFI_STATUS\r


@@ -329,13 +329,13 @@ GetMouseState (
   OUT  EFI_SIMPLE_POINTER_STATE     *MouseState\r
   );\r
 \r
   OUT  EFI_SIMPLE_POINTER_STATE     *MouseState\r
   );\r
 \r

-/**                                                                 \r
+/**\r

   Resets the pointer device hardware.\r
   Resets the pointer device hardware.\r

-  \r
+\r

   @param  This                  A pointer to the EFI_SIMPLE_POINTER_PROTOCOL instance.\r
   @param  ExtendedVerification  Indicates that the driver may perform a more exhaustive\r
                                 verification operation of the device during reset.\r
   @param  This                  A pointer to the EFI_SIMPLE_POINTER_PROTOCOL instance.\r
   @param  ExtendedVerification  Indicates that the driver may perform a more exhaustive\r
                                 verification operation of the device during reset.\r

-                                \r
+\r

   @retval EFI_SUCCESS           The device was reset.\r
   @retval EFI_DEVICE_ERROR      The device is not functioning correctly and could not be reset.\r
 \r
   @retval EFI_SUCCESS           The device was reset.\r
   @retval EFI_DEVICE_ERROR      The device is not functioning correctly and could not be reset.\r
 \r


@@ -352,7 +352,7 @@ UsbMouseReset (
 \r
   @param  Event        Event to be signaled when there's input from mouse.\r
   @param  Context      Points to USB_MOUSE_DEV instance.\r
 \r
   @param  Event        Event to be signaled when there's input from mouse.\r
   @param  Context      Points to USB_MOUSE_DEV instance.\r

- \r
+\r

 **/\r
 VOID\r
 EFIAPI\r
 **/\r
 VOID\r
 EFIAPI\r

diff --git a/MdeModulePkg/Bus/Usb/UsbMouseDxe/UsbMouseDxe.inf b/MdeModulePkg/Bus/Usb/UsbMouseDxe/UsbMouseDxe.inf
index 13d8859f98640b2587fc48ef13a23022a47ba113..5bea024d20c50d3688715f404f723700f07a0ff8 100644 (file)
--- a/MdeModulePkg/Bus/Usb/UsbMouseDxe/UsbMouseDxe.inf
+++ b/MdeModulePkg/Bus/Usb/UsbMouseDxe/UsbMouseDxe.inf
@@ -9,7 +9,7 @@
 # 1. Universal Serial Bus HID Firmware Specification, ver 1.11\r
 # 2. UEFI Specification, v2.1\r
 #\r
 # 1. Universal Serial Bus HID Firmware Specification, ver 1.11\r
 # 2. UEFI Specification, v2.1\r
 #\r

-# Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.<BR>\r
+# Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r

 #\r
 #  This program and the accompanying materials\r
 #  are licensed and made available under the terms and conditions of the BSD License\r
 #\r
 #  This program and the accompanying materials\r
 #  are licensed and made available under the terms and conditions of the BSD License\r


@@ -36,7 +36,7 @@
 #\r
 #  VALID_ARCHITECTURES           = IA32 X64 IPF EBC\r
 #\r
 #\r
 #  VALID_ARCHITECTURES           = IA32 X64 IPF EBC\r
 #\r

-#  DRIVER_BINDING                =  gUsbMouseDriverBinding                        \r
+#  DRIVER_BINDING                =  gUsbMouseDriverBinding\r

 #  COMPONENT_NAME                =  gUsbMouseComponentName\r
 #  COMPONENT_NAME2               =  gUsbMouseComponentName2\r
 #\r
 #  COMPONENT_NAME                =  gUsbMouseComponentName\r
 #  COMPONENT_NAME2               =  gUsbMouseComponentName2\r
 #\r

diff --git a/MdeModulePkg/Bus/Usb/UsbMouseDxe/UsbMouseDxe.uni b/MdeModulePkg/Bus/Usb/UsbMouseDxe/UsbMouseDxe.uni
index a7313ce7a66455af9c3a9de6c27479a32bb9a2b8..8d04b8eb47e47aa652470d22534ad9335cf1a39d 100644 (file)
--- a/MdeModulePkg/Bus/Usb/UsbMouseDxe/UsbMouseDxe.uni
+++ b/MdeModulePkg/Bus/Usb/UsbMouseDxe/UsbMouseDxe.uni
@@ -9,13 +9,13 @@
 // 1. Universal Serial Bus HID Firmware Specification, ver 1.11\r
 // 2. UEFI Specification, v2.1\r
 //\r
 // 1. Universal Serial Bus HID Firmware Specification, ver 1.11\r
 // 2. UEFI Specification, v2.1\r
 //\r

-// Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.<BR>\r
+// Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r

 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r
 // which accompanies this distribution. The full text of the license may be found at\r
 // http://opensource.org/licenses/bsd-license.php\r
 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r
 // which accompanies this distribution. The full text of the license may be found at\r
 // http://opensource.org/licenses/bsd-license.php\r

-// \r
+//\r

 // THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 // WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 //\r
 // THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 // WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 //\r

diff --git a/MdeModulePkg/Bus/Usb/UsbMouseDxe/UsbMouseDxeExtra.uni b/MdeModulePkg/Bus/Usb/UsbMouseDxe/UsbMouseDxeExtra.uni
index 49769a99e799fbe0a4fae697f8b911f2fa59f980..28f3ea37ab34755c2f0254756c317d9151b6764a 100644 (file)
--- a/MdeModulePkg/Bus/Usb/UsbMouseDxe/UsbMouseDxeExtra.uni
+++ b/MdeModulePkg/Bus/Usb/UsbMouseDxe/UsbMouseDxeExtra.uni
@@ -1,7 +1,7 @@
 // /** @file\r
 // UsbMouseDxe Localized Strings and Content\r
 //\r
 // /** @file\r
 // UsbMouseDxe Localized Strings and Content\r
 //\r

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

 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r
 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r


@@ -13,8 +13,8 @@
 //\r
 // **/\r
 \r
 //\r
 // **/\r
 \r

-#string STR_PROPERTIES_MODULE_NAME \r
-#language en-US \r
+#string STR_PROPERTIES_MODULE_NAME\r
+#language en-US\r

 "USB Mouse DXE Driver"\r
 \r
 \r
 "USB Mouse DXE Driver"\r
 \r
 \r

diff --git a/MdeModulePkg/Core/Dxe/Dispatcher/Dependency.c b/MdeModulePkg/Core/Dxe/Dispatcher/Dependency.c
index 1d8a57b87984f655cbbfa0c6620efce1885b2579..0afed413fdac641f77939771d22406fc0d7e6811 100644 (file)
--- a/MdeModulePkg/Core/Dxe/Dispatcher/Dependency.c
+++ b/MdeModulePkg/Core/Dxe/Dispatcher/Dependency.c
@@ -5,7 +5,7 @@
   if a driver can be scheduled for execution.  The criteria for\r
   schedulability is that the dependency expression is satisfied.\r
 \r
   if a driver can be scheduled for execution.  The criteria for\r
   schedulability is that the dependency expression is satisfied.\r
 \r

-Copyright (c) 2006 - 2010, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r

 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r


@@ -409,7 +409,7 @@ CoreIsSchedulable (
     case EFI_DEP_REPLACE_TRUE:\r
       CopyMem (&DriverGuid, Iterator + 1, sizeof (EFI_GUID));\r
       DEBUG ((DEBUG_DISPATCH, "  PUSH GUID(%g) = TRUE\n", &DriverGuid));\r
     case EFI_DEP_REPLACE_TRUE:\r
       CopyMem (&DriverGuid, Iterator + 1, sizeof (EFI_GUID));\r
       DEBUG ((DEBUG_DISPATCH, "  PUSH GUID(%g) = TRUE\n", &DriverGuid));\r

-      \r
+\r

       Status = PushBool (TRUE);\r
       if (EFI_ERROR (Status)) {\r
         DEBUG ((DEBUG_DISPATCH, "  RESULT = FALSE (Unexpected error)\n"));\r
       Status = PushBool (TRUE);\r
       if (EFI_ERROR (Status)) {\r
         DEBUG ((DEBUG_DISPATCH, "  RESULT = FALSE (Unexpected error)\n"));\r

diff --git a/MdeModulePkg/Core/Dxe/Dispatcher/Dispatcher.c b/MdeModulePkg/Core/Dxe/Dispatcher/Dispatcher.c
index 4c6ca761a6054b7b2605ffd1a4e7ddb7c61accab..f72c47a9e54ccb6d5f2a35d32305d56ddcf16453 100644 (file)
--- a/MdeModulePkg/Core/Dxe/Dispatcher/Dispatcher.c
+++ b/MdeModulePkg/Core/Dxe/Dispatcher/Dispatcher.c
@@ -26,7 +26,7 @@
   Depex - Dependency Expresion.\r
   SOR   - Schedule On Request - Don't schedule if this bit is set.\r
 \r
   Depex - Dependency Expresion.\r
   SOR   - Schedule On Request - Don't schedule if this bit is set.\r
 \r

-Copyright (c) 2006 - 2017, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r

 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r


@@ -335,13 +335,13 @@ CoreSchedule (
       CoreReleaseDispatcherLock ();\r
 \r
       DEBUG ((DEBUG_DISPATCH, "Schedule FFS(%g) - EFI_SUCCESS\n", DriverName));\r
       CoreReleaseDispatcherLock ();\r
 \r
       DEBUG ((DEBUG_DISPATCH, "Schedule FFS(%g) - EFI_SUCCESS\n", DriverName));\r

-      \r
+\r

       return EFI_SUCCESS;\r
     }\r
   }\r
       return EFI_SUCCESS;\r
     }\r
   }\r

-  \r
+\r

   DEBUG ((DEBUG_DISPATCH, "Schedule FFS(%g) - EFI_NOT_FOUND\n", DriverName));\r
   DEBUG ((DEBUG_DISPATCH, "Schedule FFS(%g) - EFI_NOT_FOUND\n", DriverName));\r

-  \r
+\r

   return EFI_NOT_FOUND;\r
 }\r
 \r
   return EFI_NOT_FOUND;\r
 }\r
 \r


@@ -418,7 +418,7 @@ CoreDispatcher (
   EFI_CORE_DRIVER_ENTRY           *DriverEntry;\r
   BOOLEAN                         ReadyToRun;\r
   EFI_EVENT                       DxeDispatchEvent;\r
   EFI_CORE_DRIVER_ENTRY           *DriverEntry;\r
   BOOLEAN                         ReadyToRun;\r
   EFI_EVENT                       DxeDispatchEvent;\r

-  \r
+\r

   PERF_FUNCTION_BEGIN ();\r
 \r
   if (gDispatcherRunning) {\r
   PERF_FUNCTION_BEGIN ();\r
 \r
   if (gDispatcherRunning) {\r


@@ -512,10 +512,10 @@ CoreDispatcher (
 \r
       CoreReleaseDispatcherLock ();\r
 \r
 \r
       CoreReleaseDispatcherLock ();\r
 \r

- \r
+\r

       if (DriverEntry->IsFvImage) {\r
         //\r
       if (DriverEntry->IsFvImage) {\r
         //\r

-        // Produce a firmware volume block protocol for FvImage so it gets dispatched from. \r
+        // Produce a firmware volume block protocol for FvImage so it gets dispatched from.\r

         //\r
         Status = CoreProcessFvImageFile (DriverEntry->Fv, DriverEntry->FvHandle, &DriverEntry->FileName);\r
       } else {\r
         //\r
         Status = CoreProcessFvImageFile (DriverEntry->Fv, DriverEntry->FvHandle, &DriverEntry->FileName);\r
       } else {\r


@@ -526,9 +526,9 @@ CoreDispatcher (
           sizeof (DriverEntry->ImageHandle)\r
           );\r
         ASSERT (DriverEntry->ImageHandle != NULL);\r
           sizeof (DriverEntry->ImageHandle)\r
           );\r
         ASSERT (DriverEntry->ImageHandle != NULL);\r

-  \r
+\r

         Status = CoreStartImage (DriverEntry->ImageHandle, NULL, NULL);\r
         Status = CoreStartImage (DriverEntry->ImageHandle, NULL, NULL);\r

-  \r
+\r

         REPORT_STATUS_CODE_WITH_EXTENDED_DATA (\r
           EFI_PROGRESS_CODE,\r
           (EFI_SOFTWARE_DXE_CORE | EFI_SW_PC_INIT_END),\r
         REPORT_STATUS_CODE_WITH_EXTENDED_DATA (\r
           EFI_PROGRESS_CODE,\r
           (EFI_SOFTWARE_DXE_CORE | EFI_SW_PC_INIT_END),\r


@@ -692,17 +692,17 @@ FvHasBeenProcessed (
 \r
 /**\r
   Remember that Fv protocol on FvHandle has had it's drivers placed on the\r
 \r
 /**\r
   Remember that Fv protocol on FvHandle has had it's drivers placed on the\r

-  mDiscoveredList. This fucntion adds entries on the mFvHandleList if new \r
+  mDiscoveredList. This fucntion adds entries on the mFvHandleList if new\r

   entry is different from one in mFvHandleList by checking FvImage Guid.\r
   Items are never removed/freed from the mFvHandleList.\r
 \r
   @param  FvHandle              The handle of a FV that has been processed\r
 \r
   @return A point to new added FvHandle entry. If FvHandle with the same FvImage guid\r
   entry is different from one in mFvHandleList by checking FvImage Guid.\r
   Items are never removed/freed from the mFvHandleList.\r
 \r
   @param  FvHandle              The handle of a FV that has been processed\r
 \r
   @return A point to new added FvHandle entry. If FvHandle with the same FvImage guid\r

-          has been added, NULL will return. \r
+          has been added, NULL will return.\r

 \r
 **/\r
 \r
 **/\r

-KNOWN_HANDLE * \r
+KNOWN_HANDLE *\r

 FvIsBeingProcesssed (\r
   IN  EFI_HANDLE    FvHandle\r
   )\r
 FvIsBeingProcesssed (\r
   IN  EFI_HANDLE    FvHandle\r
   )\r


@@ -1247,7 +1247,7 @@ CoreFwVolEventProtocolNotify (
     KnownHandle = FvIsBeingProcesssed (FvHandle);\r
     if (KnownHandle == NULL) {\r
       //\r
     KnownHandle = FvIsBeingProcesssed (FvHandle);\r
     if (KnownHandle == NULL) {\r
       //\r

-      // The FV with the same FV name guid has already been processed. \r
+      // The FV with the same FV name guid has already been processed.\r

       // So lets skip it!\r
       //\r
       continue;\r
       // So lets skip it!\r
       //\r
       continue;\r


@@ -1337,7 +1337,7 @@ CoreFwVolEventProtocolNotify (
             if (!EFI_ERROR (Status)) {\r
               //\r
               // If SMM depex section is found, this FV image is invalid to be supported.\r
             if (!EFI_ERROR (Status)) {\r
               //\r
               // If SMM depex section is found, this FV image is invalid to be supported.\r

-              // ASSERT FALSE to report this FV image.  \r
+              // ASSERT FALSE to report this FV image.\r

               //\r
               FreePool (DepexBuffer);\r
               ASSERT (FALSE);\r
               //\r
               FreePool (DepexBuffer);\r
               ASSERT (FALSE);\r


@@ -1359,7 +1359,7 @@ CoreFwVolEventProtocolNotify (
                            );\r
             if (EFI_ERROR (Status)) {\r
               //\r
                            );\r
             if (EFI_ERROR (Status)) {\r
               //\r

-              // If no depex section, produce a firmware volume block protocol for it so it gets dispatched from. \r
+              // If no depex section, produce a firmware volume block protocol for it so it gets dispatched from.\r

               //\r
               CoreProcessFvImageFile (Fv, FvHandle, &NameGuid);\r
             } else {\r
               //\r
               CoreProcessFvImageFile (Fv, FvHandle, &NameGuid);\r
             } else {\r

diff --git a/MdeModulePkg/Core/Dxe/DxeCore.uni b/MdeModulePkg/Core/Dxe/DxeCore.uni
index 0b4450dbbe641ca401b701a7136631c6681dd948..f4386e36092a7cf3ec18aad43b566170cfe3e622 100644 (file)
--- a/MdeModulePkg/Core/Dxe/DxeCore.uni
+++ b/MdeModulePkg/Core/Dxe/DxeCore.uni
@@ -3,13 +3,13 @@
 //\r
 // It provides an implementation of DXE Core that is compliant with DXE CIS.\r
 //\r
 //\r
 // It provides an implementation of DXE Core that is compliant with DXE CIS.\r
 //\r

-// Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.<BR>\r
+// Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r

 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r
 // which accompanies this distribution.  The full text of the license may be found at\r
 // http://opensource.org/licenses/bsd-license.php\r
 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r
 // which accompanies this distribution.  The full text of the license may be found at\r
 // http://opensource.org/licenses/bsd-license.php\r

-// \r
+//\r

 // THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 // WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 //\r
 // THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 // WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 //\r

diff --git a/MdeModulePkg/Core/Dxe/DxeCoreExtra.uni b/MdeModulePkg/Core/Dxe/DxeCoreExtra.uni
index d04eaf4958db114fac22fd0feedda94e04380b51..e26f39cba2d1a75de52903e6955c997c9a2a2a23 100644 (file)
--- a/MdeModulePkg/Core/Dxe/DxeCoreExtra.uni
+++ b/MdeModulePkg/Core/Dxe/DxeCoreExtra.uni
@@ -1,7 +1,7 @@
 // /** @file\r
 // DxeCore Localized Strings and Content\r
 //\r
 // /** @file\r
 // DxeCore Localized Strings and Content\r
 //\r

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

 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r
 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r


@@ -13,8 +13,8 @@
 //\r
 // **/\r
 \r
 //\r
 // **/\r
 \r

-#string STR_PROPERTIES_MODULE_NAME \r
-#language en-US \r
+#string STR_PROPERTIES_MODULE_NAME\r
+#language en-US\r

 "Core DXE Services Driver"\r
 \r
 \r
 "Core DXE Services Driver"\r
 \r
 \r

diff --git a/MdeModulePkg/Core/Dxe/DxeMain.h b/MdeModulePkg/Core/Dxe/DxeMain.h
index 07b86ba696da523882dc3a35c54ae9c9e06e63f6..7ec82388a3f9f05fc0aa9c60b7f7b5ed9068b62a 100644 (file)
--- a/MdeModulePkg/Core/Dxe/DxeMain.h
+++ b/MdeModulePkg/Core/Dxe/DxeMain.h
@@ -2,7 +2,7 @@
   The internal header file includes the common header files, defines\r
   internal structure and functions used by DxeCore module.\r
 \r
   The internal header file includes the common header files, defines\r
   internal structure and functions used by DxeCore module.\r
 \r

-Copyright (c) 2006 - 2017, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r

 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r


@@ -198,43 +198,43 @@ typedef struct {
 typedef struct {\r
   UINTN                       Signature;\r
   /// Image handle\r
 typedef struct {\r
   UINTN                       Signature;\r
   /// Image handle\r

-  EFI_HANDLE                  Handle;   \r
+  EFI_HANDLE                  Handle;\r

   /// Image type\r
   /// Image type\r

-  UINTN                       Type;           \r
+  UINTN                       Type;\r

   /// If entrypoint has been called\r
   /// If entrypoint has been called\r

-  BOOLEAN                     Started;        \r
+  BOOLEAN                     Started;\r

   /// The image's entry point\r
   /// The image's entry point\r

-  EFI_IMAGE_ENTRY_POINT       EntryPoint;     \r
+  EFI_IMAGE_ENTRY_POINT       EntryPoint;\r

   /// loaded image protocol\r
   /// loaded image protocol\r

-  EFI_LOADED_IMAGE_PROTOCOL   Info;           \r
+  EFI_LOADED_IMAGE_PROTOCOL   Info;\r

   /// Location in memory\r
   /// Location in memory\r

-  EFI_PHYSICAL_ADDRESS        ImageBasePage;  \r
+  EFI_PHYSICAL_ADDRESS        ImageBasePage;\r

   /// Number of pages\r
   /// Number of pages\r

-  UINTN                       NumberOfPages;  \r
+  UINTN                       NumberOfPages;\r

   /// Original fixup data\r
   /// Original fixup data\r

-  CHAR8                       *FixupData;     \r
+  CHAR8                       *FixupData;\r

   /// Tpl of started image\r
   /// Tpl of started image\r

-  EFI_TPL                     Tpl;            \r
+  EFI_TPL                     Tpl;\r

   /// Status returned by started image\r
   /// Status returned by started image\r

-  EFI_STATUS                  Status;         \r
+  EFI_STATUS                  Status;\r

   /// Size of ExitData from started image\r
   /// Size of ExitData from started image\r

-  UINTN                       ExitDataSize;   \r
+  UINTN                       ExitDataSize;\r

   /// Pointer to exit data from started image\r
   /// Pointer to exit data from started image\r

-  VOID                        *ExitData;      \r
+  VOID                        *ExitData;\r

   /// Pointer to pool allocation for context save/restore\r
   /// Pointer to pool allocation for context save/restore\r

-  VOID                        *JumpBuffer;    \r
+  VOID                        *JumpBuffer;\r

   /// Pointer to buffer for context save/restore\r
   /// Pointer to buffer for context save/restore\r

-  BASE_LIBRARY_JUMP_BUFFER    *JumpContext;  \r
+  BASE_LIBRARY_JUMP_BUFFER    *JumpContext;\r

   /// Machine type from PE image\r
   /// Machine type from PE image\r

-  UINT16                      Machine;        \r
+  UINT16                      Machine;\r

   /// EBC Protocol pointer\r
   /// EBC Protocol pointer\r

-  EFI_EBC_PROTOCOL            *Ebc;           \r
+  EFI_EBC_PROTOCOL            *Ebc;\r

   /// Runtime image list\r
   /// Runtime image list\r

-  EFI_RUNTIME_IMAGE_ENTRY     *RuntimeData;   \r
+  EFI_RUNTIME_IMAGE_ENTRY     *RuntimeData;\r

   /// Pointer to Loaded Image Device Path Protocol\r
   /// Pointer to Loaded Image Device Path Protocol\r

-  EFI_DEVICE_PATH_PROTOCOL    *LoadedImageDevicePath;  \r
+  EFI_DEVICE_PATH_PROTOCOL    *LoadedImageDevicePath;\r

   /// PeCoffLoader ImageContext\r
   /// PeCoffLoader ImageContext\r

-  PE_COFF_LOADER_IMAGE_CONTEXT  ImageContext; \r
+  PE_COFF_LOADER_IMAGE_CONTEXT  ImageContext;\r

   /// Status returned by LoadImage() service.\r
   EFI_STATUS                  LoadImageStatus;\r
 } LOADED_IMAGE_PRIVATE_DATA;\r
   /// Status returned by LoadImage() service.\r
   EFI_STATUS                  LoadImageStatus;\r
 } LOADED_IMAGE_PRIVATE_DATA;\r


@@ -1180,8 +1180,8 @@ CoreConnectHandlesByKey (
   @retval EFI_NOT_FOUND         1) There are no EFI_DRIVER_BINDING_PROTOCOL instances\r
                                 present in the system.\r
                                 2) No drivers were connected to ControllerHandle.\r
   @retval EFI_NOT_FOUND         1) There are no EFI_DRIVER_BINDING_PROTOCOL instances\r
                                 present in the system.\r
                                 2) No drivers were connected to ControllerHandle.\r

-  @retval EFI_SECURITY_VIOLATION \r
-                                The user has no permission to start UEFI device drivers on the device path \r
+  @retval EFI_SECURITY_VIOLATION\r
+                                The user has no permission to start UEFI device drivers on the device path\r

                                 associated with the ControllerHandle or specified by the RemainingDevicePath.\r
 \r
 **/\r
                                 associated with the ControllerHandle or specified by the RemainingDevicePath.\r
 \r
 **/\r


@@ -1426,10 +1426,10 @@ CoreInternalFreePool (
   @retval EFI_LOAD_ERROR          Image was not loaded because the image format was corrupt or not\r
                                   understood.\r
   @retval EFI_DEVICE_ERROR        Image was not loaded because the device returned a read error.\r
   @retval EFI_LOAD_ERROR          Image was not loaded because the image format was corrupt or not\r
                                   understood.\r
   @retval EFI_DEVICE_ERROR        Image was not loaded because the device returned a read error.\r

-  @retval EFI_ACCESS_DENIED       Image was not loaded because the platform policy prohibits the \r
+  @retval EFI_ACCESS_DENIED       Image was not loaded because the platform policy prohibits the\r

                                   image from being loaded. NULL is returned in *ImageHandle.\r
                                   image from being loaded. NULL is returned in *ImageHandle.\r

-  @retval EFI_SECURITY_VIOLATION  Image was loaded and an ImageHandle was created with a \r
-                                  valid EFI_LOADED_IMAGE_PROTOCOL. However, the current \r
+  @retval EFI_SECURITY_VIOLATION  Image was loaded and an ImageHandle was created with a\r
+                                  valid EFI_LOADED_IMAGE_PROTOCOL. However, the current\r

                                   platform policy specifies that the image should not be started.\r
 \r
 **/\r
                                   platform policy specifies that the image should not be started.\r
 \r
 **/\r


@@ -1836,7 +1836,7 @@ CoreGetMemorySpaceDescriptor (
   @param  Attributes             Specified attributes\r
 \r
   @retval EFI_SUCCESS           The attributes were set for the memory region.\r
   @param  Attributes             Specified attributes\r
 \r
   @retval EFI_SUCCESS           The attributes were set for the memory region.\r

-  @retval EFI_INVALID_PARAMETER Length is zero. \r
+  @retval EFI_INVALID_PARAMETER Length is zero.\r

   @retval EFI_UNSUPPORTED       The processor does not support one or more bytes of the memory\r
                                 resource range specified by BaseAddress and Length.\r
   @retval EFI_UNSUPPORTED       The bit mask of attributes is not support for the memory resource\r
   @retval EFI_UNSUPPORTED       The processor does not support one or more bytes of the memory\r
                                 resource range specified by BaseAddress and Length.\r
   @retval EFI_UNSUPPORTED       The bit mask of attributes is not support for the memory resource\r


@@ -2671,7 +2671,7 @@ CoreReleaseLock (
   );\r
 \r
 /**\r
   );\r
 \r
 /**\r

-  Read data from Firmware Block by FVB protocol Read. \r
+  Read data from Firmware Block by FVB protocol Read.\r

   The data may cross the multi block ranges.\r
 \r
   @param  Fvb                   The FW_VOL_BLOCK_PROTOCOL instance from which to read data.\r
   The data may cross the multi block ranges.\r
 \r
   @param  Fvb                   The FW_VOL_BLOCK_PROTOCOL instance from which to read data.\r

diff --git a/MdeModulePkg/Core/Dxe/DxeMain.inf b/MdeModulePkg/Core/Dxe/DxeMain.inf
index d2e7360ed441378e3bae86b069350d934e618722..68fa0a01d9bd96e2d923c3a4942c371b10f44c13 100644 (file)
--- a/MdeModulePkg/Core/Dxe/DxeMain.inf
+++ b/MdeModulePkg/Core/Dxe/DxeMain.inf
@@ -2,16 +2,16 @@
 #  This is core module in DXE phase.\r
 #\r
 #  It provides an implementation of DXE Core that is compliant with DXE CIS.\r
 #  This is core module in DXE phase.\r
 #\r
 #  It provides an implementation of DXE Core that is compliant with DXE CIS.\r

-#  \r
+#\r

 #  Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r
 #  This program and the accompanying materials\r
 #  are licensed and made available under the terms and conditions of the BSD License\r
 #  which accompanies this distribution.  The full text of the license may be found at\r
 #  http://opensource.org/licenses/bsd-license.php\r
 #  Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r
 #  This program and the accompanying materials\r
 #  are licensed and made available under the terms and conditions of the BSD License\r
 #  which accompanies this distribution.  The full text of the license may be found at\r
 #  http://opensource.org/licenses/bsd-license.php\r

-#  \r
+#\r

 #  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 #  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 #  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 #  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r

-#  \r
+#\r

 ##\r
 \r
 [Defines]\r
 ##\r
 \r
 [Defines]\r


@@ -182,7 +182,7 @@
   gEfiWatchdogTimerArchProtocolGuid             ## CONSUMES\r
 \r
 [FeaturePcd]\r
   gEfiWatchdogTimerArchProtocolGuid             ## CONSUMES\r
 \r
 [FeaturePcd]\r

-  gEfiMdeModulePkgTokenSpaceGuid.PcdFrameworkCompatibilitySupport         ## CONSUMES\r
+  gEfiMdeModulePkgTokenSpaceGuid.PcdFrameworkCompatibilitySupport     ## CONSUMES\r

 \r
 [Pcd]\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdLoadFixAddressBootTimeCodePageNumber    ## SOMETIMES_CONSUMES\r
 \r
 [Pcd]\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdLoadFixAddressBootTimeCodePageNumber    ## SOMETIMES_CONSUMES\r

diff --git a/MdeModulePkg/Core/Dxe/DxeMain/DxeMain.c b/MdeModulePkg/Core/Dxe/DxeMain/DxeMain.c
index 3f753738a273fca1c0dc312878b97cb886543078..fc46022c3c7f0ee678dee3cc5bcfcdb79dfe94dc 100644 (file)
--- a/MdeModulePkg/Core/Dxe/DxeMain/DxeMain.c
+++ b/MdeModulePkg/Core/Dxe/DxeMain/DxeMain.c
@@ -260,7 +260,7 @@ DxeMain (
   }\r
   Status = InitializeCpuExceptionHandlersEx (VectorInfoList, NULL);\r
   ASSERT_EFI_ERROR (Status);\r
   }\r
   Status = InitializeCpuExceptionHandlersEx (VectorInfoList, NULL);\r
   ASSERT_EFI_ERROR (Status);\r

-  \r
+\r

   //\r
   // Initialize Debug Agent to support source level debug in DXE phase\r
   //\r
   //\r
   // Initialize Debug Agent to support source level debug in DXE phase\r
   //\r


@@ -532,7 +532,7 @@ DxeMain (
     REPORT_STATUS_CODE (\r
       EFI_ERROR_CODE | EFI_ERROR_MAJOR,\r
       (EFI_SOFTWARE_DXE_CORE | EFI_SW_DXE_CORE_EC_NO_ARCH)\r
     REPORT_STATUS_CODE (\r
       EFI_ERROR_CODE | EFI_ERROR_MAJOR,\r
       (EFI_SOFTWARE_DXE_CORE | EFI_SW_DXE_CORE_EC_NO_ARCH)\r

-      );    \r
+      );\r

   }\r
   ASSERT_EFI_ERROR (Status);\r
 \r
   }\r
   ASSERT_EFI_ERROR (Status);\r
 \r


@@ -780,7 +780,7 @@ CoreExitBootServices (
   Status = CoreTerminateMemoryMap (MapKey);\r
   if (EFI_ERROR (Status)) {\r
     //\r
   Status = CoreTerminateMemoryMap (MapKey);\r
   if (EFI_ERROR (Status)) {\r
     //\r

-    // Notify other drivers that ExitBootServices fail \r
+    // Notify other drivers that ExitBootServices fail\r

     //\r
     CoreNotifySignalList (&gEventExitBootServicesFailedGuid);\r
     return Status;\r
     //\r
     CoreNotifySignalList (&gEventExitBootServicesFailedGuid);\r
     return Status;\r

diff --git a/MdeModulePkg/Core/Dxe/DxeMain/DxeProtocolNotify.c b/MdeModulePkg/Core/Dxe/DxeMain/DxeProtocolNotify.c
index ea7c6107b405e34f8006e54a88329a1db9e979ea..ac9edf72e8010b794b7b58092d534e8806d55d27 100644 (file)
--- a/MdeModulePkg/Core/Dxe/DxeMain/DxeProtocolNotify.c
+++ b/MdeModulePkg/Core/Dxe/DxeMain/DxeProtocolNotify.c
@@ -3,7 +3,7 @@
   the Dxe Core. The mArchProtocols[] array represents a list of\r
   events that represent the Architectural Protocols.\r
 \r
   the Dxe Core. The mArchProtocols[] array represents a list of\r
   events that represent the Architectural Protocols.\r
 \r

-Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r

 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r


@@ -206,7 +206,7 @@ GenericProtocolNotify (
 }\r
 \r
 /**\r
 }\r
 \r
 /**\r

-  Creates an event for each entry in a table that is fired everytime a Protocol \r
+  Creates an event for each entry in a table that is fired everytime a Protocol\r

   of a specific type is installed.\r
 \r
   @param Entry  Pointer to EFI_CORE_PROTOCOL_NOTIFY_ENTRY.\r
   of a specific type is installed.\r
 \r
   @param Entry  Pointer to EFI_CORE_PROTOCOL_NOTIFY_ENTRY.\r


@@ -245,7 +245,7 @@ CoreNotifyOnProtocolEntryTable (
 }\r
 \r
 /**\r
 }\r
 \r
 /**\r

-  Creates an events for the Architectural Protocols and the optional protocols \r
+  Creates an events for the Architectural Protocols and the optional protocols\r

   that are fired everytime a Protocol of a specific type is installed.\r
 \r
 **/\r
   that are fired everytime a Protocol of a specific type is installed.\r
 \r
 **/\r

diff --git a/MdeModulePkg/Core/Dxe/Event/Tpl.c b/MdeModulePkg/Core/Dxe/Event/Tpl.c
index e3caf832b8638124ace38d68f88e290160e7901c..28b91977c36ae404a1ff1a2d33dbd35a8033ea5a 100644 (file)
--- a/MdeModulePkg/Core/Dxe/Event/Tpl.c
+++ b/MdeModulePkg/Core/Dxe/Event/Tpl.c
@@ -1,7 +1,7 @@
 /** @file\r
   Task priority (TPL) functions.\r
 \r
 /** @file\r
   Task priority (TPL) functions.\r
 \r

-Copyright (c) 2006 - 2017, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r

 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r


@@ -28,7 +28,7 @@ CoreSetInterruptState (
 {\r
   EFI_STATUS  Status;\r
   BOOLEAN     InSmm;\r
 {\r
   EFI_STATUS  Status;\r
   BOOLEAN     InSmm;\r

-  \r
+\r

   if (gCpu == NULL) {\r
     return;\r
   }\r
   if (gCpu == NULL) {\r
     return;\r
   }\r

diff --git a/MdeModulePkg/Core/Dxe/FwVol/FwVol.c b/MdeModulePkg/Core/Dxe/FwVol/FwVol.c
index 2f5867b59d909ab4a2d90e614405c5ae8817d215..93ddcc35913badc81ae3b141dc6c78fad5a3166a 100644 (file)
--- a/MdeModulePkg/Core/Dxe/FwVol/FwVol.c
+++ b/MdeModulePkg/Core/Dxe/FwVol/FwVol.c
@@ -3,7 +3,7 @@
   Layers on top of Firmware Block protocol to produce a file abstraction\r
   of FV based files.\r
 \r
   Layers on top of Firmware Block protocol to produce a file abstraction\r
   of FV based files.\r
 \r

-Copyright (c) 2006 - 2017, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r

 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r


@@ -34,8 +34,8 @@ FV_DEVICE mFvDevice = {
     FvReadFile,\r
     FvReadFileSection,\r
     FvWriteFile,\r
     FvReadFile,\r
     FvReadFileSection,\r
     FvWriteFile,\r

-    FvGetNextFile,   \r
-       sizeof (UINTN),\r
+    FvGetNextFile,\r
+  sizeof (UINTN),\r

     NULL,\r
     FvGetVolumeInfo,\r
     FvSetVolumeInfo\r
     NULL,\r
     FvGetVolumeInfo,\r
     FvSetVolumeInfo\r


@@ -56,7 +56,7 @@ FV_DEVICE mFvDevice = {
 // FFS helper functions\r
 //\r
 /**\r
 // FFS helper functions\r
 //\r
 /**\r

-  Read data from Firmware Block by FVB protocol Read. \r
+  Read data from Firmware Block by FVB protocol Read.\r

   The data may cross the multi block ranges.\r
 \r
   @param  Fvb                   The FW_VOL_BLOCK_PROTOCOL instance from which to read data.\r
   The data may cross the multi block ranges.\r
 \r
   @param  Fvb                   The FW_VOL_BLOCK_PROTOCOL instance from which to read data.\r


@@ -86,7 +86,7 @@ ReadFvbData (
   UINTN                       BlockIndex;\r
   UINTN                       ReadDataSize;\r
   EFI_STATUS                  Status;\r
   UINTN                       BlockIndex;\r
   UINTN                       ReadDataSize;\r
   EFI_STATUS                  Status;\r

-  \r
+\r

   //\r
   // Try read data in current block\r
   //\r
   //\r
   // Try read data in current block\r
   //\r


@@ -102,7 +102,7 @@ ReadFvbData (
     //\r
     return Status;\r
   }\r
     //\r
     return Status;\r
   }\r

-  \r
+\r

   //\r
   // Data crosses the blocks, read data from next block\r
   //\r
   //\r
   // Data crosses the blocks, read data from next block\r
   //\r


@@ -118,7 +118,7 @@ ReadFvbData (
     //\r
     // Read data from the crossing blocks\r
     //\r
     //\r
     // Read data from the crossing blocks\r
     //\r

-    BlockIndex = 0; \r
+    BlockIndex = 0;\r

     while (BlockIndex < NumberOfBlocks && DataSize >= BlockSize) {\r
       Status = Fvb->Read (Fvb, *StartLba + BlockIndex, 0, &BlockSize, Data);\r
       if (EFI_ERROR (Status)) {\r
     while (BlockIndex < NumberOfBlocks && DataSize >= BlockSize) {\r
       Status = Fvb->Read (Fvb, *StartLba + BlockIndex, 0, &BlockSize, Data);\r
       if (EFI_ERROR (Status)) {\r


@@ -128,20 +128,20 @@ ReadFvbData (
       DataSize -= BlockSize;\r
       BlockIndex ++;\r
     }\r
       DataSize -= BlockSize;\r
       BlockIndex ++;\r
     }\r

-    \r
+\r

     //\r
     // Data doesn't exceed the current block range.\r
     //\r
     if (DataSize < BlockSize) {\r
       break;\r
     }\r
     //\r
     // Data doesn't exceed the current block range.\r
     //\r
     if (DataSize < BlockSize) {\r
       break;\r
     }\r

-    \r
+\r

     //\r
     // Data must be got from the next block range.\r
     //\r
     *StartLba += NumberOfBlocks;\r
   }\r
     //\r
     // Data must be got from the next block range.\r
     //\r
     *StartLba += NumberOfBlocks;\r
   }\r

-  \r
+\r

   //\r
   // read the remaining data\r
   //\r
   //\r
   // read the remaining data\r
   //\r


@@ -151,7 +151,7 @@ ReadFvbData (
       return Status;\r
     }\r
   }\r
       return Status;\r
     }\r
   }\r

-  \r
+\r

   //\r
   // Update Lba and Offset used by the following read.\r
   //\r
   //\r
   // Update Lba and Offset used by the following read.\r
   //\r


@@ -189,7 +189,7 @@ GetFwVolHeader (
   EFI_LBA                     StartLba;\r
   UINTN                       Offset;\r
   UINT8                       *Buffer;\r
   EFI_LBA                     StartLba;\r
   UINTN                       Offset;\r
   UINT8                       *Buffer;\r

-  \r
+\r

   //\r
   // Read the standard FV header\r
   //\r
   //\r
   // Read the standard FV header\r
   //\r


@@ -418,9 +418,9 @@ FvCheck (
           HeaderSize = 0;\r
         }\r
       }\r
           HeaderSize = 0;\r
         }\r
       }\r

-    \r
+\r

       //\r
       //\r

-      // read the FV data  \r
+      // read the FV data\r

       //\r
       for (; Index < BlockMap->NumBlocks; Index ++) {\r
         Status = Fvb->Read (Fvb,\r
       //\r
       for (; Index < BlockMap->NumBlocks; Index ++) {\r
         Status = Fvb->Read (Fvb,\r


@@ -715,7 +715,7 @@ NotifyFwVolBlock (
       // Inherit the authentication status from FVB.\r
       //\r
       FvDevice->AuthenticationStatus = GetFvbAuthenticationStatus (Fvb);\r
       // Inherit the authentication status from FVB.\r
       //\r
       FvDevice->AuthenticationStatus = GetFvbAuthenticationStatus (Fvb);\r

-      \r
+\r

       if (!EFI_ERROR (FvCheck (FvDevice))) {\r
         //\r
         // Install an New FV protocol on the existing handle\r
       if (!EFI_ERROR (FvCheck (FvDevice))) {\r
         //\r
         // Install an New FV protocol on the existing handle\r

diff --git a/MdeModulePkg/Core/Dxe/FwVolBlock/FwVolBlock.c b/MdeModulePkg/Core/Dxe/FwVolBlock/FwVolBlock.c
index f7fb18ae15df2c9c392e752eeaaa86792b8745cf..100aa28dffa4d3b94f3eee78a3d918e0ceab351d 100644 (file)
--- a/MdeModulePkg/Core/Dxe/FwVolBlock/FwVolBlock.c
+++ b/MdeModulePkg/Core/Dxe/FwVolBlock/FwVolBlock.c
@@ -4,7 +4,7 @@
   It consumes FV HOBs and creates read-only Firmare Volume Block protocol\r
   instances for each of them.\r
 \r
   It consumes FV HOBs and creates read-only Firmare Volume Block protocol\r
   instances for each of them.\r
 \r

-Copyright (c) 2006 - 2017, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r

 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r


@@ -542,7 +542,7 @@ ProduceFVBProtocolOnBuffer (
     CoreFreePool (FvbDev);\r
     return EFI_OUT_OF_RESOURCES;\r
   }\r
     CoreFreePool (FvbDev);\r
     return EFI_OUT_OF_RESOURCES;\r
   }\r

-  \r
+\r

   //\r
   // Last, fill in the cache with the linear address of the blocks\r
   //\r
   //\r
   // Last, fill in the cache with the linear address of the blocks\r
   //\r


@@ -582,11 +582,11 @@ ProduceFVBProtocolOnBuffer (
       return EFI_OUT_OF_RESOURCES;\r
     }\r
     CopyGuid (\r
       return EFI_OUT_OF_RESOURCES;\r
     }\r
     CopyGuid (\r

-      &((FV_PIWG_DEVICE_PATH *)FvbDev->DevicePath)->FvDevPath.FvName, \r
+      &((FV_PIWG_DEVICE_PATH *)FvbDev->DevicePath)->FvDevPath.FvName,\r

       (GUID *)(UINTN)(BaseAddress + FwVolHeader->ExtHeaderOffset)\r
       );\r
   }\r
       (GUID *)(UINTN)(BaseAddress + FwVolHeader->ExtHeaderOffset)\r
       );\r
   }\r

-  \r
+\r

   //\r
   //\r
   // Attach FvVolBlock Protocol to new handle\r
   //\r
   //\r
   // Attach FvVolBlock Protocol to new handle\r

diff --git a/MdeModulePkg/Core/Dxe/Gcd/Gcd.c b/MdeModulePkg/Core/Dxe/Gcd/Gcd.c
index e17e98230b79beb063c5a00cbe38c251e86e9fc3..d9c65a8045e2906ceaf6ae6d6e33b3fe51fbaf4a 100644 (file)
--- a/MdeModulePkg/Core/Dxe/Gcd/Gcd.c
+++ b/MdeModulePkg/Core/Dxe/Gcd/Gcd.c
@@ -126,7 +126,7 @@ GLOBAL_REMOVE_IF_UNREFERENCED CONST CHAR8 *mGcdIoTypeNames[] = {
   "NonExist",  // EfiGcdIoTypeNonExistent\r
   "Reserved",  // EfiGcdIoTypeReserved\r
   "I/O     ",  // EfiGcdIoTypeIo\r
   "NonExist",  // EfiGcdIoTypeNonExistent\r
   "Reserved",  // EfiGcdIoTypeReserved\r
   "I/O     ",  // EfiGcdIoTypeIo\r

-  "Unknown "   // EfiGcdIoTypeMaximum \r
+  "Unknown "   // EfiGcdIoTypeMaximum\r

 };\r
 \r
 ///\r
 };\r
 \r
 ///\r


@@ -146,7 +146,7 @@ GLOBAL_REMOVE_IF_UNREFERENCED CONST CHAR8 *mGcdAllocationTypeNames[] = {
   PcdDebugPrintErrorLevel has the DEBUG_GCD bit set.\r
 \r
   @param  InitialMap  TRUE if the initial GCD Memory Map is being dumped.  Otherwise, FALSE.\r
   PcdDebugPrintErrorLevel has the DEBUG_GCD bit set.\r
 \r
   @param  InitialMap  TRUE if the initial GCD Memory Map is being dumped.  Otherwise, FALSE.\r

-  \r
+\r

 **/\r
 VOID\r
 EFIAPI\r
 **/\r
 VOID\r
 EFIAPI\r


@@ -159,7 +159,7 @@ CoreDumpGcdMemorySpaceMap (
     UINTN                            NumberOfDescriptors;\r
     EFI_GCD_MEMORY_SPACE_DESCRIPTOR  *MemorySpaceMap;\r
     UINTN                            Index;\r
     UINTN                            NumberOfDescriptors;\r
     EFI_GCD_MEMORY_SPACE_DESCRIPTOR  *MemorySpaceMap;\r
     UINTN                            Index;\r

-   \r
+\r

     Status = CoreGetMemorySpaceMap (&NumberOfDescriptors, &MemorySpaceMap);\r
     ASSERT (Status == EFI_SUCCESS && MemorySpaceMap != NULL);\r
 \r
     Status = CoreGetMemorySpaceMap (&NumberOfDescriptors, &MemorySpaceMap);\r
     ASSERT (Status == EFI_SUCCESS && MemorySpaceMap != NULL);\r
 \r


@@ -169,11 +169,11 @@ CoreDumpGcdMemorySpaceMap (
     DEBUG ((DEBUG_GCD, "GCDMemType Range                             Capabilities     Attributes      \n"));\r
     DEBUG ((DEBUG_GCD, "========== ================================= ================ ================\n"));\r
     for (Index = 0; Index < NumberOfDescriptors; Index++) {\r
     DEBUG ((DEBUG_GCD, "GCDMemType Range                             Capabilities     Attributes      \n"));\r
     DEBUG ((DEBUG_GCD, "========== ================================= ================ ================\n"));\r
     for (Index = 0; Index < NumberOfDescriptors; Index++) {\r

-      DEBUG ((DEBUG_GCD, "%a  %016lx-%016lx %016lx %016lx%c\n", \r
+      DEBUG ((DEBUG_GCD, "%a  %016lx-%016lx %016lx %016lx%c\n",\r

         mGcdMemoryTypeNames[MIN (MemorySpaceMap[Index].GcdMemoryType, EfiGcdMemoryTypeMaximum)],\r
         mGcdMemoryTypeNames[MIN (MemorySpaceMap[Index].GcdMemoryType, EfiGcdMemoryTypeMaximum)],\r

-        MemorySpaceMap[Index].BaseAddress, \r
+        MemorySpaceMap[Index].BaseAddress,\r

         MemorySpaceMap[Index].BaseAddress + MemorySpaceMap[Index].Length - 1,\r
         MemorySpaceMap[Index].BaseAddress + MemorySpaceMap[Index].Length - 1,\r

-        MemorySpaceMap[Index].Capabilities, \r
+        MemorySpaceMap[Index].Capabilities,\r

         MemorySpaceMap[Index].Attributes,\r
         MemorySpaceMap[Index].ImageHandle == NULL ? ' ' : '*'\r
         ));\r
         MemorySpaceMap[Index].Attributes,\r
         MemorySpaceMap[Index].ImageHandle == NULL ? ' ' : '*'\r
         ));\r


@@ -184,11 +184,11 @@ CoreDumpGcdMemorySpaceMap (
 }\r
 \r
 /**\r
 }\r
 \r
 /**\r

-  Dump the entire contents if the GCD I/O Space Map using DEBUG() macros when \r
+  Dump the entire contents if the GCD I/O Space Map using DEBUG() macros when\r

   PcdDebugPrintErrorLevel has the DEBUG_GCD bit set.\r
 \r
   @param  InitialMap  TRUE if the initial GCD I/O Map is being dumped.  Otherwise, FALSE.\r
   PcdDebugPrintErrorLevel has the DEBUG_GCD bit set.\r
 \r
   @param  InitialMap  TRUE if the initial GCD I/O Map is being dumped.  Otherwise, FALSE.\r

-  \r
+\r

 **/\r
 VOID\r
 EFIAPI\r
 **/\r
 VOID\r
 EFIAPI\r


@@ -201,20 +201,20 @@ CoreDumpGcdIoSpaceMap (
     UINTN                        NumberOfDescriptors;\r
     EFI_GCD_IO_SPACE_DESCRIPTOR  *IoSpaceMap;\r
     UINTN                        Index;\r
     UINTN                        NumberOfDescriptors;\r
     EFI_GCD_IO_SPACE_DESCRIPTOR  *IoSpaceMap;\r
     UINTN                        Index;\r

-    \r
+\r

     Status = CoreGetIoSpaceMap (&NumberOfDescriptors, &IoSpaceMap);\r
     ASSERT (Status == EFI_SUCCESS && IoSpaceMap != NULL);\r
     Status = CoreGetIoSpaceMap (&NumberOfDescriptors, &IoSpaceMap);\r
     ASSERT (Status == EFI_SUCCESS && IoSpaceMap != NULL);\r

-    \r
+\r

     if (InitialMap) {\r
       DEBUG ((DEBUG_GCD, "GCD:Initial GCD I/O Space Map\n"));\r
     if (InitialMap) {\r
       DEBUG ((DEBUG_GCD, "GCD:Initial GCD I/O Space Map\n"));\r

-    }  \r
-    \r
+    }\r
+\r

     DEBUG ((DEBUG_GCD, "GCDIoType  Range                            \n"));\r
     DEBUG ((DEBUG_GCD, "========== =================================\n"));\r
     for (Index = 0; Index < NumberOfDescriptors; Index++) {\r
     DEBUG ((DEBUG_GCD, "GCDIoType  Range                            \n"));\r
     DEBUG ((DEBUG_GCD, "========== =================================\n"));\r
     for (Index = 0; Index < NumberOfDescriptors; Index++) {\r

-      DEBUG ((DEBUG_GCD, "%a   %016lx-%016lx%c\n", \r
+      DEBUG ((DEBUG_GCD, "%a   %016lx-%016lx%c\n",\r

         mGcdIoTypeNames[MIN (IoSpaceMap[Index].GcdIoType, EfiGcdIoTypeMaximum)],\r
         mGcdIoTypeNames[MIN (IoSpaceMap[Index].GcdIoType, EfiGcdIoTypeMaximum)],\r

-        IoSpaceMap[Index].BaseAddress, \r
+        IoSpaceMap[Index].BaseAddress,\r

         IoSpaceMap[Index].BaseAddress + IoSpaceMap[Index].Length - 1,\r
         IoSpaceMap[Index].ImageHandle == NULL ? ' ' : '*'\r
         ));\r
         IoSpaceMap[Index].BaseAddress + IoSpaceMap[Index].Length - 1,\r
         IoSpaceMap[Index].ImageHandle == NULL ? ' ' : '*'\r
         ));\r


@@ -223,11 +223,11 @@ CoreDumpGcdIoSpaceMap (
     FreePool (IoSpaceMap);\r
   );\r
 }\r
     FreePool (IoSpaceMap);\r
   );\r
 }\r

-  \r
+\r

 /**\r
   Validate resource descriptor HOB's attributes.\r
 \r
 /**\r
   Validate resource descriptor HOB's attributes.\r
 \r

-  If Attributes includes some memory resource's settings, it should include \r
+  If Attributes includes some memory resource's settings, it should include\r

   the corresponding capabilites also.\r
 \r
   @param  Attributes  Resource descriptor HOB attributes.\r
   the corresponding capabilites also.\r
 \r
   @param  Attributes  Resource descriptor HOB attributes.\r


@@ -876,13 +876,13 @@ CoreConvertSpace (
     //\r
     CpuArchAttributes = ConverToCpuArchAttributes (Attributes);\r
     //\r
     //\r
     CpuArchAttributes = ConverToCpuArchAttributes (Attributes);\r
     //\r

-    // CPU arch attributes include page attributes and cache attributes. \r
+    // CPU arch attributes include page attributes and cache attributes.\r

     // Only page attributes supports to be cleared, but not cache attributes.\r
     // Caller is expected to use GetMemorySpaceDescriptor() to get the current\r
     // attributes, AND/OR attributes, and then calls SetMemorySpaceAttributes()\r
     // to set the new attributes.\r
     // So 0 CPU arch attributes should not happen as memory should always have\r
     // Only page attributes supports to be cleared, but not cache attributes.\r
     // Caller is expected to use GetMemorySpaceDescriptor() to get the current\r
     // attributes, AND/OR attributes, and then calls SetMemorySpaceAttributes()\r
     // to set the new attributes.\r
     // So 0 CPU arch attributes should not happen as memory should always have\r

-    // a cache attribute (no matter UC or WB, etc). \r
+    // a cache attribute (no matter UC or WB, etc).\r

     //\r
     // Here, 0 CPU arch attributes will be filtered to be compatible with the\r
     // case that caller just calls SetMemorySpaceAttributes() with none CPU\r
     //\r
     // Here, 0 CPU arch attributes will be filtered to be compatible with the\r
     // case that caller just calls SetMemorySpaceAttributes() with none CPU\r


@@ -1293,7 +1293,7 @@ Done:
     DEBUG ((DEBUG_GCD, "  (BaseAddress = %016lx)", *BaseAddress));\r
   }\r
   DEBUG ((DEBUG_GCD, "\n"));\r
     DEBUG ((DEBUG_GCD, "  (BaseAddress = %016lx)", *BaseAddress));\r
   }\r
   DEBUG ((DEBUG_GCD, "\n"));\r

-  \r
+\r

   if ((Operation & GCD_MEMORY_SPACE_OPERATION) != 0) {\r
     CoreReleaseGcdMemoryLock ();\r
     CoreDumpGcdMemorySpaceMap (FALSE);\r
   if ((Operation & GCD_MEMORY_SPACE_OPERATION) != 0) {\r
     CoreReleaseGcdMemoryLock ();\r
     CoreDumpGcdMemorySpaceMap (FALSE);\r


@@ -1384,7 +1384,7 @@ CoreAllocateMemorySpace (
   DEBUG ((DEBUG_GCD, "  Alignment       = %016lx\n", LShiftU64 (1, Alignment)));\r
   DEBUG ((DEBUG_GCD, "  ImageHandle     = %p\n", ImageHandle));\r
   DEBUG ((DEBUG_GCD, "  DeviceHandle    = %p\n", DeviceHandle));\r
   DEBUG ((DEBUG_GCD, "  Alignment       = %016lx\n", LShiftU64 (1, Alignment)));\r
   DEBUG ((DEBUG_GCD, "  ImageHandle     = %p\n", ImageHandle));\r
   DEBUG ((DEBUG_GCD, "  DeviceHandle    = %p\n", DeviceHandle));\r

-  \r
+\r

   return CoreAllocateSpace (\r
            GCD_ALLOCATE_MEMORY_OPERATION,\r
            GcdAllocateType,\r
   return CoreAllocateSpace (\r
            GCD_ALLOCATE_MEMORY_OPERATION,\r
            GcdAllocateType,\r


@@ -1516,7 +1516,7 @@ CoreRemoveMemorySpace (
   )\r
 {\r
   DEBUG ((DEBUG_GCD, "GCD:RemoveMemorySpace(Base=%016lx,Length=%016lx)\n", BaseAddress, Length));\r
   )\r
 {\r
   DEBUG ((DEBUG_GCD, "GCD:RemoveMemorySpace(Base=%016lx,Length=%016lx)\n", BaseAddress, Length));\r

-  \r
+\r

   return CoreConvertSpace (GCD_REMOVE_MEMORY_OPERATION, (EFI_GCD_MEMORY_TYPE) 0, (EFI_GCD_IO_TYPE) 0, BaseAddress, Length, 0, 0);\r
 }\r
 \r
   return CoreConvertSpace (GCD_REMOVE_MEMORY_OPERATION, (EFI_GCD_MEMORY_TYPE) 0, (EFI_GCD_IO_TYPE) 0, BaseAddress, Length, 0, 0);\r
 }\r
 \r


@@ -1605,7 +1605,7 @@ CoreGetMemorySpaceDescriptor (
   @param  Attributes             Specified attributes\r
 \r
   @retval EFI_SUCCESS           The attributes were set for the memory region.\r
   @param  Attributes             Specified attributes\r
 \r
   @retval EFI_SUCCESS           The attributes were set for the memory region.\r

-  @retval EFI_INVALID_PARAMETER Length is zero. \r
+  @retval EFI_INVALID_PARAMETER Length is zero.\r

   @retval EFI_UNSUPPORTED       The processor does not support one or more bytes of the memory\r
                                 resource range specified by BaseAddress and Length.\r
   @retval EFI_UNSUPPORTED       The bit mask of attributes is not support for the memory resource\r
   @retval EFI_UNSUPPORTED       The processor does not support one or more bytes of the memory\r
                                 resource range specified by BaseAddress and Length.\r
   @retval EFI_UNSUPPORTED       The bit mask of attributes is not support for the memory resource\r


@@ -1762,7 +1762,7 @@ CoreAddIoSpace (
 {\r
   DEBUG ((DEBUG_GCD, "GCD:AddIoSpace(Base=%016lx,Length=%016lx)\n", BaseAddress, Length));\r
   DEBUG ((DEBUG_GCD, "  GcdIoType    = %a\n", mGcdIoTypeNames[MIN (GcdIoType, EfiGcdIoTypeMaximum)]));\r
 {\r
   DEBUG ((DEBUG_GCD, "GCD:AddIoSpace(Base=%016lx,Length=%016lx)\n", BaseAddress, Length));\r
   DEBUG ((DEBUG_GCD, "  GcdIoType    = %a\n", mGcdIoTypeNames[MIN (GcdIoType, EfiGcdIoTypeMaximum)]));\r

-  \r
+\r

   //\r
   // Make sure parameters are valid\r
   //\r
   //\r
   // Make sure parameters are valid\r
   //\r


@@ -1812,7 +1812,7 @@ CoreAllocateIoSpace (
   DEBUG ((DEBUG_GCD, "  Alignment       = %016lx\n", LShiftU64 (1, Alignment)));\r
   DEBUG ((DEBUG_GCD, "  ImageHandle     = %p\n", ImageHandle));\r
   DEBUG ((DEBUG_GCD, "  DeviceHandle    = %p\n", DeviceHandle));\r
   DEBUG ((DEBUG_GCD, "  Alignment       = %016lx\n", LShiftU64 (1, Alignment)));\r
   DEBUG ((DEBUG_GCD, "  ImageHandle     = %p\n", ImageHandle));\r
   DEBUG ((DEBUG_GCD, "  DeviceHandle    = %p\n", DeviceHandle));\r

-  \r
+\r

   return CoreAllocateSpace (\r
            GCD_ALLOCATE_IO_OPERATION,\r
            GcdAllocateType,\r
   return CoreAllocateSpace (\r
            GCD_ALLOCATE_IO_OPERATION,\r
            GcdAllocateType,\r


@@ -1868,7 +1868,7 @@ CoreRemoveIoSpace (
   )\r
 {\r
   DEBUG ((DEBUG_GCD, "GCD:RemoveIoSpace(Base=%016lx,Length=%016lx)\n", BaseAddress, Length));\r
   )\r
 {\r
   DEBUG ((DEBUG_GCD, "GCD:RemoveIoSpace(Base=%016lx,Length=%016lx)\n", BaseAddress, Length));\r

-  \r
+\r

   return CoreConvertSpace (GCD_REMOVE_IO_OPERATION, (EFI_GCD_MEMORY_TYPE) 0, (EFI_GCD_IO_TYPE) 0, BaseAddress, Length, 0, 0);\r
 }\r
 \r
   return CoreConvertSpace (GCD_REMOVE_IO_OPERATION, (EFI_GCD_MEMORY_TYPE) 0, (EFI_GCD_IO_TYPE) 0, BaseAddress, Length, 0, 0);\r
 }\r
 \r


@@ -2138,15 +2138,15 @@ CoreInitializeMemoryServices (
   // Cache the PHIT HOB for later use\r
   //\r
   PhitHob = Hob.HandoffInformationTable;\r
   // Cache the PHIT HOB for later use\r
   //\r
   PhitHob = Hob.HandoffInformationTable;\r

-  \r
+\r

   if (PcdGet64(PcdLoadModuleAtFixAddressEnable) != 0) {\r
   if (PcdGet64(PcdLoadModuleAtFixAddressEnable) != 0) {\r

-       ReservedCodePageNumber = PcdGet32(PcdLoadFixAddressRuntimeCodePageNumber);\r
-       ReservedCodePageNumber += PcdGet32(PcdLoadFixAddressBootTimeCodePageNumber);\r
-   \r
-       //\r
-       // cache the Top address for loading modules at Fixed Address \r
-       //\r
-    gLoadModuleAtFixAddressConfigurationTable.DxeCodeTopAddress = PhitHob->EfiMemoryTop \r
+    ReservedCodePageNumber = PcdGet32(PcdLoadFixAddressRuntimeCodePageNumber);\r
+    ReservedCodePageNumber += PcdGet32(PcdLoadFixAddressBootTimeCodePageNumber);\r
+\r
+    //\r
+    // cache the Top address for loading modules at Fixed Address\r
+    //\r
+    gLoadModuleAtFixAddressConfigurationTable.DxeCodeTopAddress = PhitHob->EfiMemoryTop\r

                                                                    + EFI_PAGES_TO_SIZE(ReservedCodePageNumber);\r
   }\r
   //\r
                                                                    + EFI_PAGES_TO_SIZE(ReservedCodePageNumber);\r
   }\r
   //\r


@@ -2213,14 +2213,14 @@ CoreInitializeMemoryServices (
     Length      = PageAlignLength  (ResourceHob->PhysicalStart + ResourceHob->ResourceLength - BaseAddress);\r
     if (Length < MinimalMemorySizeNeeded) {\r
       //\r
     Length      = PageAlignLength  (ResourceHob->PhysicalStart + ResourceHob->ResourceLength - BaseAddress);\r
     if (Length < MinimalMemorySizeNeeded) {\r
       //\r

-      // If that range is not large enough to intialize the DXE Core, then \r
+      // If that range is not large enough to intialize the DXE Core, then\r

       // Compute range between PHIT EfiFreeMemoryBottom and PHIT EfiFreeMemoryTop\r
       //\r
       BaseAddress = PageAlignAddress (PhitHob->EfiFreeMemoryBottom);\r
       Length      = PageAlignLength  (PhitHob->EfiFreeMemoryTop - BaseAddress);\r
       if (Length < MinimalMemorySizeNeeded) {\r
         //\r
       // Compute range between PHIT EfiFreeMemoryBottom and PHIT EfiFreeMemoryTop\r
       //\r
       BaseAddress = PageAlignAddress (PhitHob->EfiFreeMemoryBottom);\r
       Length      = PageAlignLength  (PhitHob->EfiFreeMemoryTop - BaseAddress);\r
       if (Length < MinimalMemorySizeNeeded) {\r
         //\r

-        // If that range is not large enough to intialize the DXE Core, then \r
+        // If that range is not large enough to intialize the DXE Core, then\r

         // Compute range between the start of the Resource Descriptor HOB and the start of the HOB List\r
         //\r
         BaseAddress = PageAlignAddress (ResourceHob->PhysicalStart);\r
         // Compute range between the start of the Resource Descriptor HOB and the start of the HOB List\r
         //\r
         BaseAddress = PageAlignAddress (ResourceHob->PhysicalStart);\r


@@ -2297,7 +2297,7 @@ CoreInitializeMemoryServices (
       //\r
       BaseAddress = TestedMemoryBaseAddress;\r
       Length      = TestedMemoryLength;\r
       //\r
       BaseAddress = TestedMemoryBaseAddress;\r
       Length      = TestedMemoryLength;\r

-      Attributes  = ResourceHob->ResourceAttribute; \r
+      Attributes  = ResourceHob->ResourceAttribute;\r

       HighAddress = ResourceHob->PhysicalStart;\r
     }\r
   }\r
       HighAddress = ResourceHob->PhysicalStart;\r
     }\r
   }\r


@@ -2403,7 +2403,7 @@ CoreInitializeGcdServices (
   InsertHeadList (&mGcdMemorySpaceMap, &Entry->Link);\r
 \r
   CoreDumpGcdMemorySpaceMap (TRUE);\r
   InsertHeadList (&mGcdMemorySpaceMap, &Entry->Link);\r
 \r
   CoreDumpGcdMemorySpaceMap (TRUE);\r

-  \r
+\r

   //\r
   // Initialize the GCD I/O Space Map\r
   //\r
   //\r
   // Initialize the GCD I/O Space Map\r
   //\r


@@ -2415,7 +2415,7 @@ CoreInitializeGcdServices (
   InsertHeadList (&mGcdIoSpaceMap, &Entry->Link);\r
 \r
   CoreDumpGcdIoSpaceMap (TRUE);\r
   InsertHeadList (&mGcdIoSpaceMap, &Entry->Link);\r
 \r
   CoreDumpGcdIoSpaceMap (TRUE);\r

-  \r
+\r

   //\r
   // Walk the HOB list and add all resource descriptors to the GCD\r
   //\r
   //\r
   // Walk the HOB list and add all resource descriptors to the GCD\r
   //\r

diff --git a/MdeModulePkg/Core/Dxe/Hand/DriverSupport.c b/MdeModulePkg/Core/Dxe/Hand/DriverSupport.c
index ab3cc0c07e57b7400af148a3bb458e4fd3fab840..9b4275372486baac8c7a71c017a5a586fe8e429c 100644 (file)
--- a/MdeModulePkg/Core/Dxe/Hand/DriverSupport.c
+++ b/MdeModulePkg/Core/Dxe/Hand/DriverSupport.c
@@ -1,7 +1,7 @@
 /** @file\r
   Support functions to connect/disconnect UEFI Driver model Protocol\r
 \r
 /** @file\r
   Support functions to connect/disconnect UEFI Driver model Protocol\r
 \r

-Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r

 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r


@@ -40,8 +40,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   @retval EFI_NOT_FOUND         1) There are no EFI_DRIVER_BINDING_PROTOCOL instances\r
                                 present in the system.\r
                                 2) No drivers were connected to ControllerHandle.\r
   @retval EFI_NOT_FOUND         1) There are no EFI_DRIVER_BINDING_PROTOCOL instances\r
                                 present in the system.\r
                                 2) No drivers were connected to ControllerHandle.\r

-  @retval EFI_SECURITY_VIOLATION \r
-                                The user has no permission to start UEFI device drivers on the device path \r
+  @retval EFI_SECURITY_VIOLATION\r
+                                The user has no permission to start UEFI device drivers on the device path\r

                                 associated with the ControllerHandle or specified by the RemainingDevicePath.\r
 \r
 **/\r
                                 associated with the ControllerHandle or specified by the RemainingDevicePath.\r
 \r
 **/\r


@@ -112,7 +112,7 @@ CoreConnectController (
       }\r
     }\r
   }\r
       }\r
     }\r
   }\r

-  \r
+\r

   Handle = ControllerHandle;\r
 \r
   //\r
   Handle = ControllerHandle;\r
 \r
   //\r

diff --git a/MdeModulePkg/Core/Dxe/Hand/Handle.c b/MdeModulePkg/Core/Dxe/Hand/Handle.c
index 86a4065733f8bf5ab3d510b03f27976d1751e5ae..0eb014abbad432985c7f3da4a641fed463481019 100644 (file)
--- a/MdeModulePkg/Core/Dxe/Hand/Handle.c
+++ b/MdeModulePkg/Core/Dxe/Hand/Handle.c
@@ -1,7 +1,7 @@
 /** @file\r
   UEFI handle & protocol handling.\r
 \r
 /** @file\r
   UEFI handle & protocol handling.\r
 \r

-Copyright (c) 2006 - 2017, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r

 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r


@@ -604,7 +604,7 @@ CoreInstallMultipleProtocolInterfaces (
       CoreUninstallProtocolInterface (*Handle, Protocol, Interface);\r
     }\r
     VA_END (Args);\r
       CoreUninstallProtocolInterface (*Handle, Protocol, Interface);\r
     }\r
     VA_END (Args);\r

-    \r
+\r

     *Handle = OldHandle;\r
   }\r
 \r
     *Handle = OldHandle;\r
   }\r
 \r


@@ -1314,7 +1314,7 @@ Done:
                                  form of EFI_OPEN_PROTOCOL_INFORMATION_ENTRY structures.\r
   @param  EntryCount             Number of EntryBuffer entries\r
 \r
                                  form of EFI_OPEN_PROTOCOL_INFORMATION_ENTRY structures.\r
   @param  EntryCount             Number of EntryBuffer entries\r
 \r

-  @retval EFI_SUCCESS            The open protocol information was returned in EntryBuffer, \r
+  @retval EFI_SUCCESS            The open protocol information was returned in EntryBuffer,\r

                                  and the number of entries was returned EntryCount.\r
   @retval EFI_NOT_FOUND          Handle does not support the protocol specified by Protocol.\r
   @retval EFI_OUT_OF_RESOURCES   There are not enough resources available to allocate EntryBuffer.\r
                                  and the number of entries was returned EntryCount.\r
   @retval EFI_NOT_FOUND          Handle does not support the protocol specified by Protocol.\r
   @retval EFI_OUT_OF_RESOURCES   There are not enough resources available to allocate EntryBuffer.\r

diff --git a/MdeModulePkg/Core/Dxe/Hand/Handle.h b/MdeModulePkg/Core/Dxe/Hand/Handle.h
index 28f762265a4ca4fdd79cbbf4119712f20e9b328e..2a1d5879cd0ce9ede877e850bcdcb22207b11bd7 100644 (file)
--- a/MdeModulePkg/Core/Dxe/Hand/Handle.h
+++ b/MdeModulePkg/Core/Dxe/Hand/Handle.h
@@ -1,7 +1,7 @@
 /** @file\r
   Support functions for managing protocol.\r
 \r
 /** @file\r
   Support functions for managing protocol.\r
 \r

-Copyright (c) 2006 - 2008, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r

 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r


@@ -26,7 +26,7 @@ typedef struct {
   /// All handles list of IHANDLE\r
   LIST_ENTRY          AllHandles;\r
   /// List of PROTOCOL_INTERFACE's for this handle\r
   /// All handles list of IHANDLE\r
   LIST_ENTRY          AllHandles;\r
   /// List of PROTOCOL_INTERFACE's for this handle\r

-  LIST_ENTRY          Protocols;      \r
+  LIST_ENTRY          Protocols;\r

   UINTN               LocateRequest;\r
   /// The Handle Database Key value when this handle was last created or modified\r
   UINT64              Key;\r
   UINTN               LocateRequest;\r
   /// The Handle Database Key value when this handle was last created or modified\r
   UINT64              Key;\r


@@ -44,13 +44,13 @@ typedef struct {
 typedef struct {\r
   UINTN               Signature;\r
   /// Link Entry inserted to mProtocolDatabase\r
 typedef struct {\r
   UINTN               Signature;\r
   /// Link Entry inserted to mProtocolDatabase\r

-  LIST_ENTRY          AllEntries;  \r
+  LIST_ENTRY          AllEntries;\r

   /// ID of the protocol\r
   /// ID of the protocol\r

-  EFI_GUID            ProtocolID;  \r
+  EFI_GUID            ProtocolID;\r

   /// All protocol interfaces\r
   /// All protocol interfaces\r

-  LIST_ENTRY          Protocols;     \r
+  LIST_ENTRY          Protocols;\r

   /// Registerd notification handlers\r
   /// Registerd notification handlers\r

-  LIST_ENTRY          Notify;                 \r
+  LIST_ENTRY          Notify;\r

 } PROTOCOL_ENTRY;\r
 \r
 \r
 } PROTOCOL_ENTRY;\r
 \r
 \r


@@ -63,17 +63,17 @@ typedef struct {
 typedef struct {\r
   UINTN                       Signature;\r
   /// Link on IHANDLE.Protocols\r
 typedef struct {\r
   UINTN                       Signature;\r
   /// Link on IHANDLE.Protocols\r

-  LIST_ENTRY                  Link;   \r
+  LIST_ENTRY                  Link;\r

   /// Back pointer\r
   /// Back pointer\r

-  IHANDLE                     *Handle;  \r
+  IHANDLE                     *Handle;\r

   /// Link on PROTOCOL_ENTRY.Protocols\r
   /// Link on PROTOCOL_ENTRY.Protocols\r

-  LIST_ENTRY                  ByProtocol; \r
+  LIST_ENTRY                  ByProtocol;\r

   /// The protocol ID\r
   /// The protocol ID\r

-  PROTOCOL_ENTRY              *Protocol;  \r
+  PROTOCOL_ENTRY              *Protocol;\r

   /// The interface value\r
   /// The interface value\r

-  VOID                        *Interface; \r
+  VOID                        *Interface;\r

   /// OPEN_PROTOCOL_DATA list\r
   /// OPEN_PROTOCOL_DATA list\r

-  LIST_ENTRY                  OpenList;       \r
+  LIST_ENTRY                  OpenList;\r

   UINTN                       OpenListCount;\r
 \r
 } PROTOCOL_INTERFACE;\r
   UINTN                       OpenListCount;\r
 \r
 } PROTOCOL_INTERFACE;\r


@@ -83,7 +83,7 @@ typedef struct {
 typedef struct {\r
   UINTN                       Signature;\r
   ///Link on PROTOCOL_INTERFACE.OpenList\r
 typedef struct {\r
   UINTN                       Signature;\r
   ///Link on PROTOCOL_INTERFACE.OpenList\r

-  LIST_ENTRY                  Link;      \r
+  LIST_ENTRY                  Link;\r

 \r
   EFI_HANDLE                  AgentHandle;\r
   EFI_HANDLE                  ControllerHandle;\r
 \r
   EFI_HANDLE                  AgentHandle;\r
   EFI_HANDLE                  ControllerHandle;\r


@@ -101,11 +101,11 @@ typedef struct {
   UINTN               Signature;\r
   PROTOCOL_ENTRY      *Protocol;\r
   /// All notifications for this protocol\r
   UINTN               Signature;\r
   PROTOCOL_ENTRY      *Protocol;\r
   /// All notifications for this protocol\r

-  LIST_ENTRY          Link;                   \r
+  LIST_ENTRY          Link;\r

   /// Event to notify\r
   /// Event to notify\r

-  EFI_EVENT           Event;    \r
+  EFI_EVENT           Event;\r

   /// Last position notified\r
   /// Last position notified\r

-  LIST_ENTRY          *Position;              \r
+  LIST_ENTRY          *Position;\r

 } PROTOCOL_NOTIFY;\r
 \r
 \r
 } PROTOCOL_NOTIFY;\r
 \r
 \r

diff --git a/MdeModulePkg/Core/Dxe/Hand/Locate.c b/MdeModulePkg/Core/Dxe/Hand/Locate.c
index 3cc146f3814c6aee7031408c82e0b5d34b48a6ec..4ec6130c5c844d1b876a82a220397fef9423d40f 100644 (file)
--- a/MdeModulePkg/Core/Dxe/Hand/Locate.c
+++ b/MdeModulePkg/Core/Dxe/Hand/Locate.c
@@ -1,7 +1,7 @@
 /** @file\r
   Locate handle functions\r
 \r
 /** @file\r
   Locate handle functions\r
 \r

-Copyright (c) 2006 - 2017, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r

 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r


@@ -457,7 +457,7 @@ CoreLocateDevicePath (
     if (IsDevicePathEndInstance (TmpDevicePath)) {\r
       //\r
       // If DevicePath is a multi-instance device path,\r
     if (IsDevicePathEndInstance (TmpDevicePath)) {\r
       //\r
       // If DevicePath is a multi-instance device path,\r

-      // the function will operate on the first instance \r
+      // the function will operate on the first instance\r

       //\r
       break;\r
     }\r
       //\r
       break;\r
     }\r


@@ -522,7 +522,7 @@ CoreLocateDevicePath (
     return  EFI_INVALID_PARAMETER;\r
   }\r
   *Device = BestDevice;\r
     return  EFI_INVALID_PARAMETER;\r
   }\r
   *Device = BestDevice;\r

-  \r
+\r

   //\r
   // Return the remaining part of the device path\r
   //\r
   //\r
   // Return the remaining part of the device path\r
   //\r

diff --git a/MdeModulePkg/Core/Dxe/Image/Image.c b/MdeModulePkg/Core/Dxe/Image/Image.c
index adeb4bf313a4009f028edb99a8dfc8cebc37725a..eddca140ee1a42647f6e4c7a2fd90349039373f9 100644 (file)
--- a/MdeModulePkg/Core/Dxe/Image/Image.c
+++ b/MdeModulePkg/Core/Dxe/Image/Image.c
@@ -1,7 +1,7 @@
 /** @file\r
   Core image handling services to load and unload PeImage.\r
 \r
 /** @file\r
   Core image handling services to load and unload PeImage.\r
 \r

-Copyright (c) 2006 - 2017, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r

 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r


@@ -73,7 +73,7 @@ LOADED_IMAGE_PRIVATE_DATA mCorePrivateImage  = {
 //\r
 // The field is define for Loading modules at fixed address feature to tracker the PEI code\r
 // memory range usage. It is a bit mapped array in which every bit indicates the correspoding memory page\r
 //\r
 // The field is define for Loading modules at fixed address feature to tracker the PEI code\r
 // memory range usage. It is a bit mapped array in which every bit indicates the correspoding memory page\r

-// available or not. \r
+// available or not.\r

 //\r
 GLOBAL_REMOVE_IF_UNREFERENCED    UINT64                *mDxeCodeMemoryRangeUsageBitMap=NULL;\r
 \r
 //\r
 GLOBAL_REMOVE_IF_UNREFERENCED    UINT64                *mDxeCodeMemoryRangeUsageBitMap=NULL;\r
 \r


@@ -108,7 +108,7 @@ GetMachineTypeName (
   )\r
 {\r
   UINTN  Index;\r
   )\r
 {\r
   UINTN  Index;\r

-  \r
+\r

   for (Index = 0; Index < sizeof(mMachineTypeInfo)/sizeof(mMachineTypeInfo[0]); Index++) {\r
     if (mMachineTypeInfo[Index].MachineType == MachineType) {\r
       return mMachineTypeInfo[Index].MachineTypeName;\r
   for (Index = 0; Index < sizeof(mMachineTypeInfo)/sizeof(mMachineTypeInfo[0]); Index++) {\r
     if (mMachineTypeInfo[Index].MachineType == MachineType) {\r
       return mMachineTypeInfo[Index].MachineTypeName;\r


@@ -138,7 +138,7 @@ CoreInitializeImageServices (
   UINT64                            DxeCoreImageLength;\r
   VOID                              *DxeCoreEntryPoint;\r
   EFI_PEI_HOB_POINTERS              DxeCoreHob;\r
   UINT64                            DxeCoreImageLength;\r
   VOID                              *DxeCoreEntryPoint;\r
   EFI_PEI_HOB_POINTERS              DxeCoreHob;\r

- \r
+\r

   //\r
   // Searching for image hob\r
   //\r
   //\r
   // Searching for image hob\r
   //\r


@@ -158,7 +158,7 @@ CoreInitializeImageServices (
   DxeCoreImageLength      = DxeCoreHob.MemoryAllocationModule->MemoryAllocationHeader.MemoryLength;\r
   DxeCoreEntryPoint       = (VOID *) (UINTN) DxeCoreHob.MemoryAllocationModule->EntryPoint;\r
   gDxeCoreFileName        = &DxeCoreHob.MemoryAllocationModule->ModuleName;\r
   DxeCoreImageLength      = DxeCoreHob.MemoryAllocationModule->MemoryAllocationHeader.MemoryLength;\r
   DxeCoreEntryPoint       = (VOID *) (UINTN) DxeCoreHob.MemoryAllocationModule->EntryPoint;\r
   gDxeCoreFileName        = &DxeCoreHob.MemoryAllocationModule->ModuleName;\r

-  \r
+\r

   //\r
   // Initialize the fields for an internal driver\r
   //\r
   //\r
   // Initialize the fields for an internal driver\r
   //\r


@@ -263,11 +263,11 @@ CoreReadImageFile (
 /**\r
   To check memory usage bit map array to figure out if the memory range the image will be loaded in is available or not. If\r
   memory range is available, the function will mark the corresponding bits to 1 which indicates the memory range is used.\r
 /**\r
   To check memory usage bit map array to figure out if the memory range the image will be loaded in is available or not. If\r
   memory range is available, the function will mark the corresponding bits to 1 which indicates the memory range is used.\r

-  The function is only invoked when load modules at fixed address feature is enabled. \r
-  \r
+  The function is only invoked when load modules at fixed address feature is enabled.\r
+\r

   @param  ImageBase                The base address the image will be loaded at.\r
   @param  ImageSize                The size of the image\r
   @param  ImageBase                The base address the image will be loaded at.\r
   @param  ImageSize                The size of the image\r

-  \r
+\r

   @retval EFI_SUCCESS              The memory range the image will be loaded in is available\r
   @retval EFI_NOT_FOUND            The memory range the image will be loaded in is not available\r
 **/\r
   @retval EFI_SUCCESS              The memory range the image will be loaded in is available\r
   @retval EFI_NOT_FOUND            The memory range the image will be loaded in is not available\r
 **/\r


@@ -278,23 +278,23 @@ CheckAndMarkFixLoadingMemoryUsageBitMap (
   )\r
 {\r
    UINT32                             DxeCodePageNumber;\r
   )\r
 {\r
    UINT32                             DxeCodePageNumber;\r

-   UINT64                             DxeCodeSize; \r
+   UINT64                             DxeCodeSize;\r

    EFI_PHYSICAL_ADDRESS               DxeCodeBase;\r
    UINTN                              BaseOffsetPageNumber;\r
    UINTN                              TopOffsetPageNumber;\r
    UINTN                              Index;\r
    //\r
    // The DXE code range includes RuntimeCodePage range and Boot time code range.\r
    EFI_PHYSICAL_ADDRESS               DxeCodeBase;\r
    UINTN                              BaseOffsetPageNumber;\r
    UINTN                              TopOffsetPageNumber;\r
    UINTN                              Index;\r
    //\r
    // The DXE code range includes RuntimeCodePage range and Boot time code range.\r

-   //  \r
+   //\r

    DxeCodePageNumber = PcdGet32(PcdLoadFixAddressRuntimeCodePageNumber);\r
    DxeCodePageNumber += PcdGet32(PcdLoadFixAddressBootTimeCodePageNumber);\r
    DxeCodeSize       = EFI_PAGES_TO_SIZE(DxeCodePageNumber);\r
    DxeCodeBase       =  gLoadModuleAtFixAddressConfigurationTable.DxeCodeTopAddress - DxeCodeSize;\r
    DxeCodePageNumber = PcdGet32(PcdLoadFixAddressRuntimeCodePageNumber);\r
    DxeCodePageNumber += PcdGet32(PcdLoadFixAddressBootTimeCodePageNumber);\r
    DxeCodeSize       = EFI_PAGES_TO_SIZE(DxeCodePageNumber);\r
    DxeCodeBase       =  gLoadModuleAtFixAddressConfigurationTable.DxeCodeTopAddress - DxeCodeSize;\r

-   \r
+\r

    //\r
    //\r

-   // If the memory usage bit map is not initialized,  do it. Every bit in the array \r
+   // If the memory usage bit map is not initialized,  do it. Every bit in the array\r

    // indicate the status of the corresponding memory page, available or not\r
    // indicate the status of the corresponding memory page, available or not\r

-   // \r
+   //\r

    if (mDxeCodeMemoryRangeUsageBitMap == NULL) {\r
      mDxeCodeMemoryRangeUsageBitMap = AllocateZeroPool(((DxeCodePageNumber/64) + 1)*sizeof(UINT64));\r
    }\r
    if (mDxeCodeMemoryRangeUsageBitMap == NULL) {\r
      mDxeCodeMemoryRangeUsageBitMap = AllocateZeroPool(((DxeCodePageNumber/64) + 1)*sizeof(UINT64));\r
    }\r


@@ -309,11 +309,11 @@ CheckAndMarkFixLoadingMemoryUsageBitMap (
    //\r
    if (gLoadModuleAtFixAddressConfigurationTable.DxeCodeTopAddress <  ImageBase + ImageSize ||\r
        DxeCodeBase >  ImageBase) {\r
    //\r
    if (gLoadModuleAtFixAddressConfigurationTable.DxeCodeTopAddress <  ImageBase + ImageSize ||\r
        DxeCodeBase >  ImageBase) {\r

-     return EFI_NOT_FOUND;   \r
-   }   \r
+     return EFI_NOT_FOUND;\r
+   }\r

    //\r
    // Test if the memory is avalaible or not.\r
    //\r
    // Test if the memory is avalaible or not.\r

-   // \r
+   //\r

    BaseOffsetPageNumber = EFI_SIZE_TO_PAGES((UINT32)(ImageBase - DxeCodeBase));\r
    TopOffsetPageNumber  = EFI_SIZE_TO_PAGES((UINT32)(ImageBase + ImageSize - DxeCodeBase));\r
    for (Index = BaseOffsetPageNumber; Index < TopOffsetPageNumber; Index ++) {\r
    BaseOffsetPageNumber = EFI_SIZE_TO_PAGES((UINT32)(ImageBase - DxeCodeBase));\r
    TopOffsetPageNumber  = EFI_SIZE_TO_PAGES((UINT32)(ImageBase + ImageSize - DxeCodeBase));\r
    for (Index = BaseOffsetPageNumber; Index < TopOffsetPageNumber; Index ++) {\r


@@ -321,17 +321,17 @@ CheckAndMarkFixLoadingMemoryUsageBitMap (
        //\r
        // This page is already used.\r
        //\r
        //\r
        // This page is already used.\r
        //\r

-       return EFI_NOT_FOUND;  \r
+       return EFI_NOT_FOUND;\r

      }\r
    }\r
      }\r
    }\r

-   \r
+\r

    //\r
    // Being here means the memory range is available.  So mark the bits for the memory range\r
    //\r
    // Being here means the memory range is available.  So mark the bits for the memory range\r

-   // \r
+   //\r

    for (Index = BaseOffsetPageNumber; Index < TopOffsetPageNumber; Index ++) {\r
      mDxeCodeMemoryRangeUsageBitMap[Index / 64] |= LShiftU64(1, (Index % 64));\r
    }\r
    for (Index = BaseOffsetPageNumber; Index < TopOffsetPageNumber; Index ++) {\r
      mDxeCodeMemoryRangeUsageBitMap[Index / 64] |= LShiftU64(1, (Index % 64));\r
    }\r

-   return  EFI_SUCCESS;   \r
+   return  EFI_SUCCESS;\r

 }\r
 /**\r
 \r
 }\r
 /**\r
 \r


@@ -358,10 +358,10 @@ GetPeCoffImageFixLoadingAssignedAddress(
    UINT16                             NumberOfSections;\r
    IMAGE_FILE_HANDLE                  *Handle;\r
    UINT64                             ValueInSectionHeader;\r
    UINT16                             NumberOfSections;\r
    IMAGE_FILE_HANDLE                  *Handle;\r
    UINT64                             ValueInSectionHeader;\r

-                             \r
+\r

 \r
    Status = EFI_NOT_FOUND;\r
 \r
    Status = EFI_NOT_FOUND;\r

- \r
+\r

    //\r
    // Get PeHeader pointer\r
    //\r
    //\r
    // Get PeHeader pointer\r
    //\r


@@ -395,30 +395,30 @@ GetPeCoffImageFixLoadingAssignedAddress(
      }\r
 \r
      Status = EFI_NOT_FOUND;\r
      }\r
 \r
      Status = EFI_NOT_FOUND;\r

-     \r
+\r

      if ((SectionHeader.Characteristics & EFI_IMAGE_SCN_CNT_CODE) == 0) {\r
        //\r
        // Build tool will save the address in PointerToRelocations & PointerToLineNumbers fields in the first section header\r
      if ((SectionHeader.Characteristics & EFI_IMAGE_SCN_CNT_CODE) == 0) {\r
        //\r
        // Build tool will save the address in PointerToRelocations & PointerToLineNumbers fields in the first section header\r

-       // that doesn't point to code section in image header, as well as ImageBase field of image header. And there is an \r
-       // assumption that when the feature is enabled, if a module is assigned a loading address by tools, PointerToRelocations  \r
+       // that doesn't point to code section in image header, as well as ImageBase field of image header. And there is an\r
+       // assumption that when the feature is enabled, if a module is assigned a loading address by tools, PointerToRelocations\r

        // & PointerToLineNumbers fields should NOT be Zero, or else, these 2 fields should be set to Zero\r
        //\r
        ValueInSectionHeader = ReadUnaligned64((UINT64*)&SectionHeader.PointerToRelocations);\r
        if (ValueInSectionHeader != 0) {\r
          //\r
        // & PointerToLineNumbers fields should NOT be Zero, or else, these 2 fields should be set to Zero\r
        //\r
        ValueInSectionHeader = ReadUnaligned64((UINT64*)&SectionHeader.PointerToRelocations);\r
        if (ValueInSectionHeader != 0) {\r
          //\r

-         // When the feature is configured as load module at fixed absolute address, the ImageAddress field of ImageContext \r
+         // When the feature is configured as load module at fixed absolute address, the ImageAddress field of ImageContext\r

          // hold the spcified address. If the feature is configured as load module at fixed offset, ImageAddress hold an offset\r
          // relative to top address\r
          //\r
          if ((INT64)PcdGet64(PcdLoadModuleAtFixAddressEnable) < 0) {\r
          // hold the spcified address. If the feature is configured as load module at fixed offset, ImageAddress hold an offset\r
          // relative to top address\r
          //\r
          if ((INT64)PcdGet64(PcdLoadModuleAtFixAddressEnable) < 0) {\r

-                ImageContext->ImageAddress = gLoadModuleAtFixAddressConfigurationTable.DxeCodeTopAddress + (INT64)(INTN)ImageContext->ImageAddress;\r
+            ImageContext->ImageAddress = gLoadModuleAtFixAddressConfigurationTable.DxeCodeTopAddress + (INT64)(INTN)ImageContext->ImageAddress;\r

          }\r
          //\r
          // Check if the memory range is available.\r
          //\r
          Status = CheckAndMarkFixLoadingMemoryUsageBitMap (ImageContext->ImageAddress, (UINTN)(ImageContext->ImageSize + ImageContext->SectionAlignment));\r
        }\r
          }\r
          //\r
          // Check if the memory range is available.\r
          //\r
          Status = CheckAndMarkFixLoadingMemoryUsageBitMap (ImageContext->ImageAddress, (UINTN)(ImageContext->ImageSize + ImageContext->SectionAlignment));\r
        }\r

-       break; \r
+       break;\r

      }\r
      SectionHeaderOffset += sizeof (EFI_IMAGE_SECTION_HEADER);\r
    }\r
      }\r
      SectionHeaderOffset += sizeof (EFI_IMAGE_SECTION_HEADER);\r
    }\r


@@ -541,17 +541,17 @@ CoreLoadPeImage (
 \r
       if (EFI_ERROR (Status))  {\r
           //\r
 \r
       if (EFI_ERROR (Status))  {\r
           //\r

-         // If the code memory is not ready, invoke CoreAllocatePage with AllocateAnyPages to load the driver.\r
-         //\r
+          // If the code memory is not ready, invoke CoreAllocatePage with AllocateAnyPages to load the driver.\r
+          //\r

           DEBUG ((EFI_D_INFO|EFI_D_LOAD, "LOADING MODULE FIXED ERROR: Loading module at fixed address failed since specified memory is not available.\n"));\r
           DEBUG ((EFI_D_INFO|EFI_D_LOAD, "LOADING MODULE FIXED ERROR: Loading module at fixed address failed since specified memory is not available.\n"));\r

-        \r
+\r

           Status = CoreAllocatePages (\r
                      AllocateAnyPages,\r
                      (EFI_MEMORY_TYPE) (Image->ImageContext.ImageCodeMemoryType),\r
                      Image->NumberOfPages,\r
                      &Image->ImageContext.ImageAddress\r
           Status = CoreAllocatePages (\r
                      AllocateAnyPages,\r
                      (EFI_MEMORY_TYPE) (Image->ImageContext.ImageCodeMemoryType),\r
                      Image->NumberOfPages,\r
                      &Image->ImageContext.ImageAddress\r

-                     );         \r
-      } \r
+                     );\r
+      }\r

     } else {\r
       if (Image->ImageContext.ImageAddress >= 0x100000 || Image->ImageContext.RelocationsStripped) {\r
         Status = CoreAllocatePages (\r
     } else {\r
       if (Image->ImageContext.ImageAddress >= 0x100000 || Image->ImageContext.RelocationsStripped) {\r
         Status = CoreAllocatePages (\r


@@ -1030,10 +1030,10 @@ CoreUnloadAndCloseImage (
   @retval EFI_LOAD_ERROR          Image was not loaded because the image format was corrupt or not\r
                                   understood.\r
   @retval EFI_DEVICE_ERROR        Image was not loaded because the device returned a read error.\r
   @retval EFI_LOAD_ERROR          Image was not loaded because the image format was corrupt or not\r
                                   understood.\r
   @retval EFI_DEVICE_ERROR        Image was not loaded because the device returned a read error.\r

-  @retval EFI_ACCESS_DENIED       Image was not loaded because the platform policy prohibits the \r
+  @retval EFI_ACCESS_DENIED       Image was not loaded because the platform policy prohibits the\r

                                   image from being loaded. NULL is returned in *ImageHandle.\r
                                   image from being loaded. NULL is returned in *ImageHandle.\r

-  @retval EFI_SECURITY_VIOLATION  Image was loaded and an ImageHandle was created with a \r
-                                  valid EFI_LOADED_IMAGE_PROTOCOL. However, the current \r
+  @retval EFI_SECURITY_VIOLATION  Image was loaded and an ImageHandle was created with a\r
+                                  valid EFI_LOADED_IMAGE_PROTOCOL. However, the current\r

                                   platform policy specifies that the image should not be started.\r
 \r
 **/\r
                                   platform policy specifies that the image should not be started.\r
 \r
 **/\r


@@ -1145,7 +1145,7 @@ CoreLoadImageCommon (
     // Get the source file buffer by its device path.\r
     //\r
     FHand.Source = GetFileBufferByFilePath (\r
     // Get the source file buffer by its device path.\r
     //\r
     FHand.Source = GetFileBufferByFilePath (\r

-                      BootPolicy, \r
+                      BootPolicy,\r

                       FilePath,\r
                       &FHand.SourceSize,\r
                       &AuthenticationStatus\r
                       FilePath,\r
                       &FHand.SourceSize,\r
                       &AuthenticationStatus\r


@@ -1417,10 +1417,10 @@ Done:
   @retval EFI_LOAD_ERROR          Image was not loaded because the image format was corrupt or not\r
                                   understood.\r
   @retval EFI_DEVICE_ERROR        Image was not loaded because the device returned a read error.\r
   @retval EFI_LOAD_ERROR          Image was not loaded because the image format was corrupt or not\r
                                   understood.\r
   @retval EFI_DEVICE_ERROR        Image was not loaded because the device returned a read error.\r

-  @retval EFI_ACCESS_DENIED       Image was not loaded because the platform policy prohibits the \r
+  @retval EFI_ACCESS_DENIED       Image was not loaded because the platform policy prohibits the\r

                                   image from being loaded. NULL is returned in *ImageHandle.\r
                                   image from being loaded. NULL is returned in *ImageHandle.\r

-  @retval EFI_SECURITY_VIOLATION  Image was loaded and an ImageHandle was created with a \r
-                                  valid EFI_LOADED_IMAGE_PROTOCOL. However, the current \r
+  @retval EFI_SECURITY_VIOLATION  Image was loaded and an ImageHandle was created with a\r
+                                  valid EFI_LOADED_IMAGE_PROTOCOL. However, the current\r

                                   platform policy specifies that the image should not be started.\r
 \r
 **/\r
                                   platform policy specifies that the image should not be started.\r
 \r
 **/\r


@@ -1453,10 +1453,10 @@ CoreLoadImage (
              EFI_LOAD_PE_IMAGE_ATTRIBUTE_RUNTIME_REGISTRATION | EFI_LOAD_PE_IMAGE_ATTRIBUTE_DEBUG_IMAGE_INFO_TABLE_REGISTRATION\r
              );\r
 \r
              EFI_LOAD_PE_IMAGE_ATTRIBUTE_RUNTIME_REGISTRATION | EFI_LOAD_PE_IMAGE_ATTRIBUTE_DEBUG_IMAGE_INFO_TABLE_REGISTRATION\r
              );\r
 \r

-  Handle = NULL; \r
+  Handle = NULL;\r

   if (!EFI_ERROR (Status)) {\r
     //\r
   if (!EFI_ERROR (Status)) {\r
     //\r

-    // ImageHandle will be valid only Status is success. \r
+    // ImageHandle will be valid only Status is success.\r

     //\r
     Handle = *ImageHandle;\r
   }\r
     //\r
     Handle = *ImageHandle;\r
   }\r


@@ -1498,10 +1498,10 @@ CoreLoadImage (
   @retval EFI_LOAD_ERROR          Image was not loaded because the image format was corrupt or not\r
                                   understood.\r
   @retval EFI_DEVICE_ERROR        Image was not loaded because the device returned a read error.\r
   @retval EFI_LOAD_ERROR          Image was not loaded because the image format was corrupt or not\r
                                   understood.\r
   @retval EFI_DEVICE_ERROR        Image was not loaded because the device returned a read error.\r

-  @retval EFI_ACCESS_DENIED       Image was not loaded because the platform policy prohibits the \r
+  @retval EFI_ACCESS_DENIED       Image was not loaded because the platform policy prohibits the\r

                                   image from being loaded. NULL is returned in *ImageHandle.\r
                                   image from being loaded. NULL is returned in *ImageHandle.\r

-  @retval EFI_SECURITY_VIOLATION  Image was loaded and an ImageHandle was created with a \r
-                                  valid EFI_LOADED_IMAGE_PROTOCOL. However, the current \r
+  @retval EFI_SECURITY_VIOLATION  Image was loaded and an ImageHandle was created with a\r
+                                  valid EFI_LOADED_IMAGE_PROTOCOL. However, the current\r

                                   platform policy specifies that the image should not be started.\r
 \r
 **/\r
                                   platform policy specifies that the image should not be started.\r
 \r
 **/\r


@@ -1538,10 +1538,10 @@ CoreLoadImageEx (
            Attribute\r
            );\r
 \r
            Attribute\r
            );\r
 \r

-  Handle = NULL; \r
+  Handle = NULL;\r

   if (!EFI_ERROR (Status)) {\r
     //\r
   if (!EFI_ERROR (Status)) {\r
     //\r

-    // ImageHandle will be valid only Status is success. \r
+    // ImageHandle will be valid only Status is success.\r

     //\r
     Handle = *ImageHandle;\r
   }\r
     //\r
     Handle = *ImageHandle;\r
   }\r

diff --git a/MdeModulePkg/Core/Dxe/Image/Image.h b/MdeModulePkg/Core/Dxe/Image/Image.h
index 7fb8c9368e235a0b0209900a20a07b273d556952..5cff84fee094b1e1a7db72657a58bb10b7f6ed1c 100644 (file)
--- a/MdeModulePkg/Core/Dxe/Image/Image.h
+++ b/MdeModulePkg/Core/Dxe/Image/Image.h
@@ -1,7 +1,7 @@
 /** @file\r
   Data structure and functions to load and unload PeImage.\r
 \r
 /** @file\r
   Data structure and functions to load and unload PeImage.\r
 \r

-Copyright (c) 2006 - 2011, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r

 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r


@@ -21,7 +21,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 typedef struct {\r
   UINTN                       Signature;\r
   /// Image handle\r
 typedef struct {\r
   UINTN                       Signature;\r
   /// Image handle\r

-  EFI_HANDLE                  Handle;         \r
+  EFI_HANDLE                  Handle;\r

   EFI_PE32_IMAGE_PROTOCOL     Pe32Image;\r
 } LOAD_PE32_IMAGE_PRIVATE_DATA;\r
 \r
   EFI_PE32_IMAGE_PROTOCOL     Pe32Image;\r
 } LOAD_PE32_IMAGE_PRIVATE_DATA;\r
 \r


@@ -70,10 +70,10 @@ typedef struct {
   @retval EFI_LOAD_ERROR          Image was not loaded because the image format was corrupt or not\r
                                   understood.\r
   @retval EFI_DEVICE_ERROR        Image was not loaded because the device returned a read error.\r
   @retval EFI_LOAD_ERROR          Image was not loaded because the image format was corrupt or not\r
                                   understood.\r
   @retval EFI_DEVICE_ERROR        Image was not loaded because the device returned a read error.\r

-  @retval EFI_ACCESS_DENIED       Image was not loaded because the platform policy prohibits the \r
+  @retval EFI_ACCESS_DENIED       Image was not loaded because the platform policy prohibits the\r

                                   image from being loaded. NULL is returned in *ImageHandle.\r
                                   image from being loaded. NULL is returned in *ImageHandle.\r

-  @retval EFI_SECURITY_VIOLATION  Image was loaded and an ImageHandle was created with a \r
-                                  valid EFI_LOADED_IMAGE_PROTOCOL. However, the current \r
+  @retval EFI_SECURITY_VIOLATION  Image was loaded and an ImageHandle was created with a\r
+                                  valid EFI_LOADED_IMAGE_PROTOCOL. However, the current\r

                                   platform policy specifies that the image should not be started.\r
 \r
 **/\r
                                   platform policy specifies that the image should not be started.\r
 \r
 **/\r

diff --git a/MdeModulePkg/Core/Dxe/Mem/MemoryProfileRecord.c b/MdeModulePkg/Core/Dxe/Mem/MemoryProfileRecord.c
index a91a719b4de5593b1d21f0aaf0951ace256e5f5e..83ed43a16e957f7c1317950ee818aa3ba11bd430 100644 (file)
--- a/MdeModulePkg/Core/Dxe/Mem/MemoryProfileRecord.c
+++ b/MdeModulePkg/Core/Dxe/Mem/MemoryProfileRecord.c
@@ -1,7 +1,7 @@
 /** @file\r
   Support routines for UEFI memory profile.\r
 \r
 /** @file\r
   Support routines for UEFI memory profile.\r
 \r

-  Copyright (c) 2014 - 2016, Intel Corporation. All rights reserved.<BR>\r
+  Copyright (c) 2014 - 2018, Intel Corporation. All rights reserved.<BR>\r

   This program and the accompanying materials\r
   are licensed and made available under the terms and conditions of the BSD License\r
   which accompanies this distribution.  The full text of the license may be found at\r
   This program and the accompanying materials\r
   are licensed and made available under the terms and conditions of the BSD License\r
   which accompanies this distribution.  The full text of the license may be found at\r


@@ -76,10 +76,10 @@ GLOBAL_REMOVE_IF_UNREFERENCED UINTN                    mMemoryProfileDriverPathS
   @param[in, out] ProfileSize       On entry, points to the size in bytes of the ProfileBuffer.\r
                                     On return, points to the size of the data returned in ProfileBuffer.\r
   @param[out]     ProfileBuffer     Profile buffer.\r
   @param[in, out] ProfileSize       On entry, points to the size in bytes of the ProfileBuffer.\r
                                     On return, points to the size of the data returned in ProfileBuffer.\r
   @param[out]     ProfileBuffer     Profile buffer.\r

-                      \r
+\r

   @return EFI_SUCCESS               Get the memory profile data successfully.\r
   @return EFI_UNSUPPORTED           Memory profile is unsupported.\r
   @return EFI_SUCCESS               Get the memory profile data successfully.\r
   @return EFI_UNSUPPORTED           Memory profile is unsupported.\r

-  @return EFI_BUFFER_TO_SMALL       The ProfileSize is too small for the resulting data. \r
+  @return EFI_BUFFER_TO_SMALL       The ProfileSize is too small for the resulting data.\r

                                     ProfileSize is updated with the size required.\r
 \r
 **/\r
                                     ProfileSize is updated with the size required.\r
 \r
 **/\r


@@ -514,7 +514,7 @@ NeedRecordThisDriver (
     //\r
     return TRUE;\r
   }\r
     //\r
     return TRUE;\r
   }\r

-  \r
+\r

   //\r
   // Record FilePath without END node.\r
   //\r
   //\r
   // Record FilePath without END node.\r
   //\r


@@ -1572,10 +1572,10 @@ MemoryProfileCopyData (
   @param[in, out] ProfileSize       On entry, points to the size in bytes of the ProfileBuffer.\r
                                     On return, points to the size of the data returned in ProfileBuffer.\r
   @param[out]     ProfileBuffer     Profile buffer.\r
   @param[in, out] ProfileSize       On entry, points to the size in bytes of the ProfileBuffer.\r
                                     On return, points to the size of the data returned in ProfileBuffer.\r
   @param[out]     ProfileBuffer     Profile buffer.\r

-                      \r
+\r

   @return EFI_SUCCESS               Get the memory profile data successfully.\r
   @return EFI_UNSUPPORTED           Memory profile is unsupported.\r
   @return EFI_SUCCESS               Get the memory profile data successfully.\r
   @return EFI_UNSUPPORTED           Memory profile is unsupported.\r

-  @return EFI_BUFFER_TO_SMALL       The ProfileSize is too small for the resulting data. \r
+  @return EFI_BUFFER_TO_SMALL       The ProfileSize is too small for the resulting data.\r

                                     ProfileSize is updated with the size required.\r
 \r
 **/\r
                                     ProfileSize is updated with the size required.\r
 \r
 **/\r

diff --git a/MdeModulePkg/Core/Dxe/Mem/Page.c b/MdeModulePkg/Core/Dxe/Mem/Page.c
index 8d5d03a6d90a8d13e5c520dfcd5f18e1a3ddd5e2..3b4cc08e7cec9d60454540443635994440fd26d4 100644 (file)
--- a/MdeModulePkg/Core/Dxe/Mem/Page.c
+++ b/MdeModulePkg/Core/Dxe/Mem/Page.c
@@ -1,7 +1,7 @@
 /** @file\r
   UEFI Memory page management functions.\r
 \r
 /** @file\r
   UEFI Memory page management functions.\r
 \r

-Copyright (c) 2007 - 2017, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2007 - 2018, Intel Corporation. All rights reserved.<BR>\r

 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r


@@ -93,7 +93,7 @@ EFI_MEMORY_TYPE_INFORMATION gMemoryTypeInformation[EfiMaxMemoryType + 1] = {
 };\r
 //\r
 // Only used when load module at fixed address feature is enabled. True means the memory is alreay successfully allocated\r
 };\r
 //\r
 // Only used when load module at fixed address feature is enabled. True means the memory is alreay successfully allocated\r

-// and ready to load the module in to specified address.or else, the memory is not ready and module will be loaded at a \r
+// and ready to load the module in to specified address.or else, the memory is not ready and module will be loaded at a\r

 //  address assigned by DXE core.\r
 //\r
 GLOBAL_REMOVE_IF_UNREFERENCED   BOOLEAN       gLoadFixedAddressCodeMemoryReady = FALSE;\r
 //  address assigned by DXE core.\r
 //\r
 GLOBAL_REMOVE_IF_UNREFERENCED   BOOLEAN       gLoadFixedAddressCodeMemoryReady = FALSE;\r


@@ -178,22 +178,22 @@ CoreAddRange (
   ASSERT_LOCKED (&gMemoryLock);\r
 \r
   DEBUG ((DEBUG_PAGE, "AddRange: %lx-%lx to %d\n", Start, End, Type));\r
   ASSERT_LOCKED (&gMemoryLock);\r
 \r
   DEBUG ((DEBUG_PAGE, "AddRange: %lx-%lx to %d\n", Start, End, Type));\r

-  \r
-  //\r
-  // If memory of type EfiConventionalMemory is being added that includes the page \r
-  // starting at address 0, then zero the page starting at address 0.  This has \r
-  // two benifits.  It helps find NULL pointer bugs and it also maximizes \r
-  // compatibility with operating systems that may evaluate memory in this page \r
-  // for legacy data structures.  If memory of any other type is added starting \r
-  // at address 0, then do not zero the page at address 0 because the page is being \r
+\r
+  //\r
+  // If memory of type EfiConventionalMemory is being added that includes the page\r
+  // starting at address 0, then zero the page starting at address 0.  This has\r
+  // two benifits.  It helps find NULL pointer bugs and it also maximizes\r
+  // compatibility with operating systems that may evaluate memory in this page\r
+  // for legacy data structures.  If memory of any other type is added starting\r
+  // at address 0, then do not zero the page at address 0 because the page is being\r

   // used for other purposes.\r
   // used for other purposes.\r

-  //  \r
+  //\r

   if (Type == EfiConventionalMemory && Start == 0 && (End >= EFI_PAGE_SIZE - 1)) {\r
     if ((PcdGet8 (PcdNullPointerDetectionPropertyMask) & BIT0) == 0) {\r
       SetMem ((VOID *)(UINTN)Start, EFI_PAGE_SIZE, 0);\r
     }\r
   }\r
   if (Type == EfiConventionalMemory && Start == 0 && (End >= EFI_PAGE_SIZE - 1)) {\r
     if ((PcdGet8 (PcdNullPointerDetectionPropertyMask) & BIT0) == 0) {\r
       SetMem ((VOID *)(UINTN)Start, EFI_PAGE_SIZE, 0);\r
     }\r
   }\r

-  \r
+\r

   //\r
   // Memory map being altered so updated key\r
   //\r
   //\r
   // Memory map being altered so updated key\r
   //\r


@@ -454,8 +454,8 @@ PromoteMemoryResource (
   return Promoted;\r
 }\r
 /**\r
   return Promoted;\r
 }\r
 /**\r

-  This function try to allocate Runtime code & Boot time code memory range. If LMFA enabled, 2 patchable PCD \r
-  PcdLoadFixAddressRuntimeCodePageNumber & PcdLoadFixAddressBootTimeCodePageNumber which are set by tools will record the \r
+  This function try to allocate Runtime code & Boot time code memory range. If LMFA enabled, 2 patchable PCD\r
+  PcdLoadFixAddressRuntimeCodePageNumber & PcdLoadFixAddressBootTimeCodePageNumber which are set by tools will record the\r

   size of boot time and runtime code.\r
 \r
 **/\r
   size of boot time and runtime code.\r
 \r
 **/\r


@@ -473,7 +473,7 @@ CoreLoadingFixedAddressHook (
    //\r
    // Make sure these 2 areas are not initialzied.\r
    //\r
    //\r
    // Make sure these 2 areas are not initialzied.\r
    //\r

-   if (!gLoadFixedAddressCodeMemoryReady) {   \r
+   if (!gLoadFixedAddressCodeMemoryReady) {\r

      RuntimeCodePageNumber = PcdGet32(PcdLoadFixAddressRuntimeCodePageNumber);\r
      BootTimeCodePageNumber= PcdGet32(PcdLoadFixAddressBootTimeCodePageNumber);\r
      RuntimeCodeBase       = (EFI_PHYSICAL_ADDRESS)(gLoadModuleAtFixAddressConfigurationTable.DxeCodeTopAddress - EFI_PAGES_TO_SIZE (RuntimeCodePageNumber));\r
      RuntimeCodePageNumber = PcdGet32(PcdLoadFixAddressRuntimeCodePageNumber);\r
      BootTimeCodePageNumber= PcdGet32(PcdLoadFixAddressBootTimeCodePageNumber);\r
      RuntimeCodeBase       = (EFI_PHYSICAL_ADDRESS)(gLoadModuleAtFixAddressConfigurationTable.DxeCodeTopAddress - EFI_PAGES_TO_SIZE (RuntimeCodePageNumber));\r


@@ -489,7 +489,7 @@ CoreLoadingFixedAddressHook (
                        );\r
      if (EFI_ERROR(Status)) {\r
        //\r
                        );\r
      if (EFI_ERROR(Status)) {\r
        //\r

-       // Runtime memory allocation failed \r
+       // Runtime memory allocation failed\r

        //\r
        return;\r
      }\r
        //\r
        return;\r
      }\r


@@ -504,19 +504,19 @@ CoreLoadingFixedAddressHook (
                        );\r
      if (EFI_ERROR(Status)) {\r
        //\r
                        );\r
      if (EFI_ERROR(Status)) {\r
        //\r

-        // boot memory allocation failed. Free Runtime code range and will try the allocation again when \r
-        // new memory range is installed.\r
-        //\r
-        CoreFreePages (\r
+        // boot memory allocation failed. Free Runtime code range and will try the allocation again when\r
+        // new memory range is installed.\r
+        //\r
+        CoreFreePages (\r

               RuntimeCodeBase,\r
               RuntimeCodePageNumber\r
               );\r
        return;\r
      }\r
      gLoadFixedAddressCodeMemoryReady = TRUE;\r
               RuntimeCodeBase,\r
               RuntimeCodePageNumber\r
               );\r
        return;\r
      }\r
      gLoadFixedAddressCodeMemoryReady = TRUE;\r

-   } \r
+   }\r

    return;\r
    return;\r

-}  \r
+}\r

 \r
 /**\r
   Called to initialize the memory map and add descriptors to\r
 \r
 /**\r
   Called to initialize the memory map and add descriptors to\r


@@ -545,7 +545,7 @@ CoreAddMemoryDescriptor (
   EFI_STATUS                  Status;\r
   UINTN                       Index;\r
   UINTN                       FreeIndex;\r
   EFI_STATUS                  Status;\r
   UINTN                       Index;\r
   UINTN                       FreeIndex;\r

-  \r
+\r

   if ((Start & EFI_PAGE_MASK) != 0) {\r
     return;\r
   }\r
   if ((Start & EFI_PAGE_MASK) != 0) {\r
     return;\r
   }\r


@@ -568,7 +568,7 @@ CoreAddMemoryDescriptor (
   if (PcdGet64(PcdLoadModuleAtFixAddressEnable) != 0) {\r
     CoreLoadingFixedAddressHook();\r
   }\r
   if (PcdGet64(PcdLoadModuleAtFixAddressEnable) != 0) {\r
     CoreLoadingFixedAddressHook();\r
   }\r

-  \r
+\r

   //\r
   // Check to see if the statistics for the different memory types have already been established\r
   //\r
   //\r
   // Check to see if the statistics for the different memory types have already been established\r
   //\r


@@ -576,7 +576,7 @@ CoreAddMemoryDescriptor (
     return;\r
   }\r
 \r
     return;\r
   }\r
 \r

-  \r
+\r

   //\r
   // Loop through each memory type in the order specified by the gMemoryTypeInformation[] array\r
   //\r
   //\r
   // Loop through each memory type in the order specified by the gMemoryTypeInformation[] array\r
   //\r


@@ -1163,10 +1163,10 @@ FindFreePages (
   //\r
   if ((UINT32)NewType < EfiMaxMemoryType && MaxAddress >= mMemoryTypeStatistics[NewType].MaximumAddress) {\r
     Start = CoreFindFreePagesI (\r
   //\r
   if ((UINT32)NewType < EfiMaxMemoryType && MaxAddress >= mMemoryTypeStatistics[NewType].MaximumAddress) {\r
     Start = CoreFindFreePagesI (\r

-              mMemoryTypeStatistics[NewType].MaximumAddress, \r
-              mMemoryTypeStatistics[NewType].BaseAddress, \r
-              NoPages, \r
-              NewType, \r
+              mMemoryTypeStatistics[NewType].MaximumAddress,\r
+              mMemoryTypeStatistics[NewType].BaseAddress,\r
+              NoPages,\r
+              NewType,\r

               Alignment,\r
               NeedGuard\r
               );\r
               Alignment,\r
               NeedGuard\r
               );\r


@@ -1190,9 +1190,9 @@ FindFreePages (
   }\r
 \r
   //\r
   }\r
 \r
   //\r

-  // The allocation did not succeed in any of the prefered bins even after \r
-  // promoting resources. Attempt to find free pages anywhere is the requested \r
-  // address range.  If this allocation fails, then there are not enough \r
+  // The allocation did not succeed in any of the prefered bins even after\r
+  // promoting resources. Attempt to find free pages anywhere is the requested\r
+  // address range.  If this allocation fails, then there are not enough\r

   // resources anywhere to satisfy the request.\r
   //\r
   Start = CoreFindFreePagesI (MaxAddress, 0, NoPages, NewType, Alignment,\r
   // resources anywhere to satisfy the request.\r
   //\r
   Start = CoreFindFreePagesI (MaxAddress, 0, NoPages, NewType, Alignment,\r


@@ -1311,7 +1311,7 @@ CoreInternalAllocatePages (
     End = Start + NumberOfBytes - 1;\r
 \r
     if ((Start >= End) ||\r
     End = Start + NumberOfBytes - 1;\r
 \r
     if ((Start >= End) ||\r

-        (Start > MaxAddress) || \r
+        (Start > MaxAddress) ||\r

         (End > MaxAddress)) {\r
       return EFI_NOT_FOUND;\r
     }\r
         (End > MaxAddress)) {\r
       return EFI_NOT_FOUND;\r
     }\r


@@ -1571,7 +1571,7 @@ MergeMemoryMapDescriptor (
     //\r
     // Check to see if MemoryMapDescriptor is immediately above MemoryMap\r
     //\r
     //\r
     // Check to see if MemoryMapDescriptor is immediately above MemoryMap\r
     //\r

-    if (MemoryMap->PhysicalStart + EFI_PAGES_TO_SIZE ((UINTN)MemoryMap->NumberOfPages) == MemoryMapDescriptor->PhysicalStart) { \r
+    if (MemoryMap->PhysicalStart + EFI_PAGES_TO_SIZE ((UINTN)MemoryMap->NumberOfPages) == MemoryMapDescriptor->PhysicalStart) {\r

       //\r
       // Merge MemoryMapDescriptor into MemoryMap\r
       //\r
       //\r
       // Merge MemoryMapDescriptor into MemoryMap\r
       //\r


@@ -1604,7 +1604,7 @@ MergeMemoryMapDescriptor (
   //\r
   // MemoryMapDescrtiptor could not be merged with any descriptors in MemoryMap.\r
   //\r
   //\r
   // MemoryMapDescrtiptor could not be merged with any descriptors in MemoryMap.\r
   //\r

-  // Return the slot immediately after MemoryMapDescriptor as the next available \r
+  // Return the slot immediately after MemoryMapDescriptor as the next available\r

   // slot in the MemoryMap array\r
   //\r
   return NEXT_MEMORY_DESCRIPTOR (MemoryMapDescriptor, DescriptorSize);\r
   // slot in the MemoryMap array\r
   //\r
   return NEXT_MEMORY_DESCRIPTOR (MemoryMapDescriptor, DescriptorSize);\r


@@ -1678,7 +1678,7 @@ CoreGetMemoryMap (
   NumberOfEntries = 0;\r
   for (Link = mGcdMemorySpaceMap.ForwardLink; Link != &mGcdMemorySpaceMap; Link = Link->ForwardLink) {\r
     GcdMapEntry = CR (Link, EFI_GCD_MAP_ENTRY, Link, EFI_GCD_MAP_SIGNATURE);\r
   NumberOfEntries = 0;\r
   for (Link = mGcdMemorySpaceMap.ForwardLink; Link != &mGcdMemorySpaceMap; Link = Link->ForwardLink) {\r
     GcdMapEntry = CR (Link, EFI_GCD_MAP_ENTRY, Link, EFI_GCD_MAP_SIGNATURE);\r

-    if ((GcdMapEntry->GcdMemoryType == EfiGcdMemoryTypePersistent) || \r
+    if ((GcdMapEntry->GcdMemoryType == EfiGcdMemoryTypePersistent) ||\r

         (GcdMapEntry->GcdMemoryType == EfiGcdMemoryTypeReserved) ||\r
         ((GcdMapEntry->GcdMemoryType == EfiGcdMemoryTypeMemoryMappedIo) &&\r
         ((GcdMapEntry->Attributes & EFI_MEMORY_RUNTIME) == EFI_MEMORY_RUNTIME))) {\r
         (GcdMapEntry->GcdMemoryType == EfiGcdMemoryTypeReserved) ||\r
         ((GcdMapEntry->GcdMemoryType == EfiGcdMemoryTypeMemoryMappedIo) &&\r
         ((GcdMapEntry->Attributes & EFI_MEMORY_RUNTIME) == EFI_MEMORY_RUNTIME))) {\r


@@ -1764,13 +1764,13 @@ CoreGetMemoryMap (
     }\r
 \r
     //\r
     }\r
 \r
     //\r

-    // Check to see if the new Memory Map Descriptor can be merged with an \r
+    // Check to see if the new Memory Map Descriptor can be merged with an\r

     // existing descriptor if they are adjacent and have the same attributes\r
     //\r
     MemoryMap = MergeMemoryMapDescriptor (MemoryMapStart, MemoryMap, Size);\r
   }\r
 \r
     // existing descriptor if they are adjacent and have the same attributes\r
     //\r
     MemoryMap = MergeMemoryMapDescriptor (MemoryMapStart, MemoryMap, Size);\r
   }\r
 \r

- \r
+\r

   ZeroMem (&MergeGcdMapEntry, sizeof (MergeGcdMapEntry));\r
   GcdMapEntry = NULL;\r
   for (Link = mGcdMemorySpaceMap.ForwardLink; ; Link = Link->ForwardLink) {\r
   ZeroMem (&MergeGcdMapEntry, sizeof (MergeGcdMapEntry));\r
   GcdMapEntry = NULL;\r
   for (Link = mGcdMemorySpaceMap.ForwardLink; ; Link = Link->ForwardLink) {\r


@@ -1779,8 +1779,8 @@ CoreGetMemoryMap (
       // Merge adjacent same type and attribute GCD memory range\r
       //\r
       GcdMapEntry = CR (Link, EFI_GCD_MAP_ENTRY, Link, EFI_GCD_MAP_SIGNATURE);\r
       // Merge adjacent same type and attribute GCD memory range\r
       //\r
       GcdMapEntry = CR (Link, EFI_GCD_MAP_ENTRY, Link, EFI_GCD_MAP_SIGNATURE);\r

-  \r
-      if ((MergeGcdMapEntry.Capabilities == GcdMapEntry->Capabilities) && \r
+\r
+      if ((MergeGcdMapEntry.Capabilities == GcdMapEntry->Capabilities) &&\r

           (MergeGcdMapEntry.Attributes == GcdMapEntry->Attributes) &&\r
           (MergeGcdMapEntry.GcdMemoryType == GcdMapEntry->GcdMemoryType) &&\r
           (MergeGcdMapEntry.GcdIoType == GcdMapEntry->GcdIoType)) {\r
           (MergeGcdMapEntry.Attributes == GcdMapEntry->Attributes) &&\r
           (MergeGcdMapEntry.GcdMemoryType == GcdMapEntry->GcdMemoryType) &&\r
           (MergeGcdMapEntry.GcdIoType == GcdMapEntry->GcdIoType)) {\r


@@ -1793,19 +1793,19 @@ CoreGetMemoryMap (
         ((MergeGcdMapEntry.GcdMemoryType == EfiGcdMemoryTypeMemoryMappedIo) &&\r
         ((MergeGcdMapEntry.Attributes & EFI_MEMORY_RUNTIME) == EFI_MEMORY_RUNTIME))) {\r
       //\r
         ((MergeGcdMapEntry.GcdMemoryType == EfiGcdMemoryTypeMemoryMappedIo) &&\r
         ((MergeGcdMapEntry.Attributes & EFI_MEMORY_RUNTIME) == EFI_MEMORY_RUNTIME))) {\r
       //\r

-      // Page Align GCD range is required. When it is converted to EFI_MEMORY_DESCRIPTOR, \r
-      // it will be recorded as page PhysicalStart and NumberOfPages. \r
+      // Page Align GCD range is required. When it is converted to EFI_MEMORY_DESCRIPTOR,\r
+      // it will be recorded as page PhysicalStart and NumberOfPages.\r

       //\r
       ASSERT ((MergeGcdMapEntry.BaseAddress & EFI_PAGE_MASK) == 0);\r
       ASSERT (((MergeGcdMapEntry.EndAddress - MergeGcdMapEntry.BaseAddress + 1) & EFI_PAGE_MASK) == 0);\r
       //\r
       ASSERT ((MergeGcdMapEntry.BaseAddress & EFI_PAGE_MASK) == 0);\r
       ASSERT (((MergeGcdMapEntry.EndAddress - MergeGcdMapEntry.BaseAddress + 1) & EFI_PAGE_MASK) == 0);\r

-      \r
-      // \r
+\r
+      //\r

       // Create EFI_MEMORY_DESCRIPTOR for every Reserved and runtime MMIO GCD entries\r
       //\r
       MemoryMap->PhysicalStart = MergeGcdMapEntry.BaseAddress;\r
       MemoryMap->VirtualStart  = 0;\r
       MemoryMap->NumberOfPages = RShiftU64 ((MergeGcdMapEntry.EndAddress - MergeGcdMapEntry.BaseAddress + 1), EFI_PAGE_SHIFT);\r
       // Create EFI_MEMORY_DESCRIPTOR for every Reserved and runtime MMIO GCD entries\r
       //\r
       MemoryMap->PhysicalStart = MergeGcdMapEntry.BaseAddress;\r
       MemoryMap->VirtualStart  = 0;\r
       MemoryMap->NumberOfPages = RShiftU64 ((MergeGcdMapEntry.EndAddress - MergeGcdMapEntry.BaseAddress + 1), EFI_PAGE_SHIFT);\r

-      MemoryMap->Attribute     = (MergeGcdMapEntry.Attributes & ~EFI_MEMORY_PORT_IO) | \r
+      MemoryMap->Attribute     = (MergeGcdMapEntry.Attributes & ~EFI_MEMORY_PORT_IO) |\r

                                 (MergeGcdMapEntry.Capabilities & (EFI_MEMORY_RP | EFI_MEMORY_WP | EFI_MEMORY_XP | EFI_MEMORY_RO |\r
                                 EFI_MEMORY_UC | EFI_MEMORY_UCE | EFI_MEMORY_WC | EFI_MEMORY_WT | EFI_MEMORY_WB));\r
 \r
                                 (MergeGcdMapEntry.Capabilities & (EFI_MEMORY_RP | EFI_MEMORY_WP | EFI_MEMORY_XP | EFI_MEMORY_RO |\r
                                 EFI_MEMORY_UC | EFI_MEMORY_UCE | EFI_MEMORY_WC | EFI_MEMORY_WT | EFI_MEMORY_WB));\r
 \r


@@ -1820,33 +1820,33 @@ CoreGetMemoryMap (
       }\r
 \r
       //\r
       }\r
 \r
       //\r

-      // Check to see if the new Memory Map Descriptor can be merged with an \r
+      // Check to see if the new Memory Map Descriptor can be merged with an\r

       // existing descriptor if they are adjacent and have the same attributes\r
       //\r
       MemoryMap = MergeMemoryMapDescriptor (MemoryMapStart, MemoryMap, Size);\r
     }\r
       // existing descriptor if they are adjacent and have the same attributes\r
       //\r
       MemoryMap = MergeMemoryMapDescriptor (MemoryMapStart, MemoryMap, Size);\r
     }\r

-    \r
+\r

     if (MergeGcdMapEntry.GcdMemoryType == EfiGcdMemoryTypePersistent) {\r
       //\r
     if (MergeGcdMapEntry.GcdMemoryType == EfiGcdMemoryTypePersistent) {\r
       //\r

-      // Page Align GCD range is required. When it is converted to EFI_MEMORY_DESCRIPTOR, \r
-      // it will be recorded as page PhysicalStart and NumberOfPages. \r
+      // Page Align GCD range is required. When it is converted to EFI_MEMORY_DESCRIPTOR,\r
+      // it will be recorded as page PhysicalStart and NumberOfPages.\r

       //\r
       ASSERT ((MergeGcdMapEntry.BaseAddress & EFI_PAGE_MASK) == 0);\r
       ASSERT (((MergeGcdMapEntry.EndAddress - MergeGcdMapEntry.BaseAddress + 1) & EFI_PAGE_MASK) == 0);\r
 \r
       //\r
       ASSERT ((MergeGcdMapEntry.BaseAddress & EFI_PAGE_MASK) == 0);\r
       ASSERT (((MergeGcdMapEntry.EndAddress - MergeGcdMapEntry.BaseAddress + 1) & EFI_PAGE_MASK) == 0);\r
 \r

-      // \r
+      //\r

       // Create EFI_MEMORY_DESCRIPTOR for every Persistent GCD entries\r
       //\r
       MemoryMap->PhysicalStart = MergeGcdMapEntry.BaseAddress;\r
       MemoryMap->VirtualStart  = 0;\r
       MemoryMap->NumberOfPages = RShiftU64 ((MergeGcdMapEntry.EndAddress - MergeGcdMapEntry.BaseAddress + 1), EFI_PAGE_SHIFT);\r
       // Create EFI_MEMORY_DESCRIPTOR for every Persistent GCD entries\r
       //\r
       MemoryMap->PhysicalStart = MergeGcdMapEntry.BaseAddress;\r
       MemoryMap->VirtualStart  = 0;\r
       MemoryMap->NumberOfPages = RShiftU64 ((MergeGcdMapEntry.EndAddress - MergeGcdMapEntry.BaseAddress + 1), EFI_PAGE_SHIFT);\r

-      MemoryMap->Attribute     = MergeGcdMapEntry.Attributes | EFI_MEMORY_NV | \r
+      MemoryMap->Attribute     = MergeGcdMapEntry.Attributes | EFI_MEMORY_NV |\r

                                 (MergeGcdMapEntry.Capabilities & (EFI_MEMORY_RP | EFI_MEMORY_WP | EFI_MEMORY_XP | EFI_MEMORY_RO |\r
                                 EFI_MEMORY_UC | EFI_MEMORY_UCE | EFI_MEMORY_WC | EFI_MEMORY_WT | EFI_MEMORY_WB));\r
       MemoryMap->Type          = EfiPersistentMemory;\r
                                 (MergeGcdMapEntry.Capabilities & (EFI_MEMORY_RP | EFI_MEMORY_WP | EFI_MEMORY_XP | EFI_MEMORY_RO |\r
                                 EFI_MEMORY_UC | EFI_MEMORY_UCE | EFI_MEMORY_WC | EFI_MEMORY_WT | EFI_MEMORY_WB));\r
       MemoryMap->Type          = EfiPersistentMemory;\r

-      \r
+\r

       //\r
       //\r

-      // Check to see if the new Memory Map Descriptor can be merged with an \r
+      // Check to see if the new Memory Map Descriptor can be merged with an\r

       // existing descriptor if they are adjacent and have the same attributes\r
       //\r
       MemoryMap = MergeMemoryMapDescriptor (MemoryMapStart, MemoryMap, Size);\r
       // existing descriptor if they are adjacent and have the same attributes\r
       //\r
       MemoryMap = MergeMemoryMapDescriptor (MemoryMapStart, MemoryMap, Size);\r

diff --git a/MdeModulePkg/Core/Dxe/Misc/DebugImageInfo.c b/MdeModulePkg/Core/Dxe/Misc/DebugImageInfo.c
index fda6d44043d3e044701f224ff5943b2643359e12..4a9217fa76dc9ae08a3671883ab8739a2cb8d80f 100644 (file)
--- a/MdeModulePkg/Core/Dxe/Misc/DebugImageInfo.c
+++ b/MdeModulePkg/Core/Dxe/Misc/DebugImageInfo.c
@@ -2,7 +2,7 @@
   Support functions for managing debug image info table when loading and unloading\r
   images.\r
 \r
   Support functions for managing debug image info table when loading and unloading\r
   images.\r
 \r

-Copyright (c) 2006 - 2017, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r

 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r


@@ -65,9 +65,9 @@ CoreInitializeDebugImageInfoTable (
     Memory = MAX_ADDRESS;\r
   }\r
   Status = CoreAllocatePages (\r
     Memory = MAX_ADDRESS;\r
   }\r
   Status = CoreAllocatePages (\r

-             AllocateMaxAddress, \r
+             AllocateMaxAddress,\r

              EfiBootServicesData,\r
              EfiBootServicesData,\r

-             RealPages, \r
+             RealPages,\r

              &Memory\r
              );\r
   if (EFI_ERROR (Status)) {\r
              &Memory\r
              );\r
   if (EFI_ERROR (Status)) {\r


@@ -80,16 +80,16 @@ CoreInitializeDebugImageInfoTable (
     // as close to the top of memory as feasible.\r
     //\r
     Status = CoreAllocatePages (\r
     // as close to the top of memory as feasible.\r
     //\r
     Status = CoreAllocatePages (\r

-               AllocateAnyPages, \r
+               AllocateAnyPages,\r

                EfiBootServicesData,\r
                EfiBootServicesData,\r

-               RealPages, \r
+               RealPages,\r

                &Memory\r
                );\r
     ASSERT_EFI_ERROR (Status);\r
     if (EFI_ERROR (Status)) {\r
       return;\r
     }\r
                &Memory\r
                );\r
     ASSERT_EFI_ERROR (Status);\r
     if (EFI_ERROR (Status)) {\r
       return;\r
     }\r

-  }  \r
+  }\r

 \r
   //\r
   // Free overallocated pages\r
 \r
   //\r
   // Free overallocated pages\r


@@ -121,13 +121,13 @@ CoreInitializeDebugImageInfoTable (
 \r
   //\r
   // Initialize EFI_SYSTEM_TABLE_POINTER structure\r
 \r
   //\r
   // Initialize EFI_SYSTEM_TABLE_POINTER structure\r

-  //  \r
+  //\r

   mDebugTable->Signature          = EFI_SYSTEM_TABLE_SIGNATURE;\r
   mDebugTable->EfiSystemTableBase = (EFI_PHYSICAL_ADDRESS) (UINTN) gDxeCoreST;\r
   mDebugTable->Crc32              = 0;\r
   mDebugTable->Signature          = EFI_SYSTEM_TABLE_SIGNATURE;\r
   mDebugTable->EfiSystemTableBase = (EFI_PHYSICAL_ADDRESS) (UINTN) gDxeCoreST;\r
   mDebugTable->Crc32              = 0;\r

-  \r
+\r

   //\r
   //\r

-  // Install the EFI_SYSTEM_TABLE_POINTER structure in the EFI System \r
+  // Install the EFI_SYSTEM_TABLE_POINTER structure in the EFI System\r

   // Configuration Table\r
   //\r
   Status = CoreInstallConfigurationTable (&gEfiDebugImageInfoTableGuid, &mDebugInfoTableHeader);\r
   // Configuration Table\r
   //\r
   Status = CoreInstallConfigurationTable (&gEfiDebugImageInfoTableGuid, &mDebugInfoTableHeader);\r


@@ -182,7 +182,7 @@ CoreNewDebugImageInfoEntry (
   mDebugInfoTableHeader.UpdateStatus |= EFI_DEBUG_IMAGE_INFO_UPDATE_IN_PROGRESS;\r
 \r
   Table = mDebugInfoTableHeader.EfiDebugImageInfoTable;\r
   mDebugInfoTableHeader.UpdateStatus |= EFI_DEBUG_IMAGE_INFO_UPDATE_IN_PROGRESS;\r
 \r
   Table = mDebugInfoTableHeader.EfiDebugImageInfoTable;\r

-  \r
+\r

   if (mDebugInfoTableHeader.TableSize < mMaxTableEntries) {\r
     //\r
     // We still have empty entires in the Table, find the first empty entry.\r
   if (mDebugInfoTableHeader.TableSize < mMaxTableEntries) {\r
     //\r
     // We still have empty entires in the Table, find the first empty entry.\r

diff --git a/MdeModulePkg/Core/Dxe/Misc/MemoryAttributesTable.c b/MdeModulePkg/Core/Dxe/Misc/MemoryAttributesTable.c
index 35156aea14dda9faa86dbf9b6395be383d1ead9a..43e5be8b540774c92df91f866469a4c96935933d 100644 (file)
--- a/MdeModulePkg/Core/Dxe/Misc/MemoryAttributesTable.c
+++ b/MdeModulePkg/Core/Dxe/Misc/MemoryAttributesTable.c
@@ -1,7 +1,7 @@
 /** @file\r
   UEFI MemoryAttributesTable support\r
 \r
 /** @file\r
   UEFI MemoryAttributesTable support\r
 \r

-Copyright (c) 2016, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2016 - 2018, Intel Corporation. All rights reserved.<BR>\r

 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r


@@ -201,7 +201,7 @@ InstallMemoryAttributesTable (
   if (mMemoryAttributesTable != NULL) {\r
     FreePool (mMemoryAttributesTable);\r
   }\r
   if (mMemoryAttributesTable != NULL) {\r
     FreePool (mMemoryAttributesTable);\r
   }\r

-  mMemoryAttributesTable = MemoryAttributesTable; \r
+  mMemoryAttributesTable = MemoryAttributesTable;\r

 }\r
 \r
 /**\r
 }\r
 \r
 /**\r


@@ -237,7 +237,7 @@ InstallMemoryAttributesTableOnReadyToBoot (
   )\r
 {\r
   InstallMemoryAttributesTable ();\r
   )\r
 {\r
   InstallMemoryAttributesTable ();\r

-  mMemoryAttributesTableReadyToBoot = TRUE; \r
+  mMemoryAttributesTableReadyToBoot = TRUE;\r

 }\r
 \r
 /**\r
 }\r
 \r
 /**\r

diff --git a/MdeModulePkg/Core/Dxe/Misc/Stall.c b/MdeModulePkg/Core/Dxe/Misc/Stall.c
index 95a561546fe15a8541fc8b5b64b5408a2d212c92..171d5c0220a251f5999eddb856ef9811d8e9a16c 100644 (file)
--- a/MdeModulePkg/Core/Dxe/Misc/Stall.c
+++ b/MdeModulePkg/Core/Dxe/Misc/Stall.c
@@ -1,7 +1,7 @@
 /** @file\r
   UEFI Miscellaneous boot Services Stall service implementation\r
 \r
 /** @file\r
   UEFI Miscellaneous boot Services Stall service implementation\r
 \r

-Copyright (c) 2006 - 2017, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r

 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r


@@ -19,8 +19,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #include "DxeMain.h"\r
 \r
 /**\r
 #include "DxeMain.h"\r
 \r
 /**\r

-  Internal worker function to call the Metronome Architectural Protocol for \r
-  the number of ticks specified by the UINT64 Counter value.  WaitForTick() \r
+  Internal worker function to call the Metronome Architectural Protocol for\r
+  the number of ticks specified by the UINT64 Counter value.  WaitForTick()\r

   service of the Metronome Architectural Protocol uses a UINT32 for the number\r
   of ticks to wait, so this function loops when Counter is larger than 0xffffffff.\r
 \r
   service of the Metronome Architectural Protocol uses a UINT32 for the number\r
   of ticks to wait, so this function loops when Counter is larger than 0xffffffff.\r
 \r


@@ -69,7 +69,7 @@ CoreStall (
   //\r
   if ((UINT64) Microseconds > 0x1999999999999999ULL) {\r
     //\r
   //\r
   if ((UINT64) Microseconds > 0x1999999999999999ULL) {\r
     //\r

-    // Microseconds is too large to multiple by 10 first.  Perform the divide \r
+    // Microseconds is too large to multiple by 10 first.  Perform the divide\r

     // operation first and loop 10 times to avoid 64-bit math overflow.\r
     //\r
     Counter = DivU64x32Remainder (\r
     // operation first and loop 10 times to avoid 64-bit math overflow.\r
     //\r
     Counter = DivU64x32Remainder (\r


@@ -79,11 +79,11 @@ CoreStall (
                 );\r
     for (Index = 0; Index < 10; Index++) {\r
       CoreInternalWaitForTick (Counter);\r
                 );\r
     for (Index = 0; Index < 10; Index++) {\r
       CoreInternalWaitForTick (Counter);\r

-    }      \r
+    }\r

 \r
     if (Remainder != 0) {\r
       //\r
 \r
     if (Remainder != 0) {\r
       //\r

-      // If Remainder was not zero, then normally, Counter would be rounded \r
+      // If Remainder was not zero, then normally, Counter would be rounded\r

       // up by 1 tick.  In this case, since a loop for 10 counts was used\r
       // to emulate the multiply by 10 operation, Counter needs to be rounded\r
       // up by 10 counts.\r
       // up by 1 tick.  In this case, since a loop for 10 counts was used\r
       // to emulate the multiply by 10 operation, Counter needs to be rounded\r
       // up by 10 counts.\r

diff --git a/MdeModulePkg/Core/Dxe/SectionExtraction/CoreSectionExtraction.c b/MdeModulePkg/Core/Dxe/SectionExtraction/CoreSectionExtraction.c
index 9561ae176655fc4462fafeddf31cc3e076b609b0..a1d5316c657db18908e310d845d7dee3997140d8 100644 (file)
--- a/MdeModulePkg/Core/Dxe/SectionExtraction/CoreSectionExtraction.c
+++ b/MdeModulePkg/Core/Dxe/SectionExtraction/CoreSectionExtraction.c
@@ -27,7 +27,7 @@
   3) A support protocol is not found, and the data is not available to be read\r
      without it.  This results in EFI_PROTOCOL_ERROR.\r
 \r
   3) A support protocol is not found, and the data is not available to be read\r
      without it.  This results in EFI_PROTOCOL_ERROR.\r
 \r

-Copyright (c) 2006 - 2017, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r

 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r


@@ -67,7 +67,7 @@ typedef struct {
   UINTN                       EncapsulatedStreamHandle;\r
   EFI_GUID                    *EncapsulationGuid;\r
   //\r
   UINTN                       EncapsulatedStreamHandle;\r
   EFI_GUID                    *EncapsulationGuid;\r
   //\r

-  // If the section REQUIRES an extraction protocol, register for RPN \r
+  // If the section REQUIRES an extraction protocol, register for RPN\r

   // when the required GUIDed extraction protocol becomes available.\r
   //\r
   EFI_EVENT                   Event;\r
   // when the required GUIDed extraction protocol becomes available.\r
   //\r
   EFI_EVENT                   Event;\r


@@ -499,7 +499,7 @@ ChildIsType (
 \r
   @return TRUE      The GuidedSectionGuid could be identified, and the pointer to\r
                     the Guided Section Extraction Protocol will be returned to *GuidedSectionExtraction.\r
 \r
   @return TRUE      The GuidedSectionGuid could be identified, and the pointer to\r
                     the Guided Section Extraction Protocol will be returned to *GuidedSectionExtraction.\r

-  @return FALSE     The GuidedSectionGuid could not be identified, or \r
+  @return FALSE     The GuidedSectionGuid could not be identified, or\r

                     the Guided Section Extraction Protocol has not been installed yet.\r
 \r
 **/\r
                     the Guided Section Extraction Protocol has not been installed yet.\r
 \r
 **/\r


@@ -561,9 +561,9 @@ NotifyGuidedExtraction (
   UINTN                                   NewStreamBufferSize;\r
   UINT32                                  AuthenticationStatus;\r
   RPN_EVENT_CONTEXT                       *Context;\r
   UINTN                                   NewStreamBufferSize;\r
   UINT32                                  AuthenticationStatus;\r
   RPN_EVENT_CONTEXT                       *Context;\r

-  \r
+\r

   Context = RpnContext;\r
   Context = RpnContext;\r

-  \r
+\r

   GuidedHeader = (EFI_GUID_DEFINED_SECTION *) (Context->ParentStream->StreamBuffer + Context->ChildNode->OffsetInStream);\r
   ASSERT (GuidedHeader->CommonHeader.Type == EFI_SECTION_GUID_DEFINED);\r
 \r
   GuidedHeader = (EFI_GUID_DEFINED_SECTION *) (Context->ParentStream->StreamBuffer + Context->ChildNode->OffsetInStream);\r
   ASSERT (GuidedHeader->CommonHeader.Type == EFI_SECTION_GUID_DEFINED);\r
 \r


@@ -612,7 +612,7 @@ NotifyGuidedExtraction (
   gBS->CloseEvent (Event);\r
   Context->ChildNode->Event = NULL;\r
   FreePool (Context);\r
   gBS->CloseEvent (Event);\r
   Context->ChildNode->Event = NULL;\r
   FreePool (Context);\r

-}  \r
+}\r

 \r
 /**\r
   Constructor for RPN event when a missing GUIDED_SECTION_EXTRACTION_PROTOCOL appears...\r
 \r
 /**\r
   Constructor for RPN event when a missing GUIDED_SECTION_EXTRACTION_PROTOCOL appears...\r


@@ -628,16 +628,16 @@ CreateGuidedExtractionRpnEvent (
   )\r
 {\r
   RPN_EVENT_CONTEXT *Context;\r
   )\r
 {\r
   RPN_EVENT_CONTEXT *Context;\r

-  \r
+\r

   //\r
   // Allocate new event structure and context\r
   //\r
   Context = AllocatePool (sizeof (RPN_EVENT_CONTEXT));\r
   ASSERT (Context != NULL);\r
   //\r
   // Allocate new event structure and context\r
   //\r
   Context = AllocatePool (sizeof (RPN_EVENT_CONTEXT));\r
   ASSERT (Context != NULL);\r

-  \r
+\r

   Context->ChildNode = ChildNode;\r
   Context->ParentStream = ParentStream;\r
   Context->ChildNode = ChildNode;\r
   Context->ParentStream = ParentStream;\r

- \r
+\r

   Context->ChildNode->Event = EfiCreateProtocolNotifyEvent (\r
                                 Context->ChildNode->EncapsulationGuid,\r
                                 TPL_NOTIFY,\r
   Context->ChildNode->Event = EfiCreateProtocolNotifyEvent (\r
                                 Context->ChildNode->EncapsulationGuid,\r
                                 TPL_NOTIFY,\r


@@ -893,8 +893,8 @@ CreateChildNode (
         //\r
         if ((GuidedSectionAttributes & EFI_GUIDED_SECTION_PROCESSING_REQUIRED) != 0) {\r
           //\r
         //\r
         if ((GuidedSectionAttributes & EFI_GUIDED_SECTION_PROCESSING_REQUIRED) != 0) {\r
           //\r

-          // If the section REQUIRES an extraction protocol, register for RPN \r
-          // when the required GUIDed extraction protocol becomes available. \r
+          // If the section REQUIRES an extraction protocol, register for RPN\r
+          // when the required GUIDed extraction protocol becomes available.\r

           //\r
           CreateGuidedExtractionRpnEvent (Stream, Node);\r
         } else {\r
           //\r
           CreateGuidedExtractionRpnEvent (Stream, Node);\r
         } else {\r

diff --git a/MdeModulePkg/Core/DxeIplPeim/Arm/DxeLoadFunc.c b/MdeModulePkg/Core/DxeIplPeim/Arm/DxeLoadFunc.c
index 3acc4544b42c69d08d9707c37dfd6bec7f74a109..176d361f1989fc8205e921ce5bbd73296fe95251 100644 (file)
--- a/MdeModulePkg/Core/DxeIplPeim/Arm/DxeLoadFunc.c
+++ b/MdeModulePkg/Core/DxeIplPeim/Arm/DxeLoadFunc.c
@@ -1,7 +1,7 @@
 /** @file\r
 /** @file\r

-  ARM specifc functionality for DxeLoad. \r
-  \r
-Copyright (c) 2006 - 2008, Intel Corporation. All rights reserved.<BR>\r
+  ARM specifc functionality for DxeLoad.\r
+\r
+Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r

 Portions copyright (c) 2008 - 2009, Apple Inc. All rights reserved.<BR>\r
 \r
 This program and the accompanying materials\r
 Portions copyright (c) 2008 - 2009, Apple Inc. All rights reserved.<BR>\r
 \r
 This program and the accompanying materials\r


@@ -65,7 +65,7 @@ HandOffToDxeCore (
 \r
   //\r
   // Update the contents of BSP stack HOB to reflect the real stack info passed to DxeCore.\r
 \r
   //\r
   // Update the contents of BSP stack HOB to reflect the real stack info passed to DxeCore.\r

-  //    \r
+  //\r

   UpdateStackHob ((EFI_PHYSICAL_ADDRESS)(UINTN) BaseOfStack, STACK_SIZE);\r
 \r
   SwitchStack (\r
   UpdateStackHob ((EFI_PHYSICAL_ADDRESS)(UINTN) BaseOfStack, STACK_SIZE);\r
 \r
   SwitchStack (\r

diff --git a/MdeModulePkg/Core/DxeIplPeim/DxeIpl.uni b/MdeModulePkg/Core/DxeIplPeim/DxeIpl.uni
index 1a319c209cf677e48fef218b7f0ea6634ed0cae7..24b3ea4433f8e12e917bdc7276454b4330a4a160 100644 (file)
--- a/MdeModulePkg/Core/DxeIplPeim/DxeIpl.uni
+++ b/MdeModulePkg/Core/DxeIplPeim/DxeIpl.uni
@@ -5,13 +5,13 @@
 // PPI to discover and dispatch the DXE Foundation and components that are\r
 // needed to run the DXE Foundation.\r
 //\r
 // PPI to discover and dispatch the DXE Foundation and components that are\r
 // needed to run the DXE Foundation.\r
 //\r

-// Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.<BR>\r
+// Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r

 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r
 // which accompanies this distribution.  The full text of the license may be found at\r
 // http://opensource.org/licenses/bsd-license.php\r
 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r
 // which accompanies this distribution.  The full text of the license may be found at\r
 // http://opensource.org/licenses/bsd-license.php\r

-// \r
+//\r

 // THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 // WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 //\r
 // THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 // WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 //\r

diff --git a/MdeModulePkg/Core/DxeIplPeim/DxeIplExtra.uni b/MdeModulePkg/Core/DxeIplPeim/DxeIplExtra.uni
index 883a246dc8e0e20938b084ca67a218f2b351a9b8..75b17fe91d627231cd29e47f3a501fcd8a395729 100644 (file)
--- a/MdeModulePkg/Core/DxeIplPeim/DxeIplExtra.uni
+++ b/MdeModulePkg/Core/DxeIplPeim/DxeIplExtra.uni
@@ -1,7 +1,7 @@
 // /** @file\r
 // DxeIpl Localized Strings and Content\r
 //\r
 // /** @file\r
 // DxeIpl Localized Strings and Content\r
 //\r

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

 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r
 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r


@@ -13,8 +13,8 @@
 //\r
 // **/\r
 \r
 //\r
 // **/\r
 \r

-#string STR_PROPERTIES_MODULE_NAME \r
-#language en-US \r
+#string STR_PROPERTIES_MODULE_NAME\r
+#language en-US\r

 "Core DXE Services Initial Program Loader"\r
 \r
 \r
 "Core DXE Services Initial Program Loader"\r
 \r
 \r

diff --git a/MdeModulePkg/Core/DxeIplPeim/DxeLoad.c b/MdeModulePkg/Core/DxeIplPeim/DxeLoad.c
index 178bac47e4d2c35b75a82a0d0efd514759cd7032..8bc0caf8a10affe46624723e71d9b68d58d592e7 100644 (file)
--- a/MdeModulePkg/Core/DxeIplPeim/DxeLoad.c
+++ b/MdeModulePkg/Core/DxeIplPeim/DxeLoad.c
@@ -67,7 +67,7 @@ CONST EFI_PEI_NOTIFY_DESCRIPTOR mMemoryDiscoveredNotifyList = {
   @param  PeiServices Describes the list of possible PEI Services.\r
 \r
   @retval EFI_SUCESS  The entry point of DXE IPL PEIM executes successfully.\r
   @param  PeiServices Describes the list of possible PEI Services.\r
 \r
   @retval EFI_SUCESS  The entry point of DXE IPL PEIM executes successfully.\r

-  @retval Others      Some error occurs during the execution of this function. \r
+  @retval Others      Some error occurs during the execution of this function.\r

 \r
 **/\r
 EFI_STATUS\r
 \r
 **/\r
 EFI_STATUS\r


@@ -87,8 +87,8 @@ PeimInitializeDxeIpl (
     Status = PeiServicesRegisterForShadow (FileHandle);\r
     if (Status == EFI_SUCCESS) {\r
       //\r
     Status = PeiServicesRegisterForShadow (FileHandle);\r
     if (Status == EFI_SUCCESS) {\r
       //\r

-      // EFI_SUCESS means it is the first time to call register for shadow. \r
-      // \r
+      // EFI_SUCESS means it is the first time to call register for shadow.\r
+      //\r

       return Status;\r
     }\r
 \r
       return Status;\r
     }\r
 \r


@@ -116,7 +116,7 @@ PeimInitializeDxeIpl (
     // and section extraction.\r
     //\r
     Status = InstallIplPermanentMemoryPpis (NULL, NULL, NULL);\r
     // and section extraction.\r
     //\r
     Status = InstallIplPermanentMemoryPpis (NULL, NULL, NULL);\r

-    ASSERT_EFI_ERROR (Status);    \r
+    ASSERT_EFI_ERROR (Status);\r

   } else {\r
     //\r
     // Install memory discovered PPI notification to install PPIs for\r
   } else {\r
     //\r
     // Install memory discovered PPI notification to install PPIs for\r


@@ -160,7 +160,7 @@ InstallIplPermanentMemoryPpis (
   EFI_PEI_PPI_DESCRIPTOR        *GuidPpi;\r
 \r
   //\r
   EFI_PEI_PPI_DESCRIPTOR        *GuidPpi;\r
 \r
   //\r

-  // Get custom extract guided section method guid list \r
+  // Get custom extract guided section method guid list\r

   //\r
   ExtractHandlerNumber = ExtractGuidedSectionGetGuidList (&ExtractHandlerGuidTable);\r
 \r
   //\r
   ExtractHandlerNumber = ExtractGuidedSectionGetGuidList (&ExtractHandlerGuidTable);\r
 \r


@@ -189,7 +189,7 @@ InstallIplPermanentMemoryPpis (
 }\r
 \r
 /**\r
 }\r
 \r
 /**\r

-   Validate variable data for the MemoryTypeInformation. \r
+   Validate variable data for the MemoryTypeInformation.\r

 \r
    @param MemoryData       Variable data.\r
    @param MemoryDataSize   Variable data length.\r
 \r
    @param MemoryData       Variable data.\r
    @param MemoryDataSize   Variable data length.\r


@@ -236,16 +236,16 @@ ValidateMemoryTypeInfoVariable (
 }\r
 \r
 /**\r
 }\r
 \r
 /**\r

-   Main entry point to last PEIM. \r
+   Main entry point to last PEIM.\r

 \r
    This function finds DXE Core in the firmware volume and transfer the control to\r
    DXE core.\r
 \r
    This function finds DXE Core in the firmware volume and transfer the control to\r
    DXE core.\r

-    \r
+\r

    @param This          Entry point for DXE IPL PPI.\r
    @param PeiServices   General purpose services available to every PEIM.\r
    @param HobList       Address to the Pei HOB list.\r
    @param This          Entry point for DXE IPL PPI.\r
    @param PeiServices   General purpose services available to every PEIM.\r
    @param HobList       Address to the Pei HOB list.\r

-   \r
-   @return EFI_SUCCESS              DXE core was successfully loaded. \r
+\r
+   @return EFI_SUCCESS              DXE core was successfully loaded.\r

    @return EFI_OUT_OF_RESOURCES     There are not enough resources to load DXE core.\r
 \r
 **/\r
    @return EFI_OUT_OF_RESOURCES     There are not enough resources to load DXE core.\r
 \r
 **/\r


@@ -295,7 +295,7 @@ DxeLoadCore (
         );\r
     }\r
     ASSERT_EFI_ERROR (Status);\r
         );\r
     }\r
     ASSERT_EFI_ERROR (Status);\r

-    \r
+\r

     Status = S3Resume->S3RestoreConfig2 (S3Resume);\r
     ASSERT_EFI_ERROR (Status);\r
   } else if (BootMode == BOOT_IN_RECOVERY_MODE) {\r
     Status = S3Resume->S3RestoreConfig2 (S3Resume);\r
     ASSERT_EFI_ERROR (Status);\r
   } else if (BootMode == BOOT_IN_RECOVERY_MODE) {\r


@@ -310,7 +310,7 @@ DxeLoadCore (
     if (EFI_ERROR (Status)) {\r
       DEBUG ((DEBUG_ERROR, "Locate Recovery PPI Failed.(Status = %r)\n", Status));\r
       //\r
     if (EFI_ERROR (Status)) {\r
       DEBUG ((DEBUG_ERROR, "Locate Recovery PPI Failed.(Status = %r)\n", Status));\r
       //\r

-      // Report Status code the failure of locating Recovery PPI \r
+      // Report Status code the failure of locating Recovery PPI\r

       //\r
       REPORT_STATUS_CODE (\r
         EFI_ERROR_CODE | EFI_ERROR_MAJOR,\r
       //\r
       REPORT_STATUS_CODE (\r
         EFI_ERROR_CODE | EFI_ERROR_MAJOR,\r


@@ -350,8 +350,8 @@ DxeLoadCore (
                );\r
     if (!EFI_ERROR (Status)) {\r
       DataSize = sizeof (MemoryData);\r
                );\r
     if (!EFI_ERROR (Status)) {\r
       DataSize = sizeof (MemoryData);\r

-      Status = Variable->GetVariable ( \r
-                           Variable, \r
+      Status = Variable->GetVariable (\r
+                           Variable,\r

                            EFI_MEMORY_TYPE_INFORMATION_VARIABLE_NAME,\r
                            &gEfiMemoryTypeInformationGuid,\r
                            NULL,\r
                            EFI_MEMORY_TYPE_INFORMATION_VARIABLE_NAME,\r
                            &gEfiMemoryTypeInformationGuid,\r
                            NULL,\r


@@ -441,7 +441,7 @@ DxeLoadCore (
    instance that contains DxeCore.\r
 \r
    @return FileHandle of DxeCore to load DxeCore.\r
    instance that contains DxeCore.\r
 \r
    @return FileHandle of DxeCore to load DxeCore.\r

-   \r
+\r

 **/\r
 EFI_PEI_FILE_HANDLE\r
 DxeIplFindDxeCore (\r
 **/\r
 EFI_PEI_FILE_HANDLE\r
 DxeIplFindDxeCore (\r


@@ -452,7 +452,7 @@ DxeIplFindDxeCore (
   UINTN                 Instance;\r
   EFI_PEI_FV_HANDLE     VolumeHandle;\r
   EFI_PEI_FILE_HANDLE   FileHandle;\r
   UINTN                 Instance;\r
   EFI_PEI_FV_HANDLE     VolumeHandle;\r
   EFI_PEI_FILE_HANDLE   FileHandle;\r

-  \r
+\r

   Instance    = 0;\r
   while (TRUE) {\r
     //\r
   Instance    = 0;\r
   while (TRUE) {\r
     //\r


@@ -467,7 +467,7 @@ DxeIplFindDxeCore (
       REPORT_STATUS_CODE (EFI_PROGRESS_CODE, (EFI_SOFTWARE_PEI_MODULE | EFI_SW_PEI_CORE_EC_DXE_CORRUPT));\r
     }\r
     ASSERT_EFI_ERROR (Status);\r
       REPORT_STATUS_CODE (EFI_PROGRESS_CODE, (EFI_SOFTWARE_PEI_MODULE | EFI_SW_PEI_CORE_EC_DXE_CORRUPT));\r
     }\r
     ASSERT_EFI_ERROR (Status);\r

-    \r
+\r

     //\r
     // Find the DxeCore file type from the beginning in this firmware volume.\r
     //\r
     //\r
     // Find the DxeCore file type from the beginning in this firmware volume.\r
     //\r


@@ -520,7 +520,7 @@ DxeIplFindDxeCore (
                                 output buffer. If the input\r
                                 section's GuidedSectionHeader.\r
                                 Attributes field has the\r
                                 output buffer. If the input\r
                                 section's GuidedSectionHeader.\r
                                 Attributes field has the\r

-                                EFI_GUIDED_SECTION_AUTH_STATUS_VALID \r
+                                EFI_GUIDED_SECTION_AUTH_STATUS_VALID\r

                                 bit as clear,\r
                                 AuthenticationStatus must return\r
                                 zero. These bits reflect the\r
                                 bit as clear,\r
                                 AuthenticationStatus must return\r
                                 zero. These bits reflect the\r


@@ -530,14 +530,14 @@ DxeIplFindDxeCore (
                                 EFI_SUCCESS, the value of\r
                                 AuthenticationStatus is\r
                                 undefined.\r
                                 EFI_SUCCESS, the value of\r
                                 AuthenticationStatus is\r
                                 undefined.\r

-  \r
+\r

   @retval EFI_SUCCESS           The InputSection was\r
                                 successfully processed and the\r
                                 section contents were returned.\r
   @retval EFI_SUCCESS           The InputSection was\r
                                 successfully processed and the\r
                                 section contents were returned.\r

-  \r
+\r

   @retval EFI_OUT_OF_RESOURCES  The system has insufficient\r
                                 resources to process the request.\r
   @retval EFI_OUT_OF_RESOURCES  The system has insufficient\r
                                 resources to process the request.\r

-  \r
+\r

   @retval EFI_INVALID_PARAMETER The GUID in InputSection does\r
                                 not match this instance of the\r
                                 GUIDed Section Extraction PPI.\r
   @retval EFI_INVALID_PARAMETER The GUID in InputSection does\r
                                 not match this instance of the\r
                                 GUIDed Section Extraction PPI.\r


@@ -558,7 +558,7 @@ CustomGuidedSectionExtract (
   UINT32          ScratchBufferSize;\r
   UINT32          OutputBufferSize;\r
   UINT16          SectionAttribute;\r
   UINT32          ScratchBufferSize;\r
   UINT32          OutputBufferSize;\r
   UINT16          SectionAttribute;\r

-  \r
+\r

   //\r
   // Init local variable\r
   //\r
   //\r
   // Init local variable\r
   //\r


@@ -573,12 +573,12 @@ CustomGuidedSectionExtract (
              &ScratchBufferSize,\r
              &SectionAttribute\r
              );\r
              &ScratchBufferSize,\r
              &SectionAttribute\r
              );\r

-  \r
+\r

   if (EFI_ERROR (Status)) {\r
     DEBUG ((DEBUG_ERROR, "GetInfo from guided section Failed - %r\n", Status));\r
     return Status;\r
   }\r
   if (EFI_ERROR (Status)) {\r
     DEBUG ((DEBUG_ERROR, "GetInfo from guided section Failed - %r\n", Status));\r
     return Status;\r
   }\r

-  \r
+\r

   if (ScratchBufferSize != 0) {\r
     //\r
     // Allocate scratch buffer\r
   if (ScratchBufferSize != 0) {\r
     //\r
     // Allocate scratch buffer\r


@@ -589,7 +589,7 @@ CustomGuidedSectionExtract (
     }\r
   }\r
 \r
     }\r
   }\r
 \r

-  if (((SectionAttribute & EFI_GUIDED_SECTION_PROCESSING_REQUIRED) != 0) && OutputBufferSize > 0) {  \r
+  if (((SectionAttribute & EFI_GUIDED_SECTION_PROCESSING_REQUIRED) != 0) && OutputBufferSize > 0) {\r

     //\r
     // Allocate output buffer\r
     //\r
     //\r
     // Allocate output buffer\r
     //\r


@@ -599,9 +599,9 @@ CustomGuidedSectionExtract (
     }\r
     DEBUG ((DEBUG_INFO, "Customized Guided section Memory Size required is 0x%x and address is 0x%p\n", OutputBufferSize, *OutputBuffer));\r
   }\r
     }\r
     DEBUG ((DEBUG_INFO, "Customized Guided section Memory Size required is 0x%x and address is 0x%p\n", OutputBufferSize, *OutputBuffer));\r
   }\r

-  \r
+\r

   Status = ExtractGuidedSectionDecode (\r
   Status = ExtractGuidedSectionDecode (\r

-             InputSection, \r
+             InputSection,\r

              OutputBuffer,\r
              ScratchBuffer,\r
              AuthenticationStatus\r
              OutputBuffer,\r
              ScratchBuffer,\r
              AuthenticationStatus\r


@@ -613,9 +613,9 @@ CustomGuidedSectionExtract (
     DEBUG ((DEBUG_ERROR, "Extract guided section Failed - %r\n", Status));\r
     return Status;\r
   }\r
     DEBUG ((DEBUG_ERROR, "Extract guided section Failed - %r\n", Status));\r
     return Status;\r
   }\r

-  \r
+\r

   *OutputSize = (UINTN) OutputBufferSize;\r
   *OutputSize = (UINTN) OutputBufferSize;\r

-  \r
+\r

   return EFI_SUCCESS;\r
 }\r
 \r
   return EFI_SUCCESS;\r
 }\r
 \r


@@ -627,7 +627,7 @@ CustomGuidedSectionExtract (
    This function looks up the compression type field in the input section and\r
    applies the appropriate compression algorithm to compress the section to a\r
    callee allocated buffer.\r
    This function looks up the compression type field in the input section and\r
    applies the appropriate compression algorithm to compress the section to a\r
    callee allocated buffer.\r

-    \r
+\r

    @param  This                  Points to this instance of the\r
                                  EFI_PEI_DECOMPRESS_PEI PPI.\r
    @param  CompressionSection    Points to the compressed section.\r
    @param  This                  Points to this instance of the\r
                                  EFI_PEI_DECOMPRESS_PEI PPI.\r
    @param  CompressionSection    Points to the compressed section.\r


@@ -635,14 +635,14 @@ CustomGuidedSectionExtract (
                                  sections.\r
    @param  OutputSize            Holds the returned size of the decompress\r
                                  section streams.\r
                                  sections.\r
    @param  OutputSize            Holds the returned size of the decompress\r
                                  section streams.\r

-   \r
+\r

    @retval EFI_SUCCESS           The section was decompressed successfully.\r
                                  OutputBuffer contains the resulting data and\r
                                  OutputSize contains the resulting size.\r
 \r
 **/\r
 EFI_STATUS\r
    @retval EFI_SUCCESS           The section was decompressed successfully.\r
                                  OutputBuffer contains the resulting data and\r
                                  OutputSize contains the resulting size.\r
 \r
 **/\r
 EFI_STATUS\r

-EFIAPI \r
+EFIAPI\r

 Decompress (\r
   IN CONST  EFI_PEI_DECOMPRESS_PPI  *This,\r
   IN CONST  EFI_COMPRESSION_SECTION *CompressionSection,\r
 Decompress (\r
   IN CONST  EFI_PEI_DECOMPRESS_PPI  *This,\r
   IN CONST  EFI_COMPRESSION_SECTION *CompressionSection,\r


@@ -676,7 +676,7 @@ Decompress (
     UncompressedLength = CompressionSection->UncompressedLength;\r
     CompressionType = CompressionSection->CompressionType;\r
   }\r
     UncompressedLength = CompressionSection->UncompressedLength;\r
     CompressionType = CompressionSection->CompressionType;\r
   }\r

-  \r
+\r

   //\r
   // This is a compression set, expand it\r
   //\r
   //\r
   // This is a compression set, expand it\r
   //\r


@@ -791,8 +791,8 @@ UpdateStackHob (
   while ((Hob.Raw = GetNextHob (EFI_HOB_TYPE_MEMORY_ALLOCATION, Hob.Raw)) != NULL) {\r
     if (CompareGuid (&gEfiHobMemoryAllocStackGuid, &(Hob.MemoryAllocationStack->AllocDescriptor.Name))) {\r
       //\r
   while ((Hob.Raw = GetNextHob (EFI_HOB_TYPE_MEMORY_ALLOCATION, Hob.Raw)) != NULL) {\r
     if (CompareGuid (&gEfiHobMemoryAllocStackGuid, &(Hob.MemoryAllocationStack->AllocDescriptor.Name))) {\r
       //\r

-      // Build a new memory allocation HOB with old stack info with EfiBootServicesData type. Need to \r
-      // avoid this region be reclaimed by DXE core as the IDT built in SEC might be on stack, and some \r
+      // Build a new memory allocation HOB with old stack info with EfiBootServicesData type. Need to\r
+      // avoid this region be reclaimed by DXE core as the IDT built in SEC might be on stack, and some\r

       // PEIMs may also keep key information on stack\r
       //\r
       BuildMemoryAllocationHob (\r
       // PEIMs may also keep key information on stack\r
       //\r
       BuildMemoryAllocationHob (\r

diff --git a/MdeModulePkg/Core/DxeIplPeim/Ebc/DxeLoadFunc.c b/MdeModulePkg/Core/DxeIplPeim/Ebc/DxeLoadFunc.c
index f06bd75891733d2a4133165952bd8fa604f6593b..07904acedaa357421886967a453603f7f3b55ef2 100644 (file)
--- a/MdeModulePkg/Core/DxeIplPeim/Ebc/DxeLoadFunc.c
+++ b/MdeModulePkg/Core/DxeIplPeim/Ebc/DxeLoadFunc.c
@@ -1,7 +1,7 @@
 /** @file\r
   EBC-specific functionality for DxeLoad.\r
 \r
 /** @file\r
   EBC-specific functionality for DxeLoad.\r
 \r

-Copyright (c) 2006 - 2008, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r

 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r


@@ -58,7 +58,7 @@ HandOffToDxeCore (
 \r
   //\r
   // Update the contents of BSP stack HOB to reflect the real stack info passed to DxeCore.\r
 \r
   //\r
   // Update the contents of BSP stack HOB to reflect the real stack info passed to DxeCore.\r

-  //    \r
+  //\r

   UpdateStackHob ((EFI_PHYSICAL_ADDRESS)(UINTN) BaseOfStack, STACK_SIZE);\r
 \r
   //\r
   UpdateStackHob ((EFI_PHYSICAL_ADDRESS)(UINTN) BaseOfStack, STACK_SIZE);\r
 \r
   //\r

diff --git a/MdeModulePkg/Core/DxeIplPeim/Ia32/DxeLoadFunc.c b/MdeModulePkg/Core/DxeIplPeim/Ia32/DxeLoadFunc.c
index 0ec60893ee316fb2a1aeabdb0059d1ec550437ef..d5aa0474b0344c33e29e9726ac8ad9517279c433 100644 (file)
--- a/MdeModulePkg/Core/DxeIplPeim/Ia32/DxeLoadFunc.c
+++ b/MdeModulePkg/Core/DxeIplPeim/Ia32/DxeLoadFunc.c
@@ -1,7 +1,7 @@
 /** @file\r
   Ia32-specific functionality for DxeLoad.\r
 \r
 /** @file\r
   Ia32-specific functionality for DxeLoad.\r
 \r

-Copyright (c) 2006 - 2015, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r

 Copyright (c) 2017, AMD Incorporated. All rights reserved.<BR>\r
 \r
 This program and the accompanying materials\r
 Copyright (c) 2017, AMD Incorporated. All rights reserved.<BR>\r
 \r
 This program and the accompanying materials\r


@@ -73,7 +73,7 @@ Create4GPageTablesIa32Pae (
   IN EFI_PHYSICAL_ADDRESS   StackBase,\r
   IN UINTN                  StackSize\r
   )\r
   IN EFI_PHYSICAL_ADDRESS   StackBase,\r
   IN UINTN                  StackSize\r
   )\r

-{  \r
+{\r

   UINT8                                         PhysicalAddressBits;\r
   EFI_PHYSICAL_ADDRESS                          PhysicalAddress;\r
   UINTN                                         IndexOfPdpEntries;\r
   UINT8                                         PhysicalAddressBits;\r
   EFI_PHYSICAL_ADDRESS                          PhysicalAddress;\r
   UINTN                                         IndexOfPdpEntries;\r


@@ -112,7 +112,7 @@ Create4GPageTablesIa32Pae (
     //\r
     // Each Directory Pointer entries points to a page of Page Directory entires.\r
     // So allocate space for them and fill them in in the IndexOfPageDirectoryEntries loop.\r
     //\r
     // Each Directory Pointer entries points to a page of Page Directory entires.\r
     // So allocate space for them and fill them in in the IndexOfPageDirectoryEntries loop.\r

-    //       \r
+    //\r

     PageDirectoryEntry = (VOID *) PageAddress;\r
     PageAddress += SIZE_4KB;\r
 \r
     PageDirectoryEntry = (VOID *) PageAddress;\r
     PageAddress += SIZE_4KB;\r
 \r

diff --git a/MdeModulePkg/Core/DxeIplPeim/X64/DxeLoadFunc.c b/MdeModulePkg/Core/DxeIplPeim/X64/DxeLoadFunc.c
index b75a4489bf841e3bf5fbb43c915050fe4020f25b..81efcfe93d52fe1c20a40dc18870017860699304 100644 (file)
--- a/MdeModulePkg/Core/DxeIplPeim/X64/DxeLoadFunc.c
+++ b/MdeModulePkg/Core/DxeIplPeim/X64/DxeLoadFunc.c
@@ -1,7 +1,7 @@
 /** @file\r
   x64-specifc functionality for DxeLoad.\r
 \r
 /** @file\r
   x64-specifc functionality for DxeLoad.\r
 \r

-Copyright (c) 2006 - 2015, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r

 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r


@@ -97,7 +97,7 @@ HandOffToDxeCore (
     ASSERT (PcdGetBool (PcdSetNxForStack) == FALSE);\r
     ASSERT (PcdGetBool (PcdCpuStackGuard) == FALSE);\r
   }\r
     ASSERT (PcdGetBool (PcdSetNxForStack) == FALSE);\r
     ASSERT (PcdGetBool (PcdCpuStackGuard) == FALSE);\r
   }\r

-  \r
+\r

   //\r
   // End of PEI phase signal\r
   //\r
   //\r
   // End of PEI phase signal\r
   //\r


@@ -110,7 +110,7 @@ HandOffToDxeCore (
 \r
   //\r
   // Update the contents of BSP stack HOB to reflect the real stack info passed to DxeCore.\r
 \r
   //\r
   // Update the contents of BSP stack HOB to reflect the real stack info passed to DxeCore.\r

-  //    \r
+  //\r

   UpdateStackHob ((EFI_PHYSICAL_ADDRESS)(UINTN) BaseOfStack, STACK_SIZE);\r
 \r
   //\r
   UpdateStackHob ((EFI_PHYSICAL_ADDRESS)(UINTN) BaseOfStack, STACK_SIZE);\r
 \r
   //\r

diff --git a/MdeModulePkg/Core/DxeIplPeim/X64/VirtualMemory.c b/MdeModulePkg/Core/DxeIplPeim/X64/VirtualMemory.c
index d7a86c0d305d16bfc37f31dab22973514880811c..496e21991347c0a6bbe8d3cea6ee1a3d88493f34 100644 (file)
--- a/MdeModulePkg/Core/DxeIplPeim/X64/VirtualMemory.c
+++ b/MdeModulePkg/Core/DxeIplPeim/X64/VirtualMemory.c
@@ -1,9 +1,9 @@
 /** @file\r
 /** @file\r

-  x64 Virtual Memory Management Services in the form of an IA-32 driver.  \r
+  x64 Virtual Memory Management Services in the form of an IA-32 driver.\r

   Used to establish a 1:1 Virtual to Physical Mapping that is required to\r
   enter Long Mode (x64 64-bit mode).\r
 \r
   Used to establish a 1:1 Virtual to Physical Mapping that is required to\r
   enter Long Mode (x64 64-bit mode).\r
 \r

-  While we make a 1:1 mapping (identity mapping) for all physical pages \r
+  While we make a 1:1 mapping (identity mapping) for all physical pages\r

   we still need to use the MTRR's to ensure that the cachability attributes\r
   for all memory regions is correct.\r
 \r
   we still need to use the MTRR's to ensure that the cachability attributes\r
   for all memory regions is correct.\r
 \r


@@ -15,7 +15,7 @@
     2) IA-32 Intel(R) Architecture Software Developer's Manual Volume 2:Instruction Set Reference, Intel\r
     3) IA-32 Intel(R) Architecture Software Developer's Manual Volume 3:System Programmer's Guide, Intel\r
 \r
     2) IA-32 Intel(R) Architecture Software Developer's Manual Volume 2:Instruction Set Reference, Intel\r
     3) IA-32 Intel(R) Architecture Software Developer's Manual Volume 3:System Programmer's Guide, Intel\r
 \r

-Copyright (c) 2006 - 2016, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r

 Copyright (c) 2017, AMD Incorporated. All rights reserved.<BR>\r
 \r
 This program and the accompanying materials\r
 Copyright (c) 2017, AMD Incorporated. All rights reserved.<BR>\r
 \r
 This program and the accompanying materials\r


@@ -26,7 +26,7 @@ http://opensource.org/licenses/bsd-license.php
 THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 \r
 THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 \r

-**/  \r
+**/\r

 \r
 #include "DxeIpl.h"\r
 #include "VirtualMemory.h"\r
 \r
 #include "DxeIpl.h"\r
 #include "VirtualMemory.h"\r


@@ -574,7 +574,7 @@ CreateIdentityMappingPageTables (
   IN EFI_PHYSICAL_ADDRESS   StackBase,\r
   IN UINTN                  StackSize\r
   )\r
   IN EFI_PHYSICAL_ADDRESS   StackBase,\r
   IN UINTN                  StackSize\r
   )\r

-{  \r
+{\r

   UINT32                                        RegEax;\r
   UINT32                                        RegEdx;\r
   UINT8                                         PhysicalAddressBits;\r
   UINT32                                        RegEax;\r
   UINT32                                        RegEdx;\r
   UINT8                                         PhysicalAddressBits;\r


@@ -647,7 +647,7 @@ CreateIdentityMappingPageTables (
   }\r
 \r
   //\r
   }\r
 \r
   //\r

-  // Pre-allocate big pages to avoid later allocations. \r
+  // Pre-allocate big pages to avoid later allocations.\r

   //\r
   if (!Page1GSupport) {\r
     TotalPagesNum = (NumberOfPdpEntriesNeeded + 1) * NumberOfPml4EntriesNeeded + 1;\r
   //\r
   if (!Page1GSupport) {\r
     TotalPagesNum = (NumberOfPdpEntriesNeeded + 1) * NumberOfPml4EntriesNeeded + 1;\r


@@ -682,7 +682,7 @@ CreateIdentityMappingPageTables (
 \r
     if (Page1GSupport) {\r
       PageDirectory1GEntry = (VOID *) PageDirectoryPointerEntry;\r
 \r
     if (Page1GSupport) {\r
       PageDirectory1GEntry = (VOID *) PageDirectoryPointerEntry;\r

-    \r
+\r

       for (IndexOfPageDirectoryEntries = 0; IndexOfPageDirectoryEntries < 512; IndexOfPageDirectoryEntries++, PageDirectory1GEntry++, PageAddress += SIZE_1GB) {\r
         if (ToSplitPageTable (PageAddress, SIZE_1GB, StackBase, StackSize)) {\r
           Split1GPageTo2M (PageAddress, (UINT64 *) PageDirectory1GEntry, StackBase, StackSize);\r
       for (IndexOfPageDirectoryEntries = 0; IndexOfPageDirectoryEntries < 512; IndexOfPageDirectoryEntries++, PageDirectory1GEntry++, PageAddress += SIZE_1GB) {\r
         if (ToSplitPageTable (PageAddress, SIZE_1GB, StackBase, StackSize)) {\r
           Split1GPageTo2M (PageAddress, (UINT64 *) PageDirectory1GEntry, StackBase, StackSize);\r


@@ -701,7 +701,7 @@ CreateIdentityMappingPageTables (
         //\r
         // Each Directory Pointer entries points to a page of Page Directory entires.\r
         // So allocate space for them and fill them in in the IndexOfPageDirectoryEntries loop.\r
         //\r
         // Each Directory Pointer entries points to a page of Page Directory entires.\r
         // So allocate space for them and fill them in in the IndexOfPageDirectoryEntries loop.\r

-        //       \r
+        //\r

         PageDirectoryEntry = (VOID *) BigPageAddress;\r
         BigPageAddress += SIZE_4KB;\r
 \r
         PageDirectoryEntry = (VOID *) BigPageAddress;\r
         BigPageAddress += SIZE_4KB;\r
 \r

diff --git a/MdeModulePkg/Core/DxeIplPeim/X64/VirtualMemory.h b/MdeModulePkg/Core/DxeIplPeim/X64/VirtualMemory.h
index e7959b2cf01b9a73fa8c7d8b02a4c19a92784db5..85457ff93712af6bc0ec2dbe00514102bc579ad9 100644 (file)
--- a/MdeModulePkg/Core/DxeIplPeim/X64/VirtualMemory.h
+++ b/MdeModulePkg/Core/DxeIplPeim/X64/VirtualMemory.h
@@ -1,5 +1,5 @@
 /** @file\r
 /** @file\r

-  x64 Long Mode Virtual Memory Management Definitions  \r
+  x64 Long Mode Virtual Memory Management Definitions\r

 \r
   References:\r
     1) IA-32 Intel(R) Architecture Software Developer's Manual Volume 1:Basic Architecture, Intel\r
 \r
   References:\r
     1) IA-32 Intel(R) Architecture Software Developer's Manual Volume 1:Basic Architecture, Intel\r


@@ -7,7 +7,7 @@
     3) IA-32 Intel(R) Architecture Software Developer's Manual Volume 3:System Programmer's Guide, Intel\r
     4) AMD64 Architecture Programmer's Manual Volume 2: System Programming\r
 \r
     3) IA-32 Intel(R) Architecture Software Developer's Manual Volume 3:System Programmer's Guide, Intel\r
     4) AMD64 Architecture Programmer's Manual Volume 2: System Programming\r
 \r

-Copyright (c) 2006 - 2017, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r

 Copyright (c) 2017, AMD Incorporated. All rights reserved.<BR>\r
 \r
 This program and the accompanying materials\r
 Copyright (c) 2017, AMD Incorporated. All rights reserved.<BR>\r
 \r
 This program and the accompanying materials\r


@@ -18,7 +18,7 @@ http://opensource.org/licenses/bsd-license.php
 THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 \r
 THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 \r

-**/  \r
+**/\r

 #ifndef _VIRTUAL_MEMORY_H_\r
 #define _VIRTUAL_MEMORY_H_\r
 \r
 #ifndef _VIRTUAL_MEMORY_H_\r
 #define _VIRTUAL_MEMORY_H_\r
 \r


@@ -110,7 +110,7 @@ typedef union {
     UINT64  CacheDisabled:1;          // 0 = Cached, 1=Non-Cached\r
     UINT64  Accessed:1;               // 0 = Not accessed, 1 = Accessed (set by CPU)\r
     UINT64  Dirty:1;                  // 0 = Not Dirty, 1 = written by processor on access to page\r
     UINT64  CacheDisabled:1;          // 0 = Cached, 1=Non-Cached\r
     UINT64  Accessed:1;               // 0 = Not accessed, 1 = Accessed (set by CPU)\r
     UINT64  Dirty:1;                  // 0 = Not Dirty, 1 = written by processor on access to page\r

-    UINT64  MustBe1:1;                // Must be 1 \r
+    UINT64  MustBe1:1;                // Must be 1\r

     UINT64  Global:1;                 // 0 = Not global page, 1 = global page TLB not cleared on CR3 write\r
     UINT64  Available:3;              // Available for use by system software\r
     UINT64  PAT:1;                    //\r
     UINT64  Global:1;                 // 0 = Not global page, 1 = global page TLB not cleared on CR3 write\r
     UINT64  Available:3;              // Available for use by system software\r
     UINT64  PAT:1;                    //\r


@@ -134,7 +134,7 @@ typedef union {
     UINT64  CacheDisabled:1;          // 0 = Cached, 1=Non-Cached\r
     UINT64  Accessed:1;               // 0 = Not accessed, 1 = Accessed (set by CPU)\r
     UINT64  Dirty:1;                  // 0 = Not Dirty, 1 = written by processor on access to page\r
     UINT64  CacheDisabled:1;          // 0 = Cached, 1=Non-Cached\r
     UINT64  Accessed:1;               // 0 = Not accessed, 1 = Accessed (set by CPU)\r
     UINT64  Dirty:1;                  // 0 = Not Dirty, 1 = written by processor on access to page\r

-    UINT64  MustBe1:1;                // Must be 1 \r
+    UINT64  MustBe1:1;                // Must be 1\r

     UINT64  Global:1;                 // 0 = Not global page, 1 = global page TLB not cleared on CR3 write\r
     UINT64  Available:3;              // Available for use by system software\r
     UINT64  PAT:1;                    //\r
     UINT64  Global:1;                 // 0 = Not global page, 1 = global page TLB not cleared on CR3 write\r
     UINT64  Available:3;              // Available for use by system software\r
     UINT64  PAT:1;                    //\r


@@ -223,9 +223,9 @@ CreateIdentityMappingPageTables (
 \r
 \r
 /**\r
 \r
 \r
 /**\r

- \r
+\r

   Fix up the vector number in the vector code.\r
   Fix up the vector number in the vector code.\r

- \r
+\r

   @param VectorBase   Base address of the vector handler.\r
   @param VectorNum    Index of vector.\r
 \r
   @param VectorBase   Base address of the vector handler.\r
   @param VectorNum    Index of vector.\r
 \r


@@ -239,11 +239,11 @@ AsmVectorFixup (
 \r
 \r
 /**\r
 \r
 \r
 /**\r

- \r
+\r

   Get the information of vector template.\r
   Get the information of vector template.\r

-  \r
+\r

   @param TemplateBase   Base address of the template code.\r
   @param TemplateBase   Base address of the template code.\r

- \r
+\r

   @return               Size of the Template code.\r
 \r
 **/\r
   @return               Size of the Template code.\r
 \r
 **/\r


@@ -313,4 +313,4 @@ AllocatePageTableMemory (
   IN UINTN           Pages\r
   );\r
 \r
   IN UINTN           Pages\r
   );\r
 \r

-#endif \r
+#endif\r

diff --git a/MdeModulePkg/Core/Pei/BootMode/BootMode.c b/MdeModulePkg/Core/Pei/BootMode/BootMode.c
index 39afeba83843cd558c45ff243fd18f60cdb55049..af7d8b1058726645c322d2e80ff78f22a069f899 100644 (file)
--- a/MdeModulePkg/Core/Pei/BootMode/BootMode.c
+++ b/MdeModulePkg/Core/Pei/BootMode/BootMode.c
@@ -4,15 +4,15 @@
   SetBootMode()\r
   See PI Specification volume I, chapter 9 Boot Paths for additional information\r
   on the boot mode.\r
   SetBootMode()\r
   See PI Specification volume I, chapter 9 Boot Paths for additional information\r
   on the boot mode.\r

-  \r
-Copyright (c) 2006 - 2008, Intel Corporation. All rights reserved.<BR>\r
-This program and the accompanying materials                          \r
-are licensed and made available under the terms and conditions of the BSD License         \r
-which accompanies this distribution.  The full text of the license may be found at        \r
-http://opensource.org/licenses/bsd-license.php                                            \r
-                                                                                          \r
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     \r
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             \r
+\r
+Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r
+This program and the accompanying materials\r
+are licensed and made available under the terms and conditions of the BSD License\r
+which accompanies this distribution.  The full text of the license may be found at\r
+http://opensource.org/licenses/bsd-license.php\r
+\r
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r

 \r
 **/\r
 \r
 \r
 **/\r
 \r


@@ -35,7 +35,7 @@ PeiGetBootMode (
   IN  OUT   EFI_BOOT_MODE     *BootMode\r
   )\r
 {\r
   IN  OUT   EFI_BOOT_MODE     *BootMode\r
   )\r
 {\r

-  PEI_CORE_INSTANCE             *PrivateData;    \r
+  PEI_CORE_INSTANCE             *PrivateData;\r

   EFI_HOB_HANDOFF_INFO_TABLE    *HandOffHob;\r
 \r
 \r
   EFI_HOB_HANDOFF_INFO_TABLE    *HandOffHob;\r
 \r
 \r


@@ -44,13 +44,13 @@ PeiGetBootMode (
   }\r
 \r
   PrivateData = PEI_CORE_INSTANCE_FROM_PS_THIS(PeiServices);\r
   }\r
 \r
   PrivateData = PEI_CORE_INSTANCE_FROM_PS_THIS(PeiServices);\r

-  \r
+\r

   HandOffHob  = (PrivateData->HobList.HandoffInformationTable);\r
   HandOffHob  = (PrivateData->HobList.HandoffInformationTable);\r

-  \r
+\r

   *BootMode   = HandOffHob->BootMode;\r
   *BootMode   = HandOffHob->BootMode;\r

-  \r

 \r
 \r

-  return EFI_SUCCESS;   \r
+\r
+  return EFI_SUCCESS;\r

 }\r
 \r
 \r
 }\r
 \r
 \r


@@ -71,16 +71,16 @@ PeiSetBootMode (
   IN EFI_BOOT_MODE           BootMode\r
   )\r
 {\r
   IN EFI_BOOT_MODE           BootMode\r
   )\r
 {\r

-  PEI_CORE_INSTANCE                    *PrivateData;    \r
+  PEI_CORE_INSTANCE                    *PrivateData;\r

   EFI_HOB_HANDOFF_INFO_TABLE    *HandOffHob;\r
 \r
 \r
   PrivateData = PEI_CORE_INSTANCE_FROM_PS_THIS(PeiServices);\r
   EFI_HOB_HANDOFF_INFO_TABLE    *HandOffHob;\r
 \r
 \r
   PrivateData = PEI_CORE_INSTANCE_FROM_PS_THIS(PeiServices);\r

-  \r
+\r

   HandOffHob  = (PrivateData->HobList.HandoffInformationTable);\r
   HandOffHob  = (PrivateData->HobList.HandoffInformationTable);\r

-  \r
+\r

   HandOffHob->BootMode = BootMode;\r
 \r
 \r
   HandOffHob->BootMode = BootMode;\r
 \r
 \r

-  return EFI_SUCCESS;   \r
+  return EFI_SUCCESS;\r

 }\r
 }\r

diff --git a/MdeModulePkg/Core/Pei/CpuIo/CpuIo.c b/MdeModulePkg/Core/Pei/CpuIo/CpuIo.c
index c82c2215404d0080468a9037a202f5eaf04f4f21..e065a6c9889c7538a6ff3236010abdafee2175b5 100644 (file)
--- a/MdeModulePkg/Core/Pei/CpuIo/CpuIo.c
+++ b/MdeModulePkg/Core/Pei/CpuIo/CpuIo.c
@@ -1,19 +1,19 @@
 /** @file\r
   The default version of EFI_PEI_CPU_IO_PPI support published by PeiServices in\r
   PeiCore initialization phase.\r
 /** @file\r
   The default version of EFI_PEI_CPU_IO_PPI support published by PeiServices in\r
   PeiCore initialization phase.\r

- \r
+\r

   EFI_PEI_CPU_IO_PPI is installed by some platform or chipset-specific PEIM that\r
   abstracts the processor-visible I/O operations. When PeiCore is started, the\r
   default version of EFI_PEI_CPU_IO_PPI will be assigned to PeiServices table.\r
   EFI_PEI_CPU_IO_PPI is installed by some platform or chipset-specific PEIM that\r
   abstracts the processor-visible I/O operations. When PeiCore is started, the\r
   default version of EFI_PEI_CPU_IO_PPI will be assigned to PeiServices table.\r

-  \r
-Copyright (c) 2009, Intel Corporation. All rights reserved.<BR>\r
-This program and the accompanying materials                          \r
-are licensed and made available under the terms and conditions of the BSD License         \r
-which accompanies this distribution.  The full text of the license may be found at        \r
-http://opensource.org/licenses/bsd-license.php                                            \r
-                                                                                          \r
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     \r
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             \r
+\r
+Copyright (c) 2009 - 2018, Intel Corporation. All rights reserved.<BR>\r
+This program and the accompanying materials\r
+are licensed and made available under the terms and conditions of the BSD License\r
+which accompanies this distribution.  The full text of the license may be found at\r
+http://opensource.org/licenses/bsd-license.php\r
+\r
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r

 \r
 **/\r
 \r
 \r
 **/\r
 \r


@@ -52,12 +52,12 @@ EFI_PEI_CPU_IO_PPI gPeiDefaultCpuIoPpi = {
 \r
 /**\r
   Memory-based read services.\r
 \r
 /**\r
   Memory-based read services.\r

-  \r
-  This function is to perform the Memory Access Read service based on installed \r
-  instance of the EFI_PEI_CPU_IO_PPI. \r
-  If the EFI_PEI_CPU_IO_PPI is not installed by platform/chipset PEIM, then \r
-  return EFI_NOT_YET_AVAILABLE. \r
-   \r
+\r
+  This function is to perform the Memory Access Read service based on installed\r
+  instance of the EFI_PEI_CPU_IO_PPI.\r
+  If the EFI_PEI_CPU_IO_PPI is not installed by platform/chipset PEIM, then\r
+  return EFI_NOT_YET_AVAILABLE.\r
+\r

   @param  PeiServices           An indirect pointer to the PEI Services Table\r
                                 published by the PEI Foundation.\r
   @param  This                  Pointer to local data for the interface.\r
   @param  PeiServices           An indirect pointer to the PEI Services Table\r
                                 published by the PEI Foundation.\r
   @param  This                  Pointer to local data for the interface.\r


@@ -67,7 +67,7 @@ EFI_PEI_CPU_IO_PPI gPeiDefaultCpuIoPpi = {
   @param  Buffer                A pointer to the buffer of data.\r
 \r
   @retval EFI_SUCCESS           The function completed successfully.\r
   @param  Buffer                A pointer to the buffer of data.\r
 \r
   @retval EFI_SUCCESS           The function completed successfully.\r

-  @retval EFI_NOT_YET_AVAILABLE The service has not been installed.     \r
+  @retval EFI_NOT_YET_AVAILABLE The service has not been installed.\r

 **/\r
 EFI_STATUS\r
 EFIAPI\r
 **/\r
 EFI_STATUS\r
 EFIAPI\r


@@ -82,15 +82,15 @@ PeiDefaultMemRead (
 {\r
   return EFI_NOT_AVAILABLE_YET;\r
 }\r
 {\r
   return EFI_NOT_AVAILABLE_YET;\r
 }\r

-  \r
+\r

 /**\r
   Memory-based write services.\r
 /**\r
   Memory-based write services.\r

-   \r
-  This function is to perform the Memory Access Write service based on installed \r
-  instance of the EFI_PEI_CPU_IO_PPI. \r
-  If the EFI_PEI_CPU_IO_PPI is not installed by platform/chipset PEIM, then \r
-  return EFI_NOT_YET_AVAILABLE. \r
-   \r
+\r
+  This function is to perform the Memory Access Write service based on installed\r
+  instance of the EFI_PEI_CPU_IO_PPI.\r
+  If the EFI_PEI_CPU_IO_PPI is not installed by platform/chipset PEIM, then\r
+  return EFI_NOT_YET_AVAILABLE.\r
+\r

   @param  PeiServices           An indirect pointer to the PEI Services Table\r
                                 published by the PEI Foundation.\r
   @param  This                  Pointer to local data for the interface.\r
   @param  PeiServices           An indirect pointer to the PEI Services Table\r
                                 published by the PEI Foundation.\r
   @param  This                  Pointer to local data for the interface.\r


@@ -100,7 +100,7 @@ PeiDefaultMemRead (
   @param  Buffer                A pointer to the buffer of data.\r
 \r
   @retval EFI_SUCCESS           The function completed successfully.\r
   @param  Buffer                A pointer to the buffer of data.\r
 \r
   @retval EFI_SUCCESS           The function completed successfully.\r

-  @retval EFI_NOT_YET_AVAILABLE The service has not been installed.     \r
+  @retval EFI_NOT_YET_AVAILABLE The service has not been installed.\r

 **/\r
 EFI_STATUS\r
 EFIAPI\r
 **/\r
 EFI_STATUS\r
 EFIAPI\r


@@ -118,11 +118,11 @@ PeiDefaultMemWrite (
 \r
 /**\r
   IO-based read services.\r
 \r
 /**\r
   IO-based read services.\r

-  \r
+\r

   This function is to perform the IO-base read service for the EFI_PEI_CPU_IO_PPI.\r
   This function is to perform the IO-base read service for the EFI_PEI_CPU_IO_PPI.\r

-  If the EFI_PEI_CPU_IO_PPI is not installed by platform/chipset PEIM, then \r
-  return EFI_NOT_YET_AVAILABLE. \r
-  \r
+  If the EFI_PEI_CPU_IO_PPI is not installed by platform/chipset PEIM, then\r
+  return EFI_NOT_YET_AVAILABLE.\r
+\r

   @param  PeiServices           An indirect pointer to the PEI Services Table\r
                                 published by the PEI Foundation.\r
   @param  This                  Pointer to local data for the interface.\r
   @param  PeiServices           An indirect pointer to the PEI Services Table\r
                                 published by the PEI Foundation.\r
   @param  This                  Pointer to local data for the interface.\r


@@ -150,11 +150,11 @@ PeiDefaultIoRead (
 \r
 /**\r
   IO-based write services.\r
 \r
 /**\r
   IO-based write services.\r

-  \r
+\r

   This function is to perform the IO-base write service for the EFI_PEI_CPU_IO_PPI.\r
   This function is to perform the IO-base write service for the EFI_PEI_CPU_IO_PPI.\r

-  If the EFI_PEI_CPU_IO_PPI is not installed by platform/chipset PEIM, then \r
-  return EFI_NOT_YET_AVAILABLE. \r
-  \r
+  If the EFI_PEI_CPU_IO_PPI is not installed by platform/chipset PEIM, then\r
+  return EFI_NOT_YET_AVAILABLE.\r
+\r

   @param  PeiServices           An indirect pointer to the PEI Services Table\r
                                 published by the PEI Foundation.\r
   @param  This                  Pointer to local data for the interface.\r
   @param  PeiServices           An indirect pointer to the PEI Services Table\r
                                 published by the PEI Foundation.\r
   @param  This                  Pointer to local data for the interface.\r


@@ -182,10 +182,10 @@ PeiDefaultIoWrite (
 \r
 /**\r
   8-bit I/O read operations.\r
 \r
 /**\r
   8-bit I/O read operations.\r

-  \r
-  If the EFI_PEI_CPU_IO_PPI is not installed by platform/chipset PEIM, then \r
+\r
+  If the EFI_PEI_CPU_IO_PPI is not installed by platform/chipset PEIM, then\r

   return 0.\r
   return 0.\r

-  \r
+\r

   @param  PeiServices    An indirect pointer to the PEI Services Table published by the PEI Foundation.\r
   @param  This           Pointer to local data for the interface.\r
   @param  Address        The physical address of the access.\r
   @param  PeiServices    An indirect pointer to the PEI Services Table published by the PEI Foundation.\r
   @param  This           Pointer to local data for the interface.\r
   @param  Address        The physical address of the access.\r


@@ -205,10 +205,10 @@ PeiDefaultIoRead8 (
 \r
 /**\r
   Reads an 16-bit I/O port.\r
 \r
 /**\r
   Reads an 16-bit I/O port.\r

-  \r
-  If the EFI_PEI_CPU_IO_PPI is not installed by platform/chipset PEIM, then \r
+\r
+  If the EFI_PEI_CPU_IO_PPI is not installed by platform/chipset PEIM, then\r

   return 0.\r
   return 0.\r

-  \r
+\r

   @param  PeiServices    An indirect pointer to the PEI Services Table published by the PEI Foundation.\r
   @param  This           Pointer to local data for the interface.\r
   @param  Address        The physical address of the access.\r
   @param  PeiServices    An indirect pointer to the PEI Services Table published by the PEI Foundation.\r
   @param  This           Pointer to local data for the interface.\r
   @param  Address        The physical address of the access.\r


@@ -228,10 +228,10 @@ PeiDefaultIoRead16 (
 \r
 /**\r
   Reads an 32-bit I/O port.\r
 \r
 /**\r
   Reads an 32-bit I/O port.\r

-  \r
-  If the EFI_PEI_CPU_IO_PPI is not installed by platform/chipset PEIM, then \r
+\r
+  If the EFI_PEI_CPU_IO_PPI is not installed by platform/chipset PEIM, then\r

   return 0.\r
   return 0.\r

-  \r
+\r

   @param  PeiServices    An indirect pointer to the PEI Services Table published by the PEI Foundation.\r
   @param  This           Pointer to local data for the interface.\r
   @param  Address        The physical address of the access.\r
   @param  PeiServices    An indirect pointer to the PEI Services Table published by the PEI Foundation.\r
   @param  This           Pointer to local data for the interface.\r
   @param  Address        The physical address of the access.\r


@@ -251,10 +251,10 @@ PeiDefaultIoRead32 (
 \r
 /**\r
   Reads an 64-bit I/O port.\r
 \r
 /**\r
   Reads an 64-bit I/O port.\r

-  \r
-  If the EFI_PEI_CPU_IO_PPI is not installed by platform/chipset PEIM, then \r
+\r
+  If the EFI_PEI_CPU_IO_PPI is not installed by platform/chipset PEIM, then\r

   return 0.\r
   return 0.\r

-  \r
+\r

   @param  PeiServices    An indirect pointer to the PEI Services Table published by the PEI Foundation.\r
   @param  This           Pointer to local data for the interface.\r
   @param  Address        The physical address of the access.\r
   @param  PeiServices    An indirect pointer to the PEI Services Table published by the PEI Foundation.\r
   @param  This           Pointer to local data for the interface.\r
   @param  Address        The physical address of the access.\r


@@ -276,7 +276,7 @@ PeiDefaultIoRead64 (
   8-bit I/O write operations.\r
   If the EFI_PEI_CPU_IO_PPI is not installed by platform/chipset PEIM, then do\r
   nothing.\r
   8-bit I/O write operations.\r
   If the EFI_PEI_CPU_IO_PPI is not installed by platform/chipset PEIM, then do\r
   nothing.\r

-  \r
+\r

   @param  PeiServices    An indirect pointer to the PEI Services Table published by the PEI Foundation.\r
   @param  This           Pointer to local data for the interface.\r
   @param  Address        The physical address of the access.\r
   @param  PeiServices    An indirect pointer to the PEI Services Table published by the PEI Foundation.\r
   @param  This           Pointer to local data for the interface.\r
   @param  Address        The physical address of the access.\r


@@ -291,13 +291,13 @@ PeiDefaultIoWrite8 (
   IN  UINT8                       Data\r
   )\r
 {\r
   IN  UINT8                       Data\r
   )\r
 {\r

-}  \r
+}\r

 \r
 /**\r
   16-bit I/O write operations.\r
   If the EFI_PEI_CPU_IO_PPI is not installed by platform/chipset PEIM, then do\r
   nothing.\r
 \r
 /**\r
   16-bit I/O write operations.\r
   If the EFI_PEI_CPU_IO_PPI is not installed by platform/chipset PEIM, then do\r
   nothing.\r

-  \r
+\r

   @param  PeiServices    An indirect pointer to the PEI Services Table published by the PEI Foundation.\r
   @param  This           Pointer to local data for the interface.\r
   @param  Address        The physical address of the access.\r
   @param  PeiServices    An indirect pointer to the PEI Services Table published by the PEI Foundation.\r
   @param  This           Pointer to local data for the interface.\r
   @param  Address        The physical address of the access.\r


@@ -318,7 +318,7 @@ PeiDefaultIoWrite16 (
   32-bit I/O write operations.\r
   If the EFI_PEI_CPU_IO_PPI is not installed by platform/chipset PEIM, then do\r
   nothing.\r
   32-bit I/O write operations.\r
   If the EFI_PEI_CPU_IO_PPI is not installed by platform/chipset PEIM, then do\r
   nothing.\r

-  \r
+\r

   @param  PeiServices    An indirect pointer to the PEI Services Table published by the PEI Foundation.\r
   @param  This           Pointer to local data for the interface.\r
   @param  Address        The physical address of the access.\r
   @param  PeiServices    An indirect pointer to the PEI Services Table published by the PEI Foundation.\r
   @param  This           Pointer to local data for the interface.\r
   @param  Address        The physical address of the access.\r


@@ -339,7 +339,7 @@ PeiDefaultIoWrite32 (
   64-bit I/O write operations.\r
   If the EFI_PEI_CPU_IO_PPI is not installed by platform/chipset PEIM, then do\r
   nothing.\r
   64-bit I/O write operations.\r
   If the EFI_PEI_CPU_IO_PPI is not installed by platform/chipset PEIM, then do\r
   nothing.\r

-  \r
+\r

   @param  PeiServices    An indirect pointer to the PEI Services Table published by the PEI Foundation.\r
   @param  This           Pointer to local data for the interface.\r
   @param  Address        The physical address of the access.\r
   @param  PeiServices    An indirect pointer to the PEI Services Table published by the PEI Foundation.\r
   @param  This           Pointer to local data for the interface.\r
   @param  Address        The physical address of the access.\r


@@ -359,9 +359,9 @@ PeiDefaultIoWrite64 (
 /**\r
   8-bit memory read operations.\r
 \r
 /**\r
   8-bit memory read operations.\r
 \r

-  If the EFI_PEI_CPU_IO_PPI is not installed by platform/chipset PEIM, then \r
+  If the EFI_PEI_CPU_IO_PPI is not installed by platform/chipset PEIM, then\r

   return 0.\r
   return 0.\r

-  \r
+\r

   @param  PeiServices    An indirect pointer to the PEI Services Table published by the PEI Foundation.\r
   @param  This           Pointer to local data for the interface.\r
   @param  Address        The physical address of the access.\r
   @param  PeiServices    An indirect pointer to the PEI Services Table published by the PEI Foundation.\r
   @param  This           Pointer to local data for the interface.\r
   @param  Address        The physical address of the access.\r


@@ -378,14 +378,14 @@ PeiDefaultMemRead8 (
   )\r
 {\r
   return 0;\r
   )\r
 {\r
   return 0;\r

-}  \r
+}\r

 \r
 /**\r
   16-bit memory read operations.\r
 \r
 \r
 /**\r
   16-bit memory read operations.\r
 \r

-  If the EFI_PEI_CPU_IO_PPI is not installed by platform/chipset PEIM, then \r
+  If the EFI_PEI_CPU_IO_PPI is not installed by platform/chipset PEIM, then\r

   return 0.\r
   return 0.\r

-  \r
+\r

   @param  PeiServices    An indirect pointer to the PEI Services Table published by the PEI Foundation.\r
   @param  This           Pointer to local data for the interface.\r
   @param  Address        The physical address of the access.\r
   @param  PeiServices    An indirect pointer to the PEI Services Table published by the PEI Foundation.\r
   @param  This           Pointer to local data for the interface.\r
   @param  Address        The physical address of the access.\r


@@ -402,14 +402,14 @@ PeiDefaultMemRead16 (
   )\r
 {\r
   return 0;\r
   )\r
 {\r
   return 0;\r

-}  \r
+}\r

 \r
 /**\r
   32-bit memory read operations.\r
 \r
 \r
 /**\r
   32-bit memory read operations.\r
 \r

-  If the EFI_PEI_CPU_IO_PPI is not installed by platform/chipset PEIM, then \r
+  If the EFI_PEI_CPU_IO_PPI is not installed by platform/chipset PEIM, then\r

   return 0.\r
   return 0.\r

-  \r
+\r

   @param  PeiServices    An indirect pointer to the PEI Services Table published by the PEI Foundation.\r
   @param  This           Pointer to local data for the interface.\r
   @param  Address        The physical address of the access.\r
   @param  PeiServices    An indirect pointer to the PEI Services Table published by the PEI Foundation.\r
   @param  This           Pointer to local data for the interface.\r
   @param  Address        The physical address of the access.\r


@@ -426,14 +426,14 @@ PeiDefaultMemRead32 (
   )\r
 {\r
   return 0;\r
   )\r
 {\r
   return 0;\r

-} \r
+}\r

 \r
 /**\r
   64-bit memory read operations.\r
 \r
 \r
 /**\r
   64-bit memory read operations.\r
 \r

-  If the EFI_PEI_CPU_IO_PPI is not installed by platform/chipset PEIM, then \r
+  If the EFI_PEI_CPU_IO_PPI is not installed by platform/chipset PEIM, then\r

   return 0.\r
   return 0.\r

-  \r
+\r

   @param  PeiServices    An indirect pointer to the PEI Services Table published by the PEI Foundation.\r
   @param  This           Pointer to local data for the interface.\r
   @param  Address        The physical address of the access.\r
   @param  PeiServices    An indirect pointer to the PEI Services Table published by the PEI Foundation.\r
   @param  This           Pointer to local data for the interface.\r
   @param  Address        The physical address of the access.\r


@@ -450,13 +450,13 @@ PeiDefaultMemRead64 (
   )\r
 {\r
   return 0;\r
   )\r
 {\r
   return 0;\r

-} \r
+}\r

 \r
 /**\r
   8-bit memory write operations.\r
   If the EFI_PEI_CPU_IO_PPI is not installed by platform/chipset PEIM, then do\r
   nothing.\r
 \r
 /**\r
   8-bit memory write operations.\r
   If the EFI_PEI_CPU_IO_PPI is not installed by platform/chipset PEIM, then do\r
   nothing.\r

-  \r
+\r

   @param  PeiServices    An indirect pointer to the PEI Services Table published by the PEI Foundation.\r
   @param  This           Pointer to local data for the interface.\r
   @param  Address        The physical address of the access.\r
   @param  PeiServices    An indirect pointer to the PEI Services Table published by the PEI Foundation.\r
   @param  This           Pointer to local data for the interface.\r
   @param  Address        The physical address of the access.\r


@@ -472,13 +472,13 @@ PeiDefaultMemWrite8 (
   IN  UINT8                         Data\r
   )\r
 {\r
   IN  UINT8                         Data\r
   )\r
 {\r

-}  \r
+}\r

 \r
 /**\r
   16-bit memory write operations.\r
   If the EFI_PEI_CPU_IO_PPI is not installed by platform/chipset PEIM, then do\r
   nothing.\r
 \r
 /**\r
   16-bit memory write operations.\r
   If the EFI_PEI_CPU_IO_PPI is not installed by platform/chipset PEIM, then do\r
   nothing.\r

-  \r
+\r

   @param  PeiServices    An indirect pointer to the PEI Services Table published by the PEI Foundation.\r
   @param  This           Pointer to local data for the interface.\r
   @param  Address        The physical address of the access.\r
   @param  PeiServices    An indirect pointer to the PEI Services Table published by the PEI Foundation.\r
   @param  This           Pointer to local data for the interface.\r
   @param  Address        The physical address of the access.\r


@@ -494,7 +494,7 @@ PeiDefaultMemWrite16 (
   IN  UINT16                        Data\r
   )\r
 {\r
   IN  UINT16                        Data\r
   )\r
 {\r

-}  \r
+}\r

 \r
 /**\r
   32-bit memory write operations.\r
 \r
 /**\r
   32-bit memory write operations.\r


@@ -516,13 +516,13 @@ PeiDefaultMemWrite32 (
   IN  UINT32                        Data\r
   )\r
 {\r
   IN  UINT32                        Data\r
   )\r
 {\r

-} \r
+}\r

 \r
 /**\r
   64-bit memory write operations.\r
   If the EFI_PEI_CPU_IO_PPI is not installed by platform/chipset PEIM, then do\r
   nothing.\r
 \r
 /**\r
   64-bit memory write operations.\r
   If the EFI_PEI_CPU_IO_PPI is not installed by platform/chipset PEIM, then do\r
   nothing.\r

-  \r
+\r

   @param  PeiServices    An indirect pointer to the PEI Services Table published by the PEI Foundation.\r
   @param  This           Pointer to local data for the interface.\r
   @param  Address        The physical address of the access.\r
   @param  PeiServices    An indirect pointer to the PEI Services Table published by the PEI Foundation.\r
   @param  This           Pointer to local data for the interface.\r
   @param  Address        The physical address of the access.\r


@@ -538,4 +538,4 @@ PeiDefaultMemWrite64 (
   IN  UINT64                        Data\r
   )\r
 {\r
   IN  UINT64                        Data\r
   )\r
 {\r

-} \r
+}\r

diff --git a/MdeModulePkg/Core/Pei/Dependency/Dependency.c b/MdeModulePkg/Core/Pei/Dependency/Dependency.c
index e71566b5a74ec12cc229c6ec2b5bde9c57b25697..32003a0114d209639378a676b8934d85abd3db41 100644 (file)
--- a/MdeModulePkg/Core/Pei/Dependency/Dependency.c
+++ b/MdeModulePkg/Core/Pei/Dependency/Dependency.c
@@ -5,14 +5,14 @@
   if a driver can be scheduled for execution.  The criteria for\r
   schedulability is that the dependency expression is satisfied.\r
 \r
   if a driver can be scheduled for execution.  The criteria for\r
   schedulability is that the dependency expression is satisfied.\r
 \r

-Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.<BR>\r
-This program and the accompanying materials                          \r
-are licensed and made available under the terms and conditions of the BSD License         \r
-which accompanies this distribution.  The full text of the license may be found at        \r
-http://opensource.org/licenses/bsd-license.php                                            \r
-                                                                                          \r
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     \r
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             \r
+Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r
+This program and the accompanying materials\r
+are licensed and made available under the terms and conditions of the BSD License\r
+which accompanies this distribution.  The full text of the license may be found at\r
+http://opensource.org/licenses/bsd-license.php\r
+\r
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r

 \r
 **/\r
 \r
 \r
 **/\r
 \r


@@ -42,17 +42,17 @@ IsPpiInstalled (
   VOID        *PeiInstance;\r
   EFI_STATUS  Status;\r
   EFI_GUID    PpiGuid;\r
   VOID        *PeiInstance;\r
   EFI_STATUS  Status;\r
   EFI_GUID    PpiGuid;\r

-  \r
+\r

   //\r
   // If there is no GUID to evaluate, just return current result on stack.\r
   //\r
   if (Stack->Operator == NULL) {\r
     return Stack->Result;\r
   }\r
   //\r
   // If there is no GUID to evaluate, just return current result on stack.\r
   //\r
   if (Stack->Operator == NULL) {\r
     return Stack->Result;\r
   }\r

-  \r
+\r

   //\r
   // Copy the Guid into a locale variable so that there are no\r
   //\r
   // Copy the Guid into a locale variable so that there are no\r

-  // possibilities of alignment faults for cross-compilation \r
+  // possibilities of alignment faults for cross-compilation\r

   // environments such as Intel?Itanium(TM).\r
   //\r
   CopyMem(&PpiGuid, Stack->Operator, sizeof(EFI_GUID));\r
   // environments such as Intel?Itanium(TM).\r
   //\r
   CopyMem(&PpiGuid, Stack->Operator, sizeof(EFI_GUID));\r


@@ -70,7 +70,7 @@ IsPpiInstalled (
   if (EFI_ERROR(Status)) {\r
     return FALSE;\r
   }\r
   if (EFI_ERROR(Status)) {\r
     return FALSE;\r
   }\r

-   \r
+\r

   return TRUE;\r
 }\r
 \r
   return TRUE;\r
 }\r
 \r


@@ -111,12 +111,12 @@ PeimDispatchReadiness (
   while (TRUE) {\r
 \r
     switch (*(Iterator++)) {\r
   while (TRUE) {\r
 \r
     switch (*(Iterator++)) {\r

-      \r
+\r

       //\r
       //\r

-      // For performance reason we put the frequently used items in front of \r
+      // For performance reason we put the frequently used items in front of\r

       // the rarely used  items\r
       //\r
       // the rarely used  items\r
       //\r

-      \r
+\r

       case (EFI_DEP_PUSH):\r
         //\r
         // Check to make sure the dependency grammar doesn't overflow the\r
       case (EFI_DEP_PUSH):\r
         //\r
         // Check to make sure the dependency grammar doesn't overflow the\r


@@ -137,8 +137,8 @@ PeimDispatchReadiness (
         StackPtr++;\r
         break;\r
 \r
         StackPtr++;\r
         break;\r
 \r

-      case (EFI_DEP_AND):    \r
-      case (EFI_DEP_OR):     \r
+      case (EFI_DEP_AND):\r
+      case (EFI_DEP_OR):\r

         if (*(Iterator - 1) == EFI_DEP_AND) {\r
           DEBUG ((DEBUG_DISPATCH, "  AND\n"));\r
         } else {\r
         if (*(Iterator - 1) == EFI_DEP_AND) {\r
           DEBUG ((DEBUG_DISPATCH, "  AND\n"));\r
         } else {\r


@@ -163,11 +163,11 @@ PeimDispatchReadiness (
         // evaluation of the POPed operator. Otherwise, don't POP the second\r
         // operator since it will now evaluate to the final result on the\r
         // next operand that causes a POP.\r
         // evaluation of the POPed operator. Otherwise, don't POP the second\r
         // operator since it will now evaluate to the final result on the\r
         // next operand that causes a POP.\r

-        // \r
+        //\r

         StackPtr--;\r
         //\r
         StackPtr--;\r
         //\r

-        // Iterator has increased by 1 after we retrieve the operand, so here we \r
-        // should get the value pointed by (Iterator - 1), in order to obtain the \r
+        // Iterator has increased by 1 after we retrieve the operand, so here we\r
+        // should get the value pointed by (Iterator - 1), in order to obtain the\r

         // same operand.\r
         //\r
         if (*(Iterator - 1) == EFI_DEP_AND) {\r
         // same operand.\r
         //\r
         if (*(Iterator - 1) == EFI_DEP_AND) {\r


@@ -182,7 +182,7 @@ PeimDispatchReadiness (
           }\r
         }\r
         break;\r
           }\r
         }\r
         break;\r

-        \r
+\r

       case (EFI_DEP_END):\r
         DEBUG ((DEBUG_DISPATCH, "  END\n"));\r
         StackPtr--;\r
       case (EFI_DEP_END):\r
         DEBUG ((DEBUG_DISPATCH, "  END\n"));\r
         StackPtr--;\r


@@ -197,7 +197,7 @@ PeimDispatchReadiness (
         DEBUG ((DEBUG_DISPATCH, "  RESULT = %a\n", IsPpiInstalled (PeiServices, StackPtr) ? "TRUE" : "FALSE"));\r
         return IsPpiInstalled (PeiServices, StackPtr);\r
 \r
         DEBUG ((DEBUG_DISPATCH, "  RESULT = %a\n", IsPpiInstalled (PeiServices, StackPtr) ? "TRUE" : "FALSE"));\r
         return IsPpiInstalled (PeiServices, StackPtr);\r
 \r

-      case (EFI_DEP_NOT):    \r
+      case (EFI_DEP_NOT):\r

         DEBUG ((DEBUG_DISPATCH, "  NOT\n"));\r
         //\r
         // Check to make sure the dependency grammar doesn't underflow the\r
         DEBUG ((DEBUG_DISPATCH, "  NOT\n"));\r
         //\r
         // Check to make sure the dependency grammar doesn't underflow the\r


@@ -229,8 +229,8 @@ PeimDispatchReadiness (
           return FALSE;\r
         }\r
         //\r
           return FALSE;\r
         }\r
         //\r

-        // Iterator has increased by 1 after we retrieve the operand, so here we \r
-        // should get the value pointed by (Iterator - 1), in order to obtain the \r
+        // Iterator has increased by 1 after we retrieve the operand, so here we\r
+        // should get the value pointed by (Iterator - 1), in order to obtain the\r

         // same operand.\r
         //\r
         if (*(Iterator - 1) == EFI_DEP_TRUE) {\r
         // same operand.\r
         //\r
         if (*(Iterator - 1) == EFI_DEP_TRUE) {\r

diff --git a/MdeModulePkg/Core/Pei/Dependency/Dependency.h b/MdeModulePkg/Core/Pei/Dependency/Dependency.h
index 5021ce056b9556cc247183261dbb1aa53121a1bc..1c648b501d69a837bdb4b00f2280a979597163c4 100644 (file)
--- a/MdeModulePkg/Core/Pei/Dependency/Dependency.h
+++ b/MdeModulePkg/Core/Pei/Dependency/Dependency.h
@@ -1,15 +1,15 @@
 /** @file\r
   This module contains data specific to dependency expressions\r
   and local function prototypes.\r
 /** @file\r
   This module contains data specific to dependency expressions\r
   and local function prototypes.\r

-  \r
-Copyright (c) 2006 - 2008, Intel Corporation. All rights reserved.<BR>\r
-This program and the accompanying materials                          \r
-are licensed and made available under the terms and conditions of the BSD License         \r
-which accompanies this distribution.  The full text of the license may be found at        \r
-http://opensource.org/licenses/bsd-license.php                                            \r
-                                                                                          \r
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     \r
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             \r
+\r
+Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r
+This program and the accompanying materials\r
+are licensed and made available under the terms and conditions of the BSD License\r
+which accompanies this distribution.  The full text of the license may be found at\r
+http://opensource.org/licenses/bsd-license.php\r
+\r
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r

 \r
 **/\r
 \r
 \r
 **/\r
 \r

diff --git a/MdeModulePkg/Core/Pei/Dispatcher/Dispatcher.c b/MdeModulePkg/Core/Pei/Dispatcher/Dispatcher.c
index c4f629dadffe91d1e05f9c54510b1b6cffaf690e..f6bb35a5fe8d4c3726698021cd801501d4be3705 100644 (file)
--- a/MdeModulePkg/Core/Pei/Dispatcher/Dispatcher.c
+++ b/MdeModulePkg/Core/Pei/Dispatcher/Dispatcher.c
@@ -1,7 +1,7 @@
 /** @file\r
   EFI PEI Core dispatch services\r
 /** @file\r
   EFI PEI Core dispatch services\r

-  \r
-Copyright (c) 2006 - 2017, Intel Corporation. All rights reserved.<BR>\r
+\r
+Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r

 (C) Copyright 2016 Hewlett Packard Enterprise Development LP<BR>\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 (C) Copyright 2016 Hewlett Packard Enterprise Development LP<BR>\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r


@@ -44,9 +44,9 @@ DiscoverPeimsAndOrderWithApriori (
   EFI_GUID                            *FileGuid;\r
   EFI_PEI_FIRMWARE_VOLUME_PPI         *FvPpi;\r
   EFI_FV_FILE_INFO                    FileInfo;\r
   EFI_GUID                            *FileGuid;\r
   EFI_PEI_FIRMWARE_VOLUME_PPI         *FvPpi;\r
   EFI_FV_FILE_INFO                    FileInfo;\r

-  \r
+\r

   FvPpi = CoreFileHandle->FvPpi;\r
   FvPpi = CoreFileHandle->FvPpi;\r

-  \r
+\r

   //\r
   // Walk the FV and find all the PEIMs and the Apriori file.\r
   //\r
   //\r
   // Walk the FV and find all the PEIMs and the Apriori file.\r
   //\r


@@ -182,15 +182,15 @@ DiscoverPeimsAndOrderWithApriori (
 \r
 //\r
 // This is the minimum memory required by DxeCore initialization. When LMFA feature enabled,\r
 \r
 //\r
 // This is the minimum memory required by DxeCore initialization. When LMFA feature enabled,\r

-// This part of memory still need reserved on the very top of memory so that the DXE Core could  \r
+// This part of memory still need reserved on the very top of memory so that the DXE Core could\r

 // use these memory for data initialization. This macro should be sync with the same marco\r
 // defined in DXE Core.\r
 //\r
 #define MINIMUM_INITIAL_MEMORY_SIZE 0x10000\r
 /**\r
 // use these memory for data initialization. This macro should be sync with the same marco\r
 // defined in DXE Core.\r
 //\r
 #define MINIMUM_INITIAL_MEMORY_SIZE 0x10000\r
 /**\r

-  This function is to test if the memory range described in resource HOB is available or not. \r
-  \r
-  This function should only be invoked when Loading Module at Fixed Address(LMFA) feature is enabled. Some platform may allocate the \r
+  This function is to test if the memory range described in resource HOB is available or not.\r
+\r
+  This function should only be invoked when Loading Module at Fixed Address(LMFA) feature is enabled. Some platform may allocate the\r

   memory before PeiLoadFixAddressHook in invoked. so this function is to test if the memory range described by the input resource HOB is\r
   available or not.\r
 \r
   memory before PeiLoadFixAddressHook in invoked. so this function is to test if the memory range described by the input resource HOB is\r
   available or not.\r
 \r


@@ -203,41 +203,41 @@ PeiLoadFixAddressIsMemoryRangeAvailable (
   IN EFI_HOB_RESOURCE_DESCRIPTOR        *ResourceHob\r
   )\r
 {\r
   IN EFI_HOB_RESOURCE_DESCRIPTOR        *ResourceHob\r
   )\r
 {\r

-       EFI_HOB_MEMORY_ALLOCATION          *MemoryHob;\r
-       BOOLEAN                             IsAvailable;\r
-       EFI_PEI_HOB_POINTERS                Hob;\r
-       \r
+  EFI_HOB_MEMORY_ALLOCATION          *MemoryHob;\r
+  BOOLEAN                             IsAvailable;\r
+  EFI_PEI_HOB_POINTERS                Hob;\r
+\r

   IsAvailable = TRUE;\r
   IsAvailable = TRUE;\r

-       if (PrivateData == NULL || ResourceHob == NULL) {\r
-         return FALSE;\r
-       }\r
-       //\r
+  if (PrivateData == NULL || ResourceHob == NULL) {\r
+    return FALSE;\r
+  }\r
+  //\r

   // test if the memory range describe in the HOB is already allocated.\r
   //\r
   for (Hob.Raw = PrivateData->HobList.Raw; !END_OF_HOB_LIST(Hob); Hob.Raw = GET_NEXT_HOB(Hob)) {\r
   // test if the memory range describe in the HOB is already allocated.\r
   //\r
   for (Hob.Raw = PrivateData->HobList.Raw; !END_OF_HOB_LIST(Hob); Hob.Raw = GET_NEXT_HOB(Hob)) {\r

-    //                                                              \r
-    // See if this is a memory allocation HOB                     \r

     //\r
     //\r

-    if (GET_HOB_TYPE (Hob) == EFI_HOB_TYPE_MEMORY_ALLOCATION) { \r
+    // See if this is a memory allocation HOB\r
+    //\r
+    if (GET_HOB_TYPE (Hob) == EFI_HOB_TYPE_MEMORY_ALLOCATION) {\r

       MemoryHob = Hob.MemoryAllocation;\r
       MemoryHob = Hob.MemoryAllocation;\r

-      if(MemoryHob->AllocDescriptor.MemoryBaseAddress == ResourceHob->PhysicalStart && \r
+      if(MemoryHob->AllocDescriptor.MemoryBaseAddress == ResourceHob->PhysicalStart &&\r

          MemoryHob->AllocDescriptor.MemoryBaseAddress + MemoryHob->AllocDescriptor.MemoryLength == ResourceHob->PhysicalStart + ResourceHob->ResourceLength) {\r
          IsAvailable = FALSE;\r
          MemoryHob->AllocDescriptor.MemoryBaseAddress + MemoryHob->AllocDescriptor.MemoryLength == ResourceHob->PhysicalStart + ResourceHob->ResourceLength) {\r
          IsAvailable = FALSE;\r

-         break;  \r
+         break;\r

        }\r
      }\r
   }\r
        }\r
      }\r
   }\r

-  \r
+\r

   return IsAvailable;\r
   return IsAvailable;\r

-       \r
+\r

 }\r
 /**\r
   Hook function for Loading Module at Fixed Address feature\r
 }\r
 /**\r
   Hook function for Loading Module at Fixed Address feature\r

-  \r
+\r

   This function should only be invoked when Loading Module at Fixed Address(LMFA) feature is enabled. When feature is\r
   This function should only be invoked when Loading Module at Fixed Address(LMFA) feature is enabled. When feature is\r

-  configured as Load Modules at Fix Absolute Address, this function is to validate the top address assigned by user. When \r
-  feature is configured as Load Modules at Fixed Offset, the functino is to find the top address which is TOLM-TSEG in general.  \r
-  And also the function will re-install PEI memory. \r
+  configured as Load Modules at Fix Absolute Address, this function is to validate the top address assigned by user. When\r
+  feature is configured as Load Modules at Fixed Offset, the functino is to find the top address which is TOLM-TSEG in general.\r
+  And also the function will re-install PEI memory.\r

 \r
   @param PrivateData         Pointer to the private data passed in from caller\r
 \r
 \r
   @param PrivateData         Pointer to the private data passed in from caller\r
 \r


@@ -251,7 +251,7 @@ PeiLoadFixAddressHook(
   UINT64                             PeiMemorySize;\r
   UINT64                             TotalReservedMemorySize;\r
   UINT64                             MemoryRangeEnd;\r
   UINT64                             PeiMemorySize;\r
   UINT64                             TotalReservedMemorySize;\r
   UINT64                             MemoryRangeEnd;\r

-  EFI_PHYSICAL_ADDRESS               HighAddress; \r
+  EFI_PHYSICAL_ADDRESS               HighAddress;\r

   EFI_HOB_RESOURCE_DESCRIPTOR        *ResourceHob;\r
   EFI_HOB_RESOURCE_DESCRIPTOR        *NextResourceHob;\r
   EFI_HOB_RESOURCE_DESCRIPTOR        *CurrentResourceHob;\r
   EFI_HOB_RESOURCE_DESCRIPTOR        *ResourceHob;\r
   EFI_HOB_RESOURCE_DESCRIPTOR        *NextResourceHob;\r
   EFI_HOB_RESOURCE_DESCRIPTOR        *CurrentResourceHob;\r


@@ -273,89 +273,89 @@ PeiLoadFixAddressHook(
   //\r
   // The top reserved memory include 3 parts: the topest range is for DXE core initialization with the size  MINIMUM_INITIAL_MEMORY_SIZE\r
   // then RuntimeCodePage range and Boot time code range.\r
   //\r
   // The top reserved memory include 3 parts: the topest range is for DXE core initialization with the size  MINIMUM_INITIAL_MEMORY_SIZE\r
   // then RuntimeCodePage range and Boot time code range.\r

-  //  \r
+  //\r

   TotalReservedMemorySize = MINIMUM_INITIAL_MEMORY_SIZE + EFI_PAGES_TO_SIZE(PcdGet32(PcdLoadFixAddressRuntimeCodePageNumber));\r
   TotalReservedMemorySize = MINIMUM_INITIAL_MEMORY_SIZE + EFI_PAGES_TO_SIZE(PcdGet32(PcdLoadFixAddressRuntimeCodePageNumber));\r

-  TotalReservedMemorySize+= EFI_PAGES_TO_SIZE(PcdGet32(PcdLoadFixAddressBootTimeCodePageNumber)) ;  \r
+  TotalReservedMemorySize+= EFI_PAGES_TO_SIZE(PcdGet32(PcdLoadFixAddressBootTimeCodePageNumber)) ;\r

   //\r
   // PEI memory range lies below the top reserved memory\r
   //\r
   // PEI memory range lies below the top reserved memory\r

-  // \r
+  //\r

   TotalReservedMemorySize += PeiMemorySize;\r
   TotalReservedMemorySize += PeiMemorySize;\r

-  \r
+\r

   DEBUG ((EFI_D_INFO, "LOADING MODULE FIXED INFO: PcdLoadFixAddressRuntimeCodePageNumber= 0x%x.\n", PcdGet32(PcdLoadFixAddressRuntimeCodePageNumber)));\r
   DEBUG ((EFI_D_INFO, "LOADING MODULE FIXED INFO: PcdLoadFixAddressBootTimeCodePageNumber= 0x%x.\n", PcdGet32(PcdLoadFixAddressBootTimeCodePageNumber)));\r
   DEBUG ((EFI_D_INFO, "LOADING MODULE FIXED INFO: PcdLoadFixAddressRuntimeCodePageNumber= 0x%x.\n", PcdGet32(PcdLoadFixAddressRuntimeCodePageNumber)));\r
   DEBUG ((EFI_D_INFO, "LOADING MODULE FIXED INFO: PcdLoadFixAddressBootTimeCodePageNumber= 0x%x.\n", PcdGet32(PcdLoadFixAddressBootTimeCodePageNumber)));\r

-  DEBUG ((EFI_D_INFO, "LOADING MODULE FIXED INFO: PcdLoadFixAddressPeiCodePageNumber= 0x%x.\n", PcdGet32(PcdLoadFixAddressPeiCodePageNumber)));   \r
+  DEBUG ((EFI_D_INFO, "LOADING MODULE FIXED INFO: PcdLoadFixAddressPeiCodePageNumber= 0x%x.\n", PcdGet32(PcdLoadFixAddressPeiCodePageNumber)));\r

   DEBUG ((EFI_D_INFO, "LOADING MODULE FIXED INFO: Total Reserved Memory Size = 0x%lx.\n", TotalReservedMemorySize));\r
   //\r
   DEBUG ((EFI_D_INFO, "LOADING MODULE FIXED INFO: Total Reserved Memory Size = 0x%lx.\n", TotalReservedMemorySize));\r
   //\r

-  // Loop through the system memory typed hob to merge the adjacent memory range \r
+  // Loop through the system memory typed hob to merge the adjacent memory range\r

   //\r
   for (Hob.Raw = PrivateData->HobList.Raw; !END_OF_HOB_LIST(Hob); Hob.Raw = GET_NEXT_HOB(Hob)) {\r
   //\r
   for (Hob.Raw = PrivateData->HobList.Raw; !END_OF_HOB_LIST(Hob); Hob.Raw = GET_NEXT_HOB(Hob)) {\r

-    //                                                              \r
-    // See if this is a resource descriptor HOB                     \r
+    //\r
+    // See if this is a resource descriptor HOB\r

     //\r
     if (GET_HOB_TYPE (Hob) == EFI_HOB_TYPE_RESOURCE_DESCRIPTOR) {\r
     //\r
     if (GET_HOB_TYPE (Hob) == EFI_HOB_TYPE_RESOURCE_DESCRIPTOR) {\r

-      \r
-      ResourceHob = Hob.ResourceDescriptor;  \r
+\r
+      ResourceHob = Hob.ResourceDescriptor;\r

       //\r
       // If range described in this hob is not system memory or heigher than MAX_ADDRESS, ignored.\r
       //\r
       if (ResourceHob->ResourceType != EFI_RESOURCE_SYSTEM_MEMORY ||\r
           ResourceHob->PhysicalStart + ResourceHob->ResourceLength > MAX_ADDRESS)   {\r
         continue;\r
       //\r
       // If range described in this hob is not system memory or heigher than MAX_ADDRESS, ignored.\r
       //\r
       if (ResourceHob->ResourceType != EFI_RESOURCE_SYSTEM_MEMORY ||\r
           ResourceHob->PhysicalStart + ResourceHob->ResourceLength > MAX_ADDRESS)   {\r
         continue;\r

-      }   \r
-      \r
-      for (NextHob.Raw = PrivateData->HobList.Raw; !END_OF_HOB_LIST(NextHob); NextHob.Raw = GET_NEXT_HOB(NextHob)) {       \r
+      }\r
+\r
+      for (NextHob.Raw = PrivateData->HobList.Raw; !END_OF_HOB_LIST(NextHob); NextHob.Raw = GET_NEXT_HOB(NextHob)) {\r

         if (NextHob.Raw == Hob.Raw){\r
           continue;\r
         if (NextHob.Raw == Hob.Raw){\r
           continue;\r

-        }  \r
+        }\r

         //\r
         // See if this is a resource descriptor HOB\r
         //\r
         if (GET_HOB_TYPE (NextHob) == EFI_HOB_TYPE_RESOURCE_DESCRIPTOR) {\r
         //\r
         // See if this is a resource descriptor HOB\r
         //\r
         if (GET_HOB_TYPE (NextHob) == EFI_HOB_TYPE_RESOURCE_DESCRIPTOR) {\r

-      \r
+\r

           NextResourceHob = NextHob.ResourceDescriptor;\r
           //\r
           // test if range described in this NextResourceHob is system memory and have the same attribute.\r
           // Note: Here is a assumption that system memory should always be healthy even without test.\r
           NextResourceHob = NextHob.ResourceDescriptor;\r
           //\r
           // test if range described in this NextResourceHob is system memory and have the same attribute.\r
           // Note: Here is a assumption that system memory should always be healthy even without test.\r

-          //    \r
+          //\r

           if (NextResourceHob->ResourceType == EFI_RESOURCE_SYSTEM_MEMORY &&\r
              (((NextResourceHob->ResourceAttribute^ResourceHob->ResourceAttribute)&(~EFI_RESOURCE_ATTRIBUTE_TESTED)) == 0)){\r
           if (NextResourceHob->ResourceType == EFI_RESOURCE_SYSTEM_MEMORY &&\r
              (((NextResourceHob->ResourceAttribute^ResourceHob->ResourceAttribute)&(~EFI_RESOURCE_ATTRIBUTE_TESTED)) == 0)){\r

-              \r
+\r

               //\r
               // See if the memory range described in ResourceHob and NextResourceHob is adjacent\r
               //\r
               //\r
               // See if the memory range described in ResourceHob and NextResourceHob is adjacent\r
               //\r

-              if ((ResourceHob->PhysicalStart <= NextResourceHob->PhysicalStart && \r
-                    ResourceHob->PhysicalStart + ResourceHob->ResourceLength >= NextResourceHob->PhysicalStart)|| \r
+              if ((ResourceHob->PhysicalStart <= NextResourceHob->PhysicalStart &&\r
+                    ResourceHob->PhysicalStart + ResourceHob->ResourceLength >= NextResourceHob->PhysicalStart)||\r

                   (ResourceHob->PhysicalStart >= NextResourceHob->PhysicalStart&&\r
                      ResourceHob->PhysicalStart <= NextResourceHob->PhysicalStart + NextResourceHob->ResourceLength)) {\r
                   (ResourceHob->PhysicalStart >= NextResourceHob->PhysicalStart&&\r
                      ResourceHob->PhysicalStart <= NextResourceHob->PhysicalStart + NextResourceHob->ResourceLength)) {\r

-             \r
+\r

                 MemoryRangeEnd = ((ResourceHob->PhysicalStart + ResourceHob->ResourceLength)>(NextResourceHob->PhysicalStart + NextResourceHob->ResourceLength)) ?\r
                                      (ResourceHob->PhysicalStart + ResourceHob->ResourceLength):(NextResourceHob->PhysicalStart + NextResourceHob->ResourceLength);\r
                 MemoryRangeEnd = ((ResourceHob->PhysicalStart + ResourceHob->ResourceLength)>(NextResourceHob->PhysicalStart + NextResourceHob->ResourceLength)) ?\r
                                      (ResourceHob->PhysicalStart + ResourceHob->ResourceLength):(NextResourceHob->PhysicalStart + NextResourceHob->ResourceLength);\r

-          \r
-                ResourceHob->PhysicalStart = (ResourceHob->PhysicalStart < NextResourceHob->PhysicalStart) ? \r
+\r
+                ResourceHob->PhysicalStart = (ResourceHob->PhysicalStart < NextResourceHob->PhysicalStart) ?\r

                                                     ResourceHob->PhysicalStart : NextResourceHob->PhysicalStart;\r
                                                     ResourceHob->PhysicalStart : NextResourceHob->PhysicalStart;\r

-                \r
-               \r
+\r
+\r

                 ResourceHob->ResourceLength = (MemoryRangeEnd - ResourceHob->PhysicalStart);\r
                 ResourceHob->ResourceLength = (MemoryRangeEnd - ResourceHob->PhysicalStart);\r

-                \r
+\r

                 ResourceHob->ResourceAttribute = ResourceHob->ResourceAttribute & (~EFI_RESOURCE_ATTRIBUTE_TESTED);\r
                 //\r
                 // Delete the NextResourceHob by marking it as unused.\r
                 //\r
                 GET_HOB_TYPE (NextHob) = EFI_HOB_TYPE_UNUSED;\r
                 ResourceHob->ResourceAttribute = ResourceHob->ResourceAttribute & (~EFI_RESOURCE_ATTRIBUTE_TESTED);\r
                 //\r
                 // Delete the NextResourceHob by marking it as unused.\r
                 //\r
                 GET_HOB_TYPE (NextHob) = EFI_HOB_TYPE_UNUSED;\r

-                \r
+\r

               }\r
            }\r
               }\r
            }\r

-        } \r
+        }\r

       }\r
       }\r

-    } \r
+    }\r

   }\r
   //\r
   // Some platform is already allocated pages before the HOB re-org. Here to build dedicated resource HOB to describe\r
   //  the allocated memory range\r
   //\r
   for (Hob.Raw = PrivateData->HobList.Raw; !END_OF_HOB_LIST(Hob); Hob.Raw = GET_NEXT_HOB(Hob)) {\r
   }\r
   //\r
   // Some platform is already allocated pages before the HOB re-org. Here to build dedicated resource HOB to describe\r
   //  the allocated memory range\r
   //\r
   for (Hob.Raw = PrivateData->HobList.Raw; !END_OF_HOB_LIST(Hob); Hob.Raw = GET_NEXT_HOB(Hob)) {\r

-    //                                                              \r
-    // See if this is a memory allocation HOB                     \r
+    //\r
+    // See if this is a memory allocation HOB\r

     //\r
     if (GET_HOB_TYPE (Hob) == EFI_HOB_TYPE_MEMORY_ALLOCATION) {\r
       MemoryHob = Hob.MemoryAllocation;\r
     //\r
     if (GET_HOB_TYPE (Hob) == EFI_HOB_TYPE_MEMORY_ALLOCATION) {\r
       MemoryHob = Hob.MemoryAllocation;\r


@@ -364,7 +364,7 @@ PeiLoadFixAddressHook(
         // See if this is a resource descriptor HOB\r
         //\r
         if (GET_HOB_TYPE (NextHob) == EFI_HOB_TYPE_RESOURCE_DESCRIPTOR) {\r
         // See if this is a resource descriptor HOB\r
         //\r
         if (GET_HOB_TYPE (NextHob) == EFI_HOB_TYPE_RESOURCE_DESCRIPTOR) {\r

-               NextResourceHob = NextHob.ResourceDescriptor;\r
+          NextResourceHob = NextHob.ResourceDescriptor;\r

           //\r
           // If range described in this hob is not system memory or heigher than MAX_ADDRESS, ignored.\r
           //\r
           //\r
           // If range described in this hob is not system memory or heigher than MAX_ADDRESS, ignored.\r
           //\r


@@ -373,26 +373,26 @@ PeiLoadFixAddressHook(
           }\r
           //\r
           // If the range describe in memory allocation HOB  belongs to the memroy range described by the resource hob\r
           }\r
           //\r
           // If the range describe in memory allocation HOB  belongs to the memroy range described by the resource hob\r

-          //          \r
-          if (MemoryHob->AllocDescriptor.MemoryBaseAddress >= NextResourceHob->PhysicalStart && \r
+          //\r
+          if (MemoryHob->AllocDescriptor.MemoryBaseAddress >= NextResourceHob->PhysicalStart &&\r

               MemoryHob->AllocDescriptor.MemoryBaseAddress + MemoryHob->AllocDescriptor.MemoryLength <= NextResourceHob->PhysicalStart + NextResourceHob->ResourceLength) {\r
              //\r
              // Build seperate resource hob for this allocated range\r
               MemoryHob->AllocDescriptor.MemoryBaseAddress + MemoryHob->AllocDescriptor.MemoryLength <= NextResourceHob->PhysicalStart + NextResourceHob->ResourceLength) {\r
              //\r
              // Build seperate resource hob for this allocated range\r

-             //                     \r
+             //\r

              if (MemoryHob->AllocDescriptor.MemoryBaseAddress > NextResourceHob->PhysicalStart) {\r
                BuildResourceDescriptorHob (\r
              if (MemoryHob->AllocDescriptor.MemoryBaseAddress > NextResourceHob->PhysicalStart) {\r
                BuildResourceDescriptorHob (\r

-                 EFI_RESOURCE_SYSTEM_MEMORY,                       \r
+                 EFI_RESOURCE_SYSTEM_MEMORY,\r

                  NextResourceHob->ResourceAttribute,\r
                  NextResourceHob->ResourceAttribute,\r

-                 NextResourceHob->PhysicalStart,                             \r
-                 (MemoryHob->AllocDescriptor.MemoryBaseAddress - NextResourceHob->PhysicalStart)      \r
+                 NextResourceHob->PhysicalStart,\r
+                 (MemoryHob->AllocDescriptor.MemoryBaseAddress - NextResourceHob->PhysicalStart)\r

                );\r
              }\r
              if (MemoryHob->AllocDescriptor.MemoryBaseAddress + MemoryHob->AllocDescriptor.MemoryLength < NextResourceHob->PhysicalStart + NextResourceHob->ResourceLength) {\r
                BuildResourceDescriptorHob (\r
                );\r
              }\r
              if (MemoryHob->AllocDescriptor.MemoryBaseAddress + MemoryHob->AllocDescriptor.MemoryLength < NextResourceHob->PhysicalStart + NextResourceHob->ResourceLength) {\r
                BuildResourceDescriptorHob (\r

-                 EFI_RESOURCE_SYSTEM_MEMORY,                       \r
+                 EFI_RESOURCE_SYSTEM_MEMORY,\r

                  NextResourceHob->ResourceAttribute,\r
                  NextResourceHob->ResourceAttribute,\r

-                 MemoryHob->AllocDescriptor.MemoryBaseAddress + MemoryHob->AllocDescriptor.MemoryLength,                            \r
-                 (NextResourceHob->PhysicalStart + NextResourceHob->ResourceLength -(MemoryHob->AllocDescriptor.MemoryBaseAddress + MemoryHob->AllocDescriptor.MemoryLength))    \r
+                 MemoryHob->AllocDescriptor.MemoryBaseAddress + MemoryHob->AllocDescriptor.MemoryLength,\r
+                 (NextResourceHob->PhysicalStart + NextResourceHob->ResourceLength -(MemoryHob->AllocDescriptor.MemoryBaseAddress + MemoryHob->AllocDescriptor.MemoryLength))\r

                );\r
              }\r
              NextResourceHob->PhysicalStart = MemoryHob->AllocDescriptor.MemoryBaseAddress;\r
                );\r
              }\r
              NextResourceHob->PhysicalStart = MemoryHob->AllocDescriptor.MemoryBaseAddress;\r


@@ -406,7 +406,7 @@ PeiLoadFixAddressHook(
 \r
   //\r
   // Try to find and validate the TOP address.\r
 \r
   //\r
   // Try to find and validate the TOP address.\r

-  //  \r
+  //\r

   if ((INT64)PcdGet64(PcdLoadModuleAtFixAddressEnable) > 0 ) {\r
     //\r
     // The LMFA feature is enabled as load module at fixed absolute address.\r
   if ((INT64)PcdGet64(PcdLoadModuleAtFixAddressEnable) > 0 ) {\r
     //\r
     // The LMFA feature is enabled as load module at fixed absolute address.\r


@@ -417,11 +417,11 @@ PeiLoadFixAddressHook(
     // validate the Address. Loop the resource descriptor HOB to make sure the address is in valid memory range\r
     //\r
     if ((TopLoadingAddress & EFI_PAGE_MASK) != 0) {\r
     // validate the Address. Loop the resource descriptor HOB to make sure the address is in valid memory range\r
     //\r
     if ((TopLoadingAddress & EFI_PAGE_MASK) != 0) {\r

-      DEBUG ((EFI_D_INFO, "LOADING MODULE FIXED ERROR:Top Address 0x%lx is invalid since top address should be page align. \n", TopLoadingAddress)); \r
-      ASSERT (FALSE);    \r
+      DEBUG ((EFI_D_INFO, "LOADING MODULE FIXED ERROR:Top Address 0x%lx is invalid since top address should be page align. \n", TopLoadingAddress));\r
+      ASSERT (FALSE);\r

     }\r
     //\r
     }\r
     //\r

-    // Search for a memory region that is below MAX_ADDRESS and in which TopLoadingAddress lies \r
+    // Search for a memory region that is below MAX_ADDRESS and in which TopLoadingAddress lies\r

     //\r
     for (Hob.Raw = PrivateData->HobList.Raw; !END_OF_HOB_LIST(Hob); Hob.Raw = GET_NEXT_HOB(Hob)) {\r
       //\r
     //\r
     for (Hob.Raw = PrivateData->HobList.Raw; !END_OF_HOB_LIST(Hob); Hob.Raw = GET_NEXT_HOB(Hob)) {\r
       //\r


@@ -432,61 +432,61 @@ PeiLoadFixAddressHook(
         ResourceHob = Hob.ResourceDescriptor;\r
         //\r
         // See if this resource descrior HOB describes tested system memory below MAX_ADDRESS\r
         ResourceHob = Hob.ResourceDescriptor;\r
         //\r
         // See if this resource descrior HOB describes tested system memory below MAX_ADDRESS\r

-        //    \r
+        //\r

         if (ResourceHob->ResourceType == EFI_RESOURCE_SYSTEM_MEMORY &&\r
             ResourceHob->PhysicalStart + ResourceHob->ResourceLength <= MAX_ADDRESS) {\r
             //\r
             // See if Top address specified by user is valid.\r
             //\r
         if (ResourceHob->ResourceType == EFI_RESOURCE_SYSTEM_MEMORY &&\r
             ResourceHob->PhysicalStart + ResourceHob->ResourceLength <= MAX_ADDRESS) {\r
             //\r
             // See if Top address specified by user is valid.\r
             //\r

-            if (ResourceHob->PhysicalStart + TotalReservedMemorySize < TopLoadingAddress && \r
-                (ResourceHob->PhysicalStart + ResourceHob->ResourceLength - MINIMUM_INITIAL_MEMORY_SIZE) >= TopLoadingAddress && \r
+            if (ResourceHob->PhysicalStart + TotalReservedMemorySize < TopLoadingAddress &&\r
+                (ResourceHob->PhysicalStart + ResourceHob->ResourceLength - MINIMUM_INITIAL_MEMORY_SIZE) >= TopLoadingAddress &&\r

                 PeiLoadFixAddressIsMemoryRangeAvailable(PrivateData, ResourceHob)) {\r
                 PeiLoadFixAddressIsMemoryRangeAvailable(PrivateData, ResourceHob)) {\r

-              CurrentResourceHob = ResourceHob; \r
+              CurrentResourceHob = ResourceHob;\r

               CurrentHob = Hob;\r
               break;\r
            }\r
         }\r
               CurrentHob = Hob;\r
               break;\r
            }\r
         }\r

-      }  \r
-    }  \r
+      }\r
+    }\r

     if (CurrentResourceHob != NULL) {\r
       DEBUG ((EFI_D_INFO, "LOADING MODULE FIXED INFO:Top Address 0x%lx is valid \n",  TopLoadingAddress));\r
     if (CurrentResourceHob != NULL) {\r
       DEBUG ((EFI_D_INFO, "LOADING MODULE FIXED INFO:Top Address 0x%lx is valid \n",  TopLoadingAddress));\r

-      TopLoadingAddress += MINIMUM_INITIAL_MEMORY_SIZE; \r
+      TopLoadingAddress += MINIMUM_INITIAL_MEMORY_SIZE;\r

     } else {\r
     } else {\r

-      DEBUG ((EFI_D_INFO, "LOADING MODULE FIXED ERROR:Top Address 0x%lx is invalid \n",  TopLoadingAddress)); \r
-      DEBUG ((EFI_D_INFO, "LOADING MODULE FIXED ERROR:The recommended Top Address for the platform is: \n")); \r
+      DEBUG ((EFI_D_INFO, "LOADING MODULE FIXED ERROR:Top Address 0x%lx is invalid \n",  TopLoadingAddress));\r
+      DEBUG ((EFI_D_INFO, "LOADING MODULE FIXED ERROR:The recommended Top Address for the platform is: \n"));\r

       //\r
       // Print the recomended Top address range.\r
       //\r
       // Print the recomended Top address range.\r

-      // \r
+      //\r

       for (Hob.Raw = PrivateData->HobList.Raw; !END_OF_HOB_LIST(Hob); Hob.Raw = GET_NEXT_HOB(Hob)) {\r
         //\r
         // See if this is a resource descriptor HOB\r
         //\r
         if (GET_HOB_TYPE (Hob) == EFI_HOB_TYPE_RESOURCE_DESCRIPTOR) {\r
       for (Hob.Raw = PrivateData->HobList.Raw; !END_OF_HOB_LIST(Hob); Hob.Raw = GET_NEXT_HOB(Hob)) {\r
         //\r
         // See if this is a resource descriptor HOB\r
         //\r
         if (GET_HOB_TYPE (Hob) == EFI_HOB_TYPE_RESOURCE_DESCRIPTOR) {\r

-        \r
+\r

           ResourceHob = Hob.ResourceDescriptor;\r
           //\r
           // See if this resource descrior HOB describes tested system memory below MAX_ADDRESS\r
           ResourceHob = Hob.ResourceDescriptor;\r
           //\r
           // See if this resource descrior HOB describes tested system memory below MAX_ADDRESS\r

-          //    \r
+          //\r

           if (ResourceHob->ResourceType == EFI_RESOURCE_SYSTEM_MEMORY &&\r
               ResourceHob->PhysicalStart + ResourceHob->ResourceLength <= MAX_ADDRESS) {\r
               //\r
               // See if Top address specified by user is valid.\r
               //\r
               if (ResourceHob->ResourceLength > TotalReservedMemorySize && PeiLoadFixAddressIsMemoryRangeAvailable(PrivateData, ResourceHob)) {\r
           if (ResourceHob->ResourceType == EFI_RESOURCE_SYSTEM_MEMORY &&\r
               ResourceHob->PhysicalStart + ResourceHob->ResourceLength <= MAX_ADDRESS) {\r
               //\r
               // See if Top address specified by user is valid.\r
               //\r
               if (ResourceHob->ResourceLength > TotalReservedMemorySize && PeiLoadFixAddressIsMemoryRangeAvailable(PrivateData, ResourceHob)) {\r

-                 DEBUG ((EFI_D_INFO, "(0x%lx, 0x%lx)\n",  \r
-                          (ResourceHob->PhysicalStart + TotalReservedMemorySize -MINIMUM_INITIAL_MEMORY_SIZE), \r
-                          (ResourceHob->PhysicalStart + ResourceHob->ResourceLength -MINIMUM_INITIAL_MEMORY_SIZE) \r
-                        )); \r
+                 DEBUG ((EFI_D_INFO, "(0x%lx, 0x%lx)\n",\r
+                          (ResourceHob->PhysicalStart + TotalReservedMemorySize -MINIMUM_INITIAL_MEMORY_SIZE),\r
+                          (ResourceHob->PhysicalStart + ResourceHob->ResourceLength -MINIMUM_INITIAL_MEMORY_SIZE)\r
+                        ));\r

               }\r
           }\r
         }\r
               }\r
           }\r
         }\r

-      }  \r
+      }\r

       //\r
       //\r

-      // Assert here \r
+      // Assert here\r

       //\r
       //\r

-      ASSERT (FALSE);   \r
-      return;   \r
-    }     \r
+      ASSERT (FALSE);\r
+      return;\r
+    }\r

   } else {\r
     //\r
     // The LMFA feature is enabled as load module at fixed offset relative to TOLM\r
   } else {\r
     //\r
     // The LMFA feature is enabled as load module at fixed offset relative to TOLM\r


@@ -497,15 +497,15 @@ PeiLoadFixAddressHook(
     //\r
     for (Hob.Raw = PrivateData->HobList.Raw; !END_OF_HOB_LIST(Hob); Hob.Raw = GET_NEXT_HOB(Hob)) {\r
       //\r
     //\r
     for (Hob.Raw = PrivateData->HobList.Raw; !END_OF_HOB_LIST(Hob); Hob.Raw = GET_NEXT_HOB(Hob)) {\r
       //\r

-      // See if this is a resource descriptor HOB \r
+      // See if this is a resource descriptor HOB\r

       //\r
       if (GET_HOB_TYPE (Hob) == EFI_HOB_TYPE_RESOURCE_DESCRIPTOR) {\r
       //\r
       if (GET_HOB_TYPE (Hob) == EFI_HOB_TYPE_RESOURCE_DESCRIPTOR) {\r

-        \r
-        ResourceHob = Hob.ResourceDescriptor;                                                                                                                                                                                                                               \r
+\r
+        ResourceHob = Hob.ResourceDescriptor;\r

         //\r
         // See if this resource descrior HOB describes tested system memory below MAX_ADDRESS\r
         //\r
         //\r
         // See if this resource descrior HOB describes tested system memory below MAX_ADDRESS\r
         //\r

-        if (ResourceHob->ResourceType == EFI_RESOURCE_SYSTEM_MEMORY && \r
+        if (ResourceHob->ResourceType == EFI_RESOURCE_SYSTEM_MEMORY &&\r

             ResourceHob->PhysicalStart + ResourceHob->ResourceLength <= MAX_ADDRESS &&\r
             ResourceHob->ResourceLength > TotalReservedMemorySize && PeiLoadFixAddressIsMemoryRangeAvailable(PrivateData, ResourceHob)) {\r
           //\r
             ResourceHob->PhysicalStart + ResourceHob->ResourceLength <= MAX_ADDRESS &&\r
             ResourceHob->ResourceLength > TotalReservedMemorySize && PeiLoadFixAddressIsMemoryRangeAvailable(PrivateData, ResourceHob)) {\r
           //\r


@@ -517,26 +517,26 @@ PeiLoadFixAddressHook(
              HighAddress = CurrentResourceHob->PhysicalStart;\r
           }\r
         }\r
              HighAddress = CurrentResourceHob->PhysicalStart;\r
           }\r
         }\r

-      }  \r
+      }\r

     }\r
     if (CurrentResourceHob == NULL) {\r
     }\r
     if (CurrentResourceHob == NULL) {\r

-      DEBUG ((EFI_D_INFO, "LOADING MODULE FIXED ERROR:The System Memory is too small\n")); \r
+      DEBUG ((EFI_D_INFO, "LOADING MODULE FIXED ERROR:The System Memory is too small\n"));\r

       //\r
       //\r

-      // Assert here \r
+      // Assert here\r

       //\r
       ASSERT (FALSE);\r
       //\r
       ASSERT (FALSE);\r

-      return;  \r
+      return;\r

     } else {\r
     } else {\r

-      TopLoadingAddress = CurrentResourceHob->PhysicalStart + CurrentResourceHob->ResourceLength ; \r
-    }         \r
+      TopLoadingAddress = CurrentResourceHob->PhysicalStart + CurrentResourceHob->ResourceLength ;\r
+    }\r

   }\r
   }\r

-  \r
+\r

   if (CurrentResourceHob != NULL) {\r
     //\r
     // rebuild resource HOB for PEI memmory and reserved memory\r
     //\r
     BuildResourceDescriptorHob (\r
   if (CurrentResourceHob != NULL) {\r
     //\r
     // rebuild resource HOB for PEI memmory and reserved memory\r
     //\r
     BuildResourceDescriptorHob (\r

-      EFI_RESOURCE_SYSTEM_MEMORY,                       \r
+      EFI_RESOURCE_SYSTEM_MEMORY,\r

       (\r
       EFI_RESOURCE_ATTRIBUTE_PRESENT |\r
       EFI_RESOURCE_ATTRIBUTE_INITIALIZED |\r
       (\r
       EFI_RESOURCE_ATTRIBUTE_PRESENT |\r
       EFI_RESOURCE_ATTRIBUTE_INITIALIZED |\r


@@ -546,15 +546,15 @@ PeiLoadFixAddressHook(
       EFI_RESOURCE_ATTRIBUTE_WRITE_THROUGH_CACHEABLE |\r
       EFI_RESOURCE_ATTRIBUTE_WRITE_BACK_CACHEABLE\r
       ),\r
       EFI_RESOURCE_ATTRIBUTE_WRITE_THROUGH_CACHEABLE |\r
       EFI_RESOURCE_ATTRIBUTE_WRITE_BACK_CACHEABLE\r
       ),\r

-      (TopLoadingAddress - TotalReservedMemorySize),                             \r
-      TotalReservedMemorySize     \r
+      (TopLoadingAddress - TotalReservedMemorySize),\r
+      TotalReservedMemorySize\r

     );\r
     //\r
     // rebuild resource for the remain memory if necessary\r
     //\r
     if (CurrentResourceHob->PhysicalStart < TopLoadingAddress - TotalReservedMemorySize) {\r
       BuildResourceDescriptorHob (\r
     );\r
     //\r
     // rebuild resource for the remain memory if necessary\r
     //\r
     if (CurrentResourceHob->PhysicalStart < TopLoadingAddress - TotalReservedMemorySize) {\r
       BuildResourceDescriptorHob (\r

-        EFI_RESOURCE_SYSTEM_MEMORY,                       \r
+        EFI_RESOURCE_SYSTEM_MEMORY,\r

         (\r
          EFI_RESOURCE_ATTRIBUTE_PRESENT |\r
          EFI_RESOURCE_ATTRIBUTE_INITIALIZED |\r
         (\r
          EFI_RESOURCE_ATTRIBUTE_PRESENT |\r
          EFI_RESOURCE_ATTRIBUTE_INITIALIZED |\r


@@ -563,13 +563,13 @@ PeiLoadFixAddressHook(
          EFI_RESOURCE_ATTRIBUTE_WRITE_THROUGH_CACHEABLE |\r
          EFI_RESOURCE_ATTRIBUTE_WRITE_BACK_CACHEABLE\r
          ),\r
          EFI_RESOURCE_ATTRIBUTE_WRITE_THROUGH_CACHEABLE |\r
          EFI_RESOURCE_ATTRIBUTE_WRITE_BACK_CACHEABLE\r
          ),\r

-         CurrentResourceHob->PhysicalStart,                             \r
-         (TopLoadingAddress - TotalReservedMemorySize - CurrentResourceHob->PhysicalStart)      \r
+         CurrentResourceHob->PhysicalStart,\r
+         (TopLoadingAddress - TotalReservedMemorySize - CurrentResourceHob->PhysicalStart)\r

        );\r
     }\r
     if (CurrentResourceHob->PhysicalStart + CurrentResourceHob->ResourceLength  > TopLoadingAddress ) {\r
       BuildResourceDescriptorHob (\r
        );\r
     }\r
     if (CurrentResourceHob->PhysicalStart + CurrentResourceHob->ResourceLength  > TopLoadingAddress ) {\r
       BuildResourceDescriptorHob (\r

-        EFI_RESOURCE_SYSTEM_MEMORY,                     \r
+        EFI_RESOURCE_SYSTEM_MEMORY,\r

         (\r
          EFI_RESOURCE_ATTRIBUTE_PRESENT |\r
          EFI_RESOURCE_ATTRIBUTE_INITIALIZED |\r
         (\r
          EFI_RESOURCE_ATTRIBUTE_PRESENT |\r
          EFI_RESOURCE_ATTRIBUTE_INITIALIZED |\r


@@ -578,21 +578,21 @@ PeiLoadFixAddressHook(
          EFI_RESOURCE_ATTRIBUTE_WRITE_THROUGH_CACHEABLE |\r
          EFI_RESOURCE_ATTRIBUTE_WRITE_BACK_CACHEABLE\r
          ),\r
          EFI_RESOURCE_ATTRIBUTE_WRITE_THROUGH_CACHEABLE |\r
          EFI_RESOURCE_ATTRIBUTE_WRITE_BACK_CACHEABLE\r
          ),\r

-         TopLoadingAddress,                            \r
-         (CurrentResourceHob->PhysicalStart + CurrentResourceHob->ResourceLength  - TopLoadingAddress)     \r
+         TopLoadingAddress,\r
+         (CurrentResourceHob->PhysicalStart + CurrentResourceHob->ResourceLength  - TopLoadingAddress)\r

        );\r
     }\r
     //\r
     // Delete CurrentHob by marking it as unused since the the memory range described by is rebuilt.\r
     //\r
        );\r
     }\r
     //\r
     // Delete CurrentHob by marking it as unused since the the memory range described by is rebuilt.\r
     //\r

-    GET_HOB_TYPE (CurrentHob) = EFI_HOB_TYPE_UNUSED;         \r
+    GET_HOB_TYPE (CurrentHob) = EFI_HOB_TYPE_UNUSED;\r

   }\r
 \r
   //\r
   // Cache the top address for Loading Module at Fixed Address feature\r
   //\r
   PrivateData->LoadModuleAtFixAddressTopAddress = TopLoadingAddress - MINIMUM_INITIAL_MEMORY_SIZE;\r
   }\r
 \r
   //\r
   // Cache the top address for Loading Module at Fixed Address feature\r
   //\r
   PrivateData->LoadModuleAtFixAddressTopAddress = TopLoadingAddress - MINIMUM_INITIAL_MEMORY_SIZE;\r

-  DEBUG ((EFI_D_INFO, "LOADING MODULE FIXED INFO: Top address = 0x%lx\n",  PrivateData->LoadModuleAtFixAddressTopAddress)); \r
+  DEBUG ((EFI_D_INFO, "LOADING MODULE FIXED INFO: Top address = 0x%lx\n",  PrivateData->LoadModuleAtFixAddressTopAddress));\r

   //\r
   // reinstall the PEI memory relative to TopLoadingAddress\r
   //\r
   //\r
   // reinstall the PEI memory relative to TopLoadingAddress\r
   //\r


@@ -729,7 +729,7 @@ PeiCheckAndSwitchStack (
     ASSERT (NewStackSize >= SecCoreData->StackSize);\r
 \r
     //\r
     ASSERT (NewStackSize >= SecCoreData->StackSize);\r
 \r
     //\r

-    // Calculate stack offset and heap offset between temporary memory and new permement \r
+    // Calculate stack offset and heap offset between temporary memory and new permement\r

     // memory seperately.\r
     //\r
     TopOfOldStack = (UINTN)SecCoreData->StackBase + SecCoreData->StackSize;\r
     // memory seperately.\r
     //\r
     TopOfOldStack = (UINTN)SecCoreData->StackBase + SecCoreData->StackSize;\r


@@ -796,9 +796,9 @@ PeiCheckAndSwitchStack (
       }\r
 \r
       //\r
       }\r
 \r
       //\r

-      // Temporary Ram Support PPI is provided by platform, it will copy \r
+      // Temporary Ram Support PPI is provided by platform, it will copy\r

       // temporary memory to permanent memory and do stack switching.\r
       // temporary memory to permanent memory and do stack switching.\r

-      // After invoking Temporary Ram Support PPI, the following code's \r
+      // After invoking Temporary Ram Support PPI, the following code's\r

       // stack is in permanent memory.\r
       //\r
       TemporaryRamSupportPpi->TemporaryRamMigration (\r
       // stack is in permanent memory.\r
       //\r
       TemporaryRamSupportPpi->TemporaryRamMigration (\r


@@ -961,7 +961,7 @@ PeiDispatcher (
   EFI_PEI_FILE_HANDLE                 SaveCurrentFileHandle;\r
   EFI_FV_FILE_INFO                    FvFileInfo;\r
   PEI_CORE_FV_HANDLE                  *CoreFvHandle;\r
   EFI_PEI_FILE_HANDLE                 SaveCurrentFileHandle;\r
   EFI_FV_FILE_INFO                    FvFileInfo;\r
   PEI_CORE_FV_HANDLE                  *CoreFvHandle;\r

-  \r
+\r

   PeiServices = (CONST EFI_PEI_SERVICES **) &Private->Ps;\r
   PeimEntryPoint = NULL;\r
   PeimFileHandle = NULL;\r
   PeiServices = (CONST EFI_PEI_SERVICES **) &Private->Ps;\r
   PeimEntryPoint = NULL;\r
   PeimFileHandle = NULL;\r


@@ -1028,7 +1028,7 @@ PeiDispatcher (
   //\r
   do {\r
     //\r
   //\r
   do {\r
     //\r

-    // In case that reenter PeiCore happens, the last pass record is still available.   \r
+    // In case that reenter PeiCore happens, the last pass record is still available.\r

     //\r
     if (!Private->PeimDispatcherReenter) {\r
       Private->PeimNeedingDispatch      = FALSE;\r
     //\r
     if (!Private->PeimDispatcherReenter) {\r
       Private->PeimNeedingDispatch      = FALSE;\r


@@ -1036,18 +1036,18 @@ PeiDispatcher (
     } else {\r
       Private->PeimDispatcherReenter    = FALSE;\r
     }\r
     } else {\r
       Private->PeimDispatcherReenter    = FALSE;\r
     }\r

-    \r
+\r

     for (FvCount = Private->CurrentPeimFvCount; FvCount < Private->FvCount; FvCount++) {\r
       CoreFvHandle = FindNextCoreFvHandle (Private, FvCount);\r
       ASSERT (CoreFvHandle != NULL);\r
     for (FvCount = Private->CurrentPeimFvCount; FvCount < Private->FvCount; FvCount++) {\r
       CoreFvHandle = FindNextCoreFvHandle (Private, FvCount);\r
       ASSERT (CoreFvHandle != NULL);\r

-      \r
+\r

       //\r
       // If the FV has corresponding EFI_PEI_FIRMWARE_VOLUME_PPI instance, then dispatch it.\r
       //\r
       if (CoreFvHandle->FvPpi == NULL) {\r
         continue;\r
       }\r
       //\r
       // If the FV has corresponding EFI_PEI_FIRMWARE_VOLUME_PPI instance, then dispatch it.\r
       //\r
       if (CoreFvHandle->FvPpi == NULL) {\r
         continue;\r
       }\r

-      \r
+\r

       Private->CurrentPeimFvCount = FvCount;\r
 \r
       if (Private->CurrentPeimCount == 0) {\r
       Private->CurrentPeimFvCount = FvCount;\r
 \r
       if (Private->CurrentPeimCount == 0) {\r


@@ -1297,7 +1297,7 @@ DepexSatisfied (
   } else {\r
     DEBUG ((DEBUG_DISPATCH, "Evaluate PEI DEPEX for FFS(%g)\n", &FileInfo.FileName));\r
   }\r
   } else {\r
     DEBUG ((DEBUG_DISPATCH, "Evaluate PEI DEPEX for FFS(%g)\n", &FileInfo.FileName));\r
   }\r

-  \r
+\r

   if (PeimCount < Private->AprioriCount) {\r
     //\r
     // If its in the A priori file then we set Depex to TRUE\r
   if (PeimCount < Private->AprioriCount) {\r
     //\r
     // If its in the A priori file then we set Depex to TRUE\r

diff --git a/MdeModulePkg/Core/Pei/FwVol/FwVol.c b/MdeModulePkg/Core/Pei/FwVol/FwVol.c
index 4150b338b211847a17cf2d2968a11b11e1e46976..65c485549718430eb50253adfe52d4790cd4fc20 100644 (file)
--- a/MdeModulePkg/Core/Pei/FwVol/FwVol.c
+++ b/MdeModulePkg/Core/Pei/FwVol/FwVol.c
@@ -1,15 +1,15 @@
 /** @file\r
   Pei Core Firmware File System service routines.\r
 /** @file\r
   Pei Core Firmware File System service routines.\r

-  \r
+\r

 Copyright (c) 2015 HP Development Company, L.P.\r
 Copyright (c) 2015 HP Development Company, L.P.\r

-Copyright (c) 2006 - 2017, Intel Corporation. All rights reserved.<BR>\r
-This program and the accompanying materials                          \r
-are licensed and made available under the terms and conditions of the BSD License         \r
-which accompanies this distribution.  The full text of the license may be found at        \r
-http://opensource.org/licenses/bsd-license.php                                            \r
-                                                                                          \r
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     \r
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             \r
+Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r
+This program and the accompanying materials\r
+are licensed and made available under the terms and conditions of the BSD License\r
+which accompanies this distribution.  The full text of the license may be found at\r
+http://opensource.org/licenses/bsd-license.php\r
+\r
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r

 \r
 **/\r
 \r
 \r
 **/\r
 \r


@@ -19,12 +19,12 @@ EFI_PEI_NOTIFY_DESCRIPTOR mNotifyOnFvInfoList[] = {
   {\r
     EFI_PEI_PPI_DESCRIPTOR_NOTIFY_CALLBACK,\r
     &gEfiPeiFirmwareVolumeInfoPpiGuid,\r
   {\r
     EFI_PEI_PPI_DESCRIPTOR_NOTIFY_CALLBACK,\r
     &gEfiPeiFirmwareVolumeInfoPpiGuid,\r

-    FirmwareVolmeInfoPpiNotifyCallback \r
+    FirmwareVolmeInfoPpiNotifyCallback\r

   },\r
   {\r
     (EFI_PEI_PPI_DESCRIPTOR_NOTIFY_CALLBACK | EFI_PEI_PPI_DESCRIPTOR_TERMINATE_LIST),\r
     &gEfiPeiFirmwareVolumeInfo2PpiGuid,\r
   },\r
   {\r
     (EFI_PEI_PPI_DESCRIPTOR_NOTIFY_CALLBACK | EFI_PEI_PPI_DESCRIPTOR_TERMINATE_LIST),\r
     &gEfiPeiFirmwareVolumeInfo2PpiGuid,\r

-    FirmwareVolmeInfoPpiNotifyCallback \r
+    FirmwareVolmeInfoPpiNotifyCallback\r

   }\r
 };\r
 \r
   }\r
 };\r
 \r


@@ -61,7 +61,7 @@ PEI_FW_VOL_INSTANCE mPeiFfs3FwVol = {
     EFI_PEI_FIRMWARE_VOLUME_PPI_REVISION\r
   }\r
 };\r
     EFI_PEI_FIRMWARE_VOLUME_PPI_REVISION\r
   }\r
 };\r

-            \r
+\r

 EFI_PEI_PPI_DESCRIPTOR  mPeiFfs2FvPpiList = {\r
   (EFI_PEI_PPI_DESCRIPTOR_PPI | EFI_PEI_PPI_DESCRIPTOR_TERMINATE_LIST),\r
   &gEfiFirmwareFileSystem2Guid,\r
 EFI_PEI_PPI_DESCRIPTOR  mPeiFfs2FvPpiList = {\r
   (EFI_PEI_PPI_DESCRIPTOR_PPI | EFI_PEI_PPI_DESCRIPTOR_TERMINATE_LIST),\r
   &gEfiFirmwareFileSystem2Guid,\r


@@ -136,7 +136,7 @@ FfsAttributes2FvFileAttributes (
                          in the Attributes field.\r
   @param FfsHeader       Pointer to FFS File Header.\r
 \r
                          in the Attributes field.\r
   @param FfsHeader       Pointer to FFS File Header.\r
 \r

-  @retval EFI_FFS_FILE_STATE File state is set by the highest none zero bit \r
+  @retval EFI_FFS_FILE_STATE File state is set by the highest none zero bit\r

                              in the header State field.\r
 **/\r
 EFI_FFS_FILE_STATE\r
                              in the header State field.\r
 **/\r
 EFI_FFS_FILE_STATE\r


@@ -153,7 +153,7 @@ GetFileState(
   if (ErasePolarity != 0) {\r
     FileState = (EFI_FFS_FILE_STATE)~FileState;\r
   }\r
   if (ErasePolarity != 0) {\r
     FileState = (EFI_FFS_FILE_STATE)~FileState;\r
   }\r

-  \r
+\r

   //\r
   // Get file state set by its highest none zero bit.\r
   //\r
   //\r
   // Get file state set by its highest none zero bit.\r
   //\r


@@ -163,7 +163,7 @@ GetFileState(
   }\r
 \r
   return HighestBit;\r
   }\r
 \r
   return HighestBit;\r

-} \r
+}\r

 \r
 /**\r
   Calculates the checksum of the header of a file.\r
 \r
 /**\r
   Calculates the checksum of the header of a file.\r


@@ -206,7 +206,7 @@ CalculateHeaderChecksum (
   Find FV handler according to FileHandle in that FV.\r
 \r
   @param FileHandle      Handle of file image\r
   Find FV handler according to FileHandle in that FV.\r
 \r
   @param FileHandle      Handle of file image\r

-  \r
+\r

   @return Pointer to instance of PEI_CORE_FV_HANDLE.\r
 **/\r
 PEI_CORE_FV_HANDLE*\r
   @return Pointer to instance of PEI_CORE_FV_HANDLE.\r
 **/\r
 PEI_CORE_FV_HANDLE*\r


@@ -221,10 +221,10 @@ FileHandleToVolume (
 \r
   PrivateData = PEI_CORE_INSTANCE_FROM_PS_THIS (GetPeiServicesTablePointer ());\r
   BestIndex   = PrivateData->FvCount;\r
 \r
   PrivateData = PEI_CORE_INSTANCE_FROM_PS_THIS (GetPeiServicesTablePointer ());\r
   BestIndex   = PrivateData->FvCount;\r

-  \r
+\r

   //\r
   // Find the best matched FV image that includes this FileHandle.\r
   //\r
   // Find the best matched FV image that includes this FileHandle.\r

-  // FV may include the child FV, and they are in the same continuous space. \r
+  // FV may include the child FV, and they are in the same continuous space.\r

   // If FileHandle is from the child FV, the updated logic can find its matched FV.\r
   //\r
   for (Index = 0; Index < PrivateData->FvCount; Index++) {\r
   // If FileHandle is from the child FV, the updated logic can find its matched FV.\r
   //\r
   for (Index = 0; Index < PrivateData->FvCount; Index++) {\r


@@ -253,8 +253,8 @@ FileHandleToVolume (
   FFS volume as defined by SearchType. The search starts from FileHeader inside\r
   the Firmware Volume defined by FwVolHeader.\r
   If SearchType is EFI_FV_FILETYPE_ALL, the first FFS file will return without check its file type.\r
   FFS volume as defined by SearchType. The search starts from FileHeader inside\r
   the Firmware Volume defined by FwVolHeader.\r
   If SearchType is EFI_FV_FILETYPE_ALL, the first FFS file will return without check its file type.\r

-  If SearchType is PEI_CORE_INTERNAL_FFS_FILE_DISPATCH_TYPE, \r
-  the first PEIM, or COMBINED PEIM or FV file type FFS file will return.  \r
+  If SearchType is PEI_CORE_INTERNAL_FFS_FILE_DISPATCH_TYPE,\r
+  the first PEIM, or COMBINED PEIM or FV file type FFS file will return.\r

 \r
   @param FvHandle        Pointer to the FV header of the volume to search\r
   @param FileName        File name\r
 \r
   @param FvHandle        Pointer to the FV header of the volume to search\r
   @param FileName        File name\r


@@ -288,7 +288,7 @@ FindFileEx (
   UINT8                                 FileState;\r
   UINT8                                 DataCheckSum;\r
   BOOLEAN                               IsFfs3Fv;\r
   UINT8                                 FileState;\r
   UINT8                                 DataCheckSum;\r
   BOOLEAN                               IsFfs3Fv;\r

-  \r
+\r

   //\r
   // Convert the handle of FV to FV header for memory-mapped firmware volume\r
   //\r
   //\r
   // Convert the handle of FV to FV header for memory-mapped firmware volume\r
   //\r


@@ -303,7 +303,7 @@ FindFileEx (
   } else {\r
     ErasePolarity = 0;\r
   }\r
   } else {\r
     ErasePolarity = 0;\r
   }\r

-  \r
+\r

   //\r
   // If FileHeader is not specified (NULL) or FileName is not NULL,\r
   // start with the first file in the firmware volume.  Otherwise,\r
   //\r
   // If FileHeader is not specified (NULL) or FileName is not NULL,\r
   // start with the first file in the firmware volume.  Otherwise,\r


@@ -336,13 +336,13 @@ FindFileEx (
     FileOccupiedSize = GET_OCCUPIED_SIZE (FileLength, 8);\r
     FfsFileHeader = (EFI_FFS_FILE_HEADER *)((UINT8 *)*FileHeader + FileOccupiedSize);\r
   }\r
     FileOccupiedSize = GET_OCCUPIED_SIZE (FileLength, 8);\r
     FfsFileHeader = (EFI_FFS_FILE_HEADER *)((UINT8 *)*FileHeader + FileOccupiedSize);\r
   }\r

-  \r
+\r

   FileOffset = (UINT32) ((UINT8 *)FfsFileHeader - (UINT8 *)FwVolHeader);\r
   ASSERT (FileOffset <= 0xFFFFFFFF);\r
 \r
   while (FileOffset < (FvLength - sizeof (EFI_FFS_FILE_HEADER))) {\r
     //\r
   FileOffset = (UINT32) ((UINT8 *)FfsFileHeader - (UINT8 *)FwVolHeader);\r
   ASSERT (FileOffset <= 0xFFFFFFFF);\r
 \r
   while (FileOffset < (FvLength - sizeof (EFI_FFS_FILE_HEADER))) {\r
     //\r

-    // Get FileState which is the highest bit of the State \r
+    // Get FileState which is the highest bit of the State\r

     //\r
     FileState = GetFileState (ErasePolarity, FfsFileHeader);\r
     switch (FileState) {\r
     //\r
     FileState = GetFileState (ErasePolarity, FfsFileHeader);\r
     switch (FileState) {\r


@@ -360,7 +360,7 @@ FindFileEx (
         FfsFileHeader =  (EFI_FFS_FILE_HEADER *) ((UINT8 *) FfsFileHeader + sizeof (EFI_FFS_FILE_HEADER));\r
       }\r
       break;\r
         FfsFileHeader =  (EFI_FFS_FILE_HEADER *) ((UINT8 *) FfsFileHeader + sizeof (EFI_FFS_FILE_HEADER));\r
       }\r
       break;\r

-        \r
+\r

     case EFI_FILE_DATA_VALID:\r
     case EFI_FILE_MARKED_FOR_UPDATE:\r
       if (CalculateHeaderChecksum (FfsFileHeader) != 0) {\r
     case EFI_FILE_DATA_VALID:\r
     case EFI_FILE_MARKED_FOR_UPDATE:\r
       if (CalculateHeaderChecksum (FfsFileHeader) != 0) {\r


@@ -404,29 +404,29 @@ FindFileEx (
           return EFI_SUCCESS;\r
         }\r
       } else if (SearchType == PEI_CORE_INTERNAL_FFS_FILE_DISPATCH_TYPE) {\r
           return EFI_SUCCESS;\r
         }\r
       } else if (SearchType == PEI_CORE_INTERNAL_FFS_FILE_DISPATCH_TYPE) {\r

-        if ((FfsFileHeader->Type == EFI_FV_FILETYPE_PEIM) || \r
+        if ((FfsFileHeader->Type == EFI_FV_FILETYPE_PEIM) ||\r

             (FfsFileHeader->Type == EFI_FV_FILETYPE_COMBINED_PEIM_DRIVER) ||\r
             (FfsFileHeader->Type == EFI_FV_FILETYPE_COMBINED_PEIM_DRIVER) ||\r

-            (FfsFileHeader->Type == EFI_FV_FILETYPE_FIRMWARE_VOLUME_IMAGE)) { \r
-          \r
+            (FfsFileHeader->Type == EFI_FV_FILETYPE_FIRMWARE_VOLUME_IMAGE)) {\r
+\r

           *FileHeader = FfsFileHeader;\r
           return EFI_SUCCESS;\r
         } else if (AprioriFile != NULL) {\r
           if (FfsFileHeader->Type == EFI_FV_FILETYPE_FREEFORM) {\r
             if (CompareGuid (&FfsFileHeader->Name, &gPeiAprioriFileNameGuid)) {\r
               *AprioriFile = FfsFileHeader;\r
           *FileHeader = FfsFileHeader;\r
           return EFI_SUCCESS;\r
         } else if (AprioriFile != NULL) {\r
           if (FfsFileHeader->Type == EFI_FV_FILETYPE_FREEFORM) {\r
             if (CompareGuid (&FfsFileHeader->Name, &gPeiAprioriFileNameGuid)) {\r
               *AprioriFile = FfsFileHeader;\r

-            }           \r
-          } \r
+            }\r
+          }\r

         }\r
         }\r

-      } else if (((SearchType == FfsFileHeader->Type) || (SearchType == EFI_FV_FILETYPE_ALL)) && \r
-                 (FfsFileHeader->Type != EFI_FV_FILETYPE_FFS_PAD)) { \r
+      } else if (((SearchType == FfsFileHeader->Type) || (SearchType == EFI_FV_FILETYPE_ALL)) &&\r
+                 (FfsFileHeader->Type != EFI_FV_FILETYPE_FFS_PAD)) {\r

         *FileHeader = FfsFileHeader;\r
         return EFI_SUCCESS;\r
       }\r
 \r
         *FileHeader = FfsFileHeader;\r
         return EFI_SUCCESS;\r
       }\r
 \r

-      FileOffset    += FileOccupiedSize; \r
+      FileOffset    += FileOccupiedSize;\r

       FfsFileHeader =  (EFI_FFS_FILE_HEADER *)((UINT8 *)FfsFileHeader + FileOccupiedSize);\r
       break;\r
       FfsFileHeader =  (EFI_FFS_FILE_HEADER *)((UINT8 *)FfsFileHeader + FileOccupiedSize);\r
       break;\r

-    \r
+\r

     case EFI_FILE_DELETED:\r
       if (IS_FFS_FILE2 (FfsFileHeader)) {\r
         if (!IsFfs3Fv) {\r
     case EFI_FILE_DELETED:\r
       if (IS_FFS_FILE2 (FfsFileHeader)) {\r
         if (!IsFfs3Fv) {\r


@@ -445,11 +445,11 @@ FindFileEx (
     default:\r
       *FileHeader = NULL;\r
       return EFI_NOT_FOUND;\r
     default:\r
       *FileHeader = NULL;\r
       return EFI_NOT_FOUND;\r

-    } \r
+    }\r

   }\r
   }\r

-  \r
+\r

   *FileHeader = NULL;\r
   *FileHeader = NULL;\r

-  return EFI_NOT_FOUND;  \r
+  return EFI_NOT_FOUND;\r

 }\r
 \r
 /**\r
 }\r
 \r
 /**\r


@@ -458,7 +458,7 @@ FindFileEx (
   @param PrivateData     - Pointer to PEI_CORE_INSTANCE.\r
   @param SecCoreData     - Pointer to EFI_SEC_PEI_HAND_OFF.\r
 **/\r
   @param PrivateData     - Pointer to PEI_CORE_INSTANCE.\r
   @param SecCoreData     - Pointer to EFI_SEC_PEI_HAND_OFF.\r
 **/\r

-VOID \r
+VOID\r

 PeiInitializeFv (\r
   IN  PEI_CORE_INSTANCE           *PrivateData,\r
   IN CONST EFI_SEC_PEI_HAND_OFF   *SecCoreData\r
 PeiInitializeFv (\r
   IN  PEI_CORE_INSTANCE           *PrivateData,\r
   IN CONST EFI_SEC_PEI_HAND_OFF   *SecCoreData\r


@@ -468,7 +468,7 @@ PeiInitializeFv (
   EFI_PEI_FIRMWARE_VOLUME_PPI   *FvPpi;\r
   EFI_PEI_FV_HANDLE             FvHandle;\r
   EFI_FIRMWARE_VOLUME_HEADER    *BfvHeader;\r
   EFI_PEI_FIRMWARE_VOLUME_PPI   *FvPpi;\r
   EFI_PEI_FV_HANDLE             FvHandle;\r
   EFI_FIRMWARE_VOLUME_HEADER    *BfvHeader;\r

-  \r
+\r

   //\r
   // Install FV_PPI for FFS2 file system.\r
   //\r
   //\r
   // Install FV_PPI for FFS2 file system.\r
   //\r


@@ -480,7 +480,7 @@ PeiInitializeFv (
   PeiServicesInstallPpi (&mPeiFfs3FvPpiList);\r
 \r
   BfvHeader = (EFI_FIRMWARE_VOLUME_HEADER *)SecCoreData->BootFirmwareVolumeBase;\r
   PeiServicesInstallPpi (&mPeiFfs3FvPpiList);\r
 \r
   BfvHeader = (EFI_FIRMWARE_VOLUME_HEADER *)SecCoreData->BootFirmwareVolumeBase;\r

-  \r
+\r

   //\r
   // The FV_PPI in BFV's format should be installed.\r
   //\r
   //\r
   // The FV_PPI in BFV's format should be installed.\r
   //\r


@@ -491,7 +491,7 @@ PeiInitializeFv (
              (VOID**)&FvPpi\r
              );\r
   ASSERT_EFI_ERROR (Status);\r
              (VOID**)&FvPpi\r
              );\r
   ASSERT_EFI_ERROR (Status);\r

-    \r
+\r

   //\r
   // Get handle of BFV\r
   //\r
   //\r
   // Get handle of BFV\r
   //\r


@@ -511,15 +511,15 @@ PeiInitializeFv (
   PrivateData->Fv[PrivateData->FvCount].FvHandle = FvHandle;\r
   PrivateData->Fv[PrivateData->FvCount].AuthenticationStatus = 0;\r
   DEBUG ((\r
   PrivateData->Fv[PrivateData->FvCount].FvHandle = FvHandle;\r
   PrivateData->Fv[PrivateData->FvCount].AuthenticationStatus = 0;\r
   DEBUG ((\r

-    EFI_D_INFO, \r
-    "The %dth FV start address is 0x%11p, size is 0x%08x, handle is 0x%p\n", \r
-    (UINT32) PrivateData->FvCount, \r
-    (VOID *) BfvHeader, \r
+    EFI_D_INFO,\r
+    "The %dth FV start address is 0x%11p, size is 0x%08x, handle is 0x%p\n",\r
+    (UINT32) PrivateData->FvCount,\r
+    (VOID *) BfvHeader,\r

     (UINT32) BfvHeader->FvLength,\r
     FvHandle\r
     (UINT32) BfvHeader->FvLength,\r
     FvHandle\r

-    ));    \r
+    ));\r

   PrivateData->FvCount ++;\r
   PrivateData->FvCount ++;\r

-                            \r
+\r

   //\r
   // Post a call-back for the FvInfoPPI and FvInfo2PPI services to expose\r
   // additional Fvs to PeiCore.\r
   //\r
   // Post a call-back for the FvInfoPPI and FvInfo2PPI services to expose\r
   // additional Fvs to PeiCore.\r


@@ -528,7 +528,7 @@ PeiInitializeFv (
   ASSERT_EFI_ERROR (Status);\r
 \r
 }\r
   ASSERT_EFI_ERROR (Status);\r
 \r
 }\r

-  \r
+\r

 /**\r
   Process Firmware Volum Information once FvInfoPPI or FvInfo2PPI install.\r
   The FV Info will be registered into PeiCore private data structure.\r
 /**\r
   Process Firmware Volum Information once FvInfoPPI or FvInfo2PPI install.\r
   The FV Info will be registered into PeiCore private data structure.\r


@@ -619,7 +619,7 @@ FirmwareVolmeInfoPpiNotifyCallback (
       if (PrivateData->Fv[FvIndex].FvHandle == FvHandle) {\r
         if (IsFvInfo2 && (FvInfo2Ppi.AuthenticationStatus != PrivateData->Fv[FvIndex].AuthenticationStatus)) {\r
           PrivateData->Fv[FvIndex].AuthenticationStatus = FvInfo2Ppi.AuthenticationStatus;\r
       if (PrivateData->Fv[FvIndex].FvHandle == FvHandle) {\r
         if (IsFvInfo2 && (FvInfo2Ppi.AuthenticationStatus != PrivateData->Fv[FvIndex].AuthenticationStatus)) {\r
           PrivateData->Fv[FvIndex].AuthenticationStatus = FvInfo2Ppi.AuthenticationStatus;\r

-          DEBUG ((EFI_D_INFO, "Update AuthenticationStatus of the %dth FV to 0x%x!\n", FvIndex, FvInfo2Ppi.AuthenticationStatus));          \r
+          DEBUG ((EFI_D_INFO, "Update AuthenticationStatus of the %dth FV to 0x%x!\n", FvIndex, FvInfo2Ppi.AuthenticationStatus));\r

         }\r
         DEBUG ((EFI_D_INFO, "The Fv %p has already been processed!\n", FvInfo2Ppi.FvInfo));\r
         return EFI_SUCCESS;\r
         }\r
         DEBUG ((EFI_D_INFO, "The Fv %p has already been processed!\n", FvInfo2Ppi.FvInfo));\r
         return EFI_SUCCESS;\r


@@ -641,17 +641,17 @@ FirmwareVolmeInfoPpiNotifyCallback (
     PrivateData->Fv[PrivateData->FvCount].AuthenticationStatus = FvInfo2Ppi.AuthenticationStatus;\r
     CurFvCount = PrivateData->FvCount;\r
     DEBUG ((\r
     PrivateData->Fv[PrivateData->FvCount].AuthenticationStatus = FvInfo2Ppi.AuthenticationStatus;\r
     CurFvCount = PrivateData->FvCount;\r
     DEBUG ((\r

-      EFI_D_INFO, \r
-      "The %dth FV start address is 0x%11p, size is 0x%08x, handle is 0x%p\n", \r
+      EFI_D_INFO,\r
+      "The %dth FV start address is 0x%11p, size is 0x%08x, handle is 0x%p\n",\r

       (UINT32) CurFvCount,\r
       (UINT32) CurFvCount,\r

-      (VOID *) FvInfo2Ppi.FvInfo, \r
+      (VOID *) FvInfo2Ppi.FvInfo,\r

       FvInfo2Ppi.FvInfoSize,\r
       FvHandle\r
       FvInfo2Ppi.FvInfoSize,\r
       FvHandle\r

-      ));    \r
+      ));\r

     PrivateData->FvCount ++;\r
 \r
     //\r
     PrivateData->FvCount ++;\r
 \r
     //\r

-    // Scan and process the new discoveried FV for EFI_FV_FILETYPE_FIRMWARE_VOLUME_IMAGE \r
+    // Scan and process the new discoveried FV for EFI_FV_FILETYPE_FIRMWARE_VOLUME_IMAGE\r

     //\r
     FileHandle = NULL;\r
     do {\r
     //\r
     FileHandle = NULL;\r
     do {\r


@@ -676,17 +676,17 @@ FirmwareVolmeInfoPpiNotifyCallback (
             continue;\r
           }\r
         }\r
             continue;\r
           }\r
         }\r

-        \r
+\r

         DEBUG ((EFI_D_INFO, "Found firmware volume Image File %p in FV[%d] %p\n", FileHandle, CurFvCount, FvHandle));\r
         ProcessFvFile (PrivateData, &PrivateData->Fv[CurFvCount], FileHandle);\r
       }\r
     } while (FileHandle != NULL);\r
   } else {\r
     DEBUG ((EFI_D_ERROR, "Fail to process FV %p because no corresponding EFI_FIRMWARE_VOLUME_PPI is found!\n", FvInfo2Ppi.FvInfo));\r
         DEBUG ((EFI_D_INFO, "Found firmware volume Image File %p in FV[%d] %p\n", FileHandle, CurFvCount, FvHandle));\r
         ProcessFvFile (PrivateData, &PrivateData->Fv[CurFvCount], FileHandle);\r
       }\r
     } while (FileHandle != NULL);\r
   } else {\r
     DEBUG ((EFI_D_ERROR, "Fail to process FV %p because no corresponding EFI_FIRMWARE_VOLUME_PPI is found!\n", FvInfo2Ppi.FvInfo));\r

-    \r
+\r

     AddUnknownFormatFvInfo (PrivateData, &FvInfo2Ppi);\r
   }\r
     AddUnknownFormatFvInfo (PrivateData, &FvInfo2Ppi);\r
   }\r

-  \r
+\r

   return EFI_SUCCESS;\r
 }\r
 \r
   return EFI_SUCCESS;\r
 }\r
 \r


@@ -699,7 +699,7 @@ FirmwareVolmeInfoPpiNotifyCallback (
 \r
   @return TRUE      The GuidedSectionGuid could be identified, and the pointer to\r
                     the Guided Section Extraction Ppi will be returned to *GuidedSectionExtraction.\r
 \r
   @return TRUE      The GuidedSectionGuid could be identified, and the pointer to\r
                     the Guided Section Extraction Ppi will be returned to *GuidedSectionExtraction.\r

-  @return FALSE     The GuidedSectionGuid could not be identified, or \r
+  @return FALSE     The GuidedSectionGuid could not be identified, or\r

                     the Guided Section Extraction Ppi has not been installed yet.\r
 \r
 **/\r
                     the Guided Section Extraction Ppi has not been installed yet.\r
 \r
 **/\r


@@ -740,10 +740,10 @@ VerifyGuidedSectionGuid (
 }\r
 \r
 /**\r
 }\r
 \r
 /**\r

-  Go through the file to search SectionType section. \r
-  Search within encapsulation sections (compression and GUIDed) recursively, \r
+  Go through the file to search SectionType section.\r
+  Search within encapsulation sections (compression and GUIDed) recursively,\r

   until the match section is found.\r
   until the match section is found.\r

-  \r
+\r

   @param PeiServices       An indirect pointer to the EFI_PEI_SERVICES table published by the PEI Foundation.\r
   @param SectionType       Filter to find only section of this type.\r
   @param SectionInstance   Pointer to the filter to find the specific instance of section.\r
   @param PeiServices       An indirect pointer to the EFI_PEI_SERVICES table published by the PEI Foundation.\r
   @param SectionType       Filter to find only section of this type.\r
   @param SectionInstance   Pointer to the filter to find the specific instance of section.\r


@@ -862,8 +862,8 @@ ProcessSection (
                      PeiServices,\r
                      SectionType,\r
                      SectionInstance,\r
                      PeiServices,\r
                      SectionType,\r
                      SectionInstance,\r

-                     PpiOutput, \r
-                     PpiOutputSize, \r
+                     PpiOutput,\r
+                     PpiOutputSize,\r

                      &TempOutputBuffer,\r
                      &TempAuthenticationStatus,\r
                      IsFfs3Fv\r
                      &TempOutputBuffer,\r
                      &TempAuthenticationStatus,\r
                      IsFfs3Fv\r


@@ -946,8 +946,8 @@ ProcessSection (
                      PeiServices,\r
                      SectionType,\r
                      SectionInstance,\r
                      PeiServices,\r
                      SectionType,\r
                      SectionInstance,\r

-                     PpiOutput, \r
-                     PpiOutputSize, \r
+                     PpiOutput,\r
+                     PpiOutputSize,\r

                      &TempOutputBuffer,\r
                      &TempAuthenticationStatus,\r
                      IsFfs3Fv\r
                      &TempOutputBuffer,\r
                      &TempAuthenticationStatus,\r
                      IsFfs3Fv\r


@@ -975,7 +975,7 @@ ProcessSection (
     ParsedLength += SectionLength;\r
     Section = (EFI_COMMON_SECTION_HEADER *)((UINT8 *)Section + SectionLength);\r
   }\r
     ParsedLength += SectionLength;\r
     Section = (EFI_COMMON_SECTION_HEADER *)((UINT8 *)Section + SectionLength);\r
   }\r

-  \r
+\r

   return EFI_NOT_FOUND;\r
 }\r
 \r
   return EFI_NOT_FOUND;\r
 }\r
 \r


@@ -1003,12 +1003,12 @@ PeiFfsFindSectionData (
   )\r
 {\r
   PEI_CORE_FV_HANDLE           *CoreFvHandle;\r
   )\r
 {\r
   PEI_CORE_FV_HANDLE           *CoreFvHandle;\r

-  \r
+\r

   CoreFvHandle = FileHandleToVolume (FileHandle);\r
   if ((CoreFvHandle == NULL) || (CoreFvHandle->FvPpi == NULL)) {\r
     return EFI_NOT_FOUND;\r
   }\r
   CoreFvHandle = FileHandleToVolume (FileHandle);\r
   if ((CoreFvHandle == NULL) || (CoreFvHandle->FvPpi == NULL)) {\r
     return EFI_NOT_FOUND;\r
   }\r

-  \r
+\r

   return CoreFvHandle->FvPpi->FindSectionByType (CoreFvHandle->FvPpi, SectionType, FileHandle, SectionData);\r
 }\r
 \r
   return CoreFvHandle->FvPpi->FindSectionByType (CoreFvHandle->FvPpi, SectionType, FileHandle, SectionData);\r
 }\r
 \r


@@ -1038,7 +1038,7 @@ PeiFfsFindSectionData3 (
   )\r
 {\r
   PEI_CORE_FV_HANDLE           *CoreFvHandle;\r
   )\r
 {\r
   PEI_CORE_FV_HANDLE           *CoreFvHandle;\r

-  \r
+\r

   CoreFvHandle = FileHandleToVolume (FileHandle);\r
   if ((CoreFvHandle == NULL) || (CoreFvHandle->FvPpi == NULL)) {\r
     return EFI_NOT_FOUND;\r
   CoreFvHandle = FileHandleToVolume (FileHandle);\r
   if ((CoreFvHandle == NULL) || (CoreFvHandle->FvPpi == NULL)) {\r
     return EFI_NOT_FOUND;\r


@@ -1081,9 +1081,9 @@ PeiFfsFindNextFile (
   )\r
 {\r
   PEI_CORE_FV_HANDLE      *CoreFvHandle;\r
   )\r
 {\r
   PEI_CORE_FV_HANDLE      *CoreFvHandle;\r

-  \r
+\r

   CoreFvHandle = FvHandleToCoreHandle (FvHandle);\r
   CoreFvHandle = FvHandleToCoreHandle (FvHandle);\r

-  \r
+\r

   //\r
   // To make backward compatiblity, if can not find corresponding the handle of FV\r
   // then treat FV as build-in FFS2/FFS3 format and memory mapped FV that FV handle is pointed\r
   //\r
   // To make backward compatiblity, if can not find corresponding the handle of FV\r
   // then treat FV as build-in FFS2/FFS3 format and memory mapped FV that FV handle is pointed\r


@@ -1091,12 +1091,12 @@ PeiFfsFindNextFile (
   //\r
   if ((CoreFvHandle == NULL) && FeaturePcdGet (PcdFrameworkCompatibilitySupport)) {\r
     return FindFileEx (FvHandle, NULL, SearchType, FileHandle, NULL);\r
   //\r
   if ((CoreFvHandle == NULL) && FeaturePcdGet (PcdFrameworkCompatibilitySupport)) {\r
     return FindFileEx (FvHandle, NULL, SearchType, FileHandle, NULL);\r

-  } \r
-  \r
+  }\r
+\r

   if ((CoreFvHandle == NULL) || CoreFvHandle->FvPpi == NULL) {\r
     return EFI_NOT_FOUND;\r
   }\r
   if ((CoreFvHandle == NULL) || CoreFvHandle->FvPpi == NULL) {\r
     return EFI_NOT_FOUND;\r
   }\r

-  \r
+\r

   return CoreFvHandle->FvPpi->FindFileByType (CoreFvHandle->FvPpi, SearchType, FvHandle, FileHandle);\r
 }\r
 \r
   return CoreFvHandle->FvPpi->FindFileByType (CoreFvHandle->FvPpi, SearchType, FvHandle, FileHandle);\r
 }\r
 \r


@@ -1114,7 +1114,7 @@ PeiFfsFindNextFile (
   @retval EFI_SUCCESS            The volume was found.\r
 \r
 **/\r
   @retval EFI_SUCCESS            The volume was found.\r
 \r
 **/\r

-EFI_STATUS \r
+EFI_STATUS\r

 EFIAPI\r
 PeiFfsFindNextVolume (\r
   IN CONST EFI_PEI_SERVICES         **PeiServices,\r
 EFIAPI\r
 PeiFfsFindNextVolume (\r
   IN CONST EFI_PEI_SERVICES         **PeiServices,\r


@@ -1124,21 +1124,21 @@ PeiFfsFindNextVolume (
 {\r
   PEI_CORE_INSTANCE  *Private;\r
   PEI_CORE_FV_HANDLE *CoreFvHandle;\r
 {\r
   PEI_CORE_INSTANCE  *Private;\r
   PEI_CORE_FV_HANDLE *CoreFvHandle;\r

-  \r
+\r

   if (VolumeHandle == NULL) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
   if (VolumeHandle == NULL) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r

-  \r
+\r

   Private = PEI_CORE_INSTANCE_FROM_PS_THIS (PeiServices);\r
   Private = PEI_CORE_INSTANCE_FROM_PS_THIS (PeiServices);\r

-  \r
+\r

   CoreFvHandle = FindNextCoreFvHandle (Private, Instance);\r
   if (CoreFvHandle == NULL) {\r
     *VolumeHandle = NULL;\r
     return EFI_NOT_FOUND;\r
   }\r
   CoreFvHandle = FindNextCoreFvHandle (Private, Instance);\r
   if (CoreFvHandle == NULL) {\r
     *VolumeHandle = NULL;\r
     return EFI_NOT_FOUND;\r
   }\r

-  \r
+\r

   *VolumeHandle = CoreFvHandle->FvHandle;\r
   *VolumeHandle = CoreFvHandle->FvHandle;\r

-  \r
+\r

   return EFI_SUCCESS;\r
 }\r
 \r
   return EFI_SUCCESS;\r
 }\r
 \r


@@ -1148,7 +1148,7 @@ PeiFfsFindNextVolume (
 \r
   @param FileName        A pointer to the name of the file to find within the firmware volume.\r
   @param VolumeHandle    The firmware volume to search\r
 \r
   @param FileName        A pointer to the name of the file to find within the firmware volume.\r
   @param VolumeHandle    The firmware volume to search\r

-  @param FileHandle      Upon exit, points to the found file's handle \r
+  @param FileHandle      Upon exit, points to the found file's handle\r

                          or NULL if it could not be found.\r
 \r
   @retval EFI_SUCCESS            File was found.\r
                          or NULL if it could not be found.\r
 \r
   @retval EFI_SUCCESS            File was found.\r


@@ -1157,7 +1157,7 @@ PeiFfsFindNextVolume (
 \r
 **/\r
 EFI_STATUS\r
 \r
 **/\r
 EFI_STATUS\r

-EFIAPI \r
+EFIAPI\r

 PeiFfsFindFileByName (\r
   IN  CONST EFI_GUID        *FileName,\r
   IN  EFI_PEI_FV_HANDLE     VolumeHandle,\r
 PeiFfsFindFileByName (\r
   IN  CONST EFI_GUID        *FileName,\r
   IN  EFI_PEI_FV_HANDLE     VolumeHandle,\r


@@ -1165,16 +1165,16 @@ PeiFfsFindFileByName (
   )\r
 {\r
   PEI_CORE_FV_HANDLE            *CoreFvHandle;\r
   )\r
 {\r
   PEI_CORE_FV_HANDLE            *CoreFvHandle;\r

-  \r
+\r

   if ((VolumeHandle == NULL) || (FileName == NULL) || (FileHandle == NULL)) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
   if ((VolumeHandle == NULL) || (FileName == NULL) || (FileHandle == NULL)) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r

-  \r
+\r

   CoreFvHandle = FvHandleToCoreHandle (VolumeHandle);\r
   if ((CoreFvHandle == NULL) || (CoreFvHandle->FvPpi == NULL)) {\r
     return EFI_NOT_FOUND;\r
   }\r
   CoreFvHandle = FvHandleToCoreHandle (VolumeHandle);\r
   if ((CoreFvHandle == NULL) || (CoreFvHandle->FvPpi == NULL)) {\r
     return EFI_NOT_FOUND;\r
   }\r

-  \r
+\r

   return CoreFvHandle->FvPpi->FindFileByName (CoreFvHandle->FvPpi, FileName, &VolumeHandle, FileHandle);\r
 }\r
 \r
   return CoreFvHandle->FvPpi->FindFileByName (CoreFvHandle->FvPpi, FileName, &VolumeHandle, FileHandle);\r
 }\r
 \r


@@ -1190,14 +1190,14 @@ PeiFfsFindFileByName (
 \r
 **/\r
 EFI_STATUS\r
 \r
 **/\r
 EFI_STATUS\r

-EFIAPI \r
+EFIAPI\r

 PeiFfsGetFileInfo (\r
   IN EFI_PEI_FILE_HANDLE  FileHandle,\r
   OUT EFI_FV_FILE_INFO    *FileInfo\r
   )\r
 {\r
   PEI_CORE_FV_HANDLE          *CoreFvHandle;\r
 PeiFfsGetFileInfo (\r
   IN EFI_PEI_FILE_HANDLE  FileHandle,\r
   OUT EFI_FV_FILE_INFO    *FileInfo\r
   )\r
 {\r
   PEI_CORE_FV_HANDLE          *CoreFvHandle;\r

-  \r
+\r

   if ((FileHandle == NULL) || (FileInfo == NULL)) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
   if ((FileHandle == NULL) || (FileInfo == NULL)) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r


@@ -1225,14 +1225,14 @@ PeiFfsGetFileInfo (
 \r
 **/\r
 EFI_STATUS\r
 \r
 **/\r
 EFI_STATUS\r

-EFIAPI \r
+EFIAPI\r

 PeiFfsGetFileInfo2 (\r
   IN EFI_PEI_FILE_HANDLE  FileHandle,\r
   OUT EFI_FV_FILE_INFO2   *FileInfo\r
   )\r
 {\r
   PEI_CORE_FV_HANDLE          *CoreFvHandle;\r
 PeiFfsGetFileInfo2 (\r
   IN EFI_PEI_FILE_HANDLE  FileHandle,\r
   OUT EFI_FV_FILE_INFO2   *FileInfo\r
   )\r
 {\r
   PEI_CORE_FV_HANDLE          *CoreFvHandle;\r

-  \r
+\r

   if ((FileHandle == NULL) || (FileInfo == NULL)) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
   if ((FileHandle == NULL) || (FileInfo == NULL)) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r


@@ -1274,24 +1274,24 @@ PeiFfsGetFileInfo2 (
 \r
 **/\r
 EFI_STATUS\r
 \r
 **/\r
 EFI_STATUS\r

-EFIAPI \r
+EFIAPI\r

 PeiFfsGetVolumeInfo (\r
   IN EFI_PEI_FV_HANDLE  VolumeHandle,\r
   OUT EFI_FV_INFO       *VolumeInfo\r
   )\r
 {\r
   PEI_CORE_FV_HANDLE                     *CoreHandle;\r
 PeiFfsGetVolumeInfo (\r
   IN EFI_PEI_FV_HANDLE  VolumeHandle,\r
   OUT EFI_FV_INFO       *VolumeInfo\r
   )\r
 {\r
   PEI_CORE_FV_HANDLE                     *CoreHandle;\r

-  \r
+\r

   if ((VolumeInfo == NULL) || (VolumeHandle == NULL)) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
   if ((VolumeInfo == NULL) || (VolumeHandle == NULL)) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r

-  \r
+\r

   CoreHandle = FvHandleToCoreHandle (VolumeHandle);\r
   CoreHandle = FvHandleToCoreHandle (VolumeHandle);\r

-  \r
+\r

   if ((CoreHandle == NULL) || (CoreHandle->FvPpi == NULL)) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
   if ((CoreHandle == NULL) || (CoreHandle->FvPpi == NULL)) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r

-  \r
+\r

   return CoreHandle->FvPpi->GetVolumeInfo (CoreHandle->FvPpi, VolumeHandle, VolumeInfo);\r
 }\r
 \r
   return CoreHandle->FvPpi->GetVolumeInfo (CoreHandle->FvPpi, VolumeHandle, VolumeInfo);\r
 }\r
 \r


@@ -1369,7 +1369,7 @@ GetFvUsedSize (
   @retval EFI_OUT_OF_RESOURCES  Can not allocate page when aligning FV image\r
   @retval EFI_SECURITY_VIOLATION Image is illegal\r
   @retval Others                Can not find EFI_SECTION_FIRMWARE_VOLUME_IMAGE section\r
   @retval EFI_OUT_OF_RESOURCES  Can not allocate page when aligning FV image\r
   @retval EFI_SECURITY_VIOLATION Image is illegal\r
   @retval Others                Can not find EFI_SECTION_FIRMWARE_VOLUME_IMAGE section\r

-  \r
+\r

 **/\r
 EFI_STATUS\r
 ProcessFvFile (\r
 **/\r
 EFI_STATUS\r
 ProcessFvFile (\r


@@ -1410,7 +1410,7 @@ ProcessFvFile (
 \r
   ParentFvHandle = ParentFvCoreHandle->FvHandle;\r
   ParentFvPpi    = ParentFvCoreHandle->FvPpi;\r
 \r
   ParentFvHandle = ParentFvCoreHandle->FvHandle;\r
   ParentFvPpi    = ParentFvCoreHandle->FvPpi;\r

-  \r
+\r

   //\r
   // Find FvImage in FvFile\r
   //\r
   //\r
   // Find FvImage in FvFile\r
   //\r


@@ -1492,10 +1492,10 @@ ProcessFvFile (
 \r
   Status = ParentFvPpi->GetVolumeInfo (ParentFvPpi, ParentFvHandle, &ParentFvImageInfo);\r
   ASSERT_EFI_ERROR (Status);\r
 \r
   Status = ParentFvPpi->GetVolumeInfo (ParentFvPpi, ParentFvHandle, &ParentFvImageInfo);\r
   ASSERT_EFI_ERROR (Status);\r

-  \r
+\r

   Status = ParentFvPpi->GetFileInfo (ParentFvPpi, ParentFvFileHandle, &FileInfo);\r
   ASSERT_EFI_ERROR (Status);\r
   Status = ParentFvPpi->GetFileInfo (ParentFvPpi, ParentFvFileHandle, &FileInfo);\r
   ASSERT_EFI_ERROR (Status);\r

-  \r
+\r

   //\r
   // Install FvInfo(2) Ppi\r
   // NOTE: FvInfo2 must be installed before FvInfo so that recursive processing of encapsulated\r
   //\r
   // Install FvInfo(2) Ppi\r
   // NOTE: FvInfo2 must be installed before FvInfo so that recursive processing of encapsulated\r


@@ -1562,15 +1562,15 @@ ProcessFvFile (
   buffer which contains the necessary information for creating\r
   the firmware volume handle. Normally, these values are derived\r
   from the EFI_FIRMWARE_VOLUME_INFO_PPI.\r
   buffer which contains the necessary information for creating\r
   the firmware volume handle. Normally, these values are derived\r
   from the EFI_FIRMWARE_VOLUME_INFO_PPI.\r

-  \r
-  \r
+\r
+\r

   @param This                   Points to this instance of the\r
                                 EFI_PEI_FIRMWARE_VOLUME_PPI.\r
   @param Buffer                 Points to the start of the buffer.\r
   @param BufferSize             Size of the buffer.\r
   @param FvHandle               Points to the returned firmware volume\r
                                 handle. The firmware volume handle must\r
   @param This                   Points to this instance of the\r
                                 EFI_PEI_FIRMWARE_VOLUME_PPI.\r
   @param Buffer                 Points to the start of the buffer.\r
   @param BufferSize             Size of the buffer.\r
   @param FvHandle               Points to the returned firmware volume\r
                                 handle. The firmware volume handle must\r

-                                be unique within the system. \r
+                                be unique within the system.\r

 \r
   @retval EFI_SUCCESS           Firmware volume handle created.\r
   @retval EFI_VOLUME_CORRUPTED  Volume was corrupt.\r
 \r
   @retval EFI_SUCCESS           Firmware volume handle created.\r
   @retval EFI_VOLUME_CORRUPTED  Volume was corrupt.\r


@@ -1586,19 +1586,19 @@ PeiFfsFvPpiProcessVolume (
   )\r
 {\r
   EFI_STATUS          Status;\r
   )\r
 {\r
   EFI_STATUS          Status;\r

-  \r
+\r

   ASSERT (FvHandle != NULL);\r
   ASSERT (FvHandle != NULL);\r

-  \r
+\r

   if (Buffer == NULL) {\r
     return EFI_VOLUME_CORRUPTED;\r
   }\r
   if (Buffer == NULL) {\r
     return EFI_VOLUME_CORRUPTED;\r
   }\r

-  \r
+\r

   //\r
   // The build-in EFI_PEI_FIRMWARE_VOLUME_PPI for FFS2/FFS3 support memory-mapped\r
   // FV image and the handle is pointed to Fv image's buffer.\r
   //\r
   *FvHandle = (EFI_PEI_FV_HANDLE) Buffer;\r
   //\r
   // The build-in EFI_PEI_FIRMWARE_VOLUME_PPI for FFS2/FFS3 support memory-mapped\r
   // FV image and the handle is pointed to Fv image's buffer.\r
   //\r
   *FvHandle = (EFI_PEI_FV_HANDLE) Buffer;\r

-  \r
+\r

   //\r
   // Do verify for given FV buffer.\r
   //\r
   //\r
   // Do verify for given FV buffer.\r
   //\r


@@ -1609,12 +1609,12 @@ PeiFfsFvPpiProcessVolume (
   }\r
 \r
   return EFI_SUCCESS;\r
   }\r
 \r
   return EFI_SUCCESS;\r

-}  \r
+}\r

 \r
 /**\r
   Finds the next file of the specified type.\r
 \r
 \r
 /**\r
   Finds the next file of the specified type.\r
 \r

-  This service enables PEI modules to discover additional firmware files. \r
+  This service enables PEI modules to discover additional firmware files.\r

   The FileHandle must be unique within the system.\r
 \r
   @param This           Points to this instance of the\r
   The FileHandle must be unique within the system.\r
 \r
   @param This           Points to this instance of the\r


@@ -1641,13 +1641,13 @@ PeiFfsFvPpiFindFileByType (
   IN        EFI_PEI_FV_HANDLE           FvHandle,\r
   IN OUT    EFI_PEI_FILE_HANDLE         *FileHandle\r
   )\r
   IN        EFI_PEI_FV_HANDLE           FvHandle,\r
   IN OUT    EFI_PEI_FILE_HANDLE         *FileHandle\r
   )\r

-{ \r
+{\r

   return FindFileEx (FvHandle, NULL, SearchType, FileHandle, NULL);\r
 }\r
 \r
 /**\r
   return FindFileEx (FvHandle, NULL, SearchType, FileHandle, NULL);\r
 }\r
 \r
 /**\r

-  Find a file within a volume by its name. \r
-  \r
+  Find a file within a volume by its name.\r
+\r

   This service searches for files with a specific name, within\r
   either the specified firmware volume or all firmware volumes.\r
 \r
   This service searches for files with a specific name, within\r
   either the specified firmware volume or all firmware volumes.\r
 \r


@@ -1676,28 +1676,28 @@ PeiFfsFvPpiFindFileByName (
   IN  CONST  EFI_PEI_FIRMWARE_VOLUME_PPI *This,\r
   IN  CONST  EFI_GUID                    *FileName,\r
   IN  EFI_PEI_FV_HANDLE                  *FvHandle,\r
   IN  CONST  EFI_PEI_FIRMWARE_VOLUME_PPI *This,\r
   IN  CONST  EFI_GUID                    *FileName,\r
   IN  EFI_PEI_FV_HANDLE                  *FvHandle,\r

-  OUT EFI_PEI_FILE_HANDLE                *FileHandle  \r
+  OUT EFI_PEI_FILE_HANDLE                *FileHandle\r

   )\r
 {\r
   EFI_STATUS        Status;\r
   PEI_CORE_INSTANCE *PrivateData;\r
   UINTN             Index;\r
   )\r
 {\r
   EFI_STATUS        Status;\r
   PEI_CORE_INSTANCE *PrivateData;\r
   UINTN             Index;\r

-  \r
+\r

   if ((FvHandle == NULL) || (FileName == NULL) || (FileHandle == NULL)) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
   if ((FvHandle == NULL) || (FileName == NULL) || (FileHandle == NULL)) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r

-  \r
+\r

   if (*FvHandle != NULL) {\r
     Status = FindFileEx (*FvHandle, FileName, 0, FileHandle, NULL);\r
     if (Status == EFI_NOT_FOUND) {\r
       *FileHandle = NULL;\r
     }\r
   if (*FvHandle != NULL) {\r
     Status = FindFileEx (*FvHandle, FileName, 0, FileHandle, NULL);\r
     if (Status == EFI_NOT_FOUND) {\r
       *FileHandle = NULL;\r
     }\r

-  } else {   \r
+  } else {\r

     //\r
     // If *FvHandle = NULL, so search all FV for given filename\r
     //\r
     Status = EFI_NOT_FOUND;\r
     //\r
     // If *FvHandle = NULL, so search all FV for given filename\r
     //\r
     Status = EFI_NOT_FOUND;\r

-    \r
+\r

     PrivateData = PEI_CORE_INSTANCE_FROM_PS_THIS (GetPeiServicesTablePointer());\r
     for (Index = 0; Index < PrivateData->FvCount; Index ++) {\r
       //\r
     PrivateData = PEI_CORE_INSTANCE_FROM_PS_THIS (GetPeiServicesTablePointer());\r
     for (Index = 0; Index < PrivateData->FvCount; Index ++) {\r
       //\r


@@ -1712,17 +1712,17 @@ PeiFfsFvPpiFindFileByName (
       }\r
     }\r
   }\r
       }\r
     }\r
   }\r

-  \r
-  return Status;  \r
-}  \r
+\r
+  return Status;\r
+}\r

 \r
 /**\r
   Returns information about a specific file.\r
 \r
   This function returns information about a specific\r
   file, including its file name, type, attributes, starting\r
 \r
 /**\r
   Returns information about a specific file.\r
 \r
   This function returns information about a specific\r
   file, including its file name, type, attributes, starting\r

-  address and size. \r
-   \r
+  address and size.\r
+\r

   @param This                     Points to this instance of the\r
                                   EFI_PEI_FIRMWARE_VOLUME_PPI.\r
   @param FileHandle               Handle of the file.\r
   @param This                     Points to this instance of the\r
                                   EFI_PEI_FIRMWARE_VOLUME_PPI.\r
   @param FileHandle               Handle of the file.\r


@@ -1733,13 +1733,13 @@ PeiFfsFvPpiFindFileByName (
   @retval EFI_INVALID_PARAMETER   If FileHandle does not\r
                                   represent a valid file.\r
   @retval EFI_INVALID_PARAMETER   If FileInfo is NULL.\r
   @retval EFI_INVALID_PARAMETER   If FileHandle does not\r
                                   represent a valid file.\r
   @retval EFI_INVALID_PARAMETER   If FileInfo is NULL.\r

-  \r
-**/ \r
+\r
+**/\r

 EFI_STATUS\r
 EFIAPI\r
 PeiFfsFvPpiGetFileInfo (\r
 EFI_STATUS\r
 EFIAPI\r
 PeiFfsFvPpiGetFileInfo (\r

-  IN  CONST EFI_PEI_FIRMWARE_VOLUME_PPI   *This, \r
-  IN        EFI_PEI_FILE_HANDLE           FileHandle, \r
+  IN  CONST EFI_PEI_FIRMWARE_VOLUME_PPI   *This,\r
+  IN        EFI_PEI_FILE_HANDLE           FileHandle,\r

   OUT       EFI_FV_FILE_INFO              *FileInfo\r
   )\r
 {\r
   OUT       EFI_FV_FILE_INFO              *FileInfo\r
   )\r
 {\r


@@ -1770,14 +1770,14 @@ PeiFfsFvPpiGetFileInfo (
   }\r
 \r
   //\r
   }\r
 \r
   //\r

-  // Get FileState which is the highest bit of the State \r
+  // Get FileState which is the highest bit of the State\r

   //\r
   FileState = GetFileState (ErasePolarity, (EFI_FFS_FILE_HEADER*)FileHandle);\r
 \r
   switch (FileState) {\r
     case EFI_FILE_DATA_VALID:\r
     case EFI_FILE_MARKED_FOR_UPDATE:\r
   //\r
   FileState = GetFileState (ErasePolarity, (EFI_FFS_FILE_HEADER*)FileHandle);\r
 \r
   switch (FileState) {\r
     case EFI_FILE_DATA_VALID:\r
     case EFI_FILE_MARKED_FOR_UPDATE:\r

-      break;  \r
+      break;\r

     default:\r
       return EFI_INVALID_PARAMETER;\r
     }\r
     default:\r
       return EFI_INVALID_PARAMETER;\r
     }\r


@@ -1826,8 +1826,8 @@ PeiFfsFvPpiGetFileInfo (
 EFI_STATUS\r
 EFIAPI\r
 PeiFfsFvPpiGetFileInfo2 (\r
 EFI_STATUS\r
 EFIAPI\r
 PeiFfsFvPpiGetFileInfo2 (\r

-  IN  CONST EFI_PEI_FIRMWARE_VOLUME_PPI   *This, \r
-  IN        EFI_PEI_FILE_HANDLE           FileHandle, \r
+  IN  CONST EFI_PEI_FIRMWARE_VOLUME_PPI   *This,\r
+  IN        EFI_PEI_FILE_HANDLE           FileHandle,\r

   OUT       EFI_FV_FILE_INFO2             *FileInfo\r
   )\r
 {\r
   OUT       EFI_FV_FILE_INFO2             *FileInfo\r
   )\r
 {\r


@@ -1856,7 +1856,7 @@ PeiFfsFvPpiGetFileInfo2 (
 \r
 /**\r
   This function returns information about the firmware volume.\r
 \r
 /**\r
   This function returns information about the firmware volume.\r

-  \r
+\r

   @param This                     Points to this instance of the\r
                                   EFI_PEI_FIRMWARE_VOLUME_PPI.\r
   @param FvHandle                 Handle to the firmware handle.\r
   @param This                     Points to this instance of the\r
                                   EFI_PEI_FIRMWARE_VOLUME_PPI.\r
   @param FvHandle                 Handle to the firmware handle.\r


@@ -1867,12 +1867,12 @@ PeiFfsFvPpiGetFileInfo2 (
   @retval EFI_INVALID_PARAMETER   FvHandle does not indicate a valid\r
                                   firmware volume or VolumeInfo is NULL.\r
 \r
   @retval EFI_INVALID_PARAMETER   FvHandle does not indicate a valid\r
                                   firmware volume or VolumeInfo is NULL.\r
 \r

-**/   \r
+**/\r

 EFI_STATUS\r
 EFIAPI\r
 PeiFfsFvPpiGetVolumeInfo (\r
 EFI_STATUS\r
 EFIAPI\r
 PeiFfsFvPpiGetVolumeInfo (\r

-  IN  CONST  EFI_PEI_FIRMWARE_VOLUME_PPI   *This, \r
-  IN  EFI_PEI_FV_HANDLE                    FvHandle, \r
+  IN  CONST  EFI_PEI_FIRMWARE_VOLUME_PPI   *This,\r
+  IN  EFI_PEI_FV_HANDLE                    FvHandle,\r

   OUT EFI_FV_INFO                          *VolumeInfo\r
   )\r
 {\r
   OUT EFI_FV_INFO                          *VolumeInfo\r
   )\r
 {\r


@@ -1882,10 +1882,10 @@ PeiFfsFvPpiGetVolumeInfo (
   if ((VolumeInfo == NULL) || (FvHandle == NULL)) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
   if ((VolumeInfo == NULL) || (FvHandle == NULL)) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r

-  \r
+\r

   //\r
   //\r

-  // VolumeHandle may not align at 8 byte, \r
-  // but FvLength is UINT64 type, which requires FvHeader align at least 8 byte. \r
+  // VolumeHandle may not align at 8 byte,\r
+  // but FvLength is UINT64 type, which requires FvHeader align at least 8 byte.\r

   // So, Copy FvHeader into the local FvHeader structure.\r
   //\r
   CopyMem (&FwVolHeader, FvHandle, sizeof (EFI_FIRMWARE_VOLUME_HEADER));\r
   // So, Copy FvHeader into the local FvHeader structure.\r
   //\r
   CopyMem (&FwVolHeader, FvHandle, sizeof (EFI_FIRMWARE_VOLUME_HEADER));\r


@@ -1907,16 +1907,16 @@ PeiFfsFvPpiGetVolumeInfo (
     FwVolExHeaderInfo = (EFI_FIRMWARE_VOLUME_EXT_HEADER*)(((UINT8 *)FvHandle) + FwVolHeader.ExtHeaderOffset);\r
     CopyMem (&VolumeInfo->FvName, &FwVolExHeaderInfo->FvName, sizeof(EFI_GUID));\r
   }\r
     FwVolExHeaderInfo = (EFI_FIRMWARE_VOLUME_EXT_HEADER*)(((UINT8 *)FvHandle) + FwVolHeader.ExtHeaderOffset);\r
     CopyMem (&VolumeInfo->FvName, &FwVolExHeaderInfo->FvName, sizeof(EFI_GUID));\r
   }\r

-  \r
-  return EFI_SUCCESS;  \r
-}    \r
+\r
+  return EFI_SUCCESS;\r
+}\r

 \r
 /**\r
   Find the next matching section in the firmware file.\r
 \r
 /**\r
   Find the next matching section in the firmware file.\r

-  \r
+\r

   This service enables PEI modules to discover sections\r
   of a given type within a valid file.\r
   This service enables PEI modules to discover sections\r
   of a given type within a valid file.\r

-  \r
+\r

   @param This             Points to this instance of the\r
                           EFI_PEI_FIRMWARE_VOLUME_PPI.\r
   @param SearchType       A filter to find only sections of this\r
   @param This             Points to this instance of the\r
                           EFI_PEI_FIRMWARE_VOLUME_PPI.\r
   @param SearchType       A filter to find only sections of this\r


@@ -1925,7 +1925,7 @@ PeiFfsFvPpiGetVolumeInfo (
                           search.\r
   @param SectionData      Updated upon return to point to the\r
                           section found.\r
                           search.\r
   @param SectionData      Updated upon return to point to the\r
                           section found.\r

-  \r
+\r

   @retval EFI_SUCCESS     Section was found.\r
   @retval EFI_NOT_FOUND   Section of the specified type was not\r
                           found. SectionData contains NULL.\r
   @retval EFI_SUCCESS     Section was found.\r
   @retval EFI_NOT_FOUND   Section of the specified type was not\r
                           found. SectionData contains NULL.\r


@@ -2021,8 +2021,8 @@ PeiFfsFvPpiFindSectionByType2 (
              GetPeiServicesTablePointer (),\r
              SearchType,\r
              &Instance,\r
              GetPeiServicesTablePointer (),\r
              SearchType,\r
              &Instance,\r

-             Section, \r
-             FileSize, \r
+             Section,\r
+             FileSize,\r

              SectionData,\r
              &ExtractedAuthenticationStatus,\r
              FwVolInstance->IsFfs3Fv\r
              SectionData,\r
              &ExtractedAuthenticationStatus,\r
              FwVolInstance->IsFfs3Fv\r


@@ -2038,11 +2038,11 @@ PeiFfsFvPpiFindSectionByType2 (
 \r
 /**\r
   Convert the handle of FV to pointer of corresponding PEI_CORE_FV_HANDLE.\r
 \r
 /**\r
   Convert the handle of FV to pointer of corresponding PEI_CORE_FV_HANDLE.\r

-  \r
+\r

   @param FvHandle   The handle of a FV.\r
   @param FvHandle   The handle of a FV.\r

-  \r
+\r

   @retval NULL if can not find.\r
   @retval NULL if can not find.\r

-  @return Pointer of corresponding PEI_CORE_FV_HANDLE. \r
+  @return Pointer of corresponding PEI_CORE_FV_HANDLE.\r

 **/\r
 PEI_CORE_FV_HANDLE *\r
 FvHandleToCoreHandle (\r
 **/\r
 PEI_CORE_FV_HANDLE *\r
 FvHandleToCoreHandle (\r


@@ -2051,25 +2051,25 @@ FvHandleToCoreHandle (
 {\r
   UINTN             Index;\r
   PEI_CORE_INSTANCE *PrivateData;\r
 {\r
   UINTN             Index;\r
   PEI_CORE_INSTANCE *PrivateData;\r

-  \r
-  PrivateData = PEI_CORE_INSTANCE_FROM_PS_THIS (GetPeiServicesTablePointer());  \r
+\r
+  PrivateData = PEI_CORE_INSTANCE_FROM_PS_THIS (GetPeiServicesTablePointer());\r

   for (Index = 0; Index < PrivateData->FvCount; Index ++) {\r
     if (FvHandle == PrivateData->Fv[Index].FvHandle) {\r
       return &PrivateData->Fv[Index];\r
     }\r
   }\r
   for (Index = 0; Index < PrivateData->FvCount; Index ++) {\r
     if (FvHandle == PrivateData->Fv[Index].FvHandle) {\r
       return &PrivateData->Fv[Index];\r
     }\r
   }\r

-  \r
+\r

   return NULL;\r
   return NULL;\r

-}  \r
+}\r

 \r
 /**\r
   Get instance of PEI_CORE_FV_HANDLE for next volume according to given index.\r
 \r
 /**\r
   Get instance of PEI_CORE_FV_HANDLE for next volume according to given index.\r

-  \r
+\r

   This routine also will install FvInfo ppi for FV hob in PI ways.\r
   This routine also will install FvInfo ppi for FV hob in PI ways.\r

-  \r
+\r

   @param Private    Pointer of PEI_CORE_INSTANCE\r
   @param Instance   The index of FV want to be searched.\r
   @param Private    Pointer of PEI_CORE_INSTANCE\r
   @param Instance   The index of FV want to be searched.\r

-  \r
+\r

   @return Instance of PEI_CORE_FV_HANDLE.\r
 **/\r
 PEI_CORE_FV_HANDLE *\r
   @return Instance of PEI_CORE_FV_HANDLE.\r
 **/\r
 PEI_CORE_FV_HANDLE *\r


@@ -2081,7 +2081,7 @@ FindNextCoreFvHandle (
   UINTN                    Index;\r
   BOOLEAN                  Match;\r
   EFI_HOB_FIRMWARE_VOLUME  *FvHob;\r
   UINTN                    Index;\r
   BOOLEAN                  Match;\r
   EFI_HOB_FIRMWARE_VOLUME  *FvHob;\r

-  \r
+\r

   //\r
   // Handle Framework FvHob and Install FvInfo Ppi for it.\r
   //\r
   //\r
   // Handle Framework FvHob and Install FvInfo Ppi for it.\r
   //\r


@@ -2101,7 +2101,7 @@ FindNextCoreFvHandle (
           break;\r
         }\r
       }\r
           break;\r
         }\r
       }\r

-      \r
+\r

       //\r
       // Search whether FvHob has been cached into PeiCore's Unknown FV database.\r
       // If found, no need install new FvInfoPpi for it.\r
       //\r
       // Search whether FvHob has been cached into PeiCore's Unknown FV database.\r
       // If found, no need install new FvInfoPpi for it.\r


@@ -2129,8 +2129,8 @@ FindNextCoreFvHandle (
           NULL\r
           );\r
       }\r
           NULL\r
           );\r
       }\r

-      \r
-      FvHob = (EFI_HOB_FIRMWARE_VOLUME *)GetNextHob (EFI_HOB_TYPE_FV, (VOID *)((UINTN)FvHob + FvHob->Header.HobLength)); \r
+\r
+      FvHob = (EFI_HOB_FIRMWARE_VOLUME *)GetNextHob (EFI_HOB_TYPE_FV, (VOID *)((UINTN)FvHob + FvHob->Header.HobLength));\r

     }\r
   }\r
 \r
     }\r
   }\r
 \r


@@ -2140,16 +2140,16 @@ FindNextCoreFvHandle (
   }\r
 \r
   return &Private->Fv[Instance];\r
   }\r
 \r
   return &Private->Fv[Instance];\r

-}  \r
+}\r

 \r
 /**\r
   After PeiCore image is shadowed into permanent memory, all build-in FvPpi should\r
 \r
 /**\r
   After PeiCore image is shadowed into permanent memory, all build-in FvPpi should\r

-  be re-installed with the instance in permanent memory and all cached FvPpi pointers in \r
+  be re-installed with the instance in permanent memory and all cached FvPpi pointers in\r

   PrivateData->Fv[] array should be fixed up to be pointed to the one in permanent\r
   memory.\r
   PrivateData->Fv[] array should be fixed up to be pointed to the one in permanent\r
   memory.\r

-  \r
+\r

   @param PrivateData   Pointer to PEI_CORE_INSTANCE.\r
   @param PrivateData   Pointer to PEI_CORE_INSTANCE.\r

-**/  \r
+**/\r

 VOID\r
 PeiReinitializeFv (\r
   IN  PEI_CORE_INSTANCE           *PrivateData\r
 VOID\r
 PeiReinitializeFv (\r
   IN  PEI_CORE_INSTANCE           *PrivateData\r


@@ -2219,17 +2219,17 @@ PeiReinitializeFv (
 \r
 /**\r
   Report the information for a new discoveried FV in unknown third-party format.\r
 \r
 /**\r
   Report the information for a new discoveried FV in unknown third-party format.\r

-  \r
+\r

   If the EFI_PEI_FIRMWARE_VOLUME_PPI has not been installed for third-party FV format, but\r
   the FV in this format has been discoveried, then this FV's information will be cached into\r
   PEI_CORE_INSTANCE's UnknownFvInfo array.\r
   Also a notification would be installed for unknown third-party FV format guid, if EFI_PEI_FIRMWARE_VOLUME_PPI\r
   is installed later by platform's PEIM, the original unknown third-party FV will be processed by\r
   using new installed EFI_PEI_FIRMWARE_VOLUME_PPI.\r
   If the EFI_PEI_FIRMWARE_VOLUME_PPI has not been installed for third-party FV format, but\r
   the FV in this format has been discoveried, then this FV's information will be cached into\r
   PEI_CORE_INSTANCE's UnknownFvInfo array.\r
   Also a notification would be installed for unknown third-party FV format guid, if EFI_PEI_FIRMWARE_VOLUME_PPI\r
   is installed later by platform's PEIM, the original unknown third-party FV will be processed by\r
   using new installed EFI_PEI_FIRMWARE_VOLUME_PPI.\r

-  \r
+\r

   @param PrivateData  Point to instance of PEI_CORE_INSTANCE\r
   @param FvInfo2Ppi   Point to FvInfo2 PPI.\r
   @param PrivateData  Point to instance of PEI_CORE_INSTANCE\r
   @param FvInfo2Ppi   Point to FvInfo2 PPI.\r

-  \r
+\r

   @retval EFI_OUT_OF_RESOURCES  The FV info array in PEI_CORE_INSTANCE has no more spaces.\r
   @retval EFI_SUCCESS           Success to add the information for unknown FV.\r
 **/\r
   @retval EFI_OUT_OF_RESOURCES  The FV info array in PEI_CORE_INSTANCE has no more spaces.\r
   @retval EFI_SUCCESS           Success to add the information for unknown FV.\r
 **/\r


@@ -2240,14 +2240,14 @@ AddUnknownFormatFvInfo (
   )\r
 {\r
   PEI_CORE_UNKNOW_FORMAT_FV_INFO    *NewUnknownFv;\r
   )\r
 {\r
   PEI_CORE_UNKNOW_FORMAT_FV_INFO    *NewUnknownFv;\r

-  \r
+\r

   if (PrivateData->UnknownFvInfoCount + 1 >= PcdGet32 (PcdPeiCoreMaxFvSupported)) {\r
     return EFI_OUT_OF_RESOURCES;\r
   }\r
   if (PrivateData->UnknownFvInfoCount + 1 >= PcdGet32 (PcdPeiCoreMaxFvSupported)) {\r
     return EFI_OUT_OF_RESOURCES;\r
   }\r

-  \r
+\r

   NewUnknownFv = &PrivateData->UnknownFvInfo[PrivateData->UnknownFvInfoCount];\r
   PrivateData->UnknownFvInfoCount ++;\r
   NewUnknownFv = &PrivateData->UnknownFvInfo[PrivateData->UnknownFvInfoCount];\r
   PrivateData->UnknownFvInfoCount ++;\r

-  \r
+\r

   CopyGuid (&NewUnknownFv->FvFormat, &FvInfo2Ppi->FvFormat);\r
   NewUnknownFv->FvInfo     = FvInfo2Ppi->FvInfo;\r
   NewUnknownFv->FvInfoSize = FvInfo2Ppi->FvInfoSize;\r
   CopyGuid (&NewUnknownFv->FvFormat, &FvInfo2Ppi->FvFormat);\r
   NewUnknownFv->FvInfo     = FvInfo2Ppi->FvInfo;\r
   NewUnknownFv->FvInfoSize = FvInfo2Ppi->FvInfoSize;\r


@@ -2255,23 +2255,23 @@ AddUnknownFormatFvInfo (
   NewUnknownFv->NotifyDescriptor.Flags  = (EFI_PEI_PPI_DESCRIPTOR_NOTIFY_CALLBACK | EFI_PEI_PPI_DESCRIPTOR_TERMINATE_LIST);\r
   NewUnknownFv->NotifyDescriptor.Guid   = &NewUnknownFv->FvFormat;\r
   NewUnknownFv->NotifyDescriptor.Notify = ThirdPartyFvPpiNotifyCallback;\r
   NewUnknownFv->NotifyDescriptor.Flags  = (EFI_PEI_PPI_DESCRIPTOR_NOTIFY_CALLBACK | EFI_PEI_PPI_DESCRIPTOR_TERMINATE_LIST);\r
   NewUnknownFv->NotifyDescriptor.Guid   = &NewUnknownFv->FvFormat;\r
   NewUnknownFv->NotifyDescriptor.Notify = ThirdPartyFvPpiNotifyCallback;\r

-  \r
+\r

   PeiServicesNotifyPpi (&NewUnknownFv->NotifyDescriptor);\r
   return EFI_SUCCESS;\r
 }\r
 \r
 /**\r
   Find the FV information according to third-party FV format guid.\r
   PeiServicesNotifyPpi (&NewUnknownFv->NotifyDescriptor);\r
   return EFI_SUCCESS;\r
 }\r
 \r
 /**\r
   Find the FV information according to third-party FV format guid.\r

-  \r
+\r

   This routine also will remove the FV information found by given FV format guid from\r
   PrivateData->UnknownFvInfo[].\r
   This routine also will remove the FV information found by given FV format guid from\r
   PrivateData->UnknownFvInfo[].\r

-  \r
+\r

   @param PrivateData      Point to instance of PEI_CORE_INSTANCE\r
   @param Format           Point to given FV format guid\r
   @param FvInfo           On return, the pointer of FV information buffer\r
   @param FvInfoSize       On return, the size of FV information buffer.\r
   @param AuthenticationStatus On return, the authentication status of FV information buffer.\r
   @param PrivateData      Point to instance of PEI_CORE_INSTANCE\r
   @param Format           Point to given FV format guid\r
   @param FvInfo           On return, the pointer of FV information buffer\r
   @param FvInfoSize       On return, the size of FV information buffer.\r
   @param AuthenticationStatus On return, the authentication status of FV information buffer.\r

-  \r
+\r

   @retval EFI_NOT_FOUND  The FV is not found for new installed EFI_PEI_FIRMWARE_VOLUME_PPI\r
   @retval EFI_SUCCESS    Success to find a FV which could be processed by new installed EFI_PEI_FIRMWARE_VOLUME_PPI.\r
 **/\r
   @retval EFI_NOT_FOUND  The FV is not found for new installed EFI_PEI_FIRMWARE_VOLUME_PPI\r
   @retval EFI_SUCCESS    Success to find a FV which could be processed by new installed EFI_PEI_FIRMWARE_VOLUME_PPI.\r
 **/\r


@@ -2293,15 +2293,15 @@ FindUnknownFormatFvInfo (
       break;\r
     }\r
   }\r
       break;\r
     }\r
   }\r

-  \r
+\r

   if (Index == PrivateData->UnknownFvInfoCount) {\r
     return EFI_NOT_FOUND;\r
   }\r
   if (Index == PrivateData->UnknownFvInfoCount) {\r
     return EFI_NOT_FOUND;\r
   }\r

-  \r
+\r

   *FvInfo     = PrivateData->UnknownFvInfo[Index].FvInfo;\r
   *FvInfoSize = PrivateData->UnknownFvInfo[Index].FvInfoSize;\r
   *AuthenticationStatus = PrivateData->UnknownFvInfo[Index].AuthenticationStatus;\r
   *FvInfo     = PrivateData->UnknownFvInfo[Index].FvInfo;\r
   *FvInfoSize = PrivateData->UnknownFvInfo[Index].FvInfoSize;\r
   *AuthenticationStatus = PrivateData->UnknownFvInfo[Index].AuthenticationStatus;\r

-  \r
+\r

   //\r
   // Remove an entry from UnknownFvInfo array.\r
   //\r
   //\r
   // Remove an entry from UnknownFvInfo array.\r
   //\r


@@ -2311,18 +2311,18 @@ FindUnknownFormatFvInfo (
   }\r
   PrivateData->UnknownFvInfoCount --;\r
   return EFI_SUCCESS;\r
   }\r
   PrivateData->UnknownFvInfoCount --;\r
   return EFI_SUCCESS;\r

-}  \r
+}\r

 \r
 /**\r
   Notification callback function for EFI_PEI_FIRMWARE_VOLUME_PPI.\r
 \r
 /**\r
   Notification callback function for EFI_PEI_FIRMWARE_VOLUME_PPI.\r

-  \r
-  When a EFI_PEI_FIRMWARE_VOLUME_PPI is installed to support new FV format, this \r
+\r
+  When a EFI_PEI_FIRMWARE_VOLUME_PPI is installed to support new FV format, this\r

   routine is called to process all discoveried FVs in this format.\r
   routine is called to process all discoveried FVs in this format.\r

-  \r
+\r

   @param PeiServices       An indirect pointer to the EFI_PEI_SERVICES table published by the PEI Foundation\r
   @param NotifyDescriptor  Address of the notification descriptor data structure.\r
   @param Ppi               Address of the PPI that was installed.\r
   @param PeiServices       An indirect pointer to the EFI_PEI_SERVICES table published by the PEI Foundation\r
   @param NotifyDescriptor  Address of the notification descriptor data structure.\r
   @param Ppi               Address of the PPI that was installed.\r

-  \r
+\r

   @retval EFI_SUCCESS  The notification callback is processed correctly.\r
 **/\r
 EFI_STATUS\r
   @retval EFI_SUCCESS  The notification callback is processed correctly.\r
 **/\r
 EFI_STATUS\r


@@ -2343,18 +2343,18 @@ ThirdPartyFvPpiNotifyCallback (
   BOOLEAN                      IsProcessed;\r
   UINTN                        FvIndex;\r
   EFI_PEI_FILE_HANDLE          FileHandle;\r
   BOOLEAN                      IsProcessed;\r
   UINTN                        FvIndex;\r
   EFI_PEI_FILE_HANDLE          FileHandle;\r

-  VOID                         *DepexData;  \r
+  VOID                         *DepexData;\r

   UINTN                        CurFvCount;\r
 \r
   PrivateData  = PEI_CORE_INSTANCE_FROM_PS_THIS (PeiServices);\r
   FvPpi = (EFI_PEI_FIRMWARE_VOLUME_PPI*) Ppi;\r
   UINTN                        CurFvCount;\r
 \r
   PrivateData  = PEI_CORE_INSTANCE_FROM_PS_THIS (PeiServices);\r
   FvPpi = (EFI_PEI_FIRMWARE_VOLUME_PPI*) Ppi;\r

-  \r
+\r

   do {\r
     Status = FindUnknownFormatFvInfo (PrivateData, NotifyDescriptor->Guid, &FvInfo, &FvInfoSize, &AuthenticationStatus);\r
     if (EFI_ERROR (Status)) {\r
       return EFI_SUCCESS;\r
     }\r
   do {\r
     Status = FindUnknownFormatFvInfo (PrivateData, NotifyDescriptor->Guid, &FvInfo, &FvInfoSize, &AuthenticationStatus);\r
     if (EFI_ERROR (Status)) {\r
       return EFI_SUCCESS;\r
     }\r

-    \r
+\r

     //\r
     // Process new found FV and get FV handle.\r
     //\r
     //\r
     // Process new found FV and get FV handle.\r
     //\r


@@ -2375,17 +2375,17 @@ ThirdPartyFvPpiNotifyCallback (
         break;\r
       }\r
     }\r
         break;\r
       }\r
     }\r

-  \r
+\r

     if (IsProcessed) {\r
       continue;\r
     }\r
     if (IsProcessed) {\r
       continue;\r
     }\r

-    \r
+\r

     if (PrivateData->FvCount >= PcdGet32 (PcdPeiCoreMaxFvSupported)) {\r
       DEBUG ((EFI_D_ERROR, "The number of Fv Images (%d) exceed the max supported FVs (%d) in Pei", PrivateData->FvCount + 1, PcdGet32 (PcdPeiCoreMaxFvSupported)));\r
       DEBUG ((EFI_D_ERROR, "PcdPeiCoreMaxFvSupported value need be reconfigurated in DSC"));\r
       ASSERT (FALSE);\r
     }\r
     if (PrivateData->FvCount >= PcdGet32 (PcdPeiCoreMaxFvSupported)) {\r
       DEBUG ((EFI_D_ERROR, "The number of Fv Images (%d) exceed the max supported FVs (%d) in Pei", PrivateData->FvCount + 1, PcdGet32 (PcdPeiCoreMaxFvSupported)));\r
       DEBUG ((EFI_D_ERROR, "PcdPeiCoreMaxFvSupported value need be reconfigurated in DSC"));\r
       ASSERT (FALSE);\r
     }\r

-        \r
+\r

     //\r
     // Update internal PEI_CORE_FV array.\r
     //\r
     //\r
     // Update internal PEI_CORE_FV array.\r
     //\r


@@ -2395,17 +2395,17 @@ ThirdPartyFvPpiNotifyCallback (
     PrivateData->Fv[PrivateData->FvCount].AuthenticationStatus = AuthenticationStatus;\r
     CurFvCount = PrivateData->FvCount;\r
     DEBUG ((\r
     PrivateData->Fv[PrivateData->FvCount].AuthenticationStatus = AuthenticationStatus;\r
     CurFvCount = PrivateData->FvCount;\r
     DEBUG ((\r

-      EFI_D_INFO, \r
-      "The %dth FV start address is 0x%11p, size is 0x%08x, handle is 0x%p\n", \r
+      EFI_D_INFO,\r
+      "The %dth FV start address is 0x%11p, size is 0x%08x, handle is 0x%p\n",\r

       (UINT32) CurFvCount,\r
       (UINT32) CurFvCount,\r

-      (VOID *) FvInfo, \r
+      (VOID *) FvInfo,\r

       FvInfoSize,\r
       FvHandle\r
       FvInfoSize,\r
       FvHandle\r

-      ));    \r
+      ));\r

     PrivateData->FvCount ++;\r
 \r
     //\r
     PrivateData->FvCount ++;\r
 \r
     //\r

-    // Scan and process the new discoveried FV for EFI_FV_FILETYPE_FIRMWARE_VOLUME_IMAGE \r
+    // Scan and process the new discoveried FV for EFI_FV_FILETYPE_FIRMWARE_VOLUME_IMAGE\r

     //\r
     FileHandle = NULL;\r
     do {\r
     //\r
     FileHandle = NULL;\r
     do {\r


@@ -2430,7 +2430,7 @@ ThirdPartyFvPpiNotifyCallback (
             continue;\r
           }\r
         }\r
             continue;\r
           }\r
         }\r

-        \r
+\r

         DEBUG ((EFI_D_INFO, "Found firmware volume Image File %p in FV[%d] %p\n", FileHandle, CurFvCount, FvHandle));\r
         ProcessFvFile (PrivateData, &PrivateData->Fv[CurFvCount], FileHandle);\r
       }\r
         DEBUG ((EFI_D_INFO, "Found firmware volume Image File %p in FV[%d] %p\n", FileHandle, CurFvCount, FvHandle));\r
         ProcessFvFile (PrivateData, &PrivateData->Fv[CurFvCount], FileHandle);\r
       }\r

diff --git a/MdeModulePkg/Core/Pei/FwVol/FwVol.h b/MdeModulePkg/Core/Pei/FwVol/FwVol.h
index 1daeb6d97b4963e5263a5c645dc2e272661f96ef..4a2451d71c39ab879a0ed08396d8a6dea1a2d183 100644 (file)
--- a/MdeModulePkg/Core/Pei/FwVol/FwVol.h
+++ b/MdeModulePkg/Core/Pei/FwVol/FwVol.h
@@ -1,14 +1,14 @@
 /** @file\r
   The internal header file for firmware volume related definitions.\r
 /** @file\r
   The internal header file for firmware volume related definitions.\r

-  \r
-Copyright (c) 2009 - 2011, Intel Corporation. All rights reserved.<BR>\r
-This program and the accompanying materials                          \r
-are licensed and made available under the terms and conditions of the BSD License         \r
-which accompanies this distribution.  The full text of the license may be found at        \r
-http://opensource.org/licenses/bsd-license.php                                            \r
-                                                                                          \r
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     \r
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             \r
+\r
+Copyright (c) 2009 - 2018, Intel Corporation. All rights reserved.<BR>\r
+This program and the accompanying materials\r
+are licensed and made available under the terms and conditions of the BSD License\r
+which accompanies this distribution.  The full text of the license may be found at\r
+http://opensource.org/licenses/bsd-license.php\r
+\r
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r

 \r
 **/\r
 \r
 \r
 **/\r
 \r


@@ -43,15 +43,15 @@ typedef struct {
   buffer which contains the necessary information for creating\r
   the firmware volume handle. Normally, these values are derived\r
   from the EFI_FIRMWARE_VOLUME_INFO_PPI.\r
   buffer which contains the necessary information for creating\r
   the firmware volume handle. Normally, these values are derived\r
   from the EFI_FIRMWARE_VOLUME_INFO_PPI.\r

-  \r
-  \r
+\r
+\r

   @param This                   Points to this instance of the\r
                                 EFI_PEI_FIRMWARE_VOLUME_PPI.\r
   @param Buffer                 Points to the start of the buffer.\r
   @param BufferSize             Size of the buffer.\r
   @param FvHandle               Points to the returned firmware volume\r
                                 handle. The firmware volume handle must\r
   @param This                   Points to this instance of the\r
                                 EFI_PEI_FIRMWARE_VOLUME_PPI.\r
   @param Buffer                 Points to the start of the buffer.\r
   @param BufferSize             Size of the buffer.\r
   @param FvHandle               Points to the returned firmware volume\r
                                 handle. The firmware volume handle must\r

-                                be unique within the system. \r
+                                be unique within the system.\r

 \r
   @retval EFI_SUCCESS           Firmware volume handle created.\r
   @retval EFI_VOLUME_CORRUPTED  Volume was corrupt.\r
 \r
   @retval EFI_SUCCESS           Firmware volume handle created.\r
   @retval EFI_VOLUME_CORRUPTED  Volume was corrupt.\r


@@ -65,11 +65,11 @@ PeiFfsFvPpiProcessVolume (
   IN  UINTN                              BufferSize,\r
   OUT EFI_PEI_FV_HANDLE                  *FvHandle\r
   );\r
   IN  UINTN                              BufferSize,\r
   OUT EFI_PEI_FV_HANDLE                  *FvHandle\r
   );\r

-  \r
+\r

 /**\r
   Finds the next file of the specified type.\r
 \r
 /**\r
   Finds the next file of the specified type.\r
 \r

-  This service enables PEI modules to discover additional firmware files. \r
+  This service enables PEI modules to discover additional firmware files.\r

   The FileHandle must be unique within the system.\r
 \r
   @param This           Points to this instance of the\r
   The FileHandle must be unique within the system.\r
 \r
   @param This           Points to this instance of the\r


@@ -87,7 +87,7 @@ PeiFfsFvPpiProcessVolume (
   @retval EFI_SUCCESS   The file was found.\r
   @retval EFI_NOT_FOUND The file was not found. FileHandle contains NULL.\r
 \r
   @retval EFI_SUCCESS   The file was found.\r
   @retval EFI_NOT_FOUND The file was not found. FileHandle contains NULL.\r
 \r

-**/  \r
+**/\r

 EFI_STATUS\r
 EFIAPI\r
 PeiFfsFvPpiFindFileByType (\r
 EFI_STATUS\r
 EFIAPI\r
 PeiFfsFvPpiFindFileByType (\r


@@ -98,8 +98,8 @@ PeiFfsFvPpiFindFileByType (
   );\r
 \r
 /**\r
   );\r
 \r
 /**\r

-  Find a file within a volume by its name. \r
-  \r
+  Find a file within a volume by its name.\r
+\r

   This service searches for files with a specific name, within\r
   either the specified firmware volume or all firmware volumes.\r
 \r
   This service searches for files with a specific name, within\r
   either the specified firmware volume or all firmware volumes.\r
 \r


@@ -121,22 +121,22 @@ PeiFfsFvPpiFindFileByType (
                                 FileName was NULL.\r
 \r
 \r
                                 FileName was NULL.\r
 \r
 \r

-**/    \r
+**/\r

 EFI_STATUS\r
 EFIAPI\r
 PeiFfsFvPpiFindFileByName (\r
   IN  CONST  EFI_PEI_FIRMWARE_VOLUME_PPI *This,\r
   IN  CONST  EFI_GUID                    *FileName,\r
   IN  EFI_PEI_FV_HANDLE                  *FvHandle,\r
 EFI_STATUS\r
 EFIAPI\r
 PeiFfsFvPpiFindFileByName (\r
   IN  CONST  EFI_PEI_FIRMWARE_VOLUME_PPI *This,\r
   IN  CONST  EFI_GUID                    *FileName,\r
   IN  EFI_PEI_FV_HANDLE                  *FvHandle,\r

-  OUT EFI_PEI_FILE_HANDLE                *FileHandle  \r
+  OUT EFI_PEI_FILE_HANDLE                *FileHandle\r

   );\r
 \r
 /**\r
   Find the next matching section in the firmware file.\r
   );\r
 \r
 /**\r
   Find the next matching section in the firmware file.\r

-  \r
+\r

   This service enables PEI modules to discover sections\r
   of a given type within a valid file.\r
   This service enables PEI modules to discover sections\r
   of a given type within a valid file.\r

-  \r
+\r

   @param This             Points to this instance of the\r
                           EFI_PEI_FIRMWARE_VOLUME_PPI.\r
   @param SearchType       A filter to find only sections of this\r
   @param This             Points to this instance of the\r
                           EFI_PEI_FIRMWARE_VOLUME_PPI.\r
   @param SearchType       A filter to find only sections of this\r


@@ -145,11 +145,11 @@ PeiFfsFvPpiFindFileByName (
                           search.\r
   @param SectionData      Updated upon  return to point to the\r
                           section found.\r
                           search.\r
   @param SectionData      Updated upon  return to point to the\r
                           section found.\r

-  \r
+\r

   @retval EFI_SUCCESS     Section was found.\r
   @retval EFI_NOT_FOUND   Section of the specified type was not\r
                           found. SectionData contains NULL.\r
   @retval EFI_SUCCESS     Section was found.\r
   @retval EFI_NOT_FOUND   Section of the specified type was not\r
                           found. SectionData contains NULL.\r

-**/      \r
+**/\r

 EFI_STATUS\r
 EFIAPI\r
 PeiFfsFvPpiFindSectionByType (\r
 EFI_STATUS\r
 EFIAPI\r
 PeiFfsFvPpiFindSectionByType (\r


@@ -198,8 +198,8 @@ PeiFfsFvPpiFindSectionByType2 (
 \r
   This function returns information about a specific\r
   file, including its file name, type, attributes, starting\r
 \r
   This function returns information about a specific\r
   file, including its file name, type, attributes, starting\r

-  address and size. \r
-   \r
+  address and size.\r
+\r

   @param This                     Points to this instance of the\r
                                   EFI_PEI_FIRMWARE_VOLUME_PPI.\r
   @param FileHandle               Handle of the file.\r
   @param This                     Points to this instance of the\r
                                   EFI_PEI_FIRMWARE_VOLUME_PPI.\r
   @param FileHandle               Handle of the file.\r


@@ -210,13 +210,13 @@ PeiFfsFvPpiFindSectionByType2 (
   @retval EFI_INVALID_PARAMETER   If FileHandle does not\r
                                   represent a valid file.\r
   @retval EFI_INVALID_PARAMETER   If FileInfo is NULL.\r
   @retval EFI_INVALID_PARAMETER   If FileHandle does not\r
                                   represent a valid file.\r
   @retval EFI_INVALID_PARAMETER   If FileInfo is NULL.\r

-  \r
-**/         \r
+\r
+**/\r

 EFI_STATUS\r
 EFIAPI\r
 PeiFfsFvPpiGetFileInfo (\r
 EFI_STATUS\r
 EFIAPI\r
 PeiFfsFvPpiGetFileInfo (\r

-  IN  CONST EFI_PEI_FIRMWARE_VOLUME_PPI   *This, \r
-  IN        EFI_PEI_FILE_HANDLE           FileHandle, \r
+  IN  CONST EFI_PEI_FIRMWARE_VOLUME_PPI   *This,\r
+  IN        EFI_PEI_FILE_HANDLE           FileHandle,\r

   OUT       EFI_FV_FILE_INFO              *FileInfo\r
   );\r
 \r
   OUT       EFI_FV_FILE_INFO              *FileInfo\r
   );\r
 \r


@@ -249,7 +249,7 @@ PeiFfsFvPpiGetFileInfo2 (
 \r
 /**\r
   This function returns information about the firmware volume.\r
 \r
 /**\r
   This function returns information about the firmware volume.\r

-  \r
+\r

   @param This                     Points to this instance of the\r
                                   EFI_PEI_FIRMWARE_VOLUME_PPI.\r
   @param FvHandle                 Handle to the firmware handle.\r
   @param This                     Points to this instance of the\r
                                   EFI_PEI_FIRMWARE_VOLUME_PPI.\r
   @param FvHandle                 Handle to the firmware handle.\r


@@ -260,28 +260,28 @@ PeiFfsFvPpiGetFileInfo2 (
   @retval EFI_INVALID_PARAMETER   FvHandle does not indicate a valid\r
                                   firmware volume or VolumeInfo is NULL.\r
 \r
   @retval EFI_INVALID_PARAMETER   FvHandle does not indicate a valid\r
                                   firmware volume or VolumeInfo is NULL.\r
 \r

-**/            \r
+**/\r

 EFI_STATUS\r
 EFIAPI\r
 PeiFfsFvPpiGetVolumeInfo (\r
 EFI_STATUS\r
 EFIAPI\r
 PeiFfsFvPpiGetVolumeInfo (\r

-  IN  CONST  EFI_PEI_FIRMWARE_VOLUME_PPI   *This, \r
-  IN  EFI_PEI_FV_HANDLE                    FvHandle, \r
+  IN  CONST  EFI_PEI_FIRMWARE_VOLUME_PPI   *This,\r
+  IN  EFI_PEI_FV_HANDLE                    FvHandle,\r

   OUT EFI_FV_INFO                          *VolumeInfo\r
   );\r
 \r
 /**\r
   Convert the handle of FV to pointer of corresponding PEI_CORE_FV_HANDLE.\r
   OUT EFI_FV_INFO                          *VolumeInfo\r
   );\r
 \r
 /**\r
   Convert the handle of FV to pointer of corresponding PEI_CORE_FV_HANDLE.\r

-  \r
+\r

   @param FvHandle   The handle of a FV.\r
   @param FvHandle   The handle of a FV.\r

-  \r
+\r

   @retval NULL if can not find.\r
   @retval NULL if can not find.\r

-  @return Pointer of corresponding PEI_CORE_FV_HANDLE. \r
+  @return Pointer of corresponding PEI_CORE_FV_HANDLE.\r

 **/\r
 PEI_CORE_FV_HANDLE *\r
 FvHandleToCoreHandle (\r
   IN EFI_PEI_FV_HANDLE  FvHandle\r
   );\r
 **/\r
 PEI_CORE_FV_HANDLE *\r
 FvHandleToCoreHandle (\r
   IN EFI_PEI_FV_HANDLE  FvHandle\r
   );\r

-  \r
+\r

 /**\r
   Given the input file pointer, search for the next matching file in the\r
   FFS volume as defined by SearchType. The search starts from FileHeader inside\r
 /**\r
   Given the input file pointer, search for the next matching file in the\r
   FFS volume as defined by SearchType. The search starts from FileHeader inside\r


@@ -310,17 +310,17 @@ FindFileEx (
 \r
 /**\r
   Report the information for a new discoveried FV in unknown format.\r
 \r
 /**\r
   Report the information for a new discoveried FV in unknown format.\r

-  \r
+\r

   If the EFI_PEI_FIRMWARE_VOLUME_PPI has not been installed for specifical FV format, but\r
   the FV in this FV format has been discoveried, then the information of this FV\r
   will be cached into PEI_CORE_INSTANCE's UnknownFvInfo array.\r
   Also a notification would be installed for unknown FV format guid, if EFI_PEI_FIRMWARE_VOLUME_PPI\r
   is installed later by platform's PEIM, the original unknown FV will be processed by\r
   using new installed EFI_PEI_FIRMWARE_VOLUME_PPI.\r
   If the EFI_PEI_FIRMWARE_VOLUME_PPI has not been installed for specifical FV format, but\r
   the FV in this FV format has been discoveried, then the information of this FV\r
   will be cached into PEI_CORE_INSTANCE's UnknownFvInfo array.\r
   Also a notification would be installed for unknown FV format guid, if EFI_PEI_FIRMWARE_VOLUME_PPI\r
   is installed later by platform's PEIM, the original unknown FV will be processed by\r
   using new installed EFI_PEI_FIRMWARE_VOLUME_PPI.\r

-  \r
+\r

   @param PrivateData  Point to instance of PEI_CORE_INSTANCE\r
   @param FvInfo2Ppi   Point to FvInfo2 PPI.\r
   @param PrivateData  Point to instance of PEI_CORE_INSTANCE\r
   @param FvInfo2Ppi   Point to FvInfo2 PPI.\r

-  \r
+\r

   @retval EFI_OUT_OF_RESOURCES  The FV info array in PEI_CORE_INSTANCE has no more spaces.\r
   @retval EFI_SUCCESS           Success to add the information for unknown FV.\r
 **/\r
   @retval EFI_OUT_OF_RESOURCES  The FV info array in PEI_CORE_INSTANCE has no more spaces.\r
   @retval EFI_SUCCESS           Success to add the information for unknown FV.\r
 **/\r


@@ -329,19 +329,19 @@ AddUnknownFormatFvInfo (
   IN PEI_CORE_INSTANCE                  *PrivateData,\r
   IN EFI_PEI_FIRMWARE_VOLUME_INFO2_PPI  *FvInfo2Ppi\r
   );\r
   IN PEI_CORE_INSTANCE                  *PrivateData,\r
   IN EFI_PEI_FIRMWARE_VOLUME_INFO2_PPI  *FvInfo2Ppi\r
   );\r

-  \r
+\r

 /**\r
   Find the FV information according to FV format guid.\r
 /**\r
   Find the FV information according to FV format guid.\r

-  \r
+\r

   This routine also will remove the FV information found by given FV format guid from\r
   PrivateData->UnknownFvInfo[].\r
   This routine also will remove the FV information found by given FV format guid from\r
   PrivateData->UnknownFvInfo[].\r

-  \r
+\r

   @param PrivateData      Point to instance of PEI_CORE_INSTANCE\r
   @param Format           Point to given FV format guid\r
   @param FvInfo           On return, the pointer of FV information buffer in given FV format guid\r
   @param FvInfoSize       On return, the size of FV information buffer.\r
   @param AuthenticationStatus On return, the authentication status of FV information buffer.\r
   @param PrivateData      Point to instance of PEI_CORE_INSTANCE\r
   @param Format           Point to given FV format guid\r
   @param FvInfo           On return, the pointer of FV information buffer in given FV format guid\r
   @param FvInfoSize       On return, the size of FV information buffer.\r
   @param AuthenticationStatus On return, the authentication status of FV information buffer.\r

-  \r
+\r

   @retval EFI_NOT_FOUND  The FV is not found for new installed EFI_PEI_FIRMWARE_VOLUME_PPI\r
   @retval EFI_SUCCESS    Success to find a FV which could be processed by new installed EFI_PEI_FIRMWARE_VOLUME_PPI.\r
 **/\r
   @retval EFI_NOT_FOUND  The FV is not found for new installed EFI_PEI_FIRMWARE_VOLUME_PPI\r
   @retval EFI_SUCCESS    Success to find a FV which could be processed by new installed EFI_PEI_FIRMWARE_VOLUME_PPI.\r
 **/\r


@@ -353,17 +353,17 @@ FindUnknownFormatFvInfo (
   OUT UINT32            *FvInfoSize,\r
   OUT UINT32            *AuthenticationStatus\r
   );\r
   OUT UINT32            *FvInfoSize,\r
   OUT UINT32            *AuthenticationStatus\r
   );\r

-  \r
+\r

 /**\r
   Notification callback function for EFI_PEI_FIRMWARE_VOLUME_PPI.\r
 /**\r
   Notification callback function for EFI_PEI_FIRMWARE_VOLUME_PPI.\r

-  \r
-  When a EFI_PEI_FIRMWARE_VOLUME_PPI is installed to support new FV format, this \r
+\r
+  When a EFI_PEI_FIRMWARE_VOLUME_PPI is installed to support new FV format, this\r

   routine is called to process all discoveried FVs in this format.\r
   routine is called to process all discoveried FVs in this format.\r

-  \r
+\r

   @param PeiServices       An indirect pointer to the EFI_PEI_SERVICES table published by the PEI Foundation\r
   @param NotifyDescriptor  Address of the notification descriptor data structure.\r
   @param Ppi               Address of the PPI that was installed.\r
   @param PeiServices       An indirect pointer to the EFI_PEI_SERVICES table published by the PEI Foundation\r
   @param NotifyDescriptor  Address of the notification descriptor data structure.\r
   @param Ppi               Address of the PPI that was installed.\r

-  \r
+\r

   @retval EFI_SUCCESS  The notification callback is processed correctly.\r
 **/\r
 EFI_STATUS\r
   @retval EFI_SUCCESS  The notification callback is processed correctly.\r
 **/\r
 EFI_STATUS\r


@@ -372,6 +372,6 @@ ThirdPartyFvPpiNotifyCallback (
   IN EFI_PEI_SERVICES              **PeiServices,\r
   IN EFI_PEI_NOTIFY_DESCRIPTOR     *NotifyDescriptor,\r
   IN VOID                          *Ppi\r
   IN EFI_PEI_SERVICES              **PeiServices,\r
   IN EFI_PEI_NOTIFY_DESCRIPTOR     *NotifyDescriptor,\r
   IN VOID                          *Ppi\r

-  );  \r
-  \r
-#endif \r
+  );\r
+\r
+#endif\r

diff --git a/MdeModulePkg/Core/Pei/Hob/Hob.c b/MdeModulePkg/Core/Pei/Hob/Hob.c
index bb9f3f744e96c3a266b2f4f5df61adb1859a3e3d..ed49e5be4ad672e47c4da143fa611f50a6d96914 100644 (file)
--- a/MdeModulePkg/Core/Pei/Hob/Hob.c
+++ b/MdeModulePkg/Core/Pei/Hob/Hob.c
@@ -1,14 +1,14 @@
 /** @file\r
   This module provide Hand-Off Block manupulation.\r
 /** @file\r
   This module provide Hand-Off Block manupulation.\r

-  \r
-Copyright (c) 2006 - 2017, Intel Corporation. All rights reserved.<BR>\r
-This program and the accompanying materials                          \r
-are licensed and made available under the terms and conditions of the BSD License         \r
-which accompanies this distribution.  The full text of the license may be found at        \r
-http://opensource.org/licenses/bsd-license.php                                            \r
-                                                                                          \r
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     \r
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             \r
+\r
+Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r
+This program and the accompanying materials\r
+are licensed and made available under the terms and conditions of the BSD License\r
+which accompanies this distribution.  The full text of the license may be found at\r
+http://opensource.org/licenses/bsd-license.php\r
+\r
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r

 \r
 **/\r
 \r
 \r
 **/\r
 \r


@@ -34,22 +34,22 @@ PeiGetHobList (
   )\r
 {\r
   PEI_CORE_INSTANCE *PrivateData;\r
   )\r
 {\r
   PEI_CORE_INSTANCE *PrivateData;\r

-  \r
+\r

   //\r
   // Only check this parameter in debug mode\r
   //\r
   //\r
   // Only check this parameter in debug mode\r
   //\r

-  \r
-  DEBUG_CODE_BEGIN ();  \r
+\r
+  DEBUG_CODE_BEGIN ();\r

     if (HobList == NULL) {\r
       return EFI_INVALID_PARAMETER;\r
     }\r
   DEBUG_CODE_END ();\r
     if (HobList == NULL) {\r
       return EFI_INVALID_PARAMETER;\r
     }\r
   DEBUG_CODE_END ();\r

-  \r
+\r

   PrivateData = PEI_CORE_INSTANCE_FROM_PS_THIS(PeiServices);\r
 \r
   *HobList    = PrivateData->HobList.Raw;\r
 \r
   PrivateData = PEI_CORE_INSTANCE_FROM_PS_THIS(PeiServices);\r
 \r
   *HobList    = PrivateData->HobList.Raw;\r
 \r

-  return EFI_SUCCESS;   \r
+  return EFI_SUCCESS;\r

 }\r
 \r
 \r
 }\r
 \r
 \r


@@ -90,7 +90,7 @@ PeiCreateHob (
   HandOffHob = *Hob;\r
 \r
   //\r
   HandOffHob = *Hob;\r
 \r
   //\r

-  // Check Length to avoid data overflow. \r
+  // Check Length to avoid data overflow.\r

   //\r
   if (0x10000 - Length <= 0x7) {\r
     return EFI_INVALID_PARAMETER;\r
   //\r
   if (0x10000 - Length <= 0x7) {\r
     return EFI_INVALID_PARAMETER;\r


@@ -106,7 +106,7 @@ PeiCreateHob (
     DEBUG ((EFI_D_ERROR, "  FreeMemoryBottom - 0x%08x\n", (UINTN)HandOffHob->EfiFreeMemoryBottom));\r
     return EFI_OUT_OF_RESOURCES;\r
   }\r
     DEBUG ((EFI_D_ERROR, "  FreeMemoryBottom - 0x%08x\n", (UINTN)HandOffHob->EfiFreeMemoryBottom));\r
     return EFI_OUT_OF_RESOURCES;\r
   }\r

-  \r
+\r

   *Hob = (VOID*) (UINTN) HandOffHob->EfiEndOfHobList;\r
   ((EFI_HOB_GENERIC_HEADER*) *Hob)->HobType   = Type;\r
   ((EFI_HOB_GENERIC_HEADER*) *Hob)->HobLength = Length;\r
   *Hob = (VOID*) (UINTN) HandOffHob->EfiEndOfHobList;\r
   ((EFI_HOB_GENERIC_HEADER*) *Hob)->HobType   = Type;\r
   ((EFI_HOB_GENERIC_HEADER*) *Hob)->HobLength = Length;\r


@@ -114,14 +114,14 @@ PeiCreateHob (
 \r
   HobEnd = (EFI_HOB_GENERIC_HEADER*) ((UINTN) *Hob + Length);\r
   HandOffHob->EfiEndOfHobList = (EFI_PHYSICAL_ADDRESS) (UINTN) HobEnd;\r
 \r
   HobEnd = (EFI_HOB_GENERIC_HEADER*) ((UINTN) *Hob + Length);\r
   HandOffHob->EfiEndOfHobList = (EFI_PHYSICAL_ADDRESS) (UINTN) HobEnd;\r

- \r
+\r

   HobEnd->HobType   = EFI_HOB_TYPE_END_OF_HOB_LIST;\r
   HobEnd->HobLength = (UINT16) sizeof (EFI_HOB_GENERIC_HEADER);\r
   HobEnd->Reserved  = 0;\r
   HobEnd++;\r
   HandOffHob->EfiFreeMemoryBottom = (EFI_PHYSICAL_ADDRESS) (UINTN) HobEnd;\r
 \r
   HobEnd->HobType   = EFI_HOB_TYPE_END_OF_HOB_LIST;\r
   HobEnd->HobLength = (UINT16) sizeof (EFI_HOB_GENERIC_HEADER);\r
   HobEnd->Reserved  = 0;\r
   HobEnd++;\r
   HandOffHob->EfiFreeMemoryBottom = (EFI_PHYSICAL_ADDRESS) (UINTN) HobEnd;\r
 \r

-  return EFI_SUCCESS;   \r
+  return EFI_SUCCESS;\r

 }\r
 \r
 /**\r
 }\r
 \r
 /**\r


@@ -222,14 +222,14 @@ PeiCoreBuildHobHandoffInfoTable (
   Hob->Header.HobType      = EFI_HOB_TYPE_HANDOFF;\r
   Hob->Header.HobLength    = (UINT16) sizeof (EFI_HOB_HANDOFF_INFO_TABLE);\r
   Hob->Header.Reserved     = 0;\r
   Hob->Header.HobType      = EFI_HOB_TYPE_HANDOFF;\r
   Hob->Header.HobLength    = (UINT16) sizeof (EFI_HOB_HANDOFF_INFO_TABLE);\r
   Hob->Header.Reserved     = 0;\r

-  \r
+\r

   HobEnd->HobType          = EFI_HOB_TYPE_END_OF_HOB_LIST;\r
   HobEnd->HobLength        = (UINT16) sizeof (EFI_HOB_GENERIC_HEADER);\r
   HobEnd->Reserved         = 0;\r
 \r
   Hob->Version             = EFI_HOB_HANDOFF_TABLE_VERSION;\r
   Hob->BootMode            = BootMode;\r
   HobEnd->HobType          = EFI_HOB_TYPE_END_OF_HOB_LIST;\r
   HobEnd->HobLength        = (UINT16) sizeof (EFI_HOB_GENERIC_HEADER);\r
   HobEnd->Reserved         = 0;\r
 \r
   Hob->Version             = EFI_HOB_HANDOFF_TABLE_VERSION;\r
   Hob->BootMode            = BootMode;\r

-  \r
+\r

   Hob->EfiMemoryTop        = MemoryBegin + MemoryLength;\r
   Hob->EfiMemoryBottom     = MemoryBegin;\r
   Hob->EfiFreeMemoryTop    = MemoryBegin + MemoryLength;\r
   Hob->EfiMemoryTop        = MemoryBegin + MemoryLength;\r
   Hob->EfiMemoryBottom     = MemoryBegin;\r
   Hob->EfiFreeMemoryTop    = MemoryBegin + MemoryLength;\r

diff --git a/MdeModulePkg/Core/Pei/Image/Image.c b/MdeModulePkg/Core/Pei/Image/Image.c
index f07f48823117aa0373f7f6fb9f8abdac7819340e..f84f2c77adf0391a27c3220f6f9c7f65e52bf076 100644 (file)
--- a/MdeModulePkg/Core/Pei/Image/Image.c
+++ b/MdeModulePkg/Core/Pei/Image/Image.c
@@ -50,7 +50,7 @@ PeiImageRead (
 {\r
   CHAR8 *Destination8;\r
   CHAR8 *Source8;\r
 {\r
   CHAR8 *Destination8;\r
   CHAR8 *Source8;\r

-  \r
+\r

   Destination8  = Buffer;\r
   Source8       = (CHAR8 *) ((UINTN) FileHandle + FileOffset);\r
   if (Destination8 != Source8) {\r
   Destination8  = Buffer;\r
   Source8       = (CHAR8 *) ((UINTN) FileHandle + FileOffset);\r
   if (Destination8 != Source8) {\r


@@ -119,10 +119,10 @@ GetImageReadFunction (
   Private = PEI_CORE_INSTANCE_FROM_PS_THIS (GetPeiServicesTablePointer ());\r
   MemoryBuffer = 0;\r
 \r
   Private = PEI_CORE_INSTANCE_FROM_PS_THIS (GetPeiServicesTablePointer ());\r
   MemoryBuffer = 0;\r
 \r

-  if (Private->PeiMemoryInstalled  && (((Private->HobList.HandoffInformationTable->BootMode != BOOT_ON_S3_RESUME) && PcdGetBool (PcdShadowPeimOnBoot)) || \r
+  if (Private->PeiMemoryInstalled  && (((Private->HobList.HandoffInformationTable->BootMode != BOOT_ON_S3_RESUME) && PcdGetBool (PcdShadowPeimOnBoot)) ||\r

       ((Private->HobList.HandoffInformationTable->BootMode == BOOT_ON_S3_RESUME) && PcdGetBool (PcdShadowPeimOnS3Boot)))) {\r
       ((Private->HobList.HandoffInformationTable->BootMode == BOOT_ON_S3_RESUME) && PcdGetBool (PcdShadowPeimOnS3Boot)))) {\r

-    // \r
-    // Shadow algorithm makes lots of non ANSI C assumptions and only works for IA32 and X64 \r
+    //\r
+    // Shadow algorithm makes lots of non ANSI C assumptions and only works for IA32 and X64\r

     //  compilers that have been tested\r
     //\r
     if (Private->ShadowedImageRead == NULL) {\r
     //  compilers that have been tested\r
     //\r
     if (Private->ShadowedImageRead == NULL) {\r


@@ -144,12 +144,12 @@ GetImageReadFunction (
 /**\r
   To check memory usage bit map array to figure out if the memory range the image will be loaded in is available or not. If\r
   memory range is available, the function will mark the corresponding bits to 1 which indicates the memory range is used.\r
 /**\r
   To check memory usage bit map array to figure out if the memory range the image will be loaded in is available or not. If\r
   memory range is available, the function will mark the corresponding bits to 1 which indicates the memory range is used.\r

-  The function is only invoked when load modules at fixed address feature is enabled. \r
-  \r
+  The function is only invoked when load modules at fixed address feature is enabled.\r
+\r

   @param  Private                  Pointer to the private data passed in from caller\r
   @param  ImageBase                The base address the image will be loaded at.\r
   @param  ImageSize                The size of the image\r
   @param  Private                  Pointer to the private data passed in from caller\r
   @param  ImageBase                The base address the image will be loaded at.\r
   @param  ImageSize                The size of the image\r

-  \r
+\r

   @retval EFI_SUCCESS              The memory range the image will be loaded in is available\r
   @retval EFI_NOT_FOUND            The memory range the image will be loaded in is not available\r
 **/\r
   @retval EFI_SUCCESS              The memory range the image will be loaded in is available\r
   @retval EFI_NOT_FOUND            The memory range the image will be loaded in is not available\r
 **/\r


@@ -167,7 +167,7 @@ CheckAndMarkFixLoadingMemoryUsageBitMap (
    UINT32                             TopOffsetPageNumber;\r
    UINT32                             Index;\r
    UINT64                             *MemoryUsageBitMap;\r
    UINT32                             TopOffsetPageNumber;\r
    UINT32                             Index;\r
    UINT64                             *MemoryUsageBitMap;\r

-   \r
+\r

 \r
    //\r
    // The reserved code range includes RuntimeCodePage range, Boot time code range and PEI code range.\r
 \r
    //\r
    // The reserved code range includes RuntimeCodePage range, Boot time code range and PEI code range.\r


@@ -176,19 +176,19 @@ CheckAndMarkFixLoadingMemoryUsageBitMap (
    DxeCodePageNumber += PcdGet32(PcdLoadFixAddressRuntimeCodePageNumber);\r
    ReservedCodeSize  = EFI_PAGES_TO_SIZE(DxeCodePageNumber + PcdGet32(PcdLoadFixAddressPeiCodePageNumber));\r
    PeiCodeBase       = Private->LoadModuleAtFixAddressTopAddress - ReservedCodeSize;\r
    DxeCodePageNumber += PcdGet32(PcdLoadFixAddressRuntimeCodePageNumber);\r
    ReservedCodeSize  = EFI_PAGES_TO_SIZE(DxeCodePageNumber + PcdGet32(PcdLoadFixAddressPeiCodePageNumber));\r
    PeiCodeBase       = Private->LoadModuleAtFixAddressTopAddress - ReservedCodeSize;\r

-   \r
+\r

    //\r
    // Test the memory range for loading the image in the PEI code range.\r
    //\r
    if ((Private->LoadModuleAtFixAddressTopAddress - EFI_PAGES_TO_SIZE(DxeCodePageNumber)) < (ImageBase + ImageSize) ||\r
    //\r
    // Test the memory range for loading the image in the PEI code range.\r
    //\r
    if ((Private->LoadModuleAtFixAddressTopAddress - EFI_PAGES_TO_SIZE(DxeCodePageNumber)) < (ImageBase + ImageSize) ||\r

-       (PeiCodeBase > ImageBase)) {         \r
-     return EFI_NOT_FOUND; \r
+       (PeiCodeBase > ImageBase)) {\r
+     return EFI_NOT_FOUND;\r

    }\r
    }\r

-   \r
+\r

    //\r
    // Test if the memory is avalaible or not.\r
    //\r
    //\r
    // Test if the memory is avalaible or not.\r
    //\r

-   MemoryUsageBitMap    = Private->PeiCodeMemoryRangeUsageBitMap;  \r
+   MemoryUsageBitMap    = Private->PeiCodeMemoryRangeUsageBitMap;\r

    BaseOffsetPageNumber = EFI_SIZE_TO_PAGES((UINT32)(ImageBase - PeiCodeBase));\r
    TopOffsetPageNumber  = EFI_SIZE_TO_PAGES((UINT32)(ImageBase + ImageSize - PeiCodeBase));\r
    for (Index = BaseOffsetPageNumber; Index < TopOffsetPageNumber; Index ++) {\r
    BaseOffsetPageNumber = EFI_SIZE_TO_PAGES((UINT32)(ImageBase - PeiCodeBase));\r
    TopOffsetPageNumber  = EFI_SIZE_TO_PAGES((UINT32)(ImageBase + ImageSize - PeiCodeBase));\r
    for (Index = BaseOffsetPageNumber; Index < TopOffsetPageNumber; Index ++) {\r


@@ -196,17 +196,17 @@ CheckAndMarkFixLoadingMemoryUsageBitMap (
        //\r
        // This page is already used.\r
        //\r
        //\r
        // This page is already used.\r
        //\r

-       return EFI_NOT_FOUND;  \r
+       return EFI_NOT_FOUND;\r

      }\r
    }\r
      }\r
    }\r

-   \r
+\r

    //\r
    // Being here means the memory range is available.  So mark the bits for the memory range\r
    //\r
    // Being here means the memory range is available.  So mark the bits for the memory range\r

-   // \r
+   //\r

    for (Index = BaseOffsetPageNumber; Index < TopOffsetPageNumber; Index ++) {\r
      MemoryUsageBitMap[Index / 64] |= LShiftU64(1, (Index % 64));\r
    }\r
    for (Index = BaseOffsetPageNumber; Index < TopOffsetPageNumber; Index ++) {\r
      MemoryUsageBitMap[Index / 64] |= LShiftU64(1, (Index % 64));\r
    }\r

-   return  EFI_SUCCESS;   \r
+   return  EFI_SUCCESS;\r

 }\r
 /**\r
 \r
 }\r
 /**\r
 \r


@@ -236,7 +236,7 @@ GetPeCoffImageFixLoadingAssignedAddress(
    UINTN                              Size;\r
    UINT16                             NumberOfSections;\r
    UINT64                             ValueInSectionHeader;\r
    UINTN                              Size;\r
    UINT16                             NumberOfSections;\r
    UINT64                             ValueInSectionHeader;\r

- \r
+\r

 \r
    FixLoadingAddress = 0;\r
    Status = EFI_NOT_FOUND;\r
 \r
    FixLoadingAddress = 0;\r
    Status = EFI_NOT_FOUND;\r


@@ -338,7 +338,7 @@ GetPeCoffImageFixLoadingAssignedAddress(
 \r
   @retval EFI_SUCCESS           The file was loaded and relocated\r
   @retval EFI_OUT_OF_RESOURCES  There was not enough memory to load and relocate the PE/COFF file\r
 \r
   @retval EFI_SUCCESS           The file was loaded and relocated\r
   @retval EFI_OUT_OF_RESOURCES  There was not enough memory to load and relocate the PE/COFF file\r

-  @retval EFI_WARN_BUFFER_TOO_SMALL \r
+  @retval EFI_WARN_BUFFER_TOO_SMALL\r

                                 There is not enough heap to allocate the requested size.\r
                                 This will not prevent the XIP image from being invoked.\r
 \r
                                 There is not enough heap to allocate the requested size.\r
                                 This will not prevent the XIP image from being invoked.\r
 \r


@@ -377,7 +377,7 @@ LoadAndRelocatePeCoffImage (
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r

-  \r
+\r

   //\r
   // Initilize local IsS3Boot and IsRegisterForShadow variable\r
   //\r
   //\r
   // Initilize local IsS3Boot and IsRegisterForShadow variable\r
   //\r


@@ -386,7 +386,7 @@ LoadAndRelocatePeCoffImage (
     IsS3Boot = TRUE;\r
   }\r
   IsRegisterForShadow = FALSE;\r
     IsS3Boot = TRUE;\r
   }\r
   IsRegisterForShadow = FALSE;\r

-  if ((Private->CurrentFileHandle == FileHandle) \r
+  if ((Private->CurrentFileHandle == FileHandle)\r

     && (Private->Fv[Private->CurrentPeimFvCount].PeimState[Private->CurrentPeimCount] == PEIM_STATE_REGISTER_FOR_SHADOW)) {\r
     IsRegisterForShadow = TRUE;\r
   }\r
     && (Private->Fv[Private->CurrentPeimFvCount].PeimState[Private->CurrentPeimCount] == PEIM_STATE_REGISTER_FOR_SHADOW)) {\r
     IsRegisterForShadow = TRUE;\r
   }\r


@@ -403,13 +403,13 @@ LoadAndRelocatePeCoffImage (
   //\r
   Status = PeiServicesFfsGetFileInfo (FileHandle, &FileInfo);\r
   ASSERT_EFI_ERROR (Status);\r
   //\r
   Status = PeiServicesFfsGetFileInfo (FileHandle, &FileInfo);\r
   ASSERT_EFI_ERROR (Status);\r

-  \r
+\r

   //\r
   // Check whether the file type is PEI module.\r
   //\r
   IsPeiModule = FALSE;\r
   //\r
   // Check whether the file type is PEI module.\r
   //\r
   IsPeiModule = FALSE;\r

-  if (FileInfo.FileType == EFI_FV_FILETYPE_PEI_CORE || \r
-      FileInfo.FileType == EFI_FV_FILETYPE_PEIM || \r
+  if (FileInfo.FileType == EFI_FV_FILETYPE_PEI_CORE ||\r
+      FileInfo.FileType == EFI_FV_FILETYPE_PEIM ||\r

       FileInfo.FileType == EFI_FV_FILETYPE_COMBINED_PEIM_DRIVER) {\r
     IsPeiModule = TRUE;\r
   }\r
       FileInfo.FileType == EFI_FV_FILETYPE_COMBINED_PEIM_DRIVER) {\r
     IsPeiModule = TRUE;\r
   }\r


@@ -548,7 +548,7 @@ LoadAndRelocatePeCoffImage (
   @retval EFI_SUCCESS      Image is successfully loaded.\r
   @retval EFI_NOT_FOUND    Fail to locate necessary PPI.\r
   @retval EFI_UNSUPPORTED  Image Machine Type is not supported.\r
   @retval EFI_SUCCESS      Image is successfully loaded.\r
   @retval EFI_NOT_FOUND    Fail to locate necessary PPI.\r
   @retval EFI_UNSUPPORTED  Image Machine Type is not supported.\r

-  @retval EFI_WARN_BUFFER_TOO_SMALL \r
+  @retval EFI_WARN_BUFFER_TOO_SMALL\r

                            There is not enough heap to allocate the requested size.\r
                            This will not prevent the XIP image from being invoked.\r
 \r
                            There is not enough heap to allocate the requested size.\r
                            This will not prevent the XIP image from being invoked.\r
 \r

diff --git a/MdeModulePkg/Core/Pei/Memory/MemoryServices.c b/MdeModulePkg/Core/Pei/Memory/MemoryServices.c
index 516311d09189db05f7507aac18d49a906b5f1068..4dc62d2262dbcc76089ede584f6bfb043c9ec8e9 100644 (file)
--- a/MdeModulePkg/Core/Pei/Memory/MemoryServices.c
+++ b/MdeModulePkg/Core/Pei/Memory/MemoryServices.c
@@ -1,14 +1,14 @@
 /** @file\r
   EFI PEI Core memory services\r
 /** @file\r
   EFI PEI Core memory services\r

-  \r
-Copyright (c) 2006 - 2017, Intel Corporation. All rights reserved.<BR>\r
-This program and the accompanying materials                          \r
-are licensed and made available under the terms and conditions of the BSD License         \r
-which accompanies this distribution.  The full text of the license may be found at        \r
-http://opensource.org/licenses/bsd-license.php                                            \r
-                                                                                          \r
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     \r
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             \r
+\r
+Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r
+This program and the accompanying materials\r
+are licensed and made available under the terms and conditions of the BSD License\r
+which accompanies this distribution.  The full text of the license may be found at\r
+http://opensource.org/licenses/bsd-license.php\r
+\r
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r

 \r
 **/\r
 \r
 \r
 **/\r
 \r


@@ -33,7 +33,7 @@ InitializeMemoryServices (
   IN PEI_CORE_INSTANCE           *OldCoreData\r
   )\r
 {\r
   IN PEI_CORE_INSTANCE           *OldCoreData\r
   )\r
 {\r

-  \r
+\r

   PrivateData->SwitchStackSignal    = FALSE;\r
 \r
   //\r
   PrivateData->SwitchStackSignal    = FALSE;\r
 \r
   //\r


@@ -44,7 +44,7 @@ InitializeMemoryServices (
 \r
     PrivateData->PeiMemoryInstalled = FALSE;\r
     PrivateData->HobList.Raw        = SecCoreData->PeiTemporaryRamBase;\r
 \r
     PrivateData->PeiMemoryInstalled = FALSE;\r
     PrivateData->HobList.Raw        = SecCoreData->PeiTemporaryRamBase;\r

-    \r
+\r

     PeiCoreBuildHobHandoffInfoTable (\r
       BOOT_WITH_FULL_CONFIGURATION,\r
       (EFI_PHYSICAL_ADDRESS) (UINTN) SecCoreData->PeiTemporaryRamBase,\r
     PeiCoreBuildHobHandoffInfoTable (\r
       BOOT_WITH_FULL_CONFIGURATION,\r
       (EFI_PHYSICAL_ADDRESS) (UINTN) SecCoreData->PeiTemporaryRamBase,\r


@@ -56,7 +56,7 @@ InitializeMemoryServices (
     //\r
     PrivateData->Ps = &(PrivateData->ServiceTableShadow);\r
   }\r
     //\r
     PrivateData->Ps = &(PrivateData->ServiceTableShadow);\r
   }\r

-  \r
+\r

   return;\r
 }\r
 \r
   return;\r
 }\r
 \r


@@ -68,7 +68,7 @@ InitializeMemoryServices (
   This routine will hold discoveried memory information into PeiCore's private data,\r
   and set SwitchStackSignal flag. After PEIM who discovery memory is dispatched,\r
   PeiDispatcher will migrate temporary memory to permenement memory.\r
   This routine will hold discoveried memory information into PeiCore's private data,\r
   and set SwitchStackSignal flag. After PEIM who discovery memory is dispatched,\r
   PeiDispatcher will migrate temporary memory to permenement memory.\r

-  \r
+\r

   @param PeiServices        An indirect pointer to the EFI_PEI_SERVICES table published by the PEI Foundation.\r
   @param MemoryBegin        Start of memory address.\r
   @param MemoryLength       Length of memory.\r
   @param PeiServices        An indirect pointer to the EFI_PEI_SERVICES table published by the PEI Foundation.\r
   @param MemoryBegin        Start of memory address.\r
   @param MemoryLength       Length of memory.\r


@@ -93,20 +93,20 @@ PeiInstallPeiMemory (
   // PEI_SERVICE.InstallPeiMemory should only be called one time during whole PEI phase.\r
   // If it is invoked more than one time, ASSERT information is given for developer debugging in debug tip and\r
   // simply return EFI_SUCESS in release tip to ignore it.\r
   // PEI_SERVICE.InstallPeiMemory should only be called one time during whole PEI phase.\r
   // If it is invoked more than one time, ASSERT information is given for developer debugging in debug tip and\r
   // simply return EFI_SUCESS in release tip to ignore it.\r

-  // \r
+  //\r

   if (PrivateData->PeiMemoryInstalled) {\r
     DEBUG ((EFI_D_ERROR, "ERROR: PeiInstallPeiMemory is called more than once!\n"));\r
     ASSERT (FALSE);\r
     return EFI_SUCCESS;\r
   }\r
   if (PrivateData->PeiMemoryInstalled) {\r
     DEBUG ((EFI_D_ERROR, "ERROR: PeiInstallPeiMemory is called more than once!\n"));\r
     ASSERT (FALSE);\r
     return EFI_SUCCESS;\r
   }\r

-  \r
+\r

   PrivateData->PhysicalMemoryBegin   = MemoryBegin;\r
   PrivateData->PhysicalMemoryLength  = MemoryLength;\r
   PrivateData->FreePhysicalMemoryTop = MemoryBegin + MemoryLength;\r
   PrivateData->PhysicalMemoryBegin   = MemoryBegin;\r
   PrivateData->PhysicalMemoryLength  = MemoryLength;\r
   PrivateData->FreePhysicalMemoryTop = MemoryBegin + MemoryLength;\r

-   \r
+\r

   PrivateData->SwitchStackSignal      = TRUE;\r
 \r
   PrivateData->SwitchStackSignal      = TRUE;\r
 \r

-  return EFI_SUCCESS;   \r
+  return EFI_SUCCESS;\r

 }\r
 \r
 /**\r
 }\r
 \r
 /**\r


@@ -765,8 +765,8 @@ PeiFreePages (
 /**\r
 \r
   Pool allocation service. Before permanent memory is discoveried, the pool will\r
 /**\r
 \r
   Pool allocation service. Before permanent memory is discoveried, the pool will\r

-  be allocated the heap in the temporary memory. Genenrally, the size of heap in temporary \r
-  memory does not exceed to 64K, so the biggest pool size could be allocated is \r
+  be allocated the heap in the temporary memory. Genenrally, the size of heap in temporary\r
+  memory does not exceed to 64K, so the biggest pool size could be allocated is\r

   64K.\r
 \r
   @param PeiServices               An indirect pointer to the EFI_PEI_SERVICES table published by the PEI Foundation.\r
   64K.\r
 \r
   @param PeiServices               An indirect pointer to the EFI_PEI_SERVICES table published by the PEI Foundation.\r


@@ -793,7 +793,7 @@ PeiAllocatePool (
   // If some "post-memory" PEIM wishes to allocate larger pool,\r
   // it should use AllocatePages service instead.\r
   //\r
   // If some "post-memory" PEIM wishes to allocate larger pool,\r
   // it should use AllocatePages service instead.\r
   //\r

-  \r
+\r

   //\r
   // Generally, the size of heap in temporary memory does not exceed to 64K,\r
   // HobLength is multiples of 8 bytes, so the maxmium size of pool is 0xFFF8 - sizeof (EFI_HOB_MEMORY_POOL)\r
   //\r
   // Generally, the size of heap in temporary memory does not exceed to 64K,\r
   // HobLength is multiples of 8 bytes, so the maxmium size of pool is 0xFFF8 - sizeof (EFI_HOB_MEMORY_POOL)\r


@@ -801,14 +801,14 @@ PeiAllocatePool (
   if (Size > (0xFFF8 - sizeof (EFI_HOB_MEMORY_POOL))) {\r
     return EFI_OUT_OF_RESOURCES;\r
   }\r
   if (Size > (0xFFF8 - sizeof (EFI_HOB_MEMORY_POOL))) {\r
     return EFI_OUT_OF_RESOURCES;\r
   }\r

-  \r
+\r

   Status = PeiServicesCreateHob (\r
              EFI_HOB_TYPE_MEMORY_POOL,\r
              (UINT16)(sizeof (EFI_HOB_MEMORY_POOL) + Size),\r
              (VOID **)&Hob\r
              );\r
   ASSERT_EFI_ERROR (Status);\r
   Status = PeiServicesCreateHob (\r
              EFI_HOB_TYPE_MEMORY_POOL,\r
              (UINT16)(sizeof (EFI_HOB_MEMORY_POOL) + Size),\r
              (VOID **)&Hob\r
              );\r
   ASSERT_EFI_ERROR (Status);\r

-  *Buffer = Hob+1;  \r
+  *Buffer = Hob+1;\r

 \r
   return Status;\r
 }\r
 \r
   return Status;\r
 }\r

diff --git a/MdeModulePkg/Core/Pei/PciCfg2/PciCfg2.c b/MdeModulePkg/Core/Pei/PciCfg2/PciCfg2.c
index a20e7c00c55e19e5cbd8fe8571b17766bfeb36ca..a6a6ad379bbe99d4d4112669f713c5d481b20bdb 100644 (file)
--- a/MdeModulePkg/Core/Pei/PciCfg2/PciCfg2.c
+++ b/MdeModulePkg/Core/Pei/PciCfg2/PciCfg2.c
@@ -1,26 +1,26 @@
 /** @file\r
   The default version of EFI_PEI_PCI_CFG2_PPI support published by PeiServices in\r
   PeiCore initialization phase.\r
 /** @file\r
   The default version of EFI_PEI_PCI_CFG2_PPI support published by PeiServices in\r
   PeiCore initialization phase.\r

- \r
-  EFI_PEI_PCI_CFG2_PPI is installed by the PEIM which supports a PCI root bridge. \r
-  When PeiCore is started, the default version of EFI_PEI_PCI_CFG2_PPI will be assigned \r
+\r
+  EFI_PEI_PCI_CFG2_PPI is installed by the PEIM which supports a PCI root bridge.\r
+  When PeiCore is started, the default version of EFI_PEI_PCI_CFG2_PPI will be assigned\r

   to PeiServices table.\r
   to PeiServices table.\r

-  \r
-Copyright (c) 2009, Intel Corporation. All rights reserved.<BR>\r
-This program and the accompanying materials                          \r
-are licensed and made available under the terms and conditions of the BSD License         \r
-which accompanies this distribution.  The full text of the license may be found at        \r
-http://opensource.org/licenses/bsd-license.php                                            \r
-                                                                                          \r
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     \r
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             \r
+\r
+Copyright (c) 2009 - 2018, Intel Corporation. All rights reserved.<BR>\r
+This program and the accompanying materials\r
+are licensed and made available under the terms and conditions of the BSD License\r
+which accompanies this distribution.  The full text of the license may be found at\r
+http://opensource.org/licenses/bsd-license.php\r
+\r
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r

 \r
 **/\r
 \r
 #include "PeiMain.h"\r
 \r
 ///\r
 \r
 **/\r
 \r
 #include "PeiMain.h"\r
 \r
 ///\r

-/// This default instance of EFI_PEI_PCI_CFG2_PPI install assigned to EFI_PEI_SERVICE.PciCfg \r
+/// This default instance of EFI_PEI_PCI_CFG2_PPI install assigned to EFI_PEI_SERVICE.PciCfg\r

 /// when PeiCore's initialization.\r
 ///\r
 EFI_PEI_PCI_CFG2_PPI gPeiDefaultPciCfg2Ppi = {\r
 /// when PeiCore's initialization.\r
 ///\r
 EFI_PEI_PCI_CFG2_PPI gPeiDefaultPciCfg2Ppi = {\r


@@ -32,9 +32,9 @@ EFI_PEI_PCI_CFG2_PPI gPeiDefaultPciCfg2Ppi = {
 /**\r
   Reads from a given location in the PCI configuration space.\r
 \r
 /**\r
   Reads from a given location in the PCI configuration space.\r
 \r

-  If the EFI_PEI_PCI_CFG2_PPI is not installed by platform/chipset PEIM, then \r
-  return EFI_NOT_YET_AVAILABLE. \r
-  \r
+  If the EFI_PEI_PCI_CFG2_PPI is not installed by platform/chipset PEIM, then\r
+  return EFI_NOT_YET_AVAILABLE.\r
+\r

   @param  PeiServices     An indirect pointer to the PEI Services Table published by the PEI Foundation.\r
   @param  This            Pointer to local data for the interface.\r
   @param  Width           The width of the access. Enumerated in bytes.\r
   @param  PeiServices     An indirect pointer to the PEI Services Table published by the PEI Foundation.\r
   @param  This            Pointer to local data for the interface.\r
   @param  Width           The width of the access. Enumerated in bytes.\r


@@ -46,7 +46,7 @@ EFI_PEI_PCI_CFG2_PPI gPeiDefaultPciCfg2Ppi = {
   @retval EFI_SUCCESS           The function completed successfully.\r
   @retval EFI_INVALID_PARAMETER The invalid access width.\r
   @retval EFI_NOT_YET_AVAILABLE If the EFI_PEI_PCI_CFG2_PPI is not installed by platform/chipset PEIM.\r
   @retval EFI_SUCCESS           The function completed successfully.\r
   @retval EFI_INVALID_PARAMETER The invalid access width.\r
   @retval EFI_NOT_YET_AVAILABLE If the EFI_PEI_PCI_CFG2_PPI is not installed by platform/chipset PEIM.\r

-  \r
+\r

 **/\r
 EFI_STATUS\r
 EFIAPI\r
 **/\r
 EFI_STATUS\r
 EFIAPI\r


@@ -64,9 +64,9 @@ PeiDefaultPciCfg2Read (
 /**\r
   Write to a given location in the PCI configuration space.\r
 \r
 /**\r
   Write to a given location in the PCI configuration space.\r
 \r

-  If the EFI_PEI_PCI_CFG2_PPI is not installed by platform/chipset PEIM, then \r
-  return EFI_NOT_YET_AVAILABLE. \r
-  \r
+  If the EFI_PEI_PCI_CFG2_PPI is not installed by platform/chipset PEIM, then\r
+  return EFI_NOT_YET_AVAILABLE.\r
+\r

   @param  PeiServices     An indirect pointer to the PEI Services Table published by the PEI Foundation.\r
   @param  This            Pointer to local data for the interface.\r
   @param  Width           The width of the access. Enumerated in bytes.\r
   @param  PeiServices     An indirect pointer to the PEI Services Table published by the PEI Foundation.\r
   @param  This            Pointer to local data for the interface.\r
   @param  Width           The width of the access. Enumerated in bytes.\r


@@ -90,13 +90,13 @@ PeiDefaultPciCfg2Write (
   )\r
 {\r
   return EFI_NOT_AVAILABLE_YET;\r
   )\r
 {\r
   return EFI_NOT_AVAILABLE_YET;\r

-}  \r
+}\r

 \r
 /**\r
   This function performs a read-modify-write operation on the contents from a given\r
   location in the PCI configuration space.\r
 \r
 /**\r
   This function performs a read-modify-write operation on the contents from a given\r
   location in the PCI configuration space.\r

-  If the EFI_PEI_PCI_CFG2_PPI is not installed by platform/chipset PEIM, then \r
-  return EFI_NOT_YET_AVAILABLE. \r
+  If the EFI_PEI_PCI_CFG2_PPI is not installed by platform/chipset PEIM, then\r
+  return EFI_NOT_YET_AVAILABLE.\r

 \r
   @param  PeiServices     An indirect pointer to the PEI Services Table\r
                           published by the PEI Foundation.\r
 \r
   @param  PeiServices     An indirect pointer to the PEI Services Table\r
                           published by the PEI Foundation.\r


@@ -125,4 +125,4 @@ PeiDefaultPciCfg2Modify (
   )\r
 {\r
   return EFI_NOT_AVAILABLE_YET;\r
   )\r
 {\r
   return EFI_NOT_AVAILABLE_YET;\r

-}   \r
+}\r

diff --git a/MdeModulePkg/Core/Pei/PeiCoreExtra.uni b/MdeModulePkg/Core/Pei/PeiCoreExtra.uni
index ec430fccaec6065c0037f8803018ea310b4bc6e2..f2cea6ca8153d2fc75e5e2126dcba04a3e1b36fd 100644 (file)
--- a/MdeModulePkg/Core/Pei/PeiCoreExtra.uni
+++ b/MdeModulePkg/Core/Pei/PeiCoreExtra.uni
@@ -1,7 +1,7 @@
 // /** @file\r
 // PeiCore Localized Strings and Content\r
 //\r
 // /** @file\r
 // PeiCore Localized Strings and Content\r
 //\r

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

 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r
 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r


@@ -12,8 +12,8 @@
 //\r
 // **/\r
 \r
 //\r
 // **/\r
 \r

-#string STR_PROPERTIES_MODULE_NAME \r
-#language en-US \r
+#string STR_PROPERTIES_MODULE_NAME\r
+#language en-US\r

 "Core PEI Services Module"\r
 \r
 \r
 "Core PEI Services Module"\r
 \r
 \r

diff --git a/MdeModulePkg/Core/Pei/PeiMain.h b/MdeModulePkg/Core/Pei/PeiMain.h
index a1cdbc15d98a72072ce48bc245f4163d274a5c16..e2f8cd9c775841213b6ec98ed8beb0da802ae2ba 100644 (file)
--- a/MdeModulePkg/Core/Pei/PeiMain.h
+++ b/MdeModulePkg/Core/Pei/PeiMain.h
@@ -1,7 +1,7 @@
 /** @file\r
   Definition of Pei Core Structures and Services\r
 /** @file\r
   Definition of Pei Core Structures and Services\r

-  \r
-Copyright (c) 2006 - 2017, Intel Corporation. All rights reserved.<BR>\r
+\r
+Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r

 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r


@@ -88,7 +88,7 @@ typedef struct {
   INTN                    LastDispatchedInstall;\r
   ///\r
   /// index of last dispatched notify in Notify link list.\r
   INTN                    LastDispatchedInstall;\r
   ///\r
   /// index of last dispatched notify in Notify link list.\r

-  /// \r
+  ///\r

   INTN                    LastDispatchedNotify;\r
   ///\r
   /// Ppi database has the PcdPeiCoreMaxPpiSupported number of entries.\r
   INTN                    LastDispatchedNotify;\r
   ///\r
   /// Ppi database has the PcdPeiCoreMaxPpiSupported number of entries.\r


@@ -157,7 +157,7 @@ typedef struct _PEI_CORE_INSTANCE  PEI_CORE_INSTANCE;
 \r
 /**\r
   Function Pointer type for PeiCore function.\r
 \r
 /**\r
   Function Pointer type for PeiCore function.\r

-  @param SecCoreData     Points to a data structure containing SEC to PEI handoff data, such as the size \r
+  @param SecCoreData     Points to a data structure containing SEC to PEI handoff data, such as the size\r

                          and location of temporary RAM, the stack location and the BFV location.\r
   @param PpiList         Points to a list of one or more PPI descriptors to be installed initially by the PEI core.\r
                          An empty PPI list consists of a single descriptor with the end-tag\r
                          and location of temporary RAM, the stack location and the BFV location.\r
   @param PpiList         Points to a list of one or more PPI descriptors to be installed initially by the PEI core.\r
                          An empty PPI list consists of a single descriptor with the end-tag\r


@@ -183,18 +183,18 @@ EFI_STATUS
 ///\r
 struct _PEI_CORE_INSTANCE {\r
   UINTN                              Signature;\r
 ///\r
 struct _PEI_CORE_INSTANCE {\r
   UINTN                              Signature;\r

-  \r
+\r

   ///\r
   /// Point to ServiceTableShadow\r
   ///\r
   EFI_PEI_SERVICES                   *Ps;\r
   PEI_PPI_DATABASE                   PpiData;\r
   ///\r
   /// Point to ServiceTableShadow\r
   ///\r
   EFI_PEI_SERVICES                   *Ps;\r
   PEI_PPI_DATABASE                   PpiData;\r

-  \r
+\r

   ///\r
   /// The count of FVs which contains FFS and could be dispatched by PeiCore.\r
   ///\r
   UINTN                              FvCount;\r
   ///\r
   /// The count of FVs which contains FFS and could be dispatched by PeiCore.\r
   ///\r
   UINTN                              FvCount;\r

-  \r
+\r

   ///\r
   /// Pointer to the buffer with the PcdPeiCoreMaxFvSupported number of entries.\r
   /// Each entry is for one FV which contains FFS and could be dispatched by PeiCore.\r
   ///\r
   /// Pointer to the buffer with the PcdPeiCoreMaxFvSupported number of entries.\r
   /// Each entry is for one FV which contains FFS and could be dispatched by PeiCore.\r


@@ -207,7 +207,7 @@ struct _PEI_CORE_INSTANCE {
   ///\r
   PEI_CORE_UNKNOW_FORMAT_FV_INFO     *UnknownFvInfo;\r
   UINTN                              UnknownFvInfoCount;\r
   ///\r
   PEI_CORE_UNKNOW_FORMAT_FV_INFO     *UnknownFvInfo;\r
   UINTN                              UnknownFvInfoCount;\r

-  \r
+\r

   ///\r
   /// Pointer to the buffer with the PcdPeiCoreMaxPeimPerFv number of entries.\r
   ///\r
   ///\r
   /// Pointer to the buffer with the PcdPeiCoreMaxPeimPerFv number of entries.\r
   ///\r


@@ -240,15 +240,15 @@ struct _PEI_CORE_INSTANCE {
   PEICORE_FUNCTION_POINTER           ShadowedPeiCore;\r
   CACHE_SECTION_DATA                 CacheSection;\r
   //\r
   PEICORE_FUNCTION_POINTER           ShadowedPeiCore;\r
   CACHE_SECTION_DATA                 CacheSection;\r
   //\r

-  // For Loading modules at fixed address feature to cache the top address below which the \r
-  // Runtime code, boot time code and PEI memory will be placed. Please note that the offset between this field \r
-  // and  Ps should not be changed since maybe user could get this top address by using the offet to Ps. \r
+  // For Loading modules at fixed address feature to cache the top address below which the\r
+  // Runtime code, boot time code and PEI memory will be placed. Please note that the offset between this field\r
+  // and  Ps should not be changed since maybe user could get this top address by using the offet to Ps.\r

   //\r
   EFI_PHYSICAL_ADDRESS               LoadModuleAtFixAddressTopAddress;\r
   //\r
   // The field is define for Loading modules at fixed address feature to tracker the PEI code\r
   // memory range usage. It is a bit mapped array in which every bit indicates the correspoding memory page\r
   //\r
   EFI_PHYSICAL_ADDRESS               LoadModuleAtFixAddressTopAddress;\r
   //\r
   // The field is define for Loading modules at fixed address feature to tracker the PEI code\r
   // memory range usage. It is a bit mapped array in which every bit indicates the correspoding memory page\r

-  // available or not. \r
+  // available or not.\r

   //\r
   UINT64                            *PeiCodeMemoryRangeUsageBitMap;\r
   //\r
   //\r
   UINT64                            *PeiCodeMemoryRangeUsageBitMap;\r
   //\r


@@ -307,7 +307,7 @@ typedef struct {
   with the old core data.\r
 \r
 \r
   with the old core data.\r
 \r
 \r

-  @param SecCoreData     Points to a data structure containing SEC to PEI handoff data, such as the size \r
+  @param SecCoreData     Points to a data structure containing SEC to PEI handoff data, such as the size\r

                          and location of temporary RAM, the stack location and the BFV location.\r
   @param PpiList         Points to a list of one or more PPI descriptors to be installed initially by the PEI core.\r
                          An empty PPI list consists of a single descriptor with the end-tag\r
                          and location of temporary RAM, the stack location and the BFV location.\r
   @param PpiList         Points to a list of one or more PPI descriptors to be installed initially by the PEI core.\r
                          An empty PPI list consists of a single descriptor with the end-tag\r


@@ -415,7 +415,7 @@ DepexSatisfied (
   Initialize PPI services.\r
 \r
   @param PrivateData     Pointer to the PEI Core data.\r
   Initialize PPI services.\r
 \r
   @param PrivateData     Pointer to the PEI Core data.\r

-  @param OldCoreData     Pointer to old PEI Core data. \r
+  @param OldCoreData     Pointer to old PEI Core data.\r

                          NULL if being run in non-permament memory mode.\r
 \r
 **/\r
                          NULL if being run in non-permament memory mode.\r
 \r
 **/\r


@@ -429,7 +429,7 @@ InitializePpiServices (
 \r
   Migrate the Hob list from the temporary memory to PEI installed memory.\r
 \r
 \r
   Migrate the Hob list from the temporary memory to PEI installed memory.\r
 \r

-  @param SecCoreData     Points to a data structure containing SEC to PEI handoff data, such as the size \r
+  @param SecCoreData     Points to a data structure containing SEC to PEI handoff data, such as the size\r

                          and location of temporary RAM, the stack location and the BFV location.\r
   @param PrivateData     Pointer to PeiCore's private data structure.\r
 \r
                          and location of temporary RAM, the stack location and the BFV location.\r
   @param PrivateData     Pointer to PeiCore's private data structure.\r
 \r


@@ -847,7 +847,7 @@ PeiFfsFindNextVolume (
   Initialize the memory services.\r
 \r
   @param PrivateData     PeiCore's private data structure\r
   Initialize the memory services.\r
 \r
   @param PrivateData     PeiCore's private data structure\r

-  @param SecCoreData     Points to a data structure containing SEC to PEI handoff data, such as the size \r
+  @param SecCoreData     Points to a data structure containing SEC to PEI handoff data, such as the size\r

                          and location of temporary RAM, the stack location and the BFV location.\r
   @param OldCoreData     Pointer to the PEI Core data.\r
                          NULL if being run in non-permament memory mode.\r
                          and location of temporary RAM, the stack location and the BFV location.\r
   @param OldCoreData     Pointer to the PEI Core data.\r
                          NULL if being run in non-permament memory mode.\r


@@ -1158,7 +1158,7 @@ PeiFfsGetFileInfo (
 \r
 **/\r
 EFI_STATUS\r
 \r
 **/\r
 EFI_STATUS\r

-EFIAPI \r
+EFIAPI\r

 PeiFfsGetFileInfo2 (\r
   IN EFI_PEI_FILE_HANDLE  FileHandle,\r
   OUT EFI_FV_FILE_INFO2   *FileInfo\r
 PeiFfsGetFileInfo2 (\r
   IN EFI_PEI_FILE_HANDLE  FileHandle,\r
   OUT EFI_FV_FILE_INFO2   *FileInfo\r


@@ -1269,7 +1269,7 @@ SecurityPpiNotifyCallback (
   @retval EFI_OUT_OF_RESOURCES  Can not allocate page when aligning FV image\r
   @retval EFI_SECURITY_VIOLATION Image is illegal\r
   @retval Others                Can not find EFI_SECTION_FIRMWARE_VOLUME_IMAGE section\r
   @retval EFI_OUT_OF_RESOURCES  Can not allocate page when aligning FV image\r
   @retval EFI_SECURITY_VIOLATION Image is illegal\r
   @retval Others                Can not find EFI_SECTION_FIRMWARE_VOLUME_IMAGE section\r

-  \r
+\r

 **/\r
 EFI_STATUS\r
 ProcessFvFile (\r
 **/\r
 EFI_STATUS\r
 ProcessFvFile (\r


@@ -1277,15 +1277,15 @@ ProcessFvFile (
   IN  PEI_CORE_FV_HANDLE          *ParentFvCoreHandle,\r
   IN  EFI_PEI_FILE_HANDLE         ParentFvFileHandle\r
   );\r
   IN  PEI_CORE_FV_HANDLE          *ParentFvCoreHandle,\r
   IN  EFI_PEI_FILE_HANDLE         ParentFvFileHandle\r
   );\r

-  \r
+\r

 /**\r
   Get instance of PEI_CORE_FV_HANDLE for next volume according to given index.\r
 /**\r
   Get instance of PEI_CORE_FV_HANDLE for next volume according to given index.\r

-  \r
+\r

   This routine also will install FvInfo ppi for FV hob in PI ways.\r
   This routine also will install FvInfo ppi for FV hob in PI ways.\r

-  \r
+\r

   @param Private    Pointer of PEI_CORE_INSTANCE\r
   @param Instance   The index of FV want to be searched.\r
   @param Private    Pointer of PEI_CORE_INSTANCE\r
   @param Instance   The index of FV want to be searched.\r

-  \r
+\r

   @return Instance of PEI_CORE_FV_HANDLE.\r
 **/\r
 PEI_CORE_FV_HANDLE *\r
   @return Instance of PEI_CORE_FV_HANDLE.\r
 **/\r
 PEI_CORE_FV_HANDLE *\r


@@ -1293,19 +1293,19 @@ FindNextCoreFvHandle (
   IN PEI_CORE_INSTANCE  *Private,\r
   IN UINTN              Instance\r
   );\r
   IN PEI_CORE_INSTANCE  *Private,\r
   IN UINTN              Instance\r
   );\r

-    \r
+\r

 //\r
 // Default EFI_PEI_CPU_IO_PPI support for EFI_PEI_SERVICES table when PeiCore initialization.\r
 //\r
 // Default EFI_PEI_CPU_IO_PPI support for EFI_PEI_SERVICES table when PeiCore initialization.\r

-//    \r
+//\r

 \r
 /**\r
   Memory-based read services.\r
 \r
 /**\r
   Memory-based read services.\r

-  \r
-  This function is to perform the Memory Access Read service based on installed \r
-  instance of the EFI_PEI_CPU_IO_PPI. \r
-  If the EFI_PEI_CPU_IO_PPI is not installed by platform/chipset PEIM, then \r
-  return EFI_NOT_YET_AVAILABLE. \r
-   \r
+\r
+  This function is to perform the Memory Access Read service based on installed\r
+  instance of the EFI_PEI_CPU_IO_PPI.\r
+  If the EFI_PEI_CPU_IO_PPI is not installed by platform/chipset PEIM, then\r
+  return EFI_NOT_YET_AVAILABLE.\r
+\r

   @param  PeiServices           An indirect pointer to the PEI Services Table\r
                                 published by the PEI Foundation.\r
   @param  This                  Pointer to local data for the interface.\r
   @param  PeiServices           An indirect pointer to the PEI Services Table\r
                                 published by the PEI Foundation.\r
   @param  This                  Pointer to local data for the interface.\r


@@ -1315,7 +1315,7 @@ FindNextCoreFvHandle (
   @param  Buffer                A pointer to the buffer of data.\r
 \r
   @retval EFI_SUCCESS           The function completed successfully.\r
   @param  Buffer                A pointer to the buffer of data.\r
 \r
   @retval EFI_SUCCESS           The function completed successfully.\r

-  @retval EFI_NOT_YET_AVAILABLE The service has not been installed.     \r
+  @retval EFI_NOT_YET_AVAILABLE The service has not been installed.\r

 **/\r
 EFI_STATUS\r
 EFIAPI\r
 **/\r
 EFI_STATUS\r
 EFIAPI\r


@@ -1327,15 +1327,15 @@ PeiDefaultMemRead (
   IN  UINTN                             Count,\r
   IN  OUT VOID                          *Buffer\r
   );\r
   IN  UINTN                             Count,\r
   IN  OUT VOID                          *Buffer\r
   );\r

-  \r
+\r

 /**\r
   Memory-based write services.\r
 /**\r
   Memory-based write services.\r

-   \r
-  This function is to perform the Memory Access Write service based on installed \r
-  instance of the EFI_PEI_CPU_IO_PPI. \r
-  If the EFI_PEI_CPU_IO_PPI is not installed by platform/chipset PEIM, then \r
-  return EFI_NOT_YET_AVAILABLE. \r
-   \r
+\r
+  This function is to perform the Memory Access Write service based on installed\r
+  instance of the EFI_PEI_CPU_IO_PPI.\r
+  If the EFI_PEI_CPU_IO_PPI is not installed by platform/chipset PEIM, then\r
+  return EFI_NOT_YET_AVAILABLE.\r
+\r

   @param  PeiServices           An indirect pointer to the PEI Services Table\r
                                 published by the PEI Foundation.\r
   @param  This                  Pointer to local data for the interface.\r
   @param  PeiServices           An indirect pointer to the PEI Services Table\r
                                 published by the PEI Foundation.\r
   @param  This                  Pointer to local data for the interface.\r


@@ -1345,7 +1345,7 @@ PeiDefaultMemRead (
   @param  Buffer                A pointer to the buffer of data.\r
 \r
   @retval EFI_SUCCESS           The function completed successfully.\r
   @param  Buffer                A pointer to the buffer of data.\r
 \r
   @retval EFI_SUCCESS           The function completed successfully.\r

-  @retval EFI_NOT_YET_AVAILABLE The service has not been installed.     \r
+  @retval EFI_NOT_YET_AVAILABLE The service has not been installed.\r

 **/\r
 EFI_STATUS\r
 EFIAPI\r
 **/\r
 EFI_STATUS\r
 EFIAPI\r


@@ -1357,14 +1357,14 @@ PeiDefaultMemWrite (
   IN  UINTN                             Count,\r
   IN  OUT VOID                          *Buffer\r
   );\r
   IN  UINTN                             Count,\r
   IN  OUT VOID                          *Buffer\r
   );\r

-  \r
+\r

 /**\r
   IO-based read services.\r
 /**\r
   IO-based read services.\r

-  \r
+\r

   This function is to perform the IO-base read service for the EFI_PEI_CPU_IO_PPI.\r
   This function is to perform the IO-base read service for the EFI_PEI_CPU_IO_PPI.\r

-  If the EFI_PEI_CPU_IO_PPI is not installed by platform/chipset PEIM, then \r
-  return EFI_NOT_YET_AVAILABLE. \r
-  \r
+  If the EFI_PEI_CPU_IO_PPI is not installed by platform/chipset PEIM, then\r
+  return EFI_NOT_YET_AVAILABLE.\r
+\r

   @param  PeiServices           An indirect pointer to the PEI Services Table\r
                                 published by the PEI Foundation.\r
   @param  This                  Pointer to local data for the interface.\r
   @param  PeiServices           An indirect pointer to the PEI Services Table\r
                                 published by the PEI Foundation.\r
   @param  This                  Pointer to local data for the interface.\r


@@ -1386,14 +1386,14 @@ PeiDefaultIoRead (
   IN      UINTN                           Count,\r
   IN OUT  VOID                            *Buffer\r
   );\r
   IN      UINTN                           Count,\r
   IN OUT  VOID                            *Buffer\r
   );\r

-  \r
+\r

 /**\r
   IO-based write services.\r
 /**\r
   IO-based write services.\r

-  \r
+\r

   This function is to perform the IO-base write service for the EFI_PEI_CPU_IO_PPI.\r
   This function is to perform the IO-base write service for the EFI_PEI_CPU_IO_PPI.\r

-  If the EFI_PEI_CPU_IO_PPI is not installed by platform/chipset PEIM, then \r
-  return EFI_NOT_YET_AVAILABLE. \r
-  \r
+  If the EFI_PEI_CPU_IO_PPI is not installed by platform/chipset PEIM, then\r
+  return EFI_NOT_YET_AVAILABLE.\r
+\r

   @param  PeiServices           An indirect pointer to the PEI Services Table\r
                                 published by the PEI Foundation.\r
   @param  This                  Pointer to local data for the interface.\r
   @param  PeiServices           An indirect pointer to the PEI Services Table\r
                                 published by the PEI Foundation.\r
   @param  This                  Pointer to local data for the interface.\r


@@ -1415,13 +1415,13 @@ PeiDefaultIoWrite (
   IN      UINTN                           Count,\r
   IN OUT  VOID                            *Buffer\r
   );\r
   IN      UINTN                           Count,\r
   IN OUT  VOID                            *Buffer\r
   );\r

-  \r
+\r

 /**\r
   8-bit I/O read operations.\r
 /**\r
   8-bit I/O read operations.\r

-  \r
-  If the EFI_PEI_CPU_IO_PPI is not installed by platform/chipset PEIM, then \r
+\r
+  If the EFI_PEI_CPU_IO_PPI is not installed by platform/chipset PEIM, then\r

   return 0.\r
   return 0.\r

-  \r
+\r

   @param  PeiServices    An indirect pointer to the PEI Services Table published by the PEI Foundation.\r
   @param  This           Pointer to local data for the interface.\r
   @param  Address        The physical address of the access.\r
   @param  PeiServices    An indirect pointer to the PEI Services Table published by the PEI Foundation.\r
   @param  This           Pointer to local data for the interface.\r
   @param  Address        The physical address of the access.\r


@@ -1435,13 +1435,13 @@ PeiDefaultIoRead8 (
   IN  CONST EFI_PEI_CPU_IO_PPI    *This,\r
   IN  UINT64                      Address\r
   );\r
   IN  CONST EFI_PEI_CPU_IO_PPI    *This,\r
   IN  UINT64                      Address\r
   );\r

-  \r
+\r

 /**\r
   Reads an 16-bit I/O port.\r
 /**\r
   Reads an 16-bit I/O port.\r

-  \r
-  If the EFI_PEI_CPU_IO_PPI is not installed by platform/chipset PEIM, then \r
+\r
+  If the EFI_PEI_CPU_IO_PPI is not installed by platform/chipset PEIM, then\r

   return 0.\r
   return 0.\r

-  \r
+\r

   @param  PeiServices    An indirect pointer to the PEI Services Table published by the PEI Foundation.\r
   @param  This           Pointer to local data for the interface.\r
   @param  Address        The physical address of the access.\r
   @param  PeiServices    An indirect pointer to the PEI Services Table published by the PEI Foundation.\r
   @param  This           Pointer to local data for the interface.\r
   @param  Address        The physical address of the access.\r


@@ -1455,13 +1455,13 @@ PeiDefaultIoRead16 (
   IN  CONST EFI_PEI_CPU_IO_PPI    *This,\r
   IN  UINT64                      Address\r
   );\r
   IN  CONST EFI_PEI_CPU_IO_PPI    *This,\r
   IN  UINT64                      Address\r
   );\r

-  \r
+\r

 /**\r
   Reads an 32-bit I/O port.\r
 /**\r
   Reads an 32-bit I/O port.\r

-  \r
-  If the EFI_PEI_CPU_IO_PPI is not installed by platform/chipset PEIM, then \r
+\r
+  If the EFI_PEI_CPU_IO_PPI is not installed by platform/chipset PEIM, then\r

   return 0.\r
   return 0.\r

-  \r
+\r

   @param  PeiServices    An indirect pointer to the PEI Services Table published by the PEI Foundation.\r
   @param  This           Pointer to local data for the interface.\r
   @param  Address        The physical address of the access.\r
   @param  PeiServices    An indirect pointer to the PEI Services Table published by the PEI Foundation.\r
   @param  This           Pointer to local data for the interface.\r
   @param  Address        The physical address of the access.\r


@@ -1475,13 +1475,13 @@ PeiDefaultIoRead32 (
   IN  CONST EFI_PEI_CPU_IO_PPI    *This,\r
   IN  UINT64                      Address\r
   );\r
   IN  CONST EFI_PEI_CPU_IO_PPI    *This,\r
   IN  UINT64                      Address\r
   );\r

-  \r
+\r

 /**\r
   Reads an 64-bit I/O port.\r
 /**\r
   Reads an 64-bit I/O port.\r

-  \r
-  If the EFI_PEI_CPU_IO_PPI is not installed by platform/chipset PEIM, then \r
+\r
+  If the EFI_PEI_CPU_IO_PPI is not installed by platform/chipset PEIM, then\r

   return 0.\r
   return 0.\r

-  \r
+\r

   @param  PeiServices    An indirect pointer to the PEI Services Table published by the PEI Foundation.\r
   @param  This           Pointer to local data for the interface.\r
   @param  Address        The physical address of the access.\r
   @param  PeiServices    An indirect pointer to the PEI Services Table published by the PEI Foundation.\r
   @param  This           Pointer to local data for the interface.\r
   @param  Address        The physical address of the access.\r


@@ -1495,7 +1495,7 @@ PeiDefaultIoRead64 (
   IN  CONST EFI_PEI_CPU_IO_PPI    *This,\r
   IN  UINT64                      Address\r
   );\r
   IN  CONST EFI_PEI_CPU_IO_PPI    *This,\r
   IN  UINT64                      Address\r
   );\r

-  \r
+\r

 /**\r
   8-bit I/O write operations.\r
 \r
 /**\r
   8-bit I/O write operations.\r
 \r


@@ -1512,7 +1512,7 @@ PeiDefaultIoWrite8 (
   IN  UINT64                      Address,\r
   IN  UINT8                       Data\r
   );\r
   IN  UINT64                      Address,\r
   IN  UINT8                       Data\r
   );\r

-  \r
+\r

 /**\r
   16-bit I/O write operations.\r
 \r
 /**\r
   16-bit I/O write operations.\r
 \r


@@ -1529,7 +1529,7 @@ PeiDefaultIoWrite16 (
   IN  UINT64                      Address,\r
   IN  UINT16                      Data\r
   );\r
   IN  UINT64                      Address,\r
   IN  UINT16                      Data\r
   );\r

-  \r
+\r

 /**\r
   32-bit I/O write operations.\r
 \r
 /**\r
   32-bit I/O write operations.\r
 \r


@@ -1546,7 +1546,7 @@ PeiDefaultIoWrite32 (
   IN  UINT64                      Address,\r
   IN  UINT32                      Data\r
   );\r
   IN  UINT64                      Address,\r
   IN  UINT32                      Data\r
   );\r

-  \r
+\r

 /**\r
   64-bit I/O write operations.\r
 \r
 /**\r
   64-bit I/O write operations.\r
 \r


@@ -1563,13 +1563,13 @@ PeiDefaultIoWrite64 (
   IN  UINT64                      Address,\r
   IN  UINT64                      Data\r
   );\r
   IN  UINT64                      Address,\r
   IN  UINT64                      Data\r
   );\r

-  \r
+\r

 /**\r
   8-bit memory read operations.\r
 \r
 /**\r
   8-bit memory read operations.\r
 \r

-  If the EFI_PEI_CPU_IO_PPI is not installed by platform/chipset PEIM, then \r
+  If the EFI_PEI_CPU_IO_PPI is not installed by platform/chipset PEIM, then\r

   return 0.\r
   return 0.\r

-  \r
+\r

   @param  PeiServices    An indirect pointer to the PEI Services Table published by the PEI Foundation.\r
   @param  This           Pointer to local data for the interface.\r
   @param  Address        The physical address of the access.\r
   @param  PeiServices    An indirect pointer to the PEI Services Table published by the PEI Foundation.\r
   @param  This           Pointer to local data for the interface.\r
   @param  Address        The physical address of the access.\r


@@ -1584,13 +1584,13 @@ PeiDefaultMemRead8 (
   IN  CONST EFI_PEI_CPU_IO_PPI    *This,\r
   IN  UINT64                      Address\r
   );\r
   IN  CONST EFI_PEI_CPU_IO_PPI    *This,\r
   IN  UINT64                      Address\r
   );\r

-  \r
+\r

 /**\r
   16-bit memory read operations.\r
 \r
 /**\r
   16-bit memory read operations.\r
 \r

-  If the EFI_PEI_CPU_IO_PPI is not installed by platform/chipset PEIM, then \r
+  If the EFI_PEI_CPU_IO_PPI is not installed by platform/chipset PEIM, then\r

   return 0.\r
   return 0.\r

-  \r
+\r

   @param  PeiServices    An indirect pointer to the PEI Services Table published by the PEI Foundation.\r
   @param  This           Pointer to local data for the interface.\r
   @param  Address        The physical address of the access.\r
   @param  PeiServices    An indirect pointer to the PEI Services Table published by the PEI Foundation.\r
   @param  This           Pointer to local data for the interface.\r
   @param  Address        The physical address of the access.\r


@@ -1605,13 +1605,13 @@ PeiDefaultMemRead16 (
   IN  CONST EFI_PEI_CPU_IO_PPI    *This,\r
   IN  UINT64                      Address\r
   );\r
   IN  CONST EFI_PEI_CPU_IO_PPI    *This,\r
   IN  UINT64                      Address\r
   );\r

-  \r
+\r

 /**\r
   32-bit memory read operations.\r
 \r
 /**\r
   32-bit memory read operations.\r
 \r

-  If the EFI_PEI_CPU_IO_PPI is not installed by platform/chipset PEIM, then \r
+  If the EFI_PEI_CPU_IO_PPI is not installed by platform/chipset PEIM, then\r

   return 0.\r
   return 0.\r

-  \r
+\r

   @param  PeiServices    An indirect pointer to the PEI Services Table published by the PEI Foundation.\r
   @param  This           Pointer to local data for the interface.\r
   @param  Address        The physical address of the access.\r
   @param  PeiServices    An indirect pointer to the PEI Services Table published by the PEI Foundation.\r
   @param  This           Pointer to local data for the interface.\r
   @param  Address        The physical address of the access.\r


@@ -1626,13 +1626,13 @@ PeiDefaultMemRead32 (
   IN  CONST EFI_PEI_CPU_IO_PPI    *This,\r
   IN  UINT64                      Address\r
   );\r
   IN  CONST EFI_PEI_CPU_IO_PPI    *This,\r
   IN  UINT64                      Address\r
   );\r

-  \r
+\r

 /**\r
   64-bit memory read operations.\r
 \r
 /**\r
   64-bit memory read operations.\r
 \r

-  If the EFI_PEI_CPU_IO_PPI is not installed by platform/chipset PEIM, then \r
+  If the EFI_PEI_CPU_IO_PPI is not installed by platform/chipset PEIM, then\r

   return 0.\r
   return 0.\r

-  \r
+\r

   @param  PeiServices    An indirect pointer to the PEI Services Table published by the PEI Foundation.\r
   @param  This           Pointer to local data for the interface.\r
   @param  Address        The physical address of the access.\r
   @param  PeiServices    An indirect pointer to the PEI Services Table published by the PEI Foundation.\r
   @param  This           Pointer to local data for the interface.\r
   @param  Address        The physical address of the access.\r


@@ -1647,7 +1647,7 @@ PeiDefaultMemRead64 (
   IN  CONST EFI_PEI_CPU_IO_PPI    *This,\r
   IN  UINT64                      Address\r
   );\r
   IN  CONST EFI_PEI_CPU_IO_PPI    *This,\r
   IN  UINT64                      Address\r
   );\r

-  \r
+\r

 /**\r
   8-bit memory write operations.\r
 \r
 /**\r
   8-bit memory write operations.\r
 \r


@@ -1665,7 +1665,7 @@ PeiDefaultMemWrite8 (
   IN  UINT64                        Address,\r
   IN  UINT8                         Data\r
   );\r
   IN  UINT64                        Address,\r
   IN  UINT8                         Data\r
   );\r

-  \r
+\r

 /**\r
   16-bit memory write operations.\r
 \r
 /**\r
   16-bit memory write operations.\r
 \r


@@ -1701,7 +1701,7 @@ PeiDefaultMemWrite32 (
   IN  UINT64                        Address,\r
   IN  UINT32                        Data\r
   );\r
   IN  UINT64                        Address,\r
   IN  UINT32                        Data\r
   );\r

-  \r
+\r

 /**\r
   64-bit memory write operations.\r
 \r
 /**\r
   64-bit memory write operations.\r
 \r


@@ -1719,19 +1719,19 @@ PeiDefaultMemWrite64 (
   IN  UINT64                        Address,\r
   IN  UINT64                        Data\r
   );\r
   IN  UINT64                        Address,\r
   IN  UINT64                        Data\r
   );\r

-  \r
-extern EFI_PEI_CPU_IO_PPI gPeiDefaultCpuIoPpi;                                        \r
+\r
+extern EFI_PEI_CPU_IO_PPI gPeiDefaultCpuIoPpi;\r

 \r
 //\r
 // Default EFI_PEI_PCI_CFG2_PPI support for EFI_PEI_SERVICES table when PeiCore initialization.\r
 \r
 //\r
 // Default EFI_PEI_PCI_CFG2_PPI support for EFI_PEI_SERVICES table when PeiCore initialization.\r

-// \r
+//\r

 \r
 /**\r
   Reads from a given location in the PCI configuration space.\r
 \r
 \r
 /**\r
   Reads from a given location in the PCI configuration space.\r
 \r

-  If the EFI_PEI_PCI_CFG2_PPI is not installed by platform/chipset PEIM, then \r
-  return EFI_NOT_YET_AVAILABLE. \r
-  \r
+  If the EFI_PEI_PCI_CFG2_PPI is not installed by platform/chipset PEIM, then\r
+  return EFI_NOT_YET_AVAILABLE.\r
+\r

   @param  PeiServices     An indirect pointer to the PEI Services Table published by the PEI Foundation.\r
   @param  This            Pointer to local data for the interface.\r
   @param  Width           The width of the access. Enumerated in bytes.\r
   @param  PeiServices     An indirect pointer to the PEI Services Table published by the PEI Foundation.\r
   @param  This            Pointer to local data for the interface.\r
   @param  Width           The width of the access. Enumerated in bytes.\r


@@ -1743,7 +1743,7 @@ extern EFI_PEI_CPU_IO_PPI gPeiDefaultCpuIoPpi;
   @retval EFI_SUCCESS           The function completed successfully.\r
   @retval EFI_INVALID_PARAMETER The invalid access width.\r
   @retval EFI_NOT_YET_AVAILABLE If the EFI_PEI_PCI_CFG2_PPI is not installed by platform/chipset PEIM.\r
   @retval EFI_SUCCESS           The function completed successfully.\r
   @retval EFI_INVALID_PARAMETER The invalid access width.\r
   @retval EFI_NOT_YET_AVAILABLE If the EFI_PEI_PCI_CFG2_PPI is not installed by platform/chipset PEIM.\r

-  \r
+\r

 **/\r
 EFI_STATUS\r
 EFIAPI\r
 **/\r
 EFI_STATUS\r
 EFIAPI\r


@@ -1754,13 +1754,13 @@ PeiDefaultPciCfg2Read (
   IN        UINT64                    Address,\r
   IN OUT    VOID                      *Buffer\r
   );\r
   IN        UINT64                    Address,\r
   IN OUT    VOID                      *Buffer\r
   );\r

-  \r
+\r

 /**\r
   Write to a given location in the PCI configuration space.\r
 \r
 /**\r
   Write to a given location in the PCI configuration space.\r
 \r

-  If the EFI_PEI_PCI_CFG2_PPI is not installed by platform/chipset PEIM, then \r
-  return EFI_NOT_YET_AVAILABLE. \r
-  \r
+  If the EFI_PEI_PCI_CFG2_PPI is not installed by platform/chipset PEIM, then\r
+  return EFI_NOT_YET_AVAILABLE.\r
+\r

   @param  PeiServices     An indirect pointer to the PEI Services Table published by the PEI Foundation.\r
   @param  This            Pointer to local data for the interface.\r
   @param  Width           The width of the access. Enumerated in bytes.\r
   @param  PeiServices     An indirect pointer to the PEI Services Table published by the PEI Foundation.\r
   @param  This            Pointer to local data for the interface.\r
   @param  Width           The width of the access. Enumerated in bytes.\r


@@ -1782,7 +1782,7 @@ PeiDefaultPciCfg2Write (
   IN        UINT64                    Address,\r
   IN OUT    VOID                      *Buffer\r
   );\r
   IN        UINT64                    Address,\r
   IN OUT    VOID                      *Buffer\r
   );\r

-  \r
+\r

 /**\r
   This function performs a read-modify-write operation on the contents from a given\r
   location in the PCI configuration space.\r
 /**\r
   This function performs a read-modify-write operation on the contents from a given\r
   location in the PCI configuration space.\r


@@ -1811,21 +1811,21 @@ PeiDefaultPciCfg2Modify (
   IN        UINT64                    Address,\r
   IN        VOID                      *SetBits,\r
   IN        VOID                      *ClearBits\r
   IN        UINT64                    Address,\r
   IN        VOID                      *SetBits,\r
   IN        VOID                      *ClearBits\r

-  );    \r
-  \r
+  );\r
+\r

 extern EFI_PEI_PCI_CFG2_PPI gPeiDefaultPciCfg2Ppi;\r
 \r
 /**\r
   After PeiCore image is shadowed into permanent memory, all build-in FvPpi should\r
 extern EFI_PEI_PCI_CFG2_PPI gPeiDefaultPciCfg2Ppi;\r
 \r
 /**\r
   After PeiCore image is shadowed into permanent memory, all build-in FvPpi should\r

-  be re-installed with the instance in permanent memory and all cached FvPpi pointers in \r
+  be re-installed with the instance in permanent memory and all cached FvPpi pointers in\r

   PrivateData->Fv[] array should be fixed up to be pointed to the one in permanent\r
   memory.\r
   PrivateData->Fv[] array should be fixed up to be pointed to the one in permanent\r
   memory.\r

-  \r
+\r

   @param PrivateData   Pointer to PEI_CORE_INSTANCE.\r
   @param PrivateData   Pointer to PEI_CORE_INSTANCE.\r

-**/  \r
+**/\r

 VOID\r
 PeiReinitializeFv (\r
   IN  PEI_CORE_INSTANCE           *PrivateData\r
   );\r
 VOID\r
 PeiReinitializeFv (\r
   IN  PEI_CORE_INSTANCE           *PrivateData\r
   );\r

-      \r
+\r

 #endif\r
 #endif\r

diff --git a/MdeModulePkg/Core/Pei/PeiMain.inf b/MdeModulePkg/Core/Pei/PeiMain.inf
index 7d9cdaa2f00530ba9174706ab39d3d81c3602991..2fb01958e52e31fdce495e59876877c439508ac8 100644 (file)
--- a/MdeModulePkg/Core/Pei/PeiMain.inf
+++ b/MdeModulePkg/Core/Pei/PeiMain.inf
@@ -6,7 +6,7 @@
 # 2) Dispatch PEIM from discovered FV.\r
 # 3) Handoff control to DxeIpl to load DXE core and enter DXE phase.\r
 #\r
 # 2) Dispatch PEIM from discovered FV.\r
 # 3) Handoff control to DxeIpl to load DXE core and enter DXE phase.\r
 #\r

-# Copyright (c) 2006 - 2017, Intel Corporation. All rights reserved.<BR>\r
+# Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r

 #\r
 #  This program and the accompanying materials\r
 #  are licensed and made available under the terms and conditions of the BSD License\r
 #\r
 #  This program and the accompanying materials\r
 #  are licensed and made available under the terms and conditions of the BSD License\r


@@ -81,10 +81,10 @@
   ## CONSUMES   ## UNDEFINED # Locate ppi\r
   ## CONSUMES   ## GUID      # Used to compare with FV's file system guid and get the FV's file system format\r
   gEfiFirmwareFileSystem3Guid\r
   ## CONSUMES   ## UNDEFINED # Locate ppi\r
   ## CONSUMES   ## GUID      # Used to compare with FV's file system guid and get the FV's file system format\r
   gEfiFirmwareFileSystem3Guid\r

-  \r
+\r

 [Ppis]\r
   gEfiPeiStatusCodePpiGuid                      ## SOMETIMES_CONSUMES # PeiReportStatusService is not ready if this PPI doesn't exist\r
 [Ppis]\r
   gEfiPeiStatusCodePpiGuid                      ## SOMETIMES_CONSUMES # PeiReportStatusService is not ready if this PPI doesn't exist\r

-  gEfiPeiResetPpiGuid                           ## SOMETIMES_CONSUMES # PeiResetService is not ready if this PPI doesn't exist \r
+  gEfiPeiResetPpiGuid                           ## SOMETIMES_CONSUMES # PeiResetService is not ready if this PPI doesn't exist\r

   gEfiDxeIplPpiGuid                             ## CONSUMES\r
   gEfiPeiMemoryDiscoveredPpiGuid                ## PRODUCES\r
   gEfiPeiDecompressPpiGuid                      ## SOMETIMES_CONSUMES\r
   gEfiDxeIplPpiGuid                             ## CONSUMES\r
   gEfiPeiMemoryDiscoveredPpiGuid                ## PRODUCES\r
   gEfiPeiDecompressPpiGuid                      ## SOMETIMES_CONSUMES\r


@@ -103,7 +103,7 @@
   gEfiPeiReset2PpiGuid                          ## SOMETIMES_CONSUMES\r
   gEfiSecHobDataPpiGuid                         ## SOMETIMES_CONSUMES\r
 \r
   gEfiPeiReset2PpiGuid                          ## SOMETIMES_CONSUMES\r
   gEfiSecHobDataPpiGuid                         ## SOMETIMES_CONSUMES\r
 \r

-[Pcd]  \r
+[Pcd]\r

   gEfiMdeModulePkgTokenSpaceGuid.PcdPeiCoreMaxFvSupported                   ## CONSUMES\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdPeiCoreMaxPeimPerFv                     ## CONSUMES\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdPeiCoreMaxPpiSupported                  ## CONSUMES\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdPeiCoreMaxFvSupported                   ## CONSUMES\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdPeiCoreMaxPeimPerFv                     ## CONSUMES\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdPeiCoreMaxPpiSupported                  ## CONSUMES\r


@@ -114,8 +114,8 @@
   gEfiMdeModulePkgTokenSpaceGuid.PcdLoadFixAddressBootTimeCodePageNumber    ## SOMETIMES_CONSUMES\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdLoadFixAddressRuntimeCodePageNumber     ## SOMETIMES_CONSUMES\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdLoadModuleAtFixAddressEnable            ## CONSUMES\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdLoadFixAddressBootTimeCodePageNumber    ## SOMETIMES_CONSUMES\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdLoadFixAddressRuntimeCodePageNumber     ## SOMETIMES_CONSUMES\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdLoadModuleAtFixAddressEnable            ## CONSUMES\r

-  gEfiMdeModulePkgTokenSpaceGuid.PcdShadowPeimOnS3Boot                      ## CONSUMES \r
-  gEfiMdeModulePkgTokenSpaceGuid.PcdShadowPeimOnBoot                        ## CONSUMES \r
+  gEfiMdeModulePkgTokenSpaceGuid.PcdShadowPeimOnS3Boot                      ## CONSUMES\r
+  gEfiMdeModulePkgTokenSpaceGuid.PcdShadowPeimOnBoot                        ## CONSUMES\r

   gEfiMdeModulePkgTokenSpaceGuid.PcdInitValueInTempStack                    ## CONSUMES\r
 \r
 # [BootMode]\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdInitValueInTempStack                    ## CONSUMES\r
 \r
 # [BootMode]\r

diff --git a/MdeModulePkg/Core/Pei/PeiMain/PeiMain.c b/MdeModulePkg/Core/Pei/PeiMain/PeiMain.c
index a52e6f020176811e0a4086db8e0a2f9fc2c44879..e3a301dfe0f22d0d227d8dd9157580bde6247eba 100644 (file)
--- a/MdeModulePkg/Core/Pei/PeiMain/PeiMain.c
+++ b/MdeModulePkg/Core/Pei/PeiMain/PeiMain.c
@@ -1,7 +1,7 @@
 /** @file\r
   Pei Core Main Entry Point\r
 /** @file\r
   Pei Core Main Entry Point\r

-  \r
-Copyright (c) 2006 - 2017, Intel Corporation. All rights reserved.<BR>\r
+\r
+Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r

 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r


@@ -46,7 +46,7 @@ EFI_PEI_SERVICES  gPs = {
   PeiFfsFindNextFile,\r
   PeiFfsFindSectionData,\r
 \r
   PeiFfsFindNextFile,\r
   PeiFfsFindSectionData,\r
 \r

-  PeiInstallPeiMemory,      \r
+  PeiInstallPeiMemory,\r

   PeiAllocatePages,\r
   PeiAllocatePool,\r
   (EFI_PEI_COPY_MEM)CopyMem,\r
   PeiAllocatePages,\r
   PeiAllocatePool,\r
   (EFI_PEI_COPY_MEM)CopyMem,\r


@@ -70,7 +70,7 @@ EFI_PEI_SERVICES  gPs = {
 \r
 /**\r
   Shadow PeiCore module from flash to installed memory.\r
 \r
 /**\r
   Shadow PeiCore module from flash to installed memory.\r

-  \r
+\r

   @param PrivateData    PeiCore's private data structure\r
 \r
   @return PeiCore function address after shadowing.\r
   @param PrivateData    PeiCore's private data structure\r
 \r
   @return PeiCore function address after shadowing.\r


@@ -155,7 +155,7 @@ PeiCore (
   EFI_HOB_HANDOFF_INFO_TABLE  *HandoffInformationTable;\r
   EFI_PEI_TEMPORARY_RAM_DONE_PPI *TemporaryRamDonePpi;\r
   UINTN                       Index;\r
   EFI_HOB_HANDOFF_INFO_TABLE  *HandoffInformationTable;\r
   EFI_PEI_TEMPORARY_RAM_DONE_PPI *TemporaryRamDonePpi;\r
   UINTN                       Index;\r

-  \r
+\r

   //\r
   // Retrieve context passed into PEI Core\r
   //\r
   //\r
   // Retrieve context passed into PEI Core\r
   //\r


@@ -252,7 +252,7 @@ PeiCore (
       // Indicate that PeiCore reenter\r
       //\r
       OldCoreData->PeimDispatcherReenter = TRUE;\r
       // Indicate that PeiCore reenter\r
       //\r
       OldCoreData->PeimDispatcherReenter = TRUE;\r

-      \r
+\r

       if (PcdGet64(PcdLoadModuleAtFixAddressEnable) != 0 && (OldCoreData->HobList.HandoffInformationTable->BootMode != BOOT_ON_S3_RESUME)) {\r
         //\r
         // if Loading Module at Fixed Address is enabled, allocate the PEI code memory range usage bit map array.\r
       if (PcdGet64(PcdLoadModuleAtFixAddressEnable) != 0 && (OldCoreData->HobList.HandoffInformationTable->BootMode != BOOT_ON_S3_RESUME)) {\r
         //\r
         // if Loading Module at Fixed Address is enabled, allocate the PEI code memory range usage bit map array.\r


@@ -270,12 +270,12 @@ PeiCore (
           || (HandoffInformationTable->BootMode != BOOT_ON_S3_RESUME && PcdGetBool (PcdShadowPeimOnBoot))) {\r
         OldCoreData->ShadowedPeiCore = ShadowPeiCore (OldCoreData);\r
       }\r
           || (HandoffInformationTable->BootMode != BOOT_ON_S3_RESUME && PcdGetBool (PcdShadowPeimOnBoot))) {\r
         OldCoreData->ShadowedPeiCore = ShadowPeiCore (OldCoreData);\r
       }\r

-      \r
+\r

       //\r
       // PEI Core has now been shadowed to memory.  Restart PEI Core in memory.\r
       //\r
       OldCoreData->ShadowedPeiCore (SecCoreData, PpiList, OldCoreData);\r
       //\r
       // PEI Core has now been shadowed to memory.  Restart PEI Core in memory.\r
       //\r
       OldCoreData->ShadowedPeiCore (SecCoreData, PpiList, OldCoreData);\r

-      \r
+\r

       //\r
       // Should never reach here.\r
       //\r
       //\r
       // Should never reach here.\r
       //\r


@@ -295,13 +295,13 @@ PeiCore (
 \r
     CpuIo = (VOID*)PrivateData.ServiceTableShadow.CpuIo;\r
     PciCfg = (VOID*)PrivateData.ServiceTableShadow.PciCfg;\r
 \r
     CpuIo = (VOID*)PrivateData.ServiceTableShadow.CpuIo;\r
     PciCfg = (VOID*)PrivateData.ServiceTableShadow.PciCfg;\r

-    \r
+\r

     CopyMem (&PrivateData.ServiceTableShadow, &gPs, sizeof (gPs));\r
     CopyMem (&PrivateData.ServiceTableShadow, &gPs, sizeof (gPs));\r

-    \r
+\r

     PrivateData.ServiceTableShadow.CpuIo  = CpuIo;\r
     PrivateData.ServiceTableShadow.PciCfg = PciCfg;\r
   }\r
     PrivateData.ServiceTableShadow.CpuIo  = CpuIo;\r
     PrivateData.ServiceTableShadow.PciCfg = PciCfg;\r
   }\r

-  \r
+\r

   //\r
   // Cache a pointer to the PEI Services Table that is either in temporary memory or permanent memory\r
   //\r
   //\r
   // Cache a pointer to the PEI Services Table that is either in temporary memory or permanent memory\r
   //\r


@@ -347,9 +347,9 @@ PeiCore (
     ASSERT (PrivateData.FileHandles != NULL);\r
   }\r
   InitializePpiServices      (&PrivateData,    OldCoreData);\r
     ASSERT (PrivateData.FileHandles != NULL);\r
   }\r
   InitializePpiServices      (&PrivateData,    OldCoreData);\r

-  \r
+\r

   //\r
   //\r

-  // Update performance measurements \r
+  // Update performance measurements\r

   //\r
   if (OldCoreData == NULL) {\r
     PERF_EVENT ("SEC"); // Means the end of SEC phase.\r
   //\r
   if (OldCoreData == NULL) {\r
     PERF_EVENT ("SEC"); // Means the end of SEC phase.\r


@@ -367,14 +367,14 @@ PeiCore (
 \r
   //\r
   // Complete PEI Core Service initialization\r
 \r
   //\r
   // Complete PEI Core Service initialization\r

-  //  \r
+  //\r

   InitializeSecurityServices (&PrivateData.Ps, OldCoreData);\r
   InitializeDispatcherData   (&PrivateData,    OldCoreData, SecCoreData);\r
   InitializeImageServices    (&PrivateData,    OldCoreData);\r
 \r
   //\r
   // Perform PEI Core Phase specific actions\r
   InitializeSecurityServices (&PrivateData.Ps, OldCoreData);\r
   InitializeDispatcherData   (&PrivateData,    OldCoreData, SecCoreData);\r
   InitializeImageServices    (&PrivateData,    OldCoreData);\r
 \r
   //\r
   // Perform PEI Core Phase specific actions\r

-  //  \r
+  //\r

   if (OldCoreData == NULL) {\r
     //\r
     // Report Status Code EFI_SW_PC_INIT\r
   if (OldCoreData == NULL) {\r
     //\r
     // Report Status Code EFI_SW_PC_INIT\r


@@ -383,7 +383,7 @@ PeiCore (
       EFI_PROGRESS_CODE,\r
       (EFI_SOFTWARE_PEI_CORE | EFI_SW_PC_INIT)\r
       );\r
       EFI_PROGRESS_CODE,\r
       (EFI_SOFTWARE_PEI_CORE | EFI_SW_PC_INIT)\r
       );\r

-      \r
+\r

     //\r
     // If SEC provided the PpiList, process it.\r
     //\r
     //\r
     // If SEC provided the PpiList, process it.\r
     //\r

diff --git a/MdeModulePkg/Core/Pei/Ppi/Ppi.c b/MdeModulePkg/Core/Pei/Ppi/Ppi.c
index 082c37945802f405422d10f0cccd3d3aca87809c..139cfeda05755e0f623eeb825285b01c83531730 100644 (file)
--- a/MdeModulePkg/Core/Pei/Ppi/Ppi.c
+++ b/MdeModulePkg/Core/Pei/Ppi/Ppi.c
@@ -1,7 +1,7 @@
 /** @file\r
   EFI PEI Core PPI services\r
 /** @file\r
   EFI PEI Core PPI services\r

-  \r
-Copyright (c) 2006 - 2017, Intel Corporation. All rights reserved.<BR>\r
+\r
+Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r

 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r


@@ -19,7 +19,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   Initialize PPI services.\r
 \r
   @param PrivateData     Pointer to the PEI Core data.\r
   Initialize PPI services.\r
 \r
   @param PrivateData     Pointer to the PEI Core data.\r

-  @param OldCoreData     Pointer to old PEI Core data. \r
+  @param OldCoreData     Pointer to old PEI Core data.\r

                          NULL if being run in non-permament memory mode.\r
 \r
 **/\r
                          NULL if being run in non-permament memory mode.\r
 \r
 **/\r


@@ -44,7 +44,7 @@ InitializePpiServices (
   @param TempBottom      Base of old temporary memory\r
   @param TempTop         Top of old temporary memory\r
   @param Offset          Offset of new memory to old temporary memory.\r
   @param TempBottom      Base of old temporary memory\r
   @param TempTop         Top of old temporary memory\r
   @param Offset          Offset of new memory to old temporary memory.\r

-  @param OffsetPositive  Positive flag of Offset value. \r
+  @param OffsetPositive  Positive flag of Offset value.\r

 \r
 **/\r
 VOID\r
 \r
 **/\r
 VOID\r


@@ -105,7 +105,7 @@ ConvertSinglePpiPointer (
 \r
   Migrate PPI Pointers from the temporary memory to PEI installed memory.\r
 \r
 \r
   Migrate PPI Pointers from the temporary memory to PEI installed memory.\r
 \r

-  @param SecCoreData     Points to a data structure containing SEC to PEI handoff data, such as the size \r
+  @param SecCoreData     Points to a data structure containing SEC to PEI handoff data, such as the size\r

                          and location of temporary RAM, the stack location and the BFV location.\r
   @param PrivateData     Pointer to PeiCore's private data structure.\r
 \r
                          and location of temporary RAM, the stack location and the BFV location.\r
   @param PrivateData     Pointer to PeiCore's private data structure.\r
 \r


@@ -145,7 +145,7 @@ ConvertPpiPointers (
         PrivateData->HeapOffset,\r
         PrivateData->HeapOffsetPositive\r
         );\r
         PrivateData->HeapOffset,\r
         PrivateData->HeapOffsetPositive\r
         );\r

-        \r
+\r

       //\r
       // Convert PPI pointer in old Stack\r
       //\r
       //\r
       // Convert PPI pointer in old Stack\r
       //\r


@@ -156,7 +156,7 @@ ConvertPpiPointers (
         PrivateData->StackOffset,\r
         PrivateData->StackOffsetPositive\r
         );\r
         PrivateData->StackOffset,\r
         PrivateData->StackOffsetPositive\r
         );\r

-        \r
+\r

       //\r
       // Convert PPI pointer in old TempRam Hole\r
       //\r
       //\r
       // Convert PPI pointer in old TempRam Hole\r
       //\r


@@ -164,7 +164,7 @@ ConvertPpiPointers (
         if (PrivateData->HoleData[IndexHole].Size == 0) {\r
           continue;\r
         }\r
         if (PrivateData->HoleData[IndexHole].Size == 0) {\r
           continue;\r
         }\r

-        \r
+\r

         ConvertSinglePpiPointer (\r
           &PrivateData->PpiData.PpiListPtrs[Index],\r
           (UINTN)PrivateData->HoleData[IndexHole].Base,\r
         ConvertSinglePpiPointer (\r
           &PrivateData->PpiData.PpiListPtrs[Index],\r
           (UINTN)PrivateData->HoleData[IndexHole].Base,\r


@@ -179,7 +179,7 @@ ConvertPpiPointers (
 \r
 /**\r
 \r
 \r
 /**\r
 \r

-  This function installs an interface in the PEI PPI database by GUID. \r
+  This function installs an interface in the PEI PPI database by GUID.\r

   The purpose of the service is to publish an interface that other parties\r
   can use to call additional PEIMs.\r
 \r
   The purpose of the service is to publish an interface that other parties\r
   can use to call additional PEIMs.\r
 \r


@@ -280,7 +280,7 @@ InternalPeiInstallPpi (
 \r
 /**\r
 \r
 \r
 /**\r
 \r

-  This function installs an interface in the PEI PPI database by GUID. \r
+  This function installs an interface in the PEI PPI database by GUID.\r

   The purpose of the service is to publish an interface that other parties\r
   can use to call additional PEIMs.\r
 \r
   The purpose of the service is to publish an interface that other parties\r
   can use to call additional PEIMs.\r
 \r


@@ -305,9 +305,9 @@ PeiInstallPpi (
 \r
 /**\r
 \r
 \r
 /**\r
 \r

-  This function reinstalls an interface in the PEI PPI database by GUID. \r
-  The purpose of the service is to publish an interface that other parties can \r
-  use to replace an interface of the same name in the protocol database with a \r
+  This function reinstalls an interface in the PEI PPI database by GUID.\r
+  The purpose of the service is to publish an interface that other parties can\r
+  use to replace an interface of the same name in the protocol database with a\r

   different interface.\r
 \r
   @param PeiServices            An indirect pointer to the EFI_PEI_SERVICES table published by the PEI Foundation.\r
   different interface.\r
 \r
   @param PeiServices            An indirect pointer to the EFI_PEI_SERVICES table published by the PEI Foundation.\r


@@ -450,8 +450,8 @@ PeiLocatePpi (
 \r
 /**\r
 \r
 \r
 /**\r
 \r

-  This function installs a notification service to be called back when a given \r
-  interface is installed or reinstalled. The purpose of the service is to publish \r
+  This function installs a notification service to be called back when a given\r
+  interface is installed or reinstalled. The purpose of the service is to publish\r

   an interface that other parties can use to call additional PPIs that may materialize later.\r
 \r
   @param PeiServices        An indirect pointer to the EFI_PEI_SERVICES table published by the PEI Foundation.\r
   an interface that other parties can use to call additional PPIs that may materialize later.\r
 \r
   @param PeiServices        An indirect pointer to the EFI_PEI_SERVICES table published by the PEI Foundation.\r


@@ -579,8 +579,8 @@ InternalPeiNotifyPpi (
 \r
 /**\r
 \r
 \r
 /**\r
 \r

-  This function installs a notification service to be called back when a given \r
-  interface is installed or reinstalled. The purpose of the service is to publish \r
+  This function installs a notification service to be called back when a given\r
+  interface is installed or reinstalled. The purpose of the service is to publish\r

   an interface that other parties can use to call additional PPIs that may materialize later.\r
 \r
   @param PeiServices        An indirect pointer to the EFI_PEI_SERVICES table published by the PEI Foundation.\r
   an interface that other parties can use to call additional PPIs that may materialize later.\r
 \r
   @param PeiServices        An indirect pointer to the EFI_PEI_SERVICES table published by the PEI Foundation.\r

diff --git a/MdeModulePkg/Core/Pei/Security/Security.c b/MdeModulePkg/Core/Pei/Security/Security.c
index 763126057d910b8d34b1837dd85bede8524d15fa..13c6368ffe23e9cea16ea5340614f5c6d6257ed0 100644 (file)
--- a/MdeModulePkg/Core/Pei/Security/Security.c
+++ b/MdeModulePkg/Core/Pei/Security/Security.c
@@ -1,14 +1,14 @@
 /** @file\r
   EFI PEI Core Security services\r
 /** @file\r
   EFI PEI Core Security services\r

-  \r
-Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.<BR>\r
-This program and the accompanying materials                          \r
-are licensed and made available under the terms and conditions of the BSD License         \r
-which accompanies this distribution.  The full text of the license may be found at        \r
-http://opensource.org/licenses/bsd-license.php                                            \r
-                                                                                          \r
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     \r
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             \r
+\r
+Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r
+This program and the accompanying materials\r
+are licensed and made available under the terms and conditions of the BSD License\r
+which accompanies this distribution.  The full text of the license may be found at\r
+http://opensource.org/licenses/bsd-license.php\r
+\r
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r

 \r
 **/\r
 \r
 \r
 **/\r
 \r


@@ -45,7 +45,7 @@ InitializeSecurityServices (
 \r
   Provide a callback for when the security PPI is installed.\r
   This routine will cache installed security PPI into PeiCore's private data.\r
 \r
   Provide a callback for when the security PPI is installed.\r
   This routine will cache installed security PPI into PeiCore's private data.\r

-  \r
+\r

   @param PeiServices        An indirect pointer to the EFI_PEI_SERVICES table published by the PEI Foundation.\r
   @param NotifyDescriptor   The descriptor for the notification event.\r
   @param Ppi                Pointer to the PPI in question.\r
   @param PeiServices        An indirect pointer to the EFI_PEI_SERVICES table published by the PEI Foundation.\r
   @param NotifyDescriptor   The descriptor for the notification event.\r
   @param Ppi                Pointer to the PPI in question.\r


@@ -67,7 +67,7 @@ SecurityPpiNotifyCallback (
   // Get PEI Core private data\r
   //\r
   PrivateData = PEI_CORE_INSTANCE_FROM_PS_THIS (PeiServices);\r
   // Get PEI Core private data\r
   //\r
   PrivateData = PEI_CORE_INSTANCE_FROM_PS_THIS (PeiServices);\r

-  \r
+\r

   //\r
   // If there isn't a security PPI installed, use the one from notification\r
   //\r
   //\r
   // If there isn't a security PPI installed, use the one from notification\r
   //\r

diff --git a/MdeModulePkg/Core/Pei/StatusCode/StatusCode.c b/MdeModulePkg/Core/Pei/StatusCode/StatusCode.c
index a7fb524ff4072dcf2bdebb282dfe2f56af38b2d2..5877b7505546c23c0974b5fd99533f3c27f96de4 100644 (file)
--- a/MdeModulePkg/Core/Pei/StatusCode/StatusCode.c
+++ b/MdeModulePkg/Core/Pei/StatusCode/StatusCode.c
@@ -1,14 +1,14 @@
 /** @file\r
   Pei Core Status Code Support\r
 /** @file\r
   Pei Core Status Code Support\r

-  \r
-Copyright (c) 2006, Intel Corporation. All rights reserved.<BR>\r
-This program and the accompanying materials                          \r
-are licensed and made available under the terms and conditions of the BSD License         \r
-which accompanies this distribution.  The full text of the license may be found at        \r
-http://opensource.org/licenses/bsd-license.php                                            \r
-                                                                                          \r
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     \r
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             \r
+\r
+Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r
+This program and the accompanying materials\r
+are licensed and made available under the terms and conditions of the BSD License\r
+which accompanies this distribution.  The full text of the license may be found at\r
+http://opensource.org/licenses/bsd-license.php\r
+\r
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r

 \r
 **/\r
 \r
 \r
 **/\r
 \r


@@ -35,7 +35,7 @@ EFIAPI
 PeiReportStatusCode (\r
   IN CONST EFI_PEI_SERVICES         **PeiServices,\r
   IN EFI_STATUS_CODE_TYPE           CodeType,\r
 PeiReportStatusCode (\r
   IN CONST EFI_PEI_SERVICES         **PeiServices,\r
   IN EFI_STATUS_CODE_TYPE           CodeType,\r

-  IN EFI_STATUS_CODE_VALUE          Value, \r
+  IN EFI_STATUS_CODE_VALUE          Value,\r

   IN UINT32                         Instance,\r
   IN CONST EFI_GUID                 *CallerId,\r
   IN CONST EFI_STATUS_CODE_DATA     *Data OPTIONAL\r
   IN UINT32                         Instance,\r
   IN CONST EFI_GUID                 *CallerId,\r
   IN CONST EFI_STATUS_CODE_DATA     *Data OPTIONAL\r


@@ -48,10 +48,10 @@ PeiReportStatusCode (
   // Locate StatusCode Ppi.\r
   //\r
   Status = PeiServicesLocatePpi (\r
   // Locate StatusCode Ppi.\r
   //\r
   Status = PeiServicesLocatePpi (\r

-             &gEfiPeiStatusCodePpiGuid,         \r
-             0,                         \r
-             NULL,                      \r
-             (VOID **)&StatusCodePpi                  \r
+             &gEfiPeiStatusCodePpiGuid,\r
+             0,\r
+             NULL,\r
+             (VOID **)&StatusCodePpi\r

              );\r
 \r
   if (!EFI_ERROR (Status)) {\r
              );\r
 \r
   if (!EFI_ERROR (Status)) {\r


@@ -63,11 +63,11 @@ PeiReportStatusCode (
                             CallerId,\r
                             Data\r
                             );\r
                             CallerId,\r
                             Data\r
                             );\r

- \r
-   return Status;   \r
-  } \r
-  \r
-  return  EFI_NOT_AVAILABLE_YET; \r
+\r
+   return Status;\r
+  }\r
+\r
+  return  EFI_NOT_AVAILABLE_YET;\r

 }\r
 \r
 \r
 }\r
 \r
 \r

diff --git a/MdeModulePkg/Core/PiSmmCore/Dependency.c b/MdeModulePkg/Core/PiSmmCore/Dependency.c
index deaf4b445e593d5f1a222588c47c35d4bde8612d..9a1f783575e4f135ef880c1c6aa349e357c53d3d 100644 (file)
--- a/MdeModulePkg/Core/PiSmmCore/Dependency.c
+++ b/MdeModulePkg/Core/PiSmmCore/Dependency.c
@@ -5,14 +5,14 @@
   if a driver can be scheduled for execution.  The criteria for\r
   schedulability is that the dependency expression is satisfied.\r
 \r
   if a driver can be scheduled for execution.  The criteria for\r
   schedulability is that the dependency expression is satisfied.\r
 \r

-  Copyright (c) 2009 - 2010, Intel Corporation. All rights reserved.<BR>\r
-  This program and the accompanying materials are licensed and made available \r
-  under the terms and conditions of the BSD License which accompanies this \r
-  distribution.  The full text of the license may be found at        \r
-  http://opensource.org/licenses/bsd-license.php                                            \r
+  Copyright (c) 2009 - 2018, Intel Corporation. All rights reserved.<BR>\r
+  This program and the accompanying materials are licensed and made available\r
+  under the terms and conditions of the BSD License which accompanies this\r
+  distribution.  The full text of the license may be found at\r
+  http://opensource.org/licenses/bsd-license.php\r

 \r
 \r

-  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     \r
-  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             \r
+  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
+  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r

 \r
 **/\r
 \r
 \r
 **/\r
 \r


@@ -194,10 +194,10 @@ SmmIsSchedulable (
   }\r
 \r
   DEBUG ((DEBUG_DISPATCH, "Evaluate SMM DEPEX for FFS(%g)\n", &DriverEntry->FileName));\r
   }\r
 \r
   DEBUG ((DEBUG_DISPATCH, "Evaluate SMM DEPEX for FFS(%g)\n", &DriverEntry->FileName));\r

-  \r
+\r

   if (DriverEntry->Depex == NULL) {\r
     //\r
   if (DriverEntry->Depex == NULL) {\r
     //\r

-    // A NULL Depex means that the SMM driver is not built correctly.  \r
+    // A NULL Depex means that the SMM driver is not built correctly.\r

     // All SMM drivers must have a valid depex expressiion.\r
     //\r
     DEBUG ((DEBUG_DISPATCH, "  RESULT = FALSE (Depex is empty)\n"));\r
     // All SMM drivers must have a valid depex expressiion.\r
     //\r
     DEBUG ((DEBUG_DISPATCH, "  RESULT = FALSE (Depex is empty)\n"));\r

diff --git a/MdeModulePkg/Core/PiSmmCore/Dispatcher.c b/MdeModulePkg/Core/PiSmmCore/Dispatcher.c
index 0b3b5924d383be4be8c2a134052213d5db0e272c..7ad0d34178532c2fe95f2ce308e3dd784e484591 100644 (file)
--- a/MdeModulePkg/Core/PiSmmCore/Dispatcher.c
+++ b/MdeModulePkg/Core/PiSmmCore/Dispatcher.c
@@ -28,14 +28,14 @@
   Depex - Dependency Expresion.\r
 \r
   Copyright (c) 2014, Hewlett-Packard Development Company, L.P.\r
   Depex - Dependency Expresion.\r
 \r
   Copyright (c) 2014, Hewlett-Packard Development Company, L.P.\r

-  Copyright (c) 2009 - 2017, Intel Corporation. All rights reserved.<BR>\r
-  This program and the accompanying materials are licensed and made available \r
-  under the terms and conditions of the BSD License which accompanies this \r
-  distribution.  The full text of the license may be found at        \r
-  http://opensource.org/licenses/bsd-license.php                                            \r
+  Copyright (c) 2009 - 2018, Intel Corporation. All rights reserved.<BR>\r
+  This program and the accompanying materials are licensed and made available\r
+  under the terms and conditions of the BSD License which accompanies this\r
+  distribution.  The full text of the license may be found at\r
+  http://opensource.org/licenses/bsd-license.php\r

 \r
 \r

-  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     \r
-  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             \r
+  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
+  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r

 \r
 **/\r
 \r
 \r
 **/\r
 \r


@@ -127,18 +127,18 @@ EFI_SECURITY2_ARCH_PROTOCOL *mSecurity2 = NULL;
 //\r
 // The global variable is defined for Loading modules at fixed address feature to track the SMM code\r
 // memory range usage. It is a bit mapped array in which every bit indicates the corresponding\r
 //\r
 // The global variable is defined for Loading modules at fixed address feature to track the SMM code\r
 // memory range usage. It is a bit mapped array in which every bit indicates the corresponding\r

-// memory page available or not. \r
+// memory page available or not.\r

 //\r
 GLOBAL_REMOVE_IF_UNREFERENCED    UINT64                *mSmmCodeMemoryRangeUsageBitMap=NULL;\r
 \r
 /**\r
   To check memory usage bit map array to figure out if the memory range in which the image will be loaded is available or not. If\r
   memory range is available, the function will mark the corresponding bits to 1 which indicates the memory range is used.\r
 //\r
 GLOBAL_REMOVE_IF_UNREFERENCED    UINT64                *mSmmCodeMemoryRangeUsageBitMap=NULL;\r
 \r
 /**\r
   To check memory usage bit map array to figure out if the memory range in which the image will be loaded is available or not. If\r
   memory range is available, the function will mark the corresponding bits to 1 which indicates the memory range is used.\r

-  The function is only invoked when load modules at fixed address feature is enabled. \r
-  \r
+  The function is only invoked when load modules at fixed address feature is enabled.\r
+\r

   @param  ImageBase                The base address the image will be loaded at.\r
   @param  ImageSize                The size of the image\r
   @param  ImageBase                The base address the image will be loaded at.\r
   @param  ImageSize                The size of the image\r

-  \r
+\r

   @retval EFI_SUCCESS              The memory range the image will be loaded in is available\r
   @retval EFI_NOT_FOUND            The memory range the image will be loaded in is not available\r
 **/\r
   @retval EFI_SUCCESS              The memory range the image will be loaded in is available\r
   @retval EFI_NOT_FOUND            The memory range the image will be loaded in is not available\r
 **/\r


@@ -149,7 +149,7 @@ CheckAndMarkFixLoadingMemoryUsageBitMap (
   )\r
 {\r
    UINT32                             SmmCodePageNumber;\r
   )\r
 {\r
    UINT32                             SmmCodePageNumber;\r

-   UINT64                             SmmCodeSize; \r
+   UINT64                             SmmCodeSize;\r

    EFI_PHYSICAL_ADDRESS               SmmCodeBase;\r
    UINTN                              BaseOffsetPageNumber;\r
    UINTN                              TopOffsetPageNumber;\r
    EFI_PHYSICAL_ADDRESS               SmmCodeBase;\r
    UINTN                              BaseOffsetPageNumber;\r
    UINTN                              TopOffsetPageNumber;\r


@@ -160,11 +160,11 @@ CheckAndMarkFixLoadingMemoryUsageBitMap (
    SmmCodePageNumber = PcdGet32(PcdLoadFixAddressSmmCodePageNumber);\r
    SmmCodeSize = EFI_PAGES_TO_SIZE (SmmCodePageNumber);\r
    SmmCodeBase = gLoadModuleAtFixAddressSmramBase;\r
    SmmCodePageNumber = PcdGet32(PcdLoadFixAddressSmmCodePageNumber);\r
    SmmCodeSize = EFI_PAGES_TO_SIZE (SmmCodePageNumber);\r
    SmmCodeBase = gLoadModuleAtFixAddressSmramBase;\r

-   \r
+\r

    //\r
    //\r

-   // If the memory usage bit map is not initialized,  do it. Every bit in the array \r
+   // If the memory usage bit map is not initialized,  do it. Every bit in the array\r

    // indicate the status of the corresponding memory page, available or not\r
    // indicate the status of the corresponding memory page, available or not\r

-   // \r
+   //\r

    if (mSmmCodeMemoryRangeUsageBitMap == NULL) {\r
      mSmmCodeMemoryRangeUsageBitMap = AllocateZeroPool(((SmmCodePageNumber / 64) + 1)*sizeof(UINT64));\r
    }\r
    if (mSmmCodeMemoryRangeUsageBitMap == NULL) {\r
      mSmmCodeMemoryRangeUsageBitMap = AllocateZeroPool(((SmmCodePageNumber / 64) + 1)*sizeof(UINT64));\r
    }\r


@@ -178,11 +178,11 @@ CheckAndMarkFixLoadingMemoryUsageBitMap (
    // see if the memory range for loading the image is in the SMM code range.\r
    //\r
    if (SmmCodeBase + SmmCodeSize <  ImageBase + ImageSize || SmmCodeBase >  ImageBase) {\r
    // see if the memory range for loading the image is in the SMM code range.\r
    //\r
    if (SmmCodeBase + SmmCodeSize <  ImageBase + ImageSize || SmmCodeBase >  ImageBase) {\r

-     return EFI_NOT_FOUND;   \r
-   }   \r
+     return EFI_NOT_FOUND;\r
+   }\r

    //\r
    // Test if the memory is avalaible or not.\r
    //\r
    // Test if the memory is avalaible or not.\r

-   // \r
+   //\r

    BaseOffsetPageNumber = EFI_SIZE_TO_PAGES((UINT32)(ImageBase - SmmCodeBase));\r
    TopOffsetPageNumber  = EFI_SIZE_TO_PAGES((UINT32)(ImageBase + ImageSize - SmmCodeBase));\r
    for (Index = BaseOffsetPageNumber; Index < TopOffsetPageNumber; Index ++) {\r
    BaseOffsetPageNumber = EFI_SIZE_TO_PAGES((UINT32)(ImageBase - SmmCodeBase));\r
    TopOffsetPageNumber  = EFI_SIZE_TO_PAGES((UINT32)(ImageBase + ImageSize - SmmCodeBase));\r
    for (Index = BaseOffsetPageNumber; Index < TopOffsetPageNumber; Index ++) {\r


@@ -190,22 +190,22 @@ CheckAndMarkFixLoadingMemoryUsageBitMap (
        //\r
        // This page is already used.\r
        //\r
        //\r
        // This page is already used.\r
        //\r

-       return EFI_NOT_FOUND;  \r
+       return EFI_NOT_FOUND;\r

      }\r
    }\r
      }\r
    }\r

-   \r
+\r

    //\r
    // Being here means the memory range is available.  So mark the bits for the memory range\r
    //\r
    // Being here means the memory range is available.  So mark the bits for the memory range\r

-   // \r
+   //\r

    for (Index = BaseOffsetPageNumber; Index < TopOffsetPageNumber; Index ++) {\r
      mSmmCodeMemoryRangeUsageBitMap[Index / 64] |= LShiftU64(1, (Index % 64));\r
    }\r
    for (Index = BaseOffsetPageNumber; Index < TopOffsetPageNumber; Index ++) {\r
      mSmmCodeMemoryRangeUsageBitMap[Index / 64] |= LShiftU64(1, (Index % 64));\r
    }\r

-   return  EFI_SUCCESS;   \r
+   return  EFI_SUCCESS;\r

 }\r
 /**\r
   Get the fixed loading address from image header assigned by build tool. This function only be called\r
   when Loading module at Fixed address feature enabled.\r
 }\r
 /**\r
   Get the fixed loading address from image header assigned by build tool. This function only be called\r
   when Loading module at Fixed address feature enabled.\r

-  \r
+\r

   @param  ImageContext              Pointer to the image context structure that describes the PE/COFF\r
                                     image that needs to be examined by this function.\r
   @retval EFI_SUCCESS               An fixed loading address is assigned to this image by build tools .\r
   @param  ImageContext              Pointer to the image context structure that describes the PE/COFF\r
                                     image that needs to be examined by this function.\r
   @retval EFI_SUCCESS               An fixed loading address is assigned to this image by build tools .\r


@@ -398,7 +398,7 @@ SmmLoadImage (
                   &AuthenticationStatus\r
                   );\r
   }\r
                   &AuthenticationStatus\r
                   );\r
   }\r

-  \r
+\r

   if (EFI_ERROR (Status)) {\r
     if (Buffer != NULL) {\r
       gBS->FreePool (Buffer);\r
   if (EFI_ERROR (Status)) {\r
     if (Buffer != NULL) {\r
       gBS->FreePool (Buffer);\r


@@ -422,7 +422,7 @@ SmmLoadImage (
   //\r
   // Verify the Authentication Status through the Security Architectural Protocol\r
   // Only on images that have been read using Firmware Volume protocol.\r
   //\r
   // Verify the Authentication Status through the Security Architectural Protocol\r
   // Only on images that have been read using Firmware Volume protocol.\r

-  // All SMM images are from FV protocol. \r
+  // All SMM images are from FV protocol.\r

   //\r
   if (!EFI_ERROR (SecurityStatus) && (mSecurity != NULL)) {\r
     SecurityStatus = mSecurity->FileAuthenticationState (\r
   //\r
   if (!EFI_ERROR (SecurityStatus) && (mSecurity != NULL)) {\r
     SecurityStatus = mSecurity->FileAuthenticationState (\r


@@ -436,7 +436,7 @@ SmmLoadImage (
     Status = SecurityStatus;\r
     return Status;\r
   }\r
     Status = SecurityStatus;\r
     return Status;\r
   }\r

-  \r
+\r

   //\r
   // Initialize ImageContext\r
   //\r
   //\r
   // Initialize ImageContext\r
   //\r


@@ -468,7 +468,7 @@ SmmLoadImage (
       // following statements is to bypass SmmFreePages\r
       //\r
       PageCount = 0;\r
       // following statements is to bypass SmmFreePages\r
       //\r
       PageCount = 0;\r

-      DstBuffer = (UINTN)gLoadModuleAtFixAddressSmramBase;   \r
+      DstBuffer = (UINTN)gLoadModuleAtFixAddressSmramBase;\r

     } else {\r
        DEBUG ((EFI_D_INFO|EFI_D_LOAD, "LOADING MODULE FIXED ERROR: Failed to load module at fixed address. \n"));\r
        //\r
     } else {\r
        DEBUG ((EFI_D_INFO|EFI_D_LOAD, "LOADING MODULE FIXED ERROR: Failed to load module at fixed address. \n"));\r
        //\r


@@ -476,7 +476,7 @@ SmmLoadImage (
        //\r
        PageCount = (UINTN)EFI_SIZE_TO_PAGES((UINTN)ImageContext.ImageSize + ImageContext.SectionAlignment);\r
        DstBuffer = (UINTN)(-1);\r
        //\r
        PageCount = (UINTN)EFI_SIZE_TO_PAGES((UINTN)ImageContext.ImageSize + ImageContext.SectionAlignment);\r
        DstBuffer = (UINTN)(-1);\r

-     \r
+\r

        Status = SmmAllocatePages (\r
                    AllocateMaxAddress,\r
                    EfiRuntimeServicesCode,\r
        Status = SmmAllocatePages (\r
                    AllocateMaxAddress,\r
                    EfiRuntimeServicesCode,\r


@@ -486,15 +486,15 @@ SmmLoadImage (
        if (EFI_ERROR (Status)) {\r
          if (Buffer != NULL) {\r
            gBS->FreePool (Buffer);\r
        if (EFI_ERROR (Status)) {\r
          if (Buffer != NULL) {\r
            gBS->FreePool (Buffer);\r

-         } \r
+         }\r

          return Status;\r
          return Status;\r

-       }     \r
+       }\r

       ImageContext.ImageAddress = (EFI_PHYSICAL_ADDRESS)DstBuffer;\r
     }\r
   } else {\r
      PageCount = (UINTN)EFI_SIZE_TO_PAGES((UINTN)ImageContext.ImageSize + ImageContext.SectionAlignment);\r
      DstBuffer = (UINTN)(-1);\r
       ImageContext.ImageAddress = (EFI_PHYSICAL_ADDRESS)DstBuffer;\r
     }\r
   } else {\r
      PageCount = (UINTN)EFI_SIZE_TO_PAGES((UINTN)ImageContext.ImageSize + ImageContext.SectionAlignment);\r
      DstBuffer = (UINTN)(-1);\r

-     \r
+\r

      Status = SmmAllocatePages (\r
                   AllocateMaxAddress,\r
                   EfiRuntimeServicesCode,\r
      Status = SmmAllocatePages (\r
                   AllocateMaxAddress,\r
                   EfiRuntimeServicesCode,\r


@@ -507,7 +507,7 @@ SmmLoadImage (
        }\r
        return Status;\r
      }\r
        }\r
        return Status;\r
      }\r

-     \r
+\r

      ImageContext.ImageAddress = (EFI_PHYSICAL_ADDRESS)DstBuffer;\r
   }\r
   //\r
      ImageContext.ImageAddress = (EFI_PHYSICAL_ADDRESS)DstBuffer;\r
   }\r
   //\r


@@ -549,7 +549,7 @@ SmmLoadImage (
   // Save Image EntryPoint in DriverEntry\r
   //\r
   DriverEntry->ImageEntryPoint  = ImageContext.EntryPoint;\r
   // Save Image EntryPoint in DriverEntry\r
   //\r
   DriverEntry->ImageEntryPoint  = ImageContext.EntryPoint;\r

-  DriverEntry->ImageBuffer      = DstBuffer; \r
+  DriverEntry->ImageBuffer      = DstBuffer;\r

   DriverEntry->NumberOfPage     = PageCount;\r
 \r
   //\r
   DriverEntry->NumberOfPage     = PageCount;\r
 \r
   //\r


@@ -698,20 +698,20 @@ SmmLoadImage (
   //\r
   // Free buffer allocated by Fv->ReadSection.\r
   //\r
   //\r
   // Free buffer allocated by Fv->ReadSection.\r
   //\r

-  // The UEFI Boot Services FreePool() function must be used because Fv->ReadSection \r
+  // The UEFI Boot Services FreePool() function must be used because Fv->ReadSection\r

   // used the UEFI Boot Services AllocatePool() function\r
   //\r
   Status = gBS->FreePool(Buffer);\r
   if (!EFI_ERROR (Status) && EFI_ERROR (SecurityStatus)) {\r
     Status = SecurityStatus;\r
   }\r
   // used the UEFI Boot Services AllocatePool() function\r
   //\r
   Status = gBS->FreePool(Buffer);\r
   if (!EFI_ERROR (Status) && EFI_ERROR (SecurityStatus)) {\r
     Status = SecurityStatus;\r
   }\r

-  return Status;  \r
+  return Status;\r

 }\r
 \r
 /**\r
   Preprocess dependency expression and update DriverEntry to reflect the\r
   state of  Before and After dependencies. If DriverEntry->Before\r
 }\r
 \r
 /**\r
   Preprocess dependency expression and update DriverEntry to reflect the\r
   state of  Before and After dependencies. If DriverEntry->Before\r

-  or DriverEntry->After is set it will never be cleared. \r
+  or DriverEntry->After is set it will never be cleared.\r

 \r
   @param  DriverEntry           DriverEntry element to update .\r
 \r
 \r
   @param  DriverEntry           DriverEntry element to update .\r
 \r


@@ -810,7 +810,7 @@ SmmGetDepexSectionAndPreProccess (
   drivers to run. Drain the mScheduledQueue and load and start a PE\r
   image for each driver. Search the mDiscoveredList to see if any driver can\r
   be placed on the mScheduledQueue. If no drivers are placed on the\r
   drivers to run. Drain the mScheduledQueue and load and start a PE\r
   image for each driver. Search the mDiscoveredList to see if any driver can\r
   be placed on the mScheduledQueue. If no drivers are placed on the\r

-  mScheduledQueue exit the function. \r
+  mScheduledQueue exit the function.\r

 \r
   @retval EFI_SUCCESS           All of the SMM Drivers that could be dispatched\r
                                 have been run and the SMM Entry Point has been\r
 \r
   @retval EFI_SUCCESS           All of the SMM Drivers that could be dispatched\r
                                 have been run and the SMM Entry Point has been\r


@@ -945,11 +945,11 @@ SmmDispatcher (
 \r
       if (!PreviousSmmEntryPointRegistered && gSmmCorePrivate->SmmEntryPointRegistered) {\r
         //\r
 \r
       if (!PreviousSmmEntryPointRegistered && gSmmCorePrivate->SmmEntryPointRegistered) {\r
         //\r

-        // Return immediately if the SMM Entry Point was registered by the SMM \r
+        // Return immediately if the SMM Entry Point was registered by the SMM\r

         // Driver that was just dispatched.  The SMM IPL will reinvoke the SMM\r
         // Driver that was just dispatched.  The SMM IPL will reinvoke the SMM\r

-        // Core Dispatcher.  This is required so SMM Mode may be enabled as soon \r
-        // as all the dependent SMM Drivers for SMM Mode have been dispatched.  \r
-        // Once the SMM Entry Point has been registered, then SMM Mode will be \r
+        // Core Dispatcher.  This is required so SMM Mode may be enabled as soon\r
+        // as all the dependent SMM Drivers for SMM Mode have been dispatched.\r
+        // Once the SMM Entry Point has been registered, then SMM Mode will be\r

         // used.\r
         //\r
         gRequestDispatch = TRUE;\r
         // used.\r
         //\r
         gRequestDispatch = TRUE;\r


@@ -1437,14 +1437,14 @@ SmmDriverDispatchHandler (
     //\r
     // Free data allocated by Fv->ReadSection ()\r
     //\r
     //\r
     // Free data allocated by Fv->ReadSection ()\r
     //\r

-    // The UEFI Boot Services FreePool() function must be used because Fv->ReadSection \r
+    // The UEFI Boot Services FreePool() function must be used because Fv->ReadSection\r

     // used the UEFI Boot Services AllocatePool() function\r
     //\r
     gBS->FreePool (AprioriFile);\r
   }\r
 \r
   //\r
     // used the UEFI Boot Services AllocatePool() function\r
     //\r
     gBS->FreePool (AprioriFile);\r
   }\r
 \r
   //\r

-  // Execute the SMM Dispatcher on any newly discovered FVs and previously \r
+  // Execute the SMM Dispatcher on any newly discovered FVs and previously\r

   // discovered SMM drivers that have been discovered but not dispatched.\r
   //\r
   Status = SmmDispatcher ();\r
   // discovered SMM drivers that have been discovered but not dispatched.\r
   //\r
   Status = SmmDispatcher ();\r


@@ -1456,7 +1456,7 @@ SmmDriverDispatchHandler (
     if (*CommBufferSize > 0) {\r
       if (Status == EFI_NOT_READY) {\r
         //\r
     if (*CommBufferSize > 0) {\r
       if (Status == EFI_NOT_READY) {\r
         //\r

-        // If a the SMM Core Entry Point was just registered, then set flag to \r
+        // If a the SMM Core Entry Point was just registered, then set flag to\r

         // request the SMM Dispatcher to be restarted.\r
         //\r
         *(UINT8 *)CommBuffer = COMM_BUFFER_SMM_DISPATCH_RESTART;\r
         // request the SMM Dispatcher to be restarted.\r
         //\r
         *(UINT8 *)CommBuffer = COMM_BUFFER_SMM_DISPATCH_RESTART;\r

diff --git a/MdeModulePkg/Core/PiSmmCore/Handle.c b/MdeModulePkg/Core/PiSmmCore/Handle.c
index 19faac8444141626673dd8974c9d9ae89bc7ccac..b6ce351ec01f91ad0fa3bf75353528b80bb8aa9e 100644 (file)
--- a/MdeModulePkg/Core/PiSmmCore/Handle.c
+++ b/MdeModulePkg/Core/PiSmmCore/Handle.c
@@ -1,14 +1,14 @@
 /** @file\r
   SMM handle & protocol handling.\r
 \r
 /** @file\r
   SMM handle & protocol handling.\r
 \r

-  Copyright (c) 2009 - 2017, Intel Corporation. All rights reserved.<BR>\r
-  This program and the accompanying materials are licensed and made available \r
-  under the terms and conditions of the BSD License which accompanies this \r
-  distribution.  The full text of the license may be found at        \r
-  http://opensource.org/licenses/bsd-license.php                                            \r
-\r
-  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     \r
-  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             \r
+  Copyright (c) 2009 - 2018, Intel Corporation. All rights reserved.<BR>\r
+  This program and the accompanying materials are licensed and made available\r
+  under the terms and conditions of the BSD License which accompanies this\r
+  distribution.  The full text of the license may be found at\r
+  http://opensource.org/licenses/bsd-license.php\r
+\r
+  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
+  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r

 \r
 **/\r
 \r
 \r
 **/\r
 \r

diff --git a/MdeModulePkg/Core/PiSmmCore/InstallConfigurationTable.c b/MdeModulePkg/Core/PiSmmCore/InstallConfigurationTable.c
index 867d1ac4b13a0e488511b2c8447535f0ec619075..b25f5722e21375d9111c304513b2d065b53c02e8 100644 (file)
--- a/MdeModulePkg/Core/PiSmmCore/InstallConfigurationTable.c
+++ b/MdeModulePkg/Core/PiSmmCore/InstallConfigurationTable.c
@@ -1,14 +1,14 @@
 /** @file\r
   System Management System Table Services SmmInstallConfigurationTable service\r
 \r
 /** @file\r
   System Management System Table Services SmmInstallConfigurationTable service\r
 \r

-  Copyright (c) 2009 - 2017, Intel Corporation. All rights reserved.<BR>\r
-  This program and the accompanying materials are licensed and made available \r
-  under the terms and conditions of the BSD License which accompanies this \r
-  distribution.  The full text of the license may be found at        \r
-  http://opensource.org/licenses/bsd-license.php                                            \r
-\r
-  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     \r
-  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             \r
+  Copyright (c) 2009 - 2018, Intel Corporation. All rights reserved.<BR>\r
+  This program and the accompanying materials are licensed and made available\r
+  under the terms and conditions of the BSD License which accompanies this\r
+  distribution.  The full text of the license may be found at\r
+  http://opensource.org/licenses/bsd-license.php\r
+\r
+  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
+  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r

 \r
 **/\r
 \r
 \r
 **/\r
 \r

diff --git a/MdeModulePkg/Core/PiSmmCore/Locate.c b/MdeModulePkg/Core/PiSmmCore/Locate.c
index c174a4dd03b8e513d23987f00aba9b45052f5b5b..3420170b0de8172c84498b695721ced19745bdab 100644 (file)
--- a/MdeModulePkg/Core/PiSmmCore/Locate.c
+++ b/MdeModulePkg/Core/PiSmmCore/Locate.c
@@ -1,14 +1,14 @@
 /** @file\r
   Locate handle functions\r
 \r
 /** @file\r
   Locate handle functions\r
 \r

-  Copyright (c) 2009 - 2017, Intel Corporation. All rights reserved.<BR>\r
-  This program and the accompanying materials are licensed and made available \r
-  under the terms and conditions of the BSD License which accompanies this \r
-  distribution.  The full text of the license may be found at        \r
-  http://opensource.org/licenses/bsd-license.php                                            \r
-\r
-  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     \r
-  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             \r
+  Copyright (c) 2009 - 2018, Intel Corporation. All rights reserved.<BR>\r
+  This program and the accompanying materials are licensed and made available\r
+  under the terms and conditions of the BSD License which accompanies this\r
+  distribution.  The full text of the license may be found at\r
+  http://opensource.org/licenses/bsd-license.php\r
+\r
+  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
+  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r

 \r
 **/\r
 \r
 \r
 **/\r
 \r

diff --git a/MdeModulePkg/Core/PiSmmCore/Notify.c b/MdeModulePkg/Core/PiSmmCore/Notify.c
index 0054fe66aab825cd81903159a05a1960b5b0ec40..6ff011e8740a347515bd852e39ad838dbf2ece65 100644 (file)
--- a/MdeModulePkg/Core/PiSmmCore/Notify.c
+++ b/MdeModulePkg/Core/PiSmmCore/Notify.c
@@ -1,14 +1,14 @@
 /** @file\r
   Support functions for UEFI protocol notification infrastructure.\r
 \r
 /** @file\r
   Support functions for UEFI protocol notification infrastructure.\r
 \r

-  Copyright (c) 2009 - 2015, Intel Corporation. All rights reserved.<BR>\r
-  This program and the accompanying materials are licensed and made available \r
-  under the terms and conditions of the BSD License which accompanies this \r
-  distribution.  The full text of the license may be found at        \r
-  http://opensource.org/licenses/bsd-license.php                                            \r
+  Copyright (c) 2009 - 2018, Intel Corporation. All rights reserved.<BR>\r
+  This program and the accompanying materials are licensed and made available\r
+  under the terms and conditions of the BSD License which accompanies this\r
+  distribution.  The full text of the license may be found at\r
+  http://opensource.org/licenses/bsd-license.php\r

 \r
 \r

-  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     \r
-  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             \r
+  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
+  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r

 \r
 **/\r
 \r
 \r
 **/\r
 \r


@@ -116,7 +116,7 @@ SmmRegisterProtocolNotify (
   }\r
 \r
   if (Function == NULL) {\r
   }\r
 \r
   if (Function == NULL) {\r

-       //\r
+    //\r

     // Get the protocol entry per Protocol\r
     //\r
     ProtEntry = SmmFindProtocolEntry ((EFI_GUID *) Protocol, FALSE);\r
     // Get the protocol entry per Protocol\r
     //\r
     ProtEntry = SmmFindProtocolEntry ((EFI_GUID *) Protocol, FALSE);\r


@@ -126,7 +126,7 @@ SmmRegisterProtocolNotify (
            Link != &ProtEntry->Notify;\r
            Link = Link->ForwardLink) {\r
         //\r
            Link != &ProtEntry->Notify;\r
            Link = Link->ForwardLink) {\r
         //\r

-        // Compare the notification record \r
+        // Compare the notification record\r

         //\r
         if (ProtNotify == (CR(Link, PROTOCOL_NOTIFY, Link, PROTOCOL_NOTIFY_SIGNATURE))){\r
           //\r
         //\r
         if (ProtNotify == (CR(Link, PROTOCOL_NOTIFY, Link, PROTOCOL_NOTIFY_SIGNATURE))){\r
           //\r


@@ -143,7 +143,7 @@ SmmRegisterProtocolNotify (
     // If the registration is not found\r
     //\r
     return EFI_NOT_FOUND;\r
     // If the registration is not found\r
     //\r
     return EFI_NOT_FOUND;\r

-  } \r
+  }\r

 \r
   ProtNotify = NULL;\r
 \r
 \r
   ProtNotify = NULL;\r
 \r

diff --git a/MdeModulePkg/Core/PiSmmCore/PiSmmCore.c b/MdeModulePkg/Core/PiSmmCore/PiSmmCore.c
index 45f40e0e60c7839ee731114a7b430d16a631094e..32c450d8a2acde76438c1ea3e1b4c8d2f68f6d7a 100644 (file)
--- a/MdeModulePkg/Core/PiSmmCore/PiSmmCore.c
+++ b/MdeModulePkg/Core/PiSmmCore/PiSmmCore.c
@@ -2,13 +2,13 @@
   SMM Core Main Entry Point\r
 \r
   Copyright (c) 2009 - 2018, Intel Corporation. All rights reserved.<BR>\r
   SMM Core Main Entry Point\r
 \r
   Copyright (c) 2009 - 2018, Intel Corporation. All rights reserved.<BR>\r

-  This program and the accompanying materials are licensed and made available \r
-  under the terms and conditions of the BSD License which accompanies this \r
-  distribution.  The full text of the license may be found at        \r
-  http://opensource.org/licenses/bsd-license.php                                            \r
+  This program and the accompanying materials are licensed and made available\r
+  under the terms and conditions of the BSD License which accompanies this\r
+  distribution.  The full text of the license may be found at\r
+  http://opensource.org/licenses/bsd-license.php\r

 \r
 \r

-  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     \r
-  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             \r
+  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
+  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r

 \r
 **/\r
 \r
 \r
 **/\r
 \r


@@ -65,7 +65,7 @@ EFI_SMM_SYSTEM_TABLE2  gSmmCoreSmst = {
 \r
 //\r
 // Flag to determine if the platform has performed a legacy boot.\r
 \r
 //\r
 // Flag to determine if the platform has performed a legacy boot.\r

-// If this flag is TRUE, then the runtime code and runtime data associated with the \r
+// If this flag is TRUE, then the runtime code and runtime data associated with the\r

 // SMM IPL are converted to free memory, so the SMM Core must guarantee that is\r
 // does not touch of the code/data associated with the SMM IPL if this flag is TRUE.\r
 //\r
 // SMM IPL are converted to free memory, so the SMM Core must guarantee that is\r
 // does not touch of the code/data associated with the SMM IPL if this flag is TRUE.\r
 //\r


@@ -82,7 +82,7 @@ BOOLEAN  mDuringS3Resume = FALSE;
 //\r
 SMM_CORE_SMI_HANDLERS  mSmmCoreSmiHandlers[] = {\r
   { SmmDriverDispatchHandler,   &gEfiEventDxeDispatchGuid,           NULL, TRUE  },\r
 //\r
 SMM_CORE_SMI_HANDLERS  mSmmCoreSmiHandlers[] = {\r
   { SmmDriverDispatchHandler,   &gEfiEventDxeDispatchGuid,           NULL, TRUE  },\r

-  { SmmReadyToLockHandler,      &gEfiDxeSmmReadyToLockProtocolGuid,  NULL, TRUE }, \r
+  { SmmReadyToLockHandler,      &gEfiDxeSmmReadyToLockProtocolGuid,  NULL, TRUE },\r

   { SmmLegacyBootHandler,       &gEfiEventLegacyBootGuid,            NULL, FALSE },\r
   { SmmExitBootServicesHandler, &gEfiEventExitBootServicesGuid,      NULL, FALSE },\r
   { SmmReadyToBootHandler,      &gEfiEventReadyToBootGuid,           NULL, FALSE },\r
   { SmmLegacyBootHandler,       &gEfiEventLegacyBootGuid,            NULL, FALSE },\r
   { SmmExitBootServicesHandler, &gEfiEventExitBootServicesGuid,      NULL, FALSE },\r
   { SmmReadyToBootHandler,      &gEfiEventReadyToBootGuid,           NULL, FALSE },\r


@@ -132,7 +132,7 @@ SmmEfiNotAvailableYetArg5 (
 \r
 /**\r
   Software SMI handler that is called when a Legacy Boot event is signalled.  The SMM\r
 \r
 /**\r
   Software SMI handler that is called when a Legacy Boot event is signalled.  The SMM\r

-  Core uses this signal to know that a Legacy Boot has been performed and that \r
+  Core uses this signal to know that a Legacy Boot has been performed and that\r

   gSmmCorePrivate that is shared between the UEFI and SMM execution environments can\r
   not be accessed from SMM anymore since that structure is considered free memory by\r
   a legacy OS. Then the SMM Core also install SMM Legacy Boot protocol to notify SMM\r
   gSmmCorePrivate that is shared between the UEFI and SMM execution environments can\r
   not be accessed from SMM anymore since that structure is considered free memory by\r
   a legacy OS. Then the SMM Core also install SMM Legacy Boot protocol to notify SMM\r


@@ -316,9 +316,9 @@ SmmReadyToBootHandler (
 \r
 /**\r
   Software SMI handler that is called when the DxeSmmReadyToLock protocol is added\r
 \r
 /**\r
   Software SMI handler that is called when the DxeSmmReadyToLock protocol is added\r

-  or if gEfiEventReadyToBootGuid is signalled.  This function unregisters the \r
-  Software SMIs that are nor required after SMRAM is locked and installs the \r
-  SMM Ready To Lock Protocol so SMM Drivers are informed that SMRAM is about \r
+  or if gEfiEventReadyToBootGuid is signalled.  This function unregisters the\r
+  Software SMIs that are nor required after SMRAM is locked and installs the\r
+  SMM Ready To Lock Protocol so SMM Drivers are informed that SMRAM is about\r

   to be locked.  It also verifies the SMM CPU I/O 2 Protocol has been installed\r
   and NULLs gBS and gST because they can not longer be used after SMRAM is locked.\r
 \r
   to be locked.  It also verifies the SMM CPU I/O 2 Protocol has been installed\r
   and NULLs gBS and gST because they can not longer be used after SMRAM is locked.\r
 \r


@@ -676,7 +676,7 @@ SmmEntryPoint (
     gSmmCorePrivate->InSmm = TRUE;\r
 \r
     //\r
     gSmmCorePrivate->InSmm = TRUE;\r
 \r
     //\r

-    // Check to see if this is a Synchronous SMI sent through the SMM Communication \r
+    // Check to see if this is a Synchronous SMI sent through the SMM Communication\r

     // Protocol or an Asynchronous SMI\r
     //\r
     CommunicationBuffer = gSmmCorePrivate->CommunicationBuffer;\r
     // Protocol or an Asynchronous SMI\r
     //\r
     CommunicationBuffer = gSmmCorePrivate->CommunicationBuffer;\r


@@ -703,9 +703,9 @@ SmmEntryPoint (
         CommunicateHeader = (EFI_SMM_COMMUNICATE_HEADER *)CommunicationBuffer;\r
         BufferSize -= OFFSET_OF (EFI_SMM_COMMUNICATE_HEADER, Data);\r
         Status = SmiManage (\r
         CommunicateHeader = (EFI_SMM_COMMUNICATE_HEADER *)CommunicationBuffer;\r
         BufferSize -= OFFSET_OF (EFI_SMM_COMMUNICATE_HEADER, Data);\r
         Status = SmiManage (\r

-                   &CommunicateHeader->HeaderGuid, \r
-                   NULL, \r
-                   CommunicateHeader->Data, \r
+                   &CommunicateHeader->HeaderGuid,\r
+                   NULL,\r
+                   CommunicateHeader->Data,\r

                    &BufferSize\r
                    );\r
         //\r
                    &BufferSize\r
                    );\r
         //\r


@@ -723,7 +723,7 @@ SmmEntryPoint (
   // Process Asynchronous SMI sources\r
   //\r
   SmiManage (NULL, NULL, NULL, NULL);\r
   // Process Asynchronous SMI sources\r
   //\r
   SmiManage (NULL, NULL, NULL, NULL);\r

-  \r
+\r

   //\r
   // Call platform hook after Smm Dispatch\r
   //\r
   //\r
   // Call platform hook after Smm Dispatch\r
   //\r


@@ -826,7 +826,7 @@ SmmCoreInstallLoadedImage (
 /**\r
   The Entry Point for SMM Core\r
 \r
 /**\r
   The Entry Point for SMM Core\r
 \r

-  Install DXE Protocols and reload SMM Core into SMRAM and register SMM Core \r
+  Install DXE Protocols and reload SMM Core into SMRAM and register SMM Core\r

   EntryPoint on the SMI vector.\r
 \r
   Note: This function is called for both DXE invocation and SMRAM invocation.\r
   EntryPoint on the SMI vector.\r
 \r
   Note: This function is called for both DXE invocation and SMRAM invocation.\r

diff --git a/MdeModulePkg/Core/PiSmmCore/PiSmmCore.h b/MdeModulePkg/Core/PiSmmCore/PiSmmCore.h
index 2f6032646f46d59fecab8ad68332467d0a5bbc05..2d3447e338b1099d1d18c1795060fcb138594254 100644 (file)
--- a/MdeModulePkg/Core/PiSmmCore/PiSmmCore.h
+++ b/MdeModulePkg/Core/PiSmmCore/PiSmmCore.h
@@ -3,13 +3,13 @@
   internal structure and functions used by SmmCore module.\r
 \r
   Copyright (c) 2009 - 2018, Intel Corporation. All rights reserved.<BR>\r
   internal structure and functions used by SmmCore module.\r
 \r
   Copyright (c) 2009 - 2018, Intel Corporation. All rights reserved.<BR>\r

-  This program and the accompanying materials are licensed and made available \r
-  under the terms and conditions of the BSD License which accompanies this \r
-  distribution.  The full text of the license may be found at        \r
-  http://opensource.org/licenses/bsd-license.php                                            \r
+  This program and the accompanying materials are licensed and made available\r
+  under the terms and conditions of the BSD License which accompanies this\r
+  distribution.  The full text of the license may be found at\r
+  http://opensource.org/licenses/bsd-license.php\r

 \r
 \r

-  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     \r
-  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             \r
+  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
+  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r

 \r
 **/\r
 \r
 \r
 **/\r
 \r


@@ -24,10 +24,10 @@
 #include <Protocol/CpuIo2.h>\r
 #include <Protocol/SmmCommunication.h>\r
 #include <Protocol/SmmAccess2.h>\r
 #include <Protocol/CpuIo2.h>\r
 #include <Protocol/SmmCommunication.h>\r
 #include <Protocol/SmmAccess2.h>\r

-#include <Protocol/FirmwareVolume2.h>   \r
-#include <Protocol/LoadedImage.h>       \r
-#include <Protocol/DevicePath.h>        \r
-#include <Protocol/Security.h>          \r
+#include <Protocol/FirmwareVolume2.h>\r
+#include <Protocol/LoadedImage.h>\r
+#include <Protocol/DevicePath.h>\r
+#include <Protocol/Security.h>\r

 #include <Protocol/Security2.h>\r
 #include <Protocol/SmmExitBootServices.h>\r
 #include <Protocol/SmmLegacyBoot.h>\r
 #include <Protocol/Security2.h>\r
 #include <Protocol/SmmExitBootServices.h>\r
 #include <Protocol/SmmLegacyBoot.h>\r


@@ -52,8 +52,8 @@
 #include <Library/DebugLib.h>\r
 #include <Library/ReportStatusCodeLib.h>\r
 #include <Library/MemoryAllocationLib.h>\r
 #include <Library/DebugLib.h>\r
 #include <Library/ReportStatusCodeLib.h>\r
 #include <Library/MemoryAllocationLib.h>\r

-#include <Library/DevicePathLib.h>             \r
-#include <Library/UefiLib.h>                   \r
+#include <Library/DevicePathLib.h>\r
+#include <Library/UefiLib.h>\r

 #include <Library/UefiBootServicesTableLib.h>\r
 #include <Library/PcdLib.h>\r
 #include <Library/SmmCorePlatformHookLib.h>\r
 #include <Library/UefiBootServicesTableLib.h>\r
 #include <Library/PcdLib.h>\r
 #include <Library/SmmCorePlatformHookLib.h>\r


@@ -136,7 +136,7 @@ typedef struct {
   //\r
   PHYSICAL_ADDRESS                ImageEntryPoint;\r
   //\r
   //\r
   PHYSICAL_ADDRESS                ImageEntryPoint;\r
   //\r

-  // Image Buffer in SMRAM  \r
+  // Image Buffer in SMRAM\r

   //\r
   PHYSICAL_ADDRESS                ImageBuffer;\r
   //\r
   //\r
   PHYSICAL_ADDRESS                ImageBuffer;\r
   //\r

diff --git a/MdeModulePkg/Core/PiSmmCore/PiSmmCore.inf b/MdeModulePkg/Core/PiSmmCore/PiSmmCore.inf
index 09cffb879e6f510eddec20f7ce5055f4e1e11536..a2ff773a746d9dda787aa165db60bc5f6ad4f87e 100644 (file)
--- a/MdeModulePkg/Core/PiSmmCore/PiSmmCore.inf
+++ b/MdeModulePkg/Core/PiSmmCore/PiSmmCore.inf
@@ -46,19 +46,19 @@
 [Packages]\r
   MdePkg/MdePkg.dec\r
   MdeModulePkg/MdeModulePkg.dec\r
 [Packages]\r
   MdePkg/MdePkg.dec\r
   MdeModulePkg/MdeModulePkg.dec\r

-  \r
+\r

 [LibraryClasses]\r
   UefiDriverEntryPoint\r
   BaseLib\r
   BaseMemoryLib\r
   PeCoffLib\r
   PeCoffGetEntryPointLib\r
 [LibraryClasses]\r
   UefiDriverEntryPoint\r
   BaseLib\r
   BaseMemoryLib\r
   PeCoffLib\r
   PeCoffGetEntryPointLib\r

-  CacheMaintenanceLib  \r
+  CacheMaintenanceLib\r

   DebugLib\r
   ReportStatusCodeLib\r
   DebugLib\r
   ReportStatusCodeLib\r

-  DevicePathLib               \r
-  UefiLib                     \r
-  UefiBootServicesTableLib    \r
+  DevicePathLib\r
+  UefiLib\r
+  UefiBootServicesTableLib\r

   MemoryAllocationLib\r
   PcdLib\r
   SmmCorePlatformHookLib\r
   MemoryAllocationLib\r
   PcdLib\r
   SmmCorePlatformHookLib\r

diff --git a/MdeModulePkg/Core/PiSmmCore/PiSmmCoreExtra.uni b/MdeModulePkg/Core/PiSmmCore/PiSmmCoreExtra.uni
index c1ed17534c90b7b4b0dc3f4a1c94e167c1d0ea90..20c329575c1cddfa9be3eb8bdc9eb407b7e750fd 100644 (file)
--- a/MdeModulePkg/Core/PiSmmCore/PiSmmCoreExtra.uni
+++ b/MdeModulePkg/Core/PiSmmCore/PiSmmCoreExtra.uni
@@ -1,7 +1,7 @@
 // /** @file\r
 // PiSmmCore Localized Strings and Content\r
 //\r
 // /** @file\r
 // PiSmmCore Localized Strings and Content\r
 //\r

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

 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r
 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r


@@ -12,8 +12,8 @@
 //\r
 // **/\r
 \r
 //\r
 // **/\r
 \r

-#string STR_PROPERTIES_MODULE_NAME \r
-#language en-US \r
+#string STR_PROPERTIES_MODULE_NAME\r
+#language en-US\r

 "Core SMM Services Driver"\r
 \r
 \r
 "Core SMM Services Driver"\r
 \r
 \r

diff --git a/MdeModulePkg/Core/PiSmmCore/PiSmmCorePrivateData.h b/MdeModulePkg/Core/PiSmmCore/PiSmmCorePrivateData.h
index 8aec7a6568facc26f12ad7b99867a4b1835df66e..2bf9abe4cc916694109b609cc440614b3fd4107a 100644 (file)
--- a/MdeModulePkg/Core/PiSmmCore/PiSmmCorePrivateData.h
+++ b/MdeModulePkg/Core/PiSmmCore/PiSmmCorePrivateData.h
@@ -2,14 +2,14 @@
   The internal header file that declared a data structure that is shared\r
   between the SMM IPL and the SMM Core.\r
 \r
   The internal header file that declared a data structure that is shared\r
   between the SMM IPL and the SMM Core.\r
 \r

-  Copyright (c) 2009 - 2015, Intel Corporation. All rights reserved.<BR>\r
-  This program and the accompanying materials are licensed and made available \r
-  under the terms and conditions of the BSD License which accompanies this \r
-  distribution.  The full text of the license may be found at        \r
-  http://opensource.org/licenses/bsd-license.php                                            \r
+  Copyright (c) 2009 - 2018, Intel Corporation. All rights reserved.<BR>\r
+  This program and the accompanying materials are licensed and made available\r
+  under the terms and conditions of the BSD License which accompanies this\r
+  distribution.  The full text of the license may be found at\r
+  http://opensource.org/licenses/bsd-license.php\r

 \r
 \r

-  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     \r
-  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             \r
+  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
+  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r

 \r
 **/\r
 \r
 \r
 **/\r
 \r


@@ -18,12 +18,12 @@
 \r
 ///\r
 /// Define values for the communications buffer used when gEfiEventDxeDispatchGuid is\r
 \r
 ///\r
 /// Define values for the communications buffer used when gEfiEventDxeDispatchGuid is\r

-/// event signaled.  This event is signaled by the DXE Core each time the DXE Core \r
+/// event signaled.  This event is signaled by the DXE Core each time the DXE Core\r

 /// dispatcher has completed its work.  When this event is signaled, the SMM Core\r
 /// if notified, so the SMM Core can dispatch SMM drivers.  If COMM_BUFFER_SMM_DISPATCH_ERROR\r
 /// is returned in the communication buffer, then an error occurred dispatching SMM\r
 /// dispatcher has completed its work.  When this event is signaled, the SMM Core\r
 /// if notified, so the SMM Core can dispatch SMM drivers.  If COMM_BUFFER_SMM_DISPATCH_ERROR\r
 /// is returned in the communication buffer, then an error occurred dispatching SMM\r

-/// Drivers.  If COMM_BUFFER_SMM_DISPATCH_SUCCESS is returned, then the SMM Core \r
-/// dispatched all the drivers it could.  If COMM_BUFFER_SMM_DISPATCH_RESTART is \r
+/// Drivers.  If COMM_BUFFER_SMM_DISPATCH_SUCCESS is returned, then the SMM Core\r
+/// dispatched all the drivers it could.  If COMM_BUFFER_SMM_DISPATCH_RESTART is\r

 /// returned, then the SMM Core just dispatched the SMM Driver that registered\r
 /// the SMM Entry Point enabling the use of SMM Mode.  In this case, the SMM Core\r
 /// should be notified again to dispatch more SMM Drivers using SMM Mode.\r
 /// returned, then the SMM Core just dispatched the SMM Driver that registered\r
 /// the SMM Entry Point enabling the use of SMM Mode.  In this case, the SMM Core\r
 /// should be notified again to dispatch more SMM Drivers using SMM Mode.\r


@@ -38,13 +38,13 @@
 #define SMM_CORE_PRIVATE_DATA_SIGNATURE  SIGNATURE_32 ('s', 'm', 'm', 'c')\r
 \r
 ///\r
 #define SMM_CORE_PRIVATE_DATA_SIGNATURE  SIGNATURE_32 ('s', 'm', 'm', 'c')\r
 \r
 ///\r

-/// Private structure that is used to share information between the SMM IPL and \r
+/// Private structure that is used to share information between the SMM IPL and\r

 /// the SMM Core.  This structure is allocated from memory of type EfiRuntimeServicesData.\r
 /// the SMM Core.  This structure is allocated from memory of type EfiRuntimeServicesData.\r

-/// Since runtime memory types are converted to available memory when a legacy boot \r
-/// is performed, the SMM Core must not access any fields of this structure if a legacy \r
-/// boot is performed.  As a result, the SMM IPL must create an event notification \r
-/// for the Legacy Boot event and notify the SMM Core that a legacy boot is being \r
-/// performed.  The SMM Core can then use this information to filter accesses to \r
+/// Since runtime memory types are converted to available memory when a legacy boot\r
+/// is performed, the SMM Core must not access any fields of this structure if a legacy\r
+/// boot is performed.  As a result, the SMM IPL must create an event notification\r
+/// for the Legacy Boot event and notify the SMM Core that a legacy boot is being\r
+/// performed.  The SMM Core can then use this information to filter accesses to\r

 /// thos structure.\r
 ///\r
 typedef struct {\r
 /// thos structure.\r
 ///\r
 typedef struct {\r


@@ -70,43 +70,43 @@ typedef struct {
   EFI_SMRAM_DESCRIPTOR            *SmramRanges;\r
 \r
   ///\r
   EFI_SMRAM_DESCRIPTOR            *SmramRanges;\r
 \r
   ///\r

-  /// The SMM Foundation Entry Point.  The SMM Core fills in this field when the \r
-  /// SMM Core is initialized.  The SMM IPL is responsbile for registering this entry \r
-  /// point with the SMM Configuration Protocol.  The SMM Configuration Protocol may \r
+  /// The SMM Foundation Entry Point.  The SMM Core fills in this field when the\r
+  /// SMM Core is initialized.  The SMM IPL is responsbile for registering this entry\r
+  /// point with the SMM Configuration Protocol.  The SMM Configuration Protocol may\r

   /// not be available at the time the SMM IPL and SMM Core are started, so the SMM IPL\r
   /// not be available at the time the SMM IPL and SMM Core are started, so the SMM IPL\r

-  /// sets up a protocol notification on the SMM Configuration Protocol and registers \r
-  /// the SMM Foundation Entry Point as soon as the SMM Configuration Protocol is \r
+  /// sets up a protocol notification on the SMM Configuration Protocol and registers\r
+  /// the SMM Foundation Entry Point as soon as the SMM Configuration Protocol is\r

   /// available.\r
   ///\r
   EFI_SMM_ENTRY_POINT             SmmEntryPoint;\r
   /// available.\r
   ///\r
   EFI_SMM_ENTRY_POINT             SmmEntryPoint;\r

-  \r
+\r

   ///\r
   /// Boolean flag set to TRUE while an SMI is being processed by the SMM Core.\r
   ///\r
   /// Boolean flag set to TRUE while an SMI is being processed by the SMM Core.\r

-  /// \r
+  ///\r

   BOOLEAN                         SmmEntryPointRegistered;\r
 \r
   ///\r
   /// Boolean flag set to TRUE while an SMI is being processed by the SMM Core.\r
   BOOLEAN                         SmmEntryPointRegistered;\r
 \r
   ///\r
   /// Boolean flag set to TRUE while an SMI is being processed by the SMM Core.\r

-  /// \r
+  ///\r

   BOOLEAN                         InSmm;\r
 \r
   ///\r
   /// This field is set by the SMM Core then the SMM Core is initialized.  This field is\r
   /// used by the SMM Base 2 Protocol and SMM Communication Protocol implementations in\r
   BOOLEAN                         InSmm;\r
 \r
   ///\r
   /// This field is set by the SMM Core then the SMM Core is initialized.  This field is\r
   /// used by the SMM Base 2 Protocol and SMM Communication Protocol implementations in\r

-  /// the SMM IPL.  \r
+  /// the SMM IPL.\r

   ///\r
   EFI_SMM_SYSTEM_TABLE2           *Smst;\r
 \r
   ///\r
   ///\r
   EFI_SMM_SYSTEM_TABLE2           *Smst;\r
 \r
   ///\r

-  /// This field is used by the SMM Communicatioon Protocol to pass a buffer into \r
+  /// This field is used by the SMM Communicatioon Protocol to pass a buffer into\r

   /// a software SMI handler and for the software SMI handler to pass a buffer back to\r
   /// a software SMI handler and for the software SMI handler to pass a buffer back to\r

-  /// the caller of the SMM Communication Protocol.  \r
+  /// the caller of the SMM Communication Protocol.\r

   ///\r
   VOID                            *CommunicationBuffer;\r
 \r
   ///\r
   /// This field is used by the SMM Communicatioon Protocol to pass the size of a buffer,\r
   ///\r
   VOID                            *CommunicationBuffer;\r
 \r
   ///\r
   /// This field is used by the SMM Communicatioon Protocol to pass the size of a buffer,\r

-  /// in bytes, into a software SMI handler and for the software SMI handler to pass the \r
+  /// in bytes, into a software SMI handler and for the software SMI handler to pass the\r

   /// size, in bytes, of a buffer back to the caller of the SMM Communication Protocol.\r
   ///\r
   UINTN                           BufferSize;\r
   /// size, in bytes, of a buffer back to the caller of the SMM Communication Protocol.\r
   ///\r
   UINTN                           BufferSize;\r

diff --git a/MdeModulePkg/Core/PiSmmCore/PiSmmIpl.c b/MdeModulePkg/Core/PiSmmCore/PiSmmIpl.c
index 7732693198c7e09aca727b36ccf294c3f3a65935..f8cbe1704bfd78e715c42b983456fa25b1a1efbc 100644 (file)
--- a/MdeModulePkg/Core/PiSmmCore/PiSmmIpl.c
+++ b/MdeModulePkg/Core/PiSmmCore/PiSmmIpl.c
@@ -1,14 +1,14 @@
 /** @file\r
   SMM IPL that produces SMM related runtime protocols and load the SMM Core into SMRAM\r
 \r
 /** @file\r
   SMM IPL that produces SMM related runtime protocols and load the SMM Core into SMRAM\r
 \r

-  Copyright (c) 2009 - 2017, Intel Corporation. All rights reserved.<BR>\r
-  This program and the accompanying materials are licensed and made available \r
-  under the terms and conditions of the BSD License which accompanies this \r
-  distribution.  The full text of the license may be found at        \r
-  http://opensource.org/licenses/bsd-license.php                                            \r
+  Copyright (c) 2009 - 2018, Intel Corporation. All rights reserved.<BR>\r
+  This program and the accompanying materials are licensed and made available\r
+  under the terms and conditions of the BSD License which accompanies this\r
+  distribution.  The full text of the license may be found at\r
+  http://opensource.org/licenses/bsd-license.php\r

 \r
 \r

-  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     \r
-  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             \r
+  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
+  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r

 \r
 **/\r
 \r
 \r
 **/\r
 \r


@@ -92,10 +92,10 @@ SmmBase2GetSmstLocation (
 \r
 /**\r
   Communicates with a registered handler.\r
 \r
 /**\r
   Communicates with a registered handler.\r

-  \r
-  This function provides a service to send and receive messages from a registered \r
-  UEFI service.  This function is part of the SMM Communication Protocol that may \r
-  be called in physical mode prior to SetVirtualAddressMap() and in virtual mode \r
+\r
+  This function provides a service to send and receive messages from a registered\r
+  UEFI service.  This function is part of the SMM Communication Protocol that may\r
+  be called in physical mode prior to SetVirtualAddressMap() and in virtual mode\r

   after SetVirtualAddressMap().\r
 \r
   @param[in] This                The EFI_SMM_COMMUNICATION_PROTOCOL instance.\r
   after SetVirtualAddressMap().\r
 \r
   @param[in] This                The EFI_SMM_COMMUNICATION_PROTOCOL instance.\r


@@ -213,7 +213,7 @@ SmmIplSetVirtualAddressNotify (
   );\r
 \r
 //\r
   );\r
 \r
 //\r

-// Data structure used to declare a table of protocol notifications and event \r
+// Data structure used to declare a table of protocol notifications and event\r

 // notifications required by the SMM IPL\r
 //\r
 typedef struct {\r
 // notifications required by the SMM IPL\r
 //\r
 typedef struct {\r


@@ -289,19 +289,19 @@ EFI_LOAD_FIXED_ADDRESS_CONFIGURATION_TABLE    *mLMFAConfigurationTable = NULL;
 SMM_IPL_EVENT_NOTIFICATION  mSmmIplEvents[] = {\r
   //\r
   // Declare protocol notification on the SMM Configuration protocol.  When this notification is established,\r
 SMM_IPL_EVENT_NOTIFICATION  mSmmIplEvents[] = {\r
   //\r
   // Declare protocol notification on the SMM Configuration protocol.  When this notification is established,\r

-  // the associated event is immediately signalled, so the notification function will be executed and the \r
+  // the associated event is immediately signalled, so the notification function will be executed and the\r

   // SMM Configuration Protocol will be found if it is already in the handle database.\r
   //\r
   { TRUE,  FALSE, &gEfiSmmConfigurationProtocolGuid,  SmmIplSmmConfigurationEventNotify, &gEfiSmmConfigurationProtocolGuid,  TPL_NOTIFY,   NULL },\r
   //\r
   // SMM Configuration Protocol will be found if it is already in the handle database.\r
   //\r
   { TRUE,  FALSE, &gEfiSmmConfigurationProtocolGuid,  SmmIplSmmConfigurationEventNotify, &gEfiSmmConfigurationProtocolGuid,  TPL_NOTIFY,   NULL },\r
   //\r

-  // Declare protocol notification on DxeSmmReadyToLock protocols.  When this notification is established, \r
-  // the associated event is immediately signalled, so the notification function will be executed and the \r
+  // Declare protocol notification on DxeSmmReadyToLock protocols.  When this notification is established,\r
+  // the associated event is immediately signalled, so the notification function will be executed and the\r

   // DXE SMM Ready To Lock Protocol will be found if it is already in the handle database.\r
   //\r
   { TRUE,  TRUE,  &gEfiDxeSmmReadyToLockProtocolGuid, SmmIplReadyToLockEventNotify,      &gEfiDxeSmmReadyToLockProtocolGuid, TPL_CALLBACK, NULL },\r
   //\r
   // Declare event notification on EndOfDxe event.  When this notification is established,\r
   // DXE SMM Ready To Lock Protocol will be found if it is already in the handle database.\r
   //\r
   { TRUE,  TRUE,  &gEfiDxeSmmReadyToLockProtocolGuid, SmmIplReadyToLockEventNotify,      &gEfiDxeSmmReadyToLockProtocolGuid, TPL_CALLBACK, NULL },\r
   //\r
   // Declare event notification on EndOfDxe event.  When this notification is established,\r

-  // the associated event is immediately signalled, so the notification function will be executed and the \r
+  // the associated event is immediately signalled, so the notification function will be executed and the\r

   // SMM End Of Dxe Protocol will be found if it is already in the handle database.\r
   //\r
   { FALSE, TRUE,  &gEfiEndOfDxeEventGroupGuid,        SmmIplGuidedEventNotify,           &gEfiEndOfDxeEventGroupGuid,        TPL_CALLBACK, NULL },\r
   // SMM End Of Dxe Protocol will be found if it is already in the handle database.\r
   //\r
   { FALSE, TRUE,  &gEfiEndOfDxeEventGroupGuid,        SmmIplGuidedEventNotify,           &gEfiEndOfDxeEventGroupGuid,        TPL_CALLBACK, NULL },\r


@@ -321,8 +321,8 @@ SMM_IPL_EVENT_NOTIFICATION  mSmmIplEvents[] = {
   //\r
   { FALSE, TRUE,  &gEfiEventReadyToBootGuid,          SmmIplReadyToLockEventNotify,      &gEfiEventReadyToBootGuid,          TPL_CALLBACK, NULL },\r
   //\r
   //\r
   { FALSE, TRUE,  &gEfiEventReadyToBootGuid,          SmmIplReadyToLockEventNotify,      &gEfiEventReadyToBootGuid,          TPL_CALLBACK, NULL },\r
   //\r

-  // Declare event notification on Legacy Boot Event Group.  This is used to inform the SMM Core that the platform \r
-  // is performing a legacy boot operation, and that the UEFI environment is no longer available and the SMM Core \r
+  // Declare event notification on Legacy Boot Event Group.  This is used to inform the SMM Core that the platform\r
+  // is performing a legacy boot operation, and that the UEFI environment is no longer available and the SMM Core\r

   // must guarantee that it does not access any UEFI related structures outside of SMRAM.\r
   // It is also to inform the SMM Core to notify SMM driver that system enter legacy boot.\r
   //\r
   // must guarantee that it does not access any UEFI related structures outside of SMRAM.\r
   // It is also to inform the SMM Core to notify SMM driver that system enter legacy boot.\r
   //\r


@@ -338,7 +338,7 @@ SMM_IPL_EVENT_NOTIFICATION  mSmmIplEvents[] = {
   //\r
   { FALSE, FALSE, &gEfiEventReadyToBootGuid,          SmmIplGuidedEventNotify,           &gEfiEventReadyToBootGuid,          TPL_CALLBACK, NULL },\r
   //\r
   //\r
   { FALSE, FALSE, &gEfiEventReadyToBootGuid,          SmmIplGuidedEventNotify,           &gEfiEventReadyToBootGuid,          TPL_CALLBACK, NULL },\r
   //\r

-  // Declare event notification on SetVirtualAddressMap() Event Group.  This is used to convert gSmmCorePrivate \r
+  // Declare event notification on SetVirtualAddressMap() Event Group.  This is used to convert gSmmCorePrivate\r

   // and mSmmControl2 from physical addresses to virtual addresses.\r
   //\r
   { FALSE, FALSE, &gEfiEventVirtualAddressChangeGuid, SmmIplSetVirtualAddressNotify,     NULL,                               TPL_CALLBACK, NULL },\r
   // and mSmmControl2 from physical addresses to virtual addresses.\r
   //\r
   { FALSE, FALSE, &gEfiEventVirtualAddressChangeGuid, SmmIplSetVirtualAddressNotify,     NULL,                               TPL_CALLBACK, NULL },\r


@@ -350,7 +350,7 @@ SMM_IPL_EVENT_NOTIFICATION  mSmmIplEvents[] = {
 \r
 /**\r
   Find the maximum SMRAM cache range that covers the range specified by SmramRange.\r
 \r
 /**\r
   Find the maximum SMRAM cache range that covers the range specified by SmramRange.\r

-  \r
+\r

   This function searches and joins all adjacent ranges of SmramRange into a range to be cached.\r
 \r
   @param   SmramRange       The SMRAM range to search from.\r
   This function searches and joins all adjacent ranges of SmramRange into a range to be cached.\r
 \r
   @param   SmramRange       The SMRAM range to search from.\r


@@ -388,7 +388,7 @@ GetSmramCacheRange (
       }\r
     }\r
   } while (FoundAjacentRange);\r
       }\r
     }\r
   } while (FoundAjacentRange);\r

-  \r
+\r

 }\r
 \r
 /**\r
 }\r
 \r
 /**\r


@@ -439,11 +439,11 @@ SmmBase2GetSmstLocation (
   if ((This == NULL) ||(Smst == NULL)) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
   if ((This == NULL) ||(Smst == NULL)) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r

-  \r
+\r

   if (!gSmmCorePrivate->InSmm) {\r
     return EFI_UNSUPPORTED;\r
   }\r
   if (!gSmmCorePrivate->InSmm) {\r
     return EFI_UNSUPPORTED;\r
   }\r

-  \r
+\r

   *Smst = gSmmCorePrivate->Smst;\r
 \r
   return EFI_SUCCESS;\r
   *Smst = gSmmCorePrivate->Smst;\r
 \r
   return EFI_SUCCESS;\r


@@ -451,10 +451,10 @@ SmmBase2GetSmstLocation (
 \r
 /**\r
   Communicates with a registered handler.\r
 \r
 /**\r
   Communicates with a registered handler.\r

-  \r
-  This function provides a service to send and receive messages from a registered \r
-  UEFI service.  This function is part of the SMM Communication Protocol that may \r
-  be called in physical mode prior to SetVirtualAddressMap() and in virtual mode \r
+\r
+  This function provides a service to send and receive messages from a registered\r
+  UEFI service.  This function is part of the SMM Communication Protocol that may\r
+  be called in physical mode prior to SetVirtualAddressMap() and in virtual mode\r

   after SetVirtualAddressMap().\r
 \r
   @param[in] This                The EFI_SMM_COMMUNICATION_PROTOCOL instance.\r
   after SetVirtualAddressMap().\r
 \r
   @param[in] This                The EFI_SMM_COMMUNICATION_PROTOCOL instance.\r


@@ -528,7 +528,7 @@ SmmCommunicationCommunicate (
     }\r
 \r
     //\r
     }\r
 \r
     //\r

-    // Return status from software SMI \r
+    // Return status from software SMI\r

     //\r
     if (CommSize != NULL) {\r
       *CommSize = gSmmCorePrivate->BufferSize;\r
     //\r
     if (CommSize != NULL) {\r
       *CommSize = gSmmCorePrivate->BufferSize;\r


@@ -552,7 +552,7 @@ SmmCommunicationCommunicate (
   if ((!gSmmCorePrivate->InSmm) && (!mSmmAccess->OpenState || mSmmAccess->LockState)) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
   if ((!gSmmCorePrivate->InSmm) && (!mSmmAccess->OpenState || mSmmAccess->LockState)) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r

- \r
+\r

   //\r
   // Save current InSmm state and set InSmm state to TRUE\r
   //\r
   //\r
   // Save current InSmm state and set InSmm state to TRUE\r
   //\r


@@ -564,9 +564,9 @@ SmmCommunicationCommunicate (
   //\r
   TempCommSize -= OFFSET_OF (EFI_SMM_COMMUNICATE_HEADER, Data);\r
   Status = gSmmCorePrivate->Smst->SmiManage (\r
   //\r
   TempCommSize -= OFFSET_OF (EFI_SMM_COMMUNICATE_HEADER, Data);\r
   Status = gSmmCorePrivate->Smst->SmiManage (\r

-                                    &CommunicateHeader->HeaderGuid, \r
-                                    NULL, \r
-                                    CommunicateHeader->Data, \r
+                                    &CommunicateHeader->HeaderGuid,\r
+                                    NULL,\r
+                                    CommunicateHeader->Data,\r

                                     &TempCommSize\r
                                     );\r
   TempCommSize += OFFSET_OF (EFI_SMM_COMMUNICATE_HEADER, Data);\r
                                     &TempCommSize\r
                                     );\r
   TempCommSize += OFFSET_OF (EFI_SMM_COMMUNICATE_HEADER, Data);\r


@@ -599,7 +599,7 @@ SmmIplGuidedEventNotify (
   UINTN                       Size;\r
 \r
   //\r
   UINTN                       Size;\r
 \r
   //\r

-  // Use Guid to initialize EFI_SMM_COMMUNICATE_HEADER structure \r
+  // Use Guid to initialize EFI_SMM_COMMUNICATE_HEADER structure\r

   //\r
   CopyGuid (&mCommunicateHeader.HeaderGuid, (EFI_GUID *)Context);\r
   mCommunicateHeader.MessageLength = 1;\r
   //\r
   CopyGuid (&mCommunicateHeader.HeaderGuid, (EFI_GUID *)Context);\r
   mCommunicateHeader.MessageLength = 1;\r


@@ -664,26 +664,26 @@ SmmIplDxeDispatchEventNotify (
     //\r
     Size = sizeof (mCommunicateHeader);\r
     SmmCommunicationCommunicate (&mSmmCommunication, &mCommunicateHeader, &Size);\r
     //\r
     Size = sizeof (mCommunicateHeader);\r
     SmmCommunicationCommunicate (&mSmmCommunication, &mCommunicateHeader, &Size);\r

-    \r
+\r

     //\r
     // Return if there is no request to restart the SMM Core Dispatcher\r
     //\r
     if (mCommunicateHeader.Data[0] != COMM_BUFFER_SMM_DISPATCH_RESTART) {\r
       return;\r
     }\r
     //\r
     // Return if there is no request to restart the SMM Core Dispatcher\r
     //\r
     if (mCommunicateHeader.Data[0] != COMM_BUFFER_SMM_DISPATCH_RESTART) {\r
       return;\r
     }\r

-      \r
+\r

     //\r
     // Attempt to reset SMRAM cacheability to UC\r
     // Assume CPU AP is available at this time\r
     //\r
     Status = gDS->SetMemorySpaceAttributes(\r
     //\r
     // Attempt to reset SMRAM cacheability to UC\r
     // Assume CPU AP is available at this time\r
     //\r
     Status = gDS->SetMemorySpaceAttributes(\r

-                    mSmramCacheBase, \r
+                    mSmramCacheBase,\r

                     mSmramCacheSize,\r
                     EFI_MEMORY_UC\r
                     );\r
     if (EFI_ERROR (Status)) {\r
       DEBUG ((DEBUG_WARN, "SMM IPL failed to reset SMRAM window to EFI_MEMORY_UC\n"));\r
                     mSmramCacheSize,\r
                     EFI_MEMORY_UC\r
                     );\r
     if (EFI_ERROR (Status)) {\r
       DEBUG ((DEBUG_WARN, "SMM IPL failed to reset SMRAM window to EFI_MEMORY_UC\n"));\r

-    }  \r
+    }\r

 \r
     //\r
     // Close all SMRAM ranges to protect SMRAM\r
 \r
     //\r
     // Close all SMRAM ranges to protect SMRAM\r


@@ -730,7 +730,7 @@ SmmIplSmmConfigurationEventNotify (
   ASSERT_EFI_ERROR (Status);\r
 \r
   //\r
   ASSERT_EFI_ERROR (Status);\r
 \r
   //\r

-  // Set flag to indicate that the SMM Entry Point has been registered which \r
+  // Set flag to indicate that the SMM Entry Point has been registered which\r

   // means that SMIs are now fully operational.\r
   //\r
   gSmmCorePrivate->SmmEntryPointRegistered = TRUE;\r
   // means that SMIs are now fully operational.\r
   //\r
   gSmmCorePrivate->SmmEntryPointRegistered = TRUE;\r


@@ -766,7 +766,7 @@ SmmIplReadyToLockEventNotify (
   if (mSmmLocked) {\r
     return;\r
   }\r
   if (mSmmLocked) {\r
     return;\r
   }\r

-  \r
+\r

   //\r
   // Make sure this notification is for this handler\r
   //\r
   //\r
   // Make sure this notification is for this handler\r
   //\r


@@ -777,7 +777,7 @@ SmmIplReadyToLockEventNotify (
     }\r
   } else {\r
     //\r
     }\r
   } else {\r
     //\r

-    // If SMM is not locked yet and we got here from gEfiEventReadyToBootGuid being \r
+    // If SMM is not locked yet and we got here from gEfiEventReadyToBootGuid being\r

     // signaled, then gEfiDxeSmmReadyToLockProtocolGuid was not installed as expected.\r
     // Print a warning on debug builds.\r
     //\r
     // signaled, then gEfiDxeSmmReadyToLockProtocolGuid was not installed as expected.\r
     // Print a warning on debug builds.\r
     //\r


@@ -797,10 +797,10 @@ SmmIplReadyToLockEventNotify (
   // Lock the SMRAM (Note: Locking SMRAM may not be supported on all platforms)\r
   //\r
   mSmmAccess->Lock (mSmmAccess);\r
   // Lock the SMRAM (Note: Locking SMRAM may not be supported on all platforms)\r
   //\r
   mSmmAccess->Lock (mSmmAccess);\r

-  \r
+\r

   //\r
   //\r

-  // Close protocol and event notification events that do not apply after the \r
-  // DXE SMM Ready To Lock Protocol has been installed or the Ready To Boot \r
+  // Close protocol and event notification events that do not apply after the\r
+  // DXE SMM Ready To Lock Protocol has been installed or the Ready To Boot\r

   // event has been signalled.\r
   //\r
   for (Index = 0; mSmmIplEvents[Index].NotifyFunction != NULL; Index++) {\r
   // event has been signalled.\r
   //\r
   for (Index = 0; mSmmIplEvents[Index].NotifyFunction != NULL; Index++) {\r


@@ -818,7 +818,7 @@ SmmIplReadyToLockEventNotify (
   // Print debug message that the SMRAM window is now locked.\r
   //\r
   DEBUG ((DEBUG_INFO, "SMM IPL locked SMRAM window\n"));\r
   // Print debug message that the SMRAM window is now locked.\r
   //\r
   DEBUG ((DEBUG_INFO, "SMM IPL locked SMRAM window\n"));\r

-  \r
+\r

   //\r
   // Set flag so this operation will not be performed again\r
   //\r
   //\r
   // Set flag so this operation will not be performed again\r
   //\r


@@ -874,7 +874,7 @@ GetPeCoffImageFixLoadingAssignedAddress(
    // Build tool will calculate the smm code size and then patch the PcdLoadFixAddressSmmCodePageNumber\r
    //\r
    SmmCodeSize = EFI_PAGES_TO_SIZE (PcdGet32(PcdLoadFixAddressSmmCodePageNumber));\r
    // Build tool will calculate the smm code size and then patch the PcdLoadFixAddressSmmCodePageNumber\r
    //\r
    SmmCodeSize = EFI_PAGES_TO_SIZE (PcdGet32(PcdLoadFixAddressSmmCodePageNumber));\r

- \r
+\r

    FixLoadingAddress = 0;\r
    Status = EFI_NOT_FOUND;\r
    SmramBase = mLMFAConfigurationTable->SmramBase;\r
    FixLoadingAddress = 0;\r
    Status = EFI_NOT_FOUND;\r
    SmramBase = mLMFAConfigurationTable->SmramBase;\r


@@ -905,9 +905,9 @@ GetPeCoffImageFixLoadingAssignedAddress(
      if (EFI_ERROR (Status)) {\r
        return Status;\r
      }\r
      if (EFI_ERROR (Status)) {\r
        return Status;\r
      }\r

-     \r
+\r

      Status = EFI_NOT_FOUND;\r
      Status = EFI_NOT_FOUND;\r

-     \r
+\r

      if ((SectionHeader.Characteristics & EFI_IMAGE_SCN_CNT_CODE) == 0) {\r
        //\r
        // Build tool saves the offset to SMRAM base as image base in PointerToRelocations & PointerToLineNumbers fields in the\r
      if ((SectionHeader.Characteristics & EFI_IMAGE_SCN_CNT_CODE) == 0) {\r
        //\r
        // Build tool saves the offset to SMRAM base as image base in PointerToRelocations & PointerToLineNumbers fields in the\r


@@ -941,7 +941,7 @@ GetPeCoffImageFixLoadingAssignedAddress(
 /**\r
   Load the SMM Core image into SMRAM and executes the SMM Core from SMRAM.\r
 \r
 /**\r
   Load the SMM Core image into SMRAM and executes the SMM Core from SMRAM.\r
 \r

-  @param[in, out] SmramRange            Descriptor for the range of SMRAM to reload the \r
+  @param[in, out] SmramRange            Descriptor for the range of SMRAM to reload the\r

                                         currently executing image, the rang of SMRAM to\r
                                         hold SMM Core will be excluded.\r
   @param[in, out] SmramRangeSmmCore     Descriptor for the range of SMRAM to hold SMM Core.\r
                                         currently executing image, the rang of SMRAM to\r
                                         hold SMM Core will be excluded.\r
   @param[in, out] SmramRangeSmmCore     Descriptor for the range of SMRAM to hold SMM Core.\r


@@ -967,19 +967,19 @@ ExecuteSmmCoreFromSmram (
 \r
   //\r
   // Search all Firmware Volumes for a PE/COFF image in a file of type SMM_CORE\r
 \r
   //\r
   // Search all Firmware Volumes for a PE/COFF image in a file of type SMM_CORE\r

-  //  \r
+  //\r

   Status = GetSectionFromAnyFvByFileType (\r
   Status = GetSectionFromAnyFvByFileType (\r

-             EFI_FV_FILETYPE_SMM_CORE, \r
+             EFI_FV_FILETYPE_SMM_CORE,\r

              0,\r
              0,\r

-             EFI_SECTION_PE32, \r
+             EFI_SECTION_PE32,\r

              0,\r
              0,\r

-             &SourceBuffer, \r
+             &SourceBuffer,\r

              &SourceSize\r
              );\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
              &SourceSize\r
              );\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r

-  \r
+\r

   //\r
   // Initilize ImageContext\r
   //\r
   //\r
   // Initilize ImageContext\r
   //\r


@@ -994,7 +994,7 @@ ExecuteSmmCoreFromSmram (
     return Status;\r
   }\r
   //\r
     return Status;\r
   }\r
   //\r

-  // if Loading module at Fixed Address feature is enabled, the SMM core driver will be loaded to \r
+  // if Loading module at Fixed Address feature is enabled, the SMM core driver will be loaded to\r

   // the address assigned by build tool.\r
   //\r
   if (PcdGet64(PcdLoadModuleAtFixAddressEnable) != 0) {\r
   // the address assigned by build tool.\r
   //\r
   if (PcdGet64(PcdLoadModuleAtFixAddressEnable) != 0) {\r


@@ -1014,7 +1014,7 @@ ExecuteSmmCoreFromSmram (
     } else {\r
       DEBUG ((EFI_D_INFO, "LOADING MODULE FIXED ERROR: Loading module at fixed address at address failed\n"));\r
       //\r
     } else {\r
       DEBUG ((EFI_D_INFO, "LOADING MODULE FIXED ERROR: Loading module at fixed address at address failed\n"));\r
       //\r

-      // Allocate memory for the image being loaded from the EFI_SRAM_DESCRIPTOR \r
+      // Allocate memory for the image being loaded from the EFI_SRAM_DESCRIPTOR\r

       // specified by SmramRange\r
       //\r
       PageCount = (UINTN)EFI_SIZE_TO_PAGES((UINTN)ImageContext.ImageSize + ImageContext.SectionAlignment);\r
       // specified by SmramRange\r
       //\r
       PageCount = (UINTN)EFI_SIZE_TO_PAGES((UINTN)ImageContext.ImageSize + ImageContext.SectionAlignment);\r


@@ -1035,7 +1035,7 @@ ExecuteSmmCoreFromSmram (
     }\r
   } else {\r
     //\r
     }\r
   } else {\r
     //\r

-    // Allocate memory for the image being loaded from the EFI_SRAM_DESCRIPTOR \r
+    // Allocate memory for the image being loaded from the EFI_SRAM_DESCRIPTOR\r

     // specified by SmramRange\r
     //\r
     PageCount = (UINTN)EFI_SIZE_TO_PAGES((UINTN)ImageContext.ImageSize + ImageContext.SectionAlignment);\r
     // specified by SmramRange\r
     //\r
     PageCount = (UINTN)EFI_SIZE_TO_PAGES((UINTN)ImageContext.ImageSize + ImageContext.SectionAlignment);\r


@@ -1054,7 +1054,7 @@ ExecuteSmmCoreFromSmram (
     //\r
     ImageContext.ImageAddress = SmramRangeSmmCore->CpuStart;\r
   }\r
     //\r
     ImageContext.ImageAddress = SmramRangeSmmCore->CpuStart;\r
   }\r

-  \r
+\r

   ImageContext.ImageAddress += ImageContext.SectionAlignment - 1;\r
   ImageContext.ImageAddress &= ~((EFI_PHYSICAL_ADDRESS)ImageContext.SectionAlignment - 1);\r
 \r
   ImageContext.ImageAddress += ImageContext.SectionAlignment - 1;\r
   ImageContext.ImageAddress &= ~((EFI_PHYSICAL_ADDRESS)ImageContext.SectionAlignment - 1);\r
 \r


@@ -1532,10 +1532,10 @@ GetFullSmramRanges (
 /**\r
   The Entry Point for SMM IPL\r
 \r
 /**\r
   The Entry Point for SMM IPL\r
 \r

-  Load SMM Core into SMRAM, register SMM Core entry point for SMIs, install \r
-  SMM Base 2 Protocol and SMM Communication Protocol, and register for the \r
+  Load SMM Core into SMRAM, register SMM Core entry point for SMIs, install\r
+  SMM Base 2 Protocol and SMM Communication Protocol, and register for the\r

   critical events required to coordinate between DXE and SMM environments.\r
   critical events required to coordinate between DXE and SMM environments.\r

-  \r
+\r

   @param  ImageHandle    The firmware allocated handle for the EFI image.\r
   @param  SystemTable    A pointer to the EFI System Table.\r
 \r
   @param  ImageHandle    The firmware allocated handle for the EFI image.\r
   @param  SystemTable    A pointer to the EFI System Table.\r
 \r


@@ -1561,8 +1561,8 @@ SmmIplEntry (
   EFI_GCD_MEMORY_SPACE_DESCRIPTOR MemDesc;\r
 \r
   //\r
   EFI_GCD_MEMORY_SPACE_DESCRIPTOR MemDesc;\r
 \r
   //\r

-  // Fill in the image handle of the SMM IPL so the SMM Core can use this as the \r
-  // ParentImageHandle field of the Load Image Protocol for all SMM Drivers loaded \r
+  // Fill in the image handle of the SMM IPL so the SMM Core can use this as the\r
+  // ParentImageHandle field of the Load Image Protocol for all SMM Drivers loaded\r

   // by the SMM Core\r
   //\r
   mSmmCorePrivateData.SmmIplImageHandle = ImageHandle;\r
   // by the SMM Core\r
   //\r
   mSmmCorePrivateData.SmmIplImageHandle = ImageHandle;\r


@@ -1591,7 +1591,7 @@ SmmIplEntry (
   // Print debug message that the SMRAM window is now open.\r
   //\r
   DEBUG ((DEBUG_INFO, "SMM IPL opened SMRAM window\n"));\r
   // Print debug message that the SMRAM window is now open.\r
   //\r
   DEBUG ((DEBUG_INFO, "SMM IPL opened SMRAM window\n"));\r

-  \r
+\r

   //\r
   // Find the largest SMRAM range between 1MB and 4GB that is at least 256KB - 4K in size\r
   //\r
   //\r
   // Find the largest SMRAM range between 1MB and 4GB that is at least 256KB - 4K in size\r
   //\r


@@ -1618,8 +1618,8 @@ SmmIplEntry (
     //\r
     // Print debug message showing SMRAM window that will be used by SMM IPL and SMM Core\r
     //\r
     //\r
     // Print debug message showing SMRAM window that will be used by SMM IPL and SMM Core\r
     //\r

-    DEBUG ((DEBUG_INFO, "SMM IPL found SMRAM window %p - %p\n", \r
-      (VOID *)(UINTN)mCurrentSmramRange->CpuStart, \r
+    DEBUG ((DEBUG_INFO, "SMM IPL found SMRAM window %p - %p\n",\r
+      (VOID *)(UINTN)mCurrentSmramRange->CpuStart,\r

       (VOID *)(UINTN)(mCurrentSmramRange->CpuStart + mCurrentSmramRange->PhysicalSize - 1)\r
       ));\r
 \r
       (VOID *)(UINTN)(mCurrentSmramRange->CpuStart + mCurrentSmramRange->PhysicalSize - 1)\r
       ));\r
 \r


@@ -1728,13 +1728,13 @@ SmmIplEntry (
       //\r
       if (CpuArch != NULL) {\r
         SetAttrStatus = gDS->SetMemorySpaceAttributes(\r
       //\r
       if (CpuArch != NULL) {\r
         SetAttrStatus = gDS->SetMemorySpaceAttributes(\r

-                               mSmramCacheBase, \r
+                               mSmramCacheBase,\r

                                mSmramCacheSize,\r
                                EFI_MEMORY_UC\r
                                );\r
         if (EFI_ERROR (SetAttrStatus)) {\r
           DEBUG ((DEBUG_WARN, "SMM IPL failed to reset SMRAM window to EFI_MEMORY_UC\n"));\r
                                mSmramCacheSize,\r
                                EFI_MEMORY_UC\r
                                );\r
         if (EFI_ERROR (SetAttrStatus)) {\r
           DEBUG ((DEBUG_WARN, "SMM IPL failed to reset SMRAM window to EFI_MEMORY_UC\n"));\r

-        }  \r
+        }\r

       }\r
     }\r
   } else {\r
       }\r
     }\r
   } else {\r


@@ -1745,7 +1745,7 @@ SmmIplEntry (
   }\r
 \r
   //\r
   }\r
 \r
   //\r

-  // If the SMM Core could not be loaded then close SMRAM window, free allocated \r
+  // If the SMM Core could not be loaded then close SMRAM window, free allocated\r

   // resources, and return an error so SMM IPL will be unloaded.\r
   //\r
   if (mCurrentSmramRange == NULL || EFI_ERROR (Status)) {\r
   // resources, and return an error so SMM IPL will be unloaded.\r
   //\r
   if (mCurrentSmramRange == NULL || EFI_ERROR (Status)) {\r


@@ -1767,7 +1767,7 @@ SmmIplEntry (
 \r
     return EFI_UNSUPPORTED;\r
   }\r
 \r
     return EFI_UNSUPPORTED;\r
   }\r

-  \r
+\r

   //\r
   // Install SMM Base2 Protocol and SMM Communication Protocol\r
   //\r
   //\r
   // Install SMM Base2 Protocol and SMM Communication Protocol\r
   //\r

diff --git a/MdeModulePkg/Core/PiSmmCore/PiSmmIpl.inf b/MdeModulePkg/Core/PiSmmCore/PiSmmIpl.inf
index 07a765b5d2ce087b486a0d2a468d0190e1d44c1e..445d2f5ced071aa5ed794824c5db71b0fa18dcb5 100644 (file)
--- a/MdeModulePkg/Core/PiSmmCore/PiSmmIpl.inf
+++ b/MdeModulePkg/Core/PiSmmCore/PiSmmIpl.inf
@@ -1,7 +1,7 @@
 ## @file\r
 #  This module provide an SMM CIS compliant implementation of SMM IPL.\r
 #\r
 ## @file\r
 #  This module provide an SMM CIS compliant implementation of SMM IPL.\r
 #\r

-#  Copyright (c) 2009 - 2016, Intel Corporation. All rights reserved.<BR>\r
+#  Copyright (c) 2009 - 2018, Intel Corporation. All rights reserved.<BR>\r

 #\r
 #  This program and the accompanying materials\r
 #  are licensed and made available under the terms and conditions of the BSD License\r
 #\r
 #  This program and the accompanying materials\r
 #  are licensed and made available under the terms and conditions of the BSD License\r


@@ -35,13 +35,13 @@
 [Packages]\r
   MdePkg/MdePkg.dec\r
   MdeModulePkg/MdeModulePkg.dec\r
 [Packages]\r
   MdePkg/MdePkg.dec\r
   MdeModulePkg/MdeModulePkg.dec\r

-  \r
+\r

 [LibraryClasses]\r
   UefiDriverEntryPoint\r
   BaseLib\r
   BaseMemoryLib\r
   PeCoffLib\r
 [LibraryClasses]\r
   UefiDriverEntryPoint\r
   BaseLib\r
   BaseMemoryLib\r
   PeCoffLib\r

-  CacheMaintenanceLib  \r
+  CacheMaintenanceLib\r

   MemoryAllocationLib\r
   DebugLib\r
   UefiBootServicesTableLib\r
   MemoryAllocationLib\r
   DebugLib\r
   UefiBootServicesTableLib\r


@@ -51,7 +51,7 @@
   DxeServicesLib\r
   PcdLib\r
   ReportStatusCodeLib\r
   DxeServicesLib\r
   PcdLib\r
   ReportStatusCodeLib\r

-  \r
+\r

 [Protocols]\r
   gEfiSmmBase2ProtocolGuid                      ## PRODUCES\r
   gEfiSmmCommunicationProtocolGuid              ## PRODUCES\r
 [Protocols]\r
   gEfiSmmBase2ProtocolGuid                      ## PRODUCES\r
   gEfiSmmCommunicationProtocolGuid              ## PRODUCES\r

diff --git a/MdeModulePkg/Core/PiSmmCore/PiSmmIplExtra.uni b/MdeModulePkg/Core/PiSmmCore/PiSmmIplExtra.uni
index 98410d8f0f5ea2bfffbefaee0a4d33abcb87fb19..28cff7cf1a338982201ab2e832c8ce719cd4822f 100644 (file)
--- a/MdeModulePkg/Core/PiSmmCore/PiSmmIplExtra.uni
+++ b/MdeModulePkg/Core/PiSmmCore/PiSmmIplExtra.uni
@@ -1,7 +1,7 @@
 // /** @file\r
 // PiSmmIpl Localized Strings and Content\r
 //\r
 // /** @file\r
 // PiSmmIpl Localized Strings and Content\r
 //\r

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

 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r
 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r


@@ -12,8 +12,8 @@
 //\r
 // **/\r
 \r
 //\r
 // **/\r
 \r

-#string STR_PROPERTIES_MODULE_NAME \r
-#language en-US \r
+#string STR_PROPERTIES_MODULE_NAME\r
+#language en-US\r

 "Core SMM Services Initial Program Loader"\r
 \r
 \r
 "Core SMM Services Initial Program Loader"\r
 \r
 \r

diff --git a/MdeModulePkg/Core/PiSmmCore/Pool.c b/MdeModulePkg/Core/PiSmmCore/Pool.c
index f30af2ae56e8f95d3cd8290c1d17f920b154b2cf..48850413881cd0ea3d6defa7c1033e0cb102f904 100644 (file)
--- a/MdeModulePkg/Core/PiSmmCore/Pool.c
+++ b/MdeModulePkg/Core/PiSmmCore/Pool.c
@@ -1,14 +1,14 @@
 /** @file\r
   SMM Memory pool management functions.\r
 \r
 /** @file\r
   SMM Memory pool management functions.\r
 \r

-  Copyright (c) 2009 - 2017, Intel Corporation. All rights reserved.<BR>\r
-  This program and the accompanying materials are licensed and made available \r
-  under the terms and conditions of the BSD License which accompanies this \r
-  distribution.  The full text of the license may be found at        \r
-  http://opensource.org/licenses/bsd-license.php                                            \r
+  Copyright (c) 2009 - 2018, Intel Corporation. All rights reserved.<BR>\r
+  This program and the accompanying materials are licensed and made available\r
+  under the terms and conditions of the BSD License which accompanies this\r
+  distribution.  The full text of the license may be found at\r
+  http://opensource.org/licenses/bsd-license.php\r

 \r
 \r

-  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     \r
-  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             \r
+  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
+  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r

 \r
 **/\r
 \r
 \r
 **/\r
 \r


@@ -16,7 +16,7 @@
 \r
 LIST_ENTRY  mSmmPoolLists[SmmPoolTypeMax][MAX_POOL_INDEX];\r
 //\r
 \r
 LIST_ENTRY  mSmmPoolLists[SmmPoolTypeMax][MAX_POOL_INDEX];\r
 //\r

-// To cache the SMRAM base since when Loading modules At fixed address feature is enabled, \r
+// To cache the SMRAM base since when Loading modules At fixed address feature is enabled,\r

 // all module is assigned an offset relative the SMRAM base in build time.\r
 //\r
 GLOBAL_REMOVE_IF_UNREFERENCED  EFI_PHYSICAL_ADDRESS       gLoadModuleAtFixAddressSmramBase = 0;\r
 // all module is assigned an offset relative the SMRAM base in build time.\r
 //\r
 GLOBAL_REMOVE_IF_UNREFERENCED  EFI_PHYSICAL_ADDRESS       gLoadModuleAtFixAddressSmramBase = 0;\r

diff --git a/MdeModulePkg/Core/PiSmmCore/Smi.c b/MdeModulePkg/Core/PiSmmCore/Smi.c
index 0c09e7fa102fb0e943629a2fdd9a35c897eac578..99bfa0724c6f23b4e379cb362de0963e64b4cf35 100644 (file)
--- a/MdeModulePkg/Core/PiSmmCore/Smi.c
+++ b/MdeModulePkg/Core/PiSmmCore/Smi.c
@@ -2,13 +2,13 @@
   SMI management.\r
 \r
   Copyright (c) 2009 - 2018, Intel Corporation. All rights reserved.<BR>\r
   SMI management.\r
 \r
   Copyright (c) 2009 - 2018, Intel Corporation. All rights reserved.<BR>\r

-  This program and the accompanying materials are licensed and made available \r
-  under the terms and conditions of the BSD License which accompanies this \r
-  distribution.  The full text of the license may be found at        \r
-  http://opensource.org/licenses/bsd-license.php                                            \r
+  This program and the accompanying materials are licensed and made available\r
+  under the terms and conditions of the BSD License which accompanies this\r
+  distribution.  The full text of the license may be found at\r
+  http://opensource.org/licenses/bsd-license.php\r

 \r
 \r

-  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     \r
-  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             \r
+  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
+  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r

 \r
 **/\r
 \r
 \r
 **/\r
 \r


@@ -113,7 +113,7 @@ SmiManage (
   SMI_HANDLER  *SmiHandler;\r
   BOOLEAN      SuccessReturn;\r
   EFI_STATUS   Status;\r
   SMI_HANDLER  *SmiHandler;\r
   BOOLEAN      SuccessReturn;\r
   EFI_STATUS   Status;\r

-  \r
+\r

   Status = EFI_NOT_FOUND;\r
   SuccessReturn = FALSE;\r
   if (HandlerType == NULL) {\r
   Status = EFI_NOT_FOUND;\r
   SuccessReturn = FALSE;\r
   if (HandlerType == NULL) {\r


@@ -171,7 +171,7 @@ SmiManage (
     case EFI_WARN_INTERRUPT_SOURCE_QUIESCED:\r
       //\r
       // If at least one of the handlers returns EFI_WARN_INTERRUPT_SOURCE_QUIESCED\r
     case EFI_WARN_INTERRUPT_SOURCE_QUIESCED:\r
       //\r
       // If at least one of the handlers returns EFI_WARN_INTERRUPT_SOURCE_QUIESCED\r

-      // then the function will return EFI_SUCCESS. \r
+      // then the function will return EFI_SUCCESS.\r

       //\r
       SuccessReturn = TRUE;\r
       break;\r
       //\r
       SuccessReturn = TRUE;\r
       break;\r

diff --git a/MdeModulePkg/Core/PiSmmCore/SmramProfileRecord.c b/MdeModulePkg/Core/PiSmmCore/SmramProfileRecord.c
index 410e0836fd1641c59cfd83905f32f5a58be4e09d..b586afa7948ec1c1ee24786afd5280a19a02d46f 100644 (file)
--- a/MdeModulePkg/Core/PiSmmCore/SmramProfileRecord.c
+++ b/MdeModulePkg/Core/PiSmmCore/SmramProfileRecord.c
@@ -1,7 +1,7 @@
 /** @file\r
   Support routines for SMRAM profile.\r
 \r
 /** @file\r
   Support routines for SMRAM profile.\r
 \r

-  Copyright (c) 2014 - 2017, Intel Corporation. All rights reserved.<BR>\r
+  Copyright (c) 2014 - 2018, Intel Corporation. All rights reserved.<BR>\r

   This program and the accompanying materials\r
   are licensed and made available under the terms and conditions of the BSD License\r
   which accompanies this distribution.  The full text of the license may be found at\r
   This program and the accompanying materials\r
   are licensed and made available under the terms and conditions of the BSD License\r
   which accompanies this distribution.  The full text of the license may be found at\r


@@ -99,10 +99,10 @@ DumpSmramInfo (
   @param[in, out] ProfileSize       On entry, points to the size in bytes of the ProfileBuffer.\r
                                     On return, points to the size of the data returned in ProfileBuffer.\r
   @param[out]     ProfileBuffer     Profile buffer.\r
   @param[in, out] ProfileSize       On entry, points to the size in bytes of the ProfileBuffer.\r
                                     On return, points to the size of the data returned in ProfileBuffer.\r
   @param[out]     ProfileBuffer     Profile buffer.\r

-                      \r
+\r

   @return EFI_SUCCESS               Get the memory profile data successfully.\r
   @return EFI_UNSUPPORTED           Memory profile is unsupported.\r
   @return EFI_SUCCESS               Get the memory profile data successfully.\r
   @return EFI_UNSUPPORTED           Memory profile is unsupported.\r

-  @return EFI_BUFFER_TO_SMALL       The ProfileSize is too small for the resulting data. \r
+  @return EFI_BUFFER_TO_SMALL       The ProfileSize is too small for the resulting data.\r

                                     ProfileSize is updated with the size required.\r
 \r
 **/\r
                                     ProfileSize is updated with the size required.\r
 \r
 **/\r


@@ -594,7 +594,7 @@ NeedRecordThisDriver (
     //\r
     return TRUE;\r
   }\r
     //\r
     return TRUE;\r
   }\r

-  \r
+\r

   //\r
   // Record FilePath without end node.\r
   //\r
   //\r
   // Record FilePath without end node.\r
   //\r


@@ -1913,10 +1913,10 @@ Done:
   @param[in, out] ProfileSize       On entry, points to the size in bytes of the ProfileBuffer.\r
                                     On return, points to the size of the data returned in ProfileBuffer.\r
   @param[out]     ProfileBuffer     Profile buffer.\r
   @param[in, out] ProfileSize       On entry, points to the size in bytes of the ProfileBuffer.\r
                                     On return, points to the size of the data returned in ProfileBuffer.\r
   @param[out]     ProfileBuffer     Profile buffer.\r

-                      \r
+\r

   @return EFI_SUCCESS               Get the memory profile data successfully.\r
   @return EFI_UNSUPPORTED           Memory profile is unsupported.\r
   @return EFI_SUCCESS               Get the memory profile data successfully.\r
   @return EFI_UNSUPPORTED           Memory profile is unsupported.\r

-  @return EFI_BUFFER_TO_SMALL       The ProfileSize is too small for the resulting data. \r
+  @return EFI_BUFFER_TO_SMALL       The ProfileSize is too small for the resulting data.\r

                                     ProfileSize is updated with the size required.\r
 \r
 **/\r
                                     ProfileSize is updated with the size required.\r
 \r
 **/\r


@@ -1986,7 +1986,7 @@ SmramProfileProtocolRegisterImage (
   EFI_SMM_DRIVER_ENTRY              DriverEntry;\r
   VOID                              *EntryPointInImage;\r
   EFI_GUID                          *Name;\r
   EFI_SMM_DRIVER_ENTRY              DriverEntry;\r
   VOID                              *EntryPointInImage;\r
   EFI_GUID                          *Name;\r

-  \r
+\r

   ZeroMem (&DriverEntry, sizeof (DriverEntry));\r
   Name = GetFileNameFromFilePath (FilePath);\r
   if (Name != NULL) {\r
   ZeroMem (&DriverEntry, sizeof (DriverEntry));\r
   Name = GetFileNameFromFilePath (FilePath);\r
   if (Name != NULL) {\r

diff --git a/MdeModulePkg/Core/RuntimeDxe/RuntimeDxe.inf b/MdeModulePkg/Core/RuntimeDxe/RuntimeDxe.inf
index 035aa9a59609f493a6294af8828bfe4b66cdba16..d66c8b9f09eeda2bf46fa157f2eda71841a4a665 100644 (file)
--- a/MdeModulePkg/Core/RuntimeDxe/RuntimeDxe.inf
+++ b/MdeModulePkg/Core/RuntimeDxe/RuntimeDxe.inf
@@ -5,7 +5,7 @@
 #  CalculateCrc32 boot services table, SetVirtualAddressMap & ConvertPointer\r
 #  runtime services table.\r
 #\r
 #  CalculateCrc32 boot services table, SetVirtualAddressMap & ConvertPointer\r
 #  runtime services table.\r
 #\r

-#  Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.<BR>\r
+#  Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r

 #\r
 #  This program and the accompanying materials\r
 #  are licensed and made available under the terms and conditions of the BSD License\r
 #\r
 #  This program and the accompanying materials\r
 #  are licensed and made available under the terms and conditions of the BSD License\r


@@ -38,7 +38,7 @@
   Crc32.c\r
   Runtime.h\r
   Runtime.c\r
   Crc32.c\r
   Runtime.h\r
   Runtime.c\r

- \r
+\r

 \r
 [Packages]\r
   MdePkg/MdePkg.dec\r
 \r
 [Packages]\r
   MdePkg/MdePkg.dec\r


@@ -57,9 +57,9 @@
 [Protocols]\r
   gEfiRuntimeArchProtocolGuid                   ## PRODUCES\r
   gEfiLoadedImageProtocolGuid                   ## CONSUMES\r
 [Protocols]\r
   gEfiRuntimeArchProtocolGuid                   ## PRODUCES\r
   gEfiLoadedImageProtocolGuid                   ## CONSUMES\r

- \r
+\r

 [depex]\r
   TRUE\r
 \r
 [UserExtensions.TianoCore."ExtraFiles"]\r
 [depex]\r
   TRUE\r
 \r
 [UserExtensions.TianoCore."ExtraFiles"]\r

-  RuntimeDxeExtra.uni
\ No newline at end of file
+  RuntimeDxeExtra.uni\r

diff --git a/MdeModulePkg/Core/RuntimeDxe/RuntimeDxeExtra.uni b/MdeModulePkg/Core/RuntimeDxe/RuntimeDxeExtra.uni
index 06bd6395e88e97c5840ca00052416704ef1ca765..3f06164e09aa18b1a813118e48c8334442abfadb 100644 (file)
--- a/MdeModulePkg/Core/RuntimeDxe/RuntimeDxeExtra.uni
+++ b/MdeModulePkg/Core/RuntimeDxe/RuntimeDxeExtra.uni
@@ -1,7 +1,7 @@
 // /** @file\r
 // RuntimeDxe Localized Strings and Content\r
 //\r
 // /** @file\r
 // RuntimeDxe Localized Strings and Content\r
 //\r

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

 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r
 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r


@@ -12,8 +12,8 @@
 //\r
 // **/\r
 \r
 //\r
 // **/\r
 \r

-#string STR_PROPERTIES_MODULE_NAME \r
-#language en-US \r
+#string STR_PROPERTIES_MODULE_NAME\r
+#language en-US\r

 "Core Runtime Services Driver"\r
 \r
 \r
 "Core Runtime Services Driver"\r
 \r
 \r

diff --git a/MdeModulePkg/Include/Guid/AcpiS3Context.h b/MdeModulePkg/Include/Guid/AcpiS3Context.h
index de0f87cfb51c12aab67e8fb1f88a4126ba9d2b5a..5e256f053bcb44f38aedb98d46d8dd48a232a8d2 100644 (file)
--- a/MdeModulePkg/Include/Guid/AcpiS3Context.h
+++ b/MdeModulePkg/Include/Guid/AcpiS3Context.h
@@ -1,7 +1,7 @@
 /** @file\r
   Definitions for data structures used in S3 resume.\r
 \r
 /** @file\r
   Definitions for data structures used in S3 resume.\r
 \r

-Copyright (c) 2011 - 2012, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2011 - 2018, Intel Corporation. All rights reserved.<BR>\r

 \r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions\r
 \r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions\r


@@ -47,7 +47,7 @@ typedef struct {
   EFI_PHYSICAL_ADDRESS  S3NvsPageTableAddress;\r
   EFI_PHYSICAL_ADDRESS  BootScriptStackBase;\r
   UINT64                BootScriptStackSize;\r
   EFI_PHYSICAL_ADDRESS  S3NvsPageTableAddress;\r
   EFI_PHYSICAL_ADDRESS  BootScriptStackBase;\r
   UINT64                BootScriptStackSize;\r

-  EFI_PHYSICAL_ADDRESS  S3DebugBufferAddress;  \r
+  EFI_PHYSICAL_ADDRESS  S3DebugBufferAddress;\r

 } ACPI_S3_CONTEXT;\r
 \r
 typedef struct {\r
 } ACPI_S3_CONTEXT;\r
 \r
 typedef struct {\r

diff --git a/MdeModulePkg/Include/Guid/BootScriptExecutorVariable.h b/MdeModulePkg/Include/Guid/BootScriptExecutorVariable.h
index 420ccea255e84ed9575a3f5660c4399b03dab63f..e9b70156eba955c85ed214e5b083acf8d3fb6b1f 100644 (file)
--- a/MdeModulePkg/Include/Guid/BootScriptExecutorVariable.h
+++ b/MdeModulePkg/Include/Guid/BootScriptExecutorVariable.h
@@ -1,9 +1,9 @@
 /** @file\r
   Define Name, GUID and data format for an EFI Variable that is used to save the entry point\r
 /** @file\r
   Define Name, GUID and data format for an EFI Variable that is used to save the entry point\r

-  of a code segment which will be loaded and executed by a standalone boot script \r
+  of a code segment which will be loaded and executed by a standalone boot script\r

   executor on S3 boot path.\r
 \r
   executor on S3 boot path.\r
 \r

-  Copyright (c) 2006 - 2010, Intel Corporation. All rights reserved.<BR>\r
+  Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r

 \r
   This program and the accompanying materials\r
   are licensed and made available under the terms and conditions\r
 \r
   This program and the accompanying materials\r
   are licensed and made available under the terms and conditions\r

diff --git a/MdeModulePkg/Include/Guid/CapsuleVendor.h b/MdeModulePkg/Include/Guid/CapsuleVendor.h
index 15ca1055b6dc91d9de495041844d3cf5a101cde5..066bfca5a07ab59f36c5eab8da9837ebec5d5941 100644 (file)
--- a/MdeModulePkg/Include/Guid/CapsuleVendor.h
+++ b/MdeModulePkg/Include/Guid/CapsuleVendor.h
@@ -5,17 +5,17 @@
   * the capsule GUID HOB data structure.\r
   The capsule HOB and variable can be used to store the capsule image start address and length.\r
   They are used by EDKII implementation of capsule update across a system reset.\r
   * the capsule GUID HOB data structure.\r
   The capsule HOB and variable can be used to store the capsule image start address and length.\r
   They are used by EDKII implementation of capsule update across a system reset.\r

-  \r
+\r

   @par Note: EDKII implementation of capsule updating has discarded this capsule GUID HOB data\r
              structure and used one UEFI Capsule HOB (defined in PI Specification 1.2) instead.\r
 \r
   @par Note: EDKII implementation of capsule updating has discarded this capsule GUID HOB data\r
              structure and used one UEFI Capsule HOB (defined in PI Specification 1.2) instead.\r
 \r

-Copyright (c) 2006 - 2011, Intel Corporation. All rights reserved.<BR>\r
-This program and the accompanying materials are licensed and made available under \r
-the terms and conditions of the BSD License that accompanies this distribution.  \r
+Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r
+This program and the accompanying materials are licensed and made available under\r
+the terms and conditions of the BSD License that accompanies this distribution.\r

 The full text of the license may be found at\r
 The full text of the license may be found at\r

-http://opensource.org/licenses/bsd-license.php.                                            \r
+http://opensource.org/licenses/bsd-license.php.\r

 \r
 \r

-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     \r
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r

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


@@ -24,10 +24,10 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #define __EFI_CAPSULE_VENDOR_GUID_H__\r
 \r
 ///\r
 #define __EFI_CAPSULE_VENDOR_GUID_H__\r
 \r
 ///\r

-/// This guid is used as a variable GUID for the capsule variable \r
+/// This guid is used as a variable GUID for the capsule variable\r

 /// if the capsule pointer is passed through reset via a variable.\r
 ///\r
 /// if the capsule pointer is passed through reset via a variable.\r
 ///\r

-/// This guid is also used as a hob GUID for the capsule data \r
+/// This guid is also used as a hob GUID for the capsule data\r

 /// when the capsule pointer is passed from PEI phase to DXE phase.\r
 ///\r
 #define EFI_CAPSULE_VENDOR_GUID  \\r
 /// when the capsule pointer is passed from PEI phase to DXE phase.\r
 ///\r
 #define EFI_CAPSULE_VENDOR_GUID  \\r


@@ -35,12 +35,12 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 \r
 ///\r
 /// Name of capsule variable.\r
 \r
 ///\r
 /// Name of capsule variable.\r

-/// \r
+///\r

 #define EFI_CAPSULE_VARIABLE_NAME L"CapsuleUpdateData"\r
 \r
 ///\r
 /// The data structure of the capsule guid hob entry.\r
 #define EFI_CAPSULE_VARIABLE_NAME L"CapsuleUpdateData"\r
 \r
 ///\r
 /// The data structure of the capsule guid hob entry.\r

-/// Note: EDKII implementation has discarded this structure and used \r
+/// Note: EDKII implementation has discarded this structure and used\r

 ///       UEFI_CAPSULE_HOB instead.\r
 ///\r
 typedef struct {\r
 ///       UEFI_CAPSULE_HOB instead.\r
 ///\r
 typedef struct {\r

diff --git a/MdeModulePkg/Include/Guid/ConnectConInEvent.h b/MdeModulePkg/Include/Guid/ConnectConInEvent.h
index 28dd4b93dea78584b5cd9e4d784fe2ee90f624d7..a587eb85d8f8ec2ccf32a10ce3b4c160400b5c10 100644 (file)
--- a/MdeModulePkg/Include/Guid/ConnectConInEvent.h
+++ b/MdeModulePkg/Include/Guid/ConnectConInEvent.h
@@ -1,8 +1,8 @@
 /** @file\r
 /** @file\r

-  GUID for an event that is signaled on the first attempt to check for a keystroke \r
+  GUID for an event that is signaled on the first attempt to check for a keystroke\r

   from the ConIn device.\r
 \r
   from the ConIn device.\r
 \r

-  Copyright (c) 2012, Intel Corporation. All rights reserved.<BR>\r
+  Copyright (c) 2012 - 2018, Intel Corporation. All rights reserved.<BR>\r

   This program and the accompanying materials\r
   are licensed and made available under the terms and conditions of the BSD License\r
   which accompanies this distribution.  The full text of the license may be found at\r
   This program and the accompanying materials\r
   are licensed and made available under the terms and conditions of the BSD License\r
   which accompanies this distribution.  The full text of the license may be found at\r

diff --git a/MdeModulePkg/Include/Guid/ConsoleInDevice.h b/MdeModulePkg/Include/Guid/ConsoleInDevice.h
index 014594f188de6280dd552af771a9f5c548d29a21..6132124367f6c8b4a7b94c967e15514373aadce7 100644 (file)
--- a/MdeModulePkg/Include/Guid/ConsoleInDevice.h
+++ b/MdeModulePkg/Include/Guid/ConsoleInDevice.h
@@ -1,14 +1,14 @@
 /** @file\r
   This GUID can be installed to the device handle to specify that the device is the console-in device.\r
 /** @file\r
   This GUID can be installed to the device handle to specify that the device is the console-in device.\r

-  \r

 \r
 \r

-Copyright (c) 2006 - 2010, Intel Corporation. All rights reserved.<BR>\r
-This program and the accompanying materials are licensed and made available under \r
-the terms and conditions of the BSD License that accompanies this distribution.  \r
+\r
+Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r
+This program and the accompanying materials are licensed and made available under\r
+the terms and conditions of the BSD License that accompanies this distribution.\r

 The full text of the license may be found at\r
 The full text of the license may be found at\r

-http://opensource.org/licenses/bsd-license.php.                                            \r
+http://opensource.org/licenses/bsd-license.php.\r

 \r
 \r

-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     \r
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r

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

diff --git a/MdeModulePkg/Include/Guid/ConsoleOutDevice.h b/MdeModulePkg/Include/Guid/ConsoleOutDevice.h
index 4d7de3d83f25b9c1abe72569769c9f68d2dc6821..0d366ed78cdcf56fdb7d773b9afcaa73108ac84a 100644 (file)
--- a/MdeModulePkg/Include/Guid/ConsoleOutDevice.h
+++ b/MdeModulePkg/Include/Guid/ConsoleOutDevice.h
@@ -1,13 +1,13 @@
 /** @file\r
   This GUID can be installed to the device handle to specify that the device is the console-out device.\r
 \r
 /** @file\r
   This GUID can be installed to the device handle to specify that the device is the console-out device.\r
 \r

-Copyright (c) 2006 - 2010, Intel Corporation. All rights reserved.<BR>\r
-This program and the accompanying materials are licensed and made available under \r
-the terms and conditions of the BSD License that accompanies this distribution.  \r
+Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r
+This program and the accompanying materials are licensed and made available under\r
+the terms and conditions of the BSD License that accompanies this distribution.\r

 The full text of the license may be found at\r
 The full text of the license may be found at\r

-http://opensource.org/licenses/bsd-license.php.                                            \r
+http://opensource.org/licenses/bsd-license.php.\r

 \r
 \r

-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     \r
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r

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

diff --git a/MdeModulePkg/Include/Guid/Crc32GuidedSectionExtraction.h b/MdeModulePkg/Include/Guid/Crc32GuidedSectionExtraction.h
index 896f0767db375db9a53aa0130fe119bcf66279b9..aebe4d45af8565749a04691103535f78887f1b47 100644 (file)
--- a/MdeModulePkg/Include/Guid/Crc32GuidedSectionExtraction.h
+++ b/MdeModulePkg/Include/Guid/Crc32GuidedSectionExtraction.h
@@ -1,14 +1,14 @@
 /** @file\r
 /** @file\r

-  This file defines CRC32 GUID to specify the CRC32 \r
+  This file defines CRC32 GUID to specify the CRC32\r

   encapsulation scheme for the GUIDed section.\r
 \r
   encapsulation scheme for the GUIDed section.\r
 \r

-Copyright (c) 2006 - 2010, Intel Corporation. All rights reserved.<BR>\r
-This program and the accompanying materials are licensed and made available under \r
-the terms and conditions of the BSD License that accompanies this distribution.  \r
+Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r
+This program and the accompanying materials are licensed and made available under\r
+the terms and conditions of the BSD License that accompanies this distribution.\r

 The full text of the license may be found at\r
 The full text of the license may be found at\r

-http://opensource.org/licenses/bsd-license.php.                                            \r
+http://opensource.org/licenses/bsd-license.php.\r

 \r
 \r

-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     \r
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r

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

diff --git a/MdeModulePkg/Include/Guid/DebugMask.h b/MdeModulePkg/Include/Guid/DebugMask.h
index 1e6beb562e56c4fb58776da614c6099aa8c7e29d..3f5ae716c7a5171dff0e376171f289fad15f4e54 100644 (file)
--- a/MdeModulePkg/Include/Guid/DebugMask.h
+++ b/MdeModulePkg/Include/Guid/DebugMask.h
@@ -2,13 +2,13 @@
 \r
   Debug Mask Protocol.\r
 \r
 \r
   Debug Mask Protocol.\r
 \r

-Copyright (c) 2011, Intel Corporation. All rights reserved.<BR>\r
-This program and the accompanying materials are licensed and made available under \r
-the terms and conditions of the BSD License that accompanies this distribution.  \r
+Copyright (c) 2011 - 2018, Intel Corporation. All rights reserved.<BR>\r
+This program and the accompanying materials are licensed and made available under\r
+the terms and conditions of the BSD License that accompanies this distribution.\r

 The full text of the license may be found at\r
 The full text of the license may be found at\r

-http://opensource.org/licenses/bsd-license.php.                                            \r
+http://opensource.org/licenses/bsd-license.php.\r

 \r
 \r

-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     \r
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r

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


@@ -29,7 +29,7 @@ typedef struct _EFI_DEBUG_MASK_PROTOCOL  EFI_DEBUG_MASK_PROTOCOL;
 \r
 ///\r
 ///\r
 \r
 ///\r
 ///\r

-///  \r
+///\r

 #define EFI_DEBUG_MASK_REVISION        0x00010000\r
 \r
 //\r
 #define EFI_DEBUG_MASK_REVISION        0x00010000\r
 \r
 //\r


@@ -38,11 +38,11 @@ typedef struct _EFI_DEBUG_MASK_PROTOCOL  EFI_DEBUG_MASK_PROTOCOL;
 typedef\r
 EFI_STATUS\r
 (EFIAPI * EFI_GET_DEBUG_MASK) (\r
 typedef\r
 EFI_STATUS\r
 (EFIAPI * EFI_GET_DEBUG_MASK) (\r

-  IN EFI_DEBUG_MASK_PROTOCOL  *This,             \r
-  IN OUT UINTN                *CurrentDebugMask  \r
+  IN EFI_DEBUG_MASK_PROTOCOL  *This,\r
+  IN OUT UINTN                *CurrentDebugMask\r

   );\r
 \r
   );\r
 \r

-typedef \r
+typedef\r

 EFI_STATUS\r
 (EFIAPI *EFI_SET_DEBUG_MASK) (\r
   IN EFI_DEBUG_MASK_PROTOCOL  *This,\r
 EFI_STATUS\r
 (EFIAPI *EFI_SET_DEBUG_MASK) (\r
   IN EFI_DEBUG_MASK_PROTOCOL  *This,\r


@@ -66,7 +66,7 @@ extern EFI_GUID gEfiDebugMaskProtocolGuid;
 ///\r
 #define EFI_GENERIC_VARIABLE_GUID \\r
   { 0x59d1c24f, 0x50f1, 0x401a, {0xb1, 0x01, 0xf3, 0x3e, 0x0d, 0xae, 0xd4, 0x43} }\r
 ///\r
 #define EFI_GENERIC_VARIABLE_GUID \\r
   { 0x59d1c24f, 0x50f1, 0x401a, {0xb1, 0x01, 0xf3, 0x3e, 0x0d, 0xae, 0xd4, 0x43} }\r

-  \r
+\r

 #define DEBUG_MASK_VARIABLE_NAME  L"EFIDebug"\r
 \r
 extern EFI_GUID gEfiGenericVariableGuid;\r
 #define DEBUG_MASK_VARIABLE_NAME  L"EFIDebug"\r
 \r
 extern EFI_GUID gEfiGenericVariableGuid;\r

diff --git a/MdeModulePkg/Include/Guid/DriverSampleHii.h b/MdeModulePkg/Include/Guid/DriverSampleHii.h
index b5e1dbc0999438667d362f1e1cb3ec6625a0b26d..101346aee1b6d2f9e7e69faeb70f5b3f52a3494a 100644 (file)
--- a/MdeModulePkg/Include/Guid/DriverSampleHii.h
+++ b/MdeModulePkg/Include/Guid/DriverSampleHii.h
@@ -1,13 +1,13 @@
 /** @file\r
 /** @file\r

-  GUIDs used as HII FormSet and HII Package list GUID in Driver Sample driver. \r
-  \r
-Copyright (c) 2011, Intel Corporation. All rights reserved.<BR>\r
-This program and the accompanying materials are licensed and made available under \r
-the terms and conditions of the BSD License that accompanies this distribution.  \r
+  GUIDs used as HII FormSet and HII Package list GUID in Driver Sample driver.\r
+\r
+Copyright (c) 2011 - 2018, Intel Corporation. All rights reserved.<BR>\r
+This program and the accompanying materials are licensed and made available under\r
+the terms and conditions of the BSD License that accompanies this distribution.\r

 The full text of the license may be found at\r
 The full text of the license may be found at\r

-http://opensource.org/licenses/bsd-license.php.                                            \r
+http://opensource.org/licenses/bsd-license.php.\r

 \r
 \r

-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     \r
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r

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

diff --git a/MdeModulePkg/Include/Guid/EndOfS3Resume.h b/MdeModulePkg/Include/Guid/EndOfS3Resume.h
index 853aa1afbc174221f92945136efa7ea1a96c647d..c3d8ca0c13c4120ad2a4d35016a505a3a65f2d71 100644 (file)
--- a/MdeModulePkg/Include/Guid/EndOfS3Resume.h
+++ b/MdeModulePkg/Include/Guid/EndOfS3Resume.h
@@ -1,15 +1,15 @@
 /** @file\r
 /** @file\r

-  This GUID will be installed at the end of S3 resume phase as protocol in SMM environment. \r
+  This GUID will be installed at the end of S3 resume phase as protocol in SMM environment.\r

   It allows for SMM drivers to hook this point and do the required tasks.\r
 \r
   It allows for SMM drivers to hook this point and do the required tasks.\r
 \r

-  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>\r
-  This program and the accompanying materials                          \r
-  are licensed and made available under the terms and conditions of the BSD License         \r
-  which accompanies this distribution.  The full text of the license may be found at        \r
-  http://opensource.org/licenses/bsd-license.php                                            \r
+  Copyright (c) 2017 - 2018, Intel Corporation. All rights reserved.<BR>\r
+  This program and the accompanying materials\r
+  are licensed and made available under the terms and conditions of the BSD License\r
+  which accompanies this distribution.  The full text of the license may be found at\r
+  http://opensource.org/licenses/bsd-license.php\r

 \r
 \r

-  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     \r
-  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             \r
+  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
+  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r

 \r
 **/\r
 \r
 \r
 **/\r
 \r

diff --git a/MdeModulePkg/Include/Guid/EventExitBootServiceFailed.h b/MdeModulePkg/Include/Guid/EventExitBootServiceFailed.h
index aa34d459ba8a4a47e4af09f0b5a2ef94b6d0deb6..38eeb8f3ac48376c8849189480db56d9f4797295 100644 (file)
--- a/MdeModulePkg/Include/Guid/EventExitBootServiceFailed.h
+++ b/MdeModulePkg/Include/Guid/EventExitBootServiceFailed.h
@@ -2,7 +2,7 @@
   GUID is the name of events used with ExitBootServices in order to be notified\r
   when this ExitBootServices Call is failed.\r
 \r
   GUID is the name of events used with ExitBootServices in order to be notified\r
   when this ExitBootServices Call is failed.\r
 \r

-  Copyright (c) 2012, Intel Corporation. All rights reserved.<BR>\r
+  Copyright (c) 2012 - 2018, Intel Corporation. All rights reserved.<BR>\r

   This program and the accompanying materials\r
   are licensed and made available under the terms and conditions of the BSD License\r
   which accompanies this distribution.  The full text of the license may be found at\r
   This program and the accompanying materials\r
   are licensed and made available under the terms and conditions of the BSD License\r
   which accompanies this distribution.  The full text of the license may be found at\r


@@ -15,7 +15,7 @@
 \r
 #ifndef __EVENT_EXIT_BOOT_FAILED_GUID_H__\r
 #define __EVENT_EXIT_BOOT_FAILED_GUID_H__\r
 \r
 #ifndef __EVENT_EXIT_BOOT_FAILED_GUID_H__\r
 #define __EVENT_EXIT_BOOT_FAILED_GUID_H__\r

-                                             \r
+\r

 #define EVENT_GROUP_EXIT_BOOT_SERVICES_FAILED \\r
   { 0x4f6c5507, 0x232f, 0x4787, { 0xb9, 0x5e, 0x72, 0xf8, 0x62, 0x49, 0xc, 0xb1 } }\r
 \r
 #define EVENT_GROUP_EXIT_BOOT_SERVICES_FAILED \\r
   { 0x4f6c5507, 0x232f, 0x4787, { 0xb9, 0x5e, 0x72, 0xf8, 0x62, 0x49, 0xc, 0xb1 } }\r
 \r

diff --git a/MdeModulePkg/Include/Guid/FaultTolerantWrite.h b/MdeModulePkg/Include/Guid/FaultTolerantWrite.h
index cb7b454b2bfc723517f8343d1a7fdad0f63d038d..167da464943151b15be9692e57d485ddad482445 100644 (file)
--- a/MdeModulePkg/Include/Guid/FaultTolerantWrite.h
+++ b/MdeModulePkg/Include/Guid/FaultTolerantWrite.h
@@ -4,14 +4,14 @@
  for FTW last write data has been done. The GUID hob will be only built if FTW last write was\r
  still in progress with SpareComplete set and DestinationComplete not set.\r
 \r
  for FTW last write data has been done. The GUID hob will be only built if FTW last write was\r
  still in progress with SpareComplete set and DestinationComplete not set.\r
 \r

-Copyright (c) 2013, Intel Corporation. All rights reserved.<BR>\r
-This program and the accompanying materials are licensed and made available under \r
-the terms and conditions of the BSD License that accompanies this distribution.  \r
+Copyright (c) 2013 - 2018, Intel Corporation. All rights reserved.<BR>\r
+This program and the accompanying materials are licensed and made available under\r
+the terms and conditions of the BSD License that accompanies this distribution.\r

 The full text of the license may be found at\r
 The full text of the license may be found at\r

-http://opensource.org/licenses/bsd-license.php.                                            \r
+http://opensource.org/licenses/bsd-license.php.\r

 \r
 \r

-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     \r
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. \r
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r

 \r
 **/\r
 \r
 \r
 **/\r
 \r

diff --git a/MdeModulePkg/Include/Guid/HiiResourceSampleHii.h b/MdeModulePkg/Include/Guid/HiiResourceSampleHii.h
index 2a86cad7bf2ee7b9bb021c2136a244339decddbf..a7a4aa1c35a9e5edf0e6e7d7c92df26bef051e3f 100644 (file)
--- a/MdeModulePkg/Include/Guid/HiiResourceSampleHii.h
+++ b/MdeModulePkg/Include/Guid/HiiResourceSampleHii.h
@@ -1,13 +1,13 @@
 /** @file\r
 /** @file\r

-  GUID used as HII FormSet GUID in HII Resource Sample driver. \r
-  \r
-Copyright (c) 2011, Intel Corporation. All rights reserved.<BR>\r
-This program and the accompanying materials are licensed and made available under \r
-the terms and conditions of the BSD License that accompanies this distribution.  \r
+  GUID used as HII FormSet GUID in HII Resource Sample driver.\r
+\r
+Copyright (c) 2011 - 2018, Intel Corporation. All rights reserved.<BR>\r
+This program and the accompanying materials are licensed and made available under\r
+the terms and conditions of the BSD License that accompanies this distribution.\r

 The full text of the license may be found at\r
 The full text of the license may be found at\r

-http://opensource.org/licenses/bsd-license.php.                                            \r
+http://opensource.org/licenses/bsd-license.php.\r

 \r
 \r

-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     \r
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r

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

diff --git a/MdeModulePkg/Include/Guid/Ip4Config2Hii.h b/MdeModulePkg/Include/Guid/Ip4Config2Hii.h
index b1b41b92304a4fb6fd164c7e82b826025884026e..e9082101b8a02b26116f5ca18016ce55348efa0f 100644 (file)
--- a/MdeModulePkg/Include/Guid/Ip4Config2Hii.h
+++ b/MdeModulePkg/Include/Guid/Ip4Config2Hii.h
@@ -1,13 +1,13 @@
 /** @file\r
 /** @file\r

-  GUIDs used as HII FormSet and HII Package list GUID in Ip4Dxe driver. \r
-  \r
-Copyright (c) 2015, Intel Corporation. All rights reserved.<BR>\r
-This program and the accompanying materials are licensed and made available under \r
-the terms and conditions of the BSD License that accompanies this distribution.  \r
+  GUIDs used as HII FormSet and HII Package list GUID in Ip4Dxe driver.\r
+\r
+Copyright (c) 2015 - 2018, Intel Corporation. All rights reserved.<BR>\r
+This program and the accompanying materials are licensed and made available under\r
+the terms and conditions of the BSD License that accompanies this distribution.\r

 The full text of the license may be found at\r
 The full text of the license may be found at\r

-http://opensource.org/licenses/bsd-license.php.                                            \r
+http://opensource.org/licenses/bsd-license.php.\r

 \r
 \r

-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     \r
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r

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

diff --git a/MdeModulePkg/Include/Guid/Ip4IScsiConfigHii.h b/MdeModulePkg/Include/Guid/Ip4IScsiConfigHii.h
index 4eb4c828ffdc6cedeeeab3851fef1bb15ed9f3e1..f4031ec4629064c162cdcb5d39e3a1a30e43b598 100644 (file)
--- a/MdeModulePkg/Include/Guid/Ip4IScsiConfigHii.h
+++ b/MdeModulePkg/Include/Guid/Ip4IScsiConfigHii.h
@@ -1,13 +1,13 @@
 /** @file\r
 /** @file\r

-  GUIDs used as HII FormSet and HII Package list GUID in IP4 IScsiDxe driver. \r
-  \r
-Copyright (c) 2011, Intel Corporation. All rights reserved.<BR>\r
-This program and the accompanying materials are licensed and made available under \r
-the terms and conditions of the BSD License that accompanies this distribution.  \r
+  GUIDs used as HII FormSet and HII Package list GUID in IP4 IScsiDxe driver.\r
+\r
+Copyright (c) 2011 - 2018, Intel Corporation. All rights reserved.<BR>\r
+This program and the accompanying materials are licensed and made available under\r
+the terms and conditions of the BSD License that accompanies this distribution.\r

 The full text of the license may be found at\r
 The full text of the license may be found at\r

-http://opensource.org/licenses/bsd-license.php.                                            \r
+http://opensource.org/licenses/bsd-license.php.\r

 \r
 \r

-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     \r
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r

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

diff --git a/MdeModulePkg/Include/Guid/LoadModuleAtFixedAddress.h b/MdeModulePkg/Include/Guid/LoadModuleAtFixedAddress.h
index ec467bbcb203687fdc2926217d99e674fa808a6f..b755da64607fc931216f2729022c8cfabe75b355 100644 (file)
--- a/MdeModulePkg/Include/Guid/LoadModuleAtFixedAddress.h
+++ b/MdeModulePkg/Include/Guid/LoadModuleAtFixedAddress.h
@@ -1,18 +1,18 @@
 /** @file\r
   This file defines a configuration Table Guid for Load module at fixed address.\r
 /** @file\r
   This file defines a configuration Table Guid for Load module at fixed address.\r

-   \r
-  This configuration table is to hold  the top address below which the Dxe runtime code and \r
-  boot time code will be loaded and Tseg base. When this feature is enabled, Build tools will assigned \r
+\r
+  This configuration table is to hold  the top address below which the Dxe runtime code and\r
+  boot time code will be loaded and Tseg base. When this feature is enabled, Build tools will assigned\r

   module loading address relative to these two addresses.\r
   module loading address relative to these two addresses.\r

-  \r

 \r
 \r

-Copyright (c) 2010, Intel Corporation. All rights reserved.<BR>\r
-This program and the accompanying materials are licensed and made available under \r
-the terms and conditions of the BSD License that accompanies this distribution.  \r
+\r
+Copyright (c) 2010 - 2018, Intel Corporation. All rights reserved.<BR>\r
+This program and the accompanying materials are licensed and made available under\r
+the terms and conditions of the BSD License that accompanies this distribution.\r

 The full text of the license may be found at\r
 The full text of the license may be found at\r

-http://opensource.org/licenses/bsd-license.php.                                            \r
+http://opensource.org/licenses/bsd-license.php.\r

 \r
 \r

-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     \r
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r

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

diff --git a/MdeModulePkg/Include/Guid/LzmaDecompress.h b/MdeModulePkg/Include/Guid/LzmaDecompress.h
index 18a6552f9c9184a2a97c2fea44d30c5571130ebe..1a2187484daa9cd7910d9c8e204bab720af3a417 100644 (file)
--- a/MdeModulePkg/Include/Guid/LzmaDecompress.h
+++ b/MdeModulePkg/Include/Guid/LzmaDecompress.h
@@ -1,13 +1,13 @@
 /** @file\r
   Lzma Custom decompress algorithm Guid definition.\r
 \r
 /** @file\r
   Lzma Custom decompress algorithm Guid definition.\r
 \r

-Copyright (c) 2009 - 2012, Intel Corporation. All rights reserved.<BR>\r
-This program and the accompanying materials are licensed and made available under \r
-the terms and conditions of the BSD License that accompanies this distribution.  \r
+Copyright (c) 2009 - 2018, Intel Corporation. All rights reserved.<BR>\r
+This program and the accompanying materials are licensed and made available under\r
+the terms and conditions of the BSD License that accompanies this distribution.\r

 The full text of the license may be found at\r
 The full text of the license may be found at\r

-http://opensource.org/licenses/bsd-license.php.                                          \r
-    \r
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     \r
+http://opensource.org/licenses/bsd-license.php.\r
+\r
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r

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


@@ -16,14 +16,14 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #define __LZMA_DECOMPRESS_GUID_H__\r
 \r
 ///\r
 #define __LZMA_DECOMPRESS_GUID_H__\r
 \r
 ///\r

-/// The Global ID used to identify a section of an FFS file of type \r
+/// The Global ID used to identify a section of an FFS file of type\r

 /// EFI_SECTION_GUID_DEFINED, whose contents have been compressed using LZMA.\r
 ///\r
 #define LZMA_CUSTOM_DECOMPRESS_GUID  \\r
   { 0xEE4E5898, 0x3914, 0x4259, { 0x9D, 0x6E, 0xDC, 0x7B, 0xD7, 0x94, 0x03, 0xCF } }\r
 \r
 ///\r
 /// EFI_SECTION_GUID_DEFINED, whose contents have been compressed using LZMA.\r
 ///\r
 #define LZMA_CUSTOM_DECOMPRESS_GUID  \\r
   { 0xEE4E5898, 0x3914, 0x4259, { 0x9D, 0x6E, 0xDC, 0x7B, 0xD7, 0x94, 0x03, 0xCF } }\r
 \r
 ///\r

-/// The Global ID used to identify a section of an FFS file of type \r
+/// The Global ID used to identify a section of an FFS file of type\r

 /// EFI_SECTION_GUID_DEFINED, whose contents have been compressed using LZMA with X86 code Converter.\r
 ///\r
 #define LZMAF86_CUSTOM_DECOMPRESS_GUID  \\r
 /// EFI_SECTION_GUID_DEFINED, whose contents have been compressed using LZMA with X86 code Converter.\r
 ///\r
 #define LZMAF86_CUSTOM_DECOMPRESS_GUID  \\r

diff --git a/MdeModulePkg/Include/Guid/MdeModuleHii.h b/MdeModulePkg/Include/Guid/MdeModuleHii.h
index e2ebb55ef4eb2ac336e4baaabb52ed33b974f95d..c1e587c54d9661288cc50fd4fafe940267fdcf74 100644 (file)
--- a/MdeModulePkg/Include/Guid/MdeModuleHii.h
+++ b/MdeModulePkg/Include/Guid/MdeModuleHii.h
@@ -1,13 +1,13 @@
 /** @file\r
   EDKII extented HII IFR guid opcodes.\r
 \r
 /** @file\r
   EDKII extented HII IFR guid opcodes.\r
 \r

-Copyright (c) 2006 - 2017, Intel Corporation. All rights reserved.<BR>\r
-This program and the accompanying materials are licensed and made available under \r
-the terms and conditions of the BSD License that accompanies this distribution.  \r
+Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r
+This program and the accompanying materials are licensed and made available under\r
+the terms and conditions of the BSD License that accompanies this distribution.\r

 The full text of the license may be found at\r
 The full text of the license may be found at\r

-http://opensource.org/licenses/bsd-license.php.                                            \r
+http://opensource.org/licenses/bsd-license.php.\r

 \r
 \r

-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     \r
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r

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

diff --git a/MdeModulePkg/Include/Guid/MdeModulePkgTokenSpace.h b/MdeModulePkg/Include/Guid/MdeModulePkgTokenSpace.h
index 6ba7cd9df1794370d184edb8dce34d96f95e65a0..48e8d1c8defc08324bc54946dc598d78df6e18ad 100644 (file)
--- a/MdeModulePkg/Include/Guid/MdeModulePkgTokenSpace.h
+++ b/MdeModulePkg/Include/Guid/MdeModulePkgTokenSpace.h
@@ -1,13 +1,13 @@
 /** @file\r
 /** @file\r

-  GUID for MdeModulePkg PCD Token Space. \r
+  GUID for MdeModulePkg PCD Token Space.\r

 \r
 \r

-Copyright (c) 2009 - 2010, Intel Corporation. All rights reserved.<BR>\r
-This program and the accompanying materials are licensed and made available under \r
-the terms and conditions of the BSD License that accompanies this distribution.  \r
+Copyright (c) 2009 - 2018, Intel Corporation. All rights reserved.<BR>\r
+This program and the accompanying materials are licensed and made available under\r
+the terms and conditions of the BSD License that accompanies this distribution.\r

 The full text of the license may be found at\r
 The full text of the license may be found at\r

-http://opensource.org/licenses/bsd-license.php.                                            \r
+http://opensource.org/licenses/bsd-license.php.\r

 \r
 \r

-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     \r
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r

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

diff --git a/MdeModulePkg/Include/Guid/MemoryProfile.h b/MdeModulePkg/Include/Guid/MemoryProfile.h
index 777f950db79a88b94b207981c48c3d57f4467d12..2f94280269bc4d87b2ff8cb8b7878dc9ef5a390f 100644 (file)
--- a/MdeModulePkg/Include/Guid/MemoryProfile.h
+++ b/MdeModulePkg/Include/Guid/MemoryProfile.h
@@ -1,7 +1,7 @@
 /** @file\r
   Memory profile data structure.\r
 \r
 /** @file\r
   Memory profile data structure.\r
 \r

-  Copyright (c) 2014 - 2016, Intel Corporation. All rights reserved.<BR>\r
+  Copyright (c) 2014 - 2018, Intel Corporation. All rights reserved.<BR>\r

   This program and the accompanying materials\r
   are licensed and made available under the terms and conditions of the BSD License\r
   which accompanies this distribution.  The full text of the license may be found at\r
   This program and the accompanying materials\r
   are licensed and made available under the terms and conditions of the BSD License\r
   which accompanies this distribution.  The full text of the license may be found at\r


@@ -213,10 +213,10 @@ typedef struct _EDKII_MEMORY_PROFILE_PROTOCOL EDKII_MEMORY_PROFILE_PROTOCOL;
   @param[in, out] ProfileSize       On entry, points to the size in bytes of the ProfileBuffer.\r
                                     On return, points to the size of the data returned in ProfileBuffer.\r
   @param[out]     ProfileBuffer     Profile buffer.\r
   @param[in, out] ProfileSize       On entry, points to the size in bytes of the ProfileBuffer.\r
                                     On return, points to the size of the data returned in ProfileBuffer.\r
   @param[out]     ProfileBuffer     Profile buffer.\r

-                      \r
+\r

   @return EFI_SUCCESS               Get the memory profile data successfully.\r
   @return EFI_UNSUPPORTED           Memory profile is unsupported.\r
   @return EFI_SUCCESS               Get the memory profile data successfully.\r
   @return EFI_UNSUPPORTED           Memory profile is unsupported.\r

-  @return EFI_BUFFER_TO_SMALL       The ProfileSize is too small for the resulting data. \r
+  @return EFI_BUFFER_TO_SMALL       The ProfileSize is too small for the resulting data.\r

                                     ProfileSize is updated with the size required.\r
 \r
 **/\r
                                     ProfileSize is updated with the size required.\r
 \r
 **/\r

diff --git a/MdeModulePkg/Include/Guid/MemoryStatusCodeRecord.h b/MdeModulePkg/Include/Guid/MemoryStatusCodeRecord.h
index 27d39e185e996b0c24ccd7ef7c5dfeb1fbff3e43..904df9a62f55a4470c8ac909e414f659ced27c1b 100644 (file)
--- a/MdeModulePkg/Include/Guid/MemoryStatusCodeRecord.h
+++ b/MdeModulePkg/Include/Guid/MemoryStatusCodeRecord.h
@@ -1,7 +1,7 @@
 /** @file\r
 /** @file\r

-  GUID used to identify status code records HOB that originate from the PEI status code.    \r
-  \r
-Copyright (c) 2006 - 2010, Intel Corporation. All rights reserved.<BR>\r
+  GUID used to identify status code records HOB that originate from the PEI status code.\r
+\r
+Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r

 (C) Copyright 2016 Hewlett Packard Enterprise Development LP<BR>\r
 This program and the accompanying materials are licensed and made available under\r
 the terms and conditions of the BSD License that accompanies this distribution.\r
 (C) Copyright 2016 Hewlett Packard Enterprise Development LP<BR>\r
 This program and the accompanying materials are licensed and made available under\r
 the terms and conditions of the BSD License that accompanies this distribution.\r


@@ -17,9 +17,9 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #define __MEMORY_STATUS_CODE_RECORD_H__\r
 \r
 ///\r
 #define __MEMORY_STATUS_CODE_RECORD_H__\r
 \r
 ///\r

-/// Global ID used to identify GUIDed HOBs that start with a structure of type \r
-/// MEMORY_STATUSCODE_PACKET_HEADER, followed by an array of structures of type \r
-/// MEMORY_STATUSCODE_RECORD.  These GUIDed HOBs record all the information \r
+/// Global ID used to identify GUIDed HOBs that start with a structure of type\r
+/// MEMORY_STATUSCODE_PACKET_HEADER, followed by an array of structures of type\r
+/// MEMORY_STATUSCODE_RECORD.  These GUIDed HOBs record all the information\r

 /// passed into the ReportStatusCode() service of PEI Services Table.\r
 ///\r
 ///  <pre>\r
 /// passed into the ReportStatusCode() service of PEI Services Table.\r
 ///\r
 ///  <pre>\r


@@ -38,7 +38,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   }\r
 \r
 ///\r
   }\r
 \r
 ///\r

-/// A header structure that is followed by an array of records that contain the \r
+/// A header structure that is followed by an array of records that contain the\r

 /// parameters passed into the ReportStatusCode() service in the PEI Services Table.\r
 ///\r
 typedef struct {\r
 /// parameters passed into the ReportStatusCode() service in the PEI Services Table.\r
 ///\r
 typedef struct {\r


@@ -57,7 +57,7 @@ typedef struct {
 } MEMORY_STATUSCODE_PACKET_HEADER;\r
 \r
 ///\r
 } MEMORY_STATUSCODE_PACKET_HEADER;\r
 \r
 ///\r

-/// A header structure that is followed by an array of records that contain the \r
+/// A header structure that is followed by an array of records that contain the\r

 /// parameters passed into the ReportStatusCode() service in the DXE Services Table.\r
 ///\r
 typedef struct {\r
 /// parameters passed into the ReportStatusCode() service in the DXE Services Table.\r
 ///\r
 typedef struct {\r


@@ -76,7 +76,7 @@ typedef struct {
 } RUNTIME_MEMORY_STATUSCODE_HEADER;\r
 \r
 ///\r
 } RUNTIME_MEMORY_STATUSCODE_HEADER;\r
 \r
 ///\r

-/// A structure that contains the parameters passed into the ReportStatusCode() \r
+/// A structure that contains the parameters passed into the ReportStatusCode()\r

 /// service in the PEI Services Table.\r
 ///\r
 typedef struct {\r
 /// service in the PEI Services Table.\r
 ///\r
 typedef struct {\r

diff --git a/MdeModulePkg/Include/Guid/MemoryTypeInformation.h b/MdeModulePkg/Include/Guid/MemoryTypeInformation.h
index 57896d9463eaa060074a3b455a4cc50b5dc4b1cf..858c043b75f0ef0d26d718a2b0ecd887da0fa6c2 100644 (file)
--- a/MdeModulePkg/Include/Guid/MemoryTypeInformation.h
+++ b/MdeModulePkg/Include/Guid/MemoryTypeInformation.h
@@ -4,16 +4,16 @@
   * Memory Type Information Variable Name.\r
   * Memory Type Information GUID HOB data structure.\r
 \r
   * Memory Type Information Variable Name.\r
   * Memory Type Information GUID HOB data structure.\r
 \r

-  The memory type information HOB and variable can \r
+  The memory type information HOB and variable can\r

   be used to store the information for each memory type in Variable or HOB.\r
 \r
   be used to store the information for each memory type in Variable or HOB.\r
 \r

-Copyright (c) 2006 - 2010, Intel Corporation. All rights reserved.<BR>\r
-This program and the accompanying materials are licensed and made available under \r
-the terms and conditions of the BSD License that accompanies this distribution.  \r
+Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r
+This program and the accompanying materials are licensed and made available under\r
+the terms and conditions of the BSD License that accompanies this distribution.\r

 The full text of the license may be found at\r
 The full text of the license may be found at\r

-http://opensource.org/licenses/bsd-license.php.                                            \r
+http://opensource.org/licenses/bsd-license.php.\r

 \r
 \r

-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     \r
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r

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

diff --git a/MdeModulePkg/Include/Guid/MtcVendor.h b/MdeModulePkg/Include/Guid/MtcVendor.h
index 77bc2ae1b8d29a8028af4a149d1f48ceca710c19..34b6611ed1149e45583ef4407b3d23543a224b7c 100644 (file)
--- a/MdeModulePkg/Include/Guid/MtcVendor.h
+++ b/MdeModulePkg/Include/Guid/MtcVendor.h
@@ -1,13 +1,13 @@
 /** @file\r
 /** @file\r

-  GUID is for MTC variable. \r
-  \r
-Copyright (c) 2011, Intel Corporation. All rights reserved.<BR>\r
-This program and the accompanying materials are licensed and made available under \r
-the terms and conditions of the BSD License that accompanies this distribution.  \r
+  GUID is for MTC variable.\r
+\r
+Copyright (c) 2011 - 2018, Intel Corporation. All rights reserved.<BR>\r
+This program and the accompanying materials are licensed and made available under\r
+the terms and conditions of the BSD License that accompanies this distribution.\r

 The full text of the license may be found at\r
 The full text of the license may be found at\r

-http://opensource.org/licenses/bsd-license.php.                                            \r
+http://opensource.org/licenses/bsd-license.php.\r

 \r
 \r

-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     \r
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r

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

diff --git a/MdeModulePkg/Include/Guid/PcdDataBaseHobGuid.h b/MdeModulePkg/Include/Guid/PcdDataBaseHobGuid.h
index 1908eb84b3c557bef4e0610cb23bd91d86c82bc5..8b51893f1c9d592b2c76b454562bea5b0009812e 100644 (file)
--- a/MdeModulePkg/Include/Guid/PcdDataBaseHobGuid.h
+++ b/MdeModulePkg/Include/Guid/PcdDataBaseHobGuid.h
@@ -1,13 +1,13 @@
 /** @file\r
   Hob guid for Pcd DataBase.\r
 \r
 /** @file\r
   Hob guid for Pcd DataBase.\r
 \r

-Copyright (c) 2009 - 2010, Intel Corporation. All rights reserved.<BR>\r
-This program and the accompanying materials are licensed and made available under \r
-the terms and conditions of the BSD License that accompanies this distribution.  \r
+Copyright (c) 2009 - 2018, Intel Corporation. All rights reserved.<BR>\r
+This program and the accompanying materials are licensed and made available under\r
+the terms and conditions of the BSD License that accompanies this distribution.\r

 The full text of the license may be found at\r
 The full text of the license may be found at\r

-http://opensource.org/licenses/bsd-license.php.                                            \r
+http://opensource.org/licenses/bsd-license.php.\r

 \r
 \r

-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     \r
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r

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

diff --git a/MdeModulePkg/Include/Guid/Performance.h b/MdeModulePkg/Include/Guid/Performance.h
index 6e21ed03e68680769665d755cd07b8e28efbe711..72e39787a6166a9b93b845cca59b663f742b568f 100644 (file)
--- a/MdeModulePkg/Include/Guid/Performance.h
+++ b/MdeModulePkg/Include/Guid/Performance.h
@@ -2,15 +2,15 @@
   This file defines performance-related definitions, including the format of:\r
   * performance GUID HOB.\r
   * performance protocol interfaces.\r
   This file defines performance-related definitions, including the format of:\r
   * performance GUID HOB.\r
   * performance protocol interfaces.\r

-  * performance variables.  \r
+  * performance variables.\r

 \r
 Copyright (c) 2009 - 2018, Intel Corporation. All rights reserved.<BR>\r
 \r
 Copyright (c) 2009 - 2018, Intel Corporation. All rights reserved.<BR>\r

-This program and the accompanying materials are licensed and made available under \r
-the terms and conditions of the BSD License that accompanies this distribution.  \r
+This program and the accompanying materials are licensed and made available under\r
+the terms and conditions of the BSD License that accompanies this distribution.\r

 The full text of the license may be found at\r
 The full text of the license may be found at\r

-http://opensource.org/licenses/bsd-license.php.                                            \r
+http://opensource.org/licenses/bsd-license.php.\r

 \r
 \r

-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     \r
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r

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


@@ -36,7 +36,7 @@ typedef struct {
 \r
 typedef struct {\r
   EFI_PHYSICAL_ADDRESS  Handle;\r
 \r
 typedef struct {\r
   EFI_PHYSICAL_ADDRESS  Handle;\r

-  CHAR8                 Token[PEI_PERFORMANCE_STRING_SIZE];   ///< Measured token string name. \r
+  CHAR8                 Token[PEI_PERFORMANCE_STRING_SIZE];   ///< Measured token string name.\r

   CHAR8                 Module[PEI_PERFORMANCE_STRING_SIZE];  ///< Module string name.\r
   UINT64                StartTimeStamp;                       ///< Start time point.\r
   UINT64                EndTimeStamp;                         ///< End time point.\r
   CHAR8                 Module[PEI_PERFORMANCE_STRING_SIZE];  ///< Module string name.\r
   UINT64                StartTimeStamp;                       ///< Start time point.\r
   UINT64                EndTimeStamp;                         ///< End time point.\r


@@ -44,7 +44,7 @@ typedef struct {
 \r
 //\r
 // The header must be aligned at 8 bytes.\r
 \r
 //\r
 // The header must be aligned at 8 bytes.\r

-// \r
+//\r

 typedef struct {\r
   UINT32                NumberOfEntries;  ///< The number of all performance log entries.\r
   UINT32                Reserved;\r
 typedef struct {\r
   UINT32                NumberOfEntries;  ///< The number of all performance log entries.\r
   UINT32                Reserved;\r


@@ -76,7 +76,7 @@ typedef struct _PERFORMANCE_EX_PROTOCOL PERFORMANCE_EX_PROTOCOL;
 \r
 typedef struct {\r
   EFI_PHYSICAL_ADDRESS  Handle;\r
 \r
 typedef struct {\r
   EFI_PHYSICAL_ADDRESS  Handle;\r

-  CHAR8                 Token[DXE_PERFORMANCE_STRING_SIZE];  ///< Measured token string name. \r
+  CHAR8                 Token[DXE_PERFORMANCE_STRING_SIZE];  ///< Measured token string name.\r

   CHAR8                 Module[DXE_PERFORMANCE_STRING_SIZE]; ///< Module string name.\r
   UINT64                StartTimeStamp;                      ///< Start time point.\r
   UINT64                EndTimeStamp;                        ///< End time point.\r
   CHAR8                 Module[DXE_PERFORMANCE_STRING_SIZE]; ///< Module string name.\r
   UINT64                StartTimeStamp;                      ///< Start time point.\r
   UINT64                EndTimeStamp;                        ///< End time point.\r


@@ -84,7 +84,7 @@ typedef struct {
 \r
 typedef struct {\r
   EFI_PHYSICAL_ADDRESS  Handle;\r
 \r
 typedef struct {\r
   EFI_PHYSICAL_ADDRESS  Handle;\r

-  CHAR8                 Token[DXE_PERFORMANCE_STRING_SIZE];  ///< Measured token string name. \r
+  CHAR8                 Token[DXE_PERFORMANCE_STRING_SIZE];  ///< Measured token string name.\r

   CHAR8                 Module[DXE_PERFORMANCE_STRING_SIZE]; ///< Module string name.\r
   UINT64                StartTimeStamp;                      ///< Start time point.\r
   UINT64                EndTimeStamp;                        ///< End time point.\r
   CHAR8                 Module[DXE_PERFORMANCE_STRING_SIZE]; ///< Module string name.\r
   UINT64                StartTimeStamp;                      ///< Start time point.\r
   UINT64                EndTimeStamp;                        ///< End time point.\r


@@ -215,7 +215,7 @@ EFI_STATUS
   @param  LogEntryKey             The key for the previous performance measurement log entry.\r
                                   If 0, then the first performance measurement log entry is retrieved.\r
   @param  GaugeDataEntry          Out parameter for the indirect pointer to the gauge data entry specified by LogEntryKey.\r
   @param  LogEntryKey             The key for the previous performance measurement log entry.\r
                                   If 0, then the first performance measurement log entry is retrieved.\r
   @param  GaugeDataEntry          Out parameter for the indirect pointer to the gauge data entry specified by LogEntryKey.\r

-                                  \r
+\r

   @retval EFI_SUCCESS             The GuageDataEntry is successfully found based on LogEntryKey.\r
   @retval EFI_NOT_FOUND           There is no entry after the measurement referred to by LogEntryKey.\r
   @retval EFI_INVALID_PARAMETER   The LogEntryKey is not a valid entry, or GaugeDataEntry is NULL.\r
   @retval EFI_SUCCESS             The GuageDataEntry is successfully found based on LogEntryKey.\r
   @retval EFI_NOT_FOUND           There is no entry after the measurement referred to by LogEntryKey.\r
   @retval EFI_INVALID_PARAMETER   The LogEntryKey is not a valid entry, or GaugeDataEntry is NULL.\r


@@ -310,7 +310,7 @@ EFI_STATUS
   @param  LogEntryKey             The key for the previous performance measurement log entry.\r
                                   If 0, then the first performance measurement log entry is retrieved.\r
   @param  GaugeDataEntryEx        Out parameter for the indirect pointer to the extented gauge data entry specified by LogEntryKey.\r
   @param  LogEntryKey             The key for the previous performance measurement log entry.\r
                                   If 0, then the first performance measurement log entry is retrieved.\r
   @param  GaugeDataEntryEx        Out parameter for the indirect pointer to the extented gauge data entry specified by LogEntryKey.\r

-                                  \r
+\r

   @retval EFI_SUCCESS             The GuageDataEntryEx is successfully found based on LogEntryKey.\r
   @retval EFI_NOT_FOUND           There is no entry after the measurement referred to by LogEntryKey.\r
   @retval EFI_INVALID_PARAMETER   The LogEntryKey is not a valid entry, or GaugeDataEntryEx is NULL.\r
   @retval EFI_SUCCESS             The GuageDataEntryEx is successfully found based on LogEntryKey.\r
   @retval EFI_NOT_FOUND           There is no entry after the measurement referred to by LogEntryKey.\r
   @retval EFI_INVALID_PARAMETER   The LogEntryKey is not a valid entry, or GaugeDataEntryEx is NULL.\r

diff --git a/MdeModulePkg/Include/Guid/PiSmmCommunicationRegionTable.h b/MdeModulePkg/Include/Guid/PiSmmCommunicationRegionTable.h
index e3021ef267325390a6fbb4a7b4fc0f5c93aba861..300fe83cadfc469c87407ad11198b6c7fb172db8 100644 (file)
--- a/MdeModulePkg/Include/Guid/PiSmmCommunicationRegionTable.h
+++ b/MdeModulePkg/Include/Guid/PiSmmCommunicationRegionTable.h
@@ -1,12 +1,12 @@
 /** @file\r
 \r
 /** @file\r
 \r

-Copyright (c) 2015, Intel Corporation. All rights reserved.<BR>\r
-This program and the accompanying materials are licensed and made available under \r
-the terms and conditions of the BSD License that accompanies this distribution.  \r
+Copyright (c) 2015 - 2018, Intel Corporation. All rights reserved.<BR>\r
+This program and the accompanying materials are licensed and made available under\r
+the terms and conditions of the BSD License that accompanies this distribution.\r

 The full text of the license may be found at\r
 The full text of the license may be found at\r

-http://opensource.org/licenses/bsd-license.php.                                          \r
-    \r
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     \r
+http://opensource.org/licenses/bsd-license.php.\r
+\r
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r

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


@@ -25,14 +25,14 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 //\r
 // This table is installed to UEFI configuration table by generic driver\r
 // or platform driver, at early DXE phase.\r
 //\r
 // This table is installed to UEFI configuration table by generic driver\r
 // or platform driver, at early DXE phase.\r

-// \r
+//\r

 // The EFI_MEMORY_DESCRIPTOR entry must contain at least one entry.\r
 // The entries must be normal memory region in EfiReservedMemoryType, EfiACPIMemoryNVS,\r
 // or EfiRuntimeServicesData.\r
 // If the Entry.Type is EfiConventionalMemory, it means this entry is free to use.\r
 // If the Entry.Type is other, it means this entry is occupied.\r
 //\r
 // The EFI_MEMORY_DESCRIPTOR entry must contain at least one entry.\r
 // The entries must be normal memory region in EfiReservedMemoryType, EfiACPIMemoryNVS,\r
 // or EfiRuntimeServicesData.\r
 // If the Entry.Type is EfiConventionalMemory, it means this entry is free to use.\r
 // If the Entry.Type is other, it means this entry is occupied.\r
 //\r

-// Any non-SMM component may put communication data there, then use \r
+// Any non-SMM component may put communication data there, then use\r

 // UEFI defined SMM Communication ACPI Table, or PI defined EFI_SMM_COMMUNICATION_PROTOCOL\r
 // to communicate with SMI handler. The process is:\r
 // 1) Find an entry whose type is EfiConventional.\r
 // UEFI defined SMM Communication ACPI Table, or PI defined EFI_SMM_COMMUNICATION_PROTOCOL\r
 // to communicate with SMI handler. The process is:\r
 // 1) Find an entry whose type is EfiConventional.\r

diff --git a/MdeModulePkg/Include/Guid/PlatDriOverrideHii.h b/MdeModulePkg/Include/Guid/PlatDriOverrideHii.h
index bd8e493ef969a561ab6fb305f6a1cdc3294c593d..b09cdc39ef37208e97eddde7e61ffb1734c96ee4 100644 (file)
--- a/MdeModulePkg/Include/Guid/PlatDriOverrideHii.h
+++ b/MdeModulePkg/Include/Guid/PlatDriOverrideHii.h
@@ -1,13 +1,13 @@
 /** @file\r
 /** @file\r

-  GUIDs used as HII FormSet and HII Package list GUID in PlatDriOverride driver. \r
-  \r
-Copyright (c) 2011, Intel Corporation. All rights reserved.<BR>\r
-This program and the accompanying materials are licensed and made available under \r
-the terms and conditions of the BSD License that accompanies this distribution.  \r
+  GUIDs used as HII FormSet and HII Package list GUID in PlatDriOverride driver.\r
+\r
+Copyright (c) 2011 - 2018, Intel Corporation. All rights reserved.<BR>\r
+This program and the accompanying materials are licensed and made available under\r
+the terms and conditions of the BSD License that accompanies this distribution.\r

 The full text of the license may be found at\r
 The full text of the license may be found at\r

-http://opensource.org/licenses/bsd-license.php.                                            \r
+http://opensource.org/licenses/bsd-license.php.\r

 \r
 \r

-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     \r
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r

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

diff --git a/MdeModulePkg/Include/Guid/S3SmmInitDone.h b/MdeModulePkg/Include/Guid/S3SmmInitDone.h
index 53fef8ed19ef0564207d88e7d31fb56be4a88bf1..0412cf0be335df79ad5ba1a41aea019e5b3a4d0f 100644 (file)
--- a/MdeModulePkg/Include/Guid/S3SmmInitDone.h
+++ b/MdeModulePkg/Include/Guid/S3SmmInitDone.h
@@ -1,16 +1,16 @@
 /** @file\r
   After S3 SMM initialization is done and before S3 boot script is executed,\r
 /** @file\r
   After S3 SMM initialization is done and before S3 boot script is executed,\r

-  this GUID is installed as PPI in PEI and protocol in SMM environment. \r
+  this GUID is installed as PPI in PEI and protocol in SMM environment.\r

   It allows for PEIMs or SMM drivers to hook this point and do the required tasks.\r
 \r
   It allows for PEIMs or SMM drivers to hook this point and do the required tasks.\r
 \r

-  Copyright (c) 2018, Intel Corporation. All rights reserved.<BR>\r
-  This program and the accompanying materials                          \r
-  are licensed and made available under the terms and conditions of the BSD License         \r
-  which accompanies this distribution.  The full text of the license may be found at        \r
-  http://opensource.org/licenses/bsd-license.php                                            \r
+  Copyright (c) 2018 - 2018, Intel Corporation. All rights reserved.<BR>\r
+  This program and the accompanying materials\r
+  are licensed and made available under the terms and conditions of the BSD License\r
+  which accompanies this distribution.  The full text of the license may be found at\r
+  http://opensource.org/licenses/bsd-license.php\r

 \r
 \r

-  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     \r
-  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             \r
+  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
+  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r

 \r
 **/\r
 \r
 \r
 **/\r
 \r

diff --git a/MdeModulePkg/Include/Guid/StandardErrorDevice.h b/MdeModulePkg/Include/Guid/StandardErrorDevice.h
index 7bc390241df1785855c68377df3905e53fc0e8d8..b717191c43b12358556b11943661d5f70c99879d 100644 (file)
--- a/MdeModulePkg/Include/Guid/StandardErrorDevice.h
+++ b/MdeModulePkg/Include/Guid/StandardErrorDevice.h
@@ -1,14 +1,14 @@
 /** @file\r
   This GUID is installed to the device handler to specify that the device is a StdErr device.\r
 /** @file\r
   This GUID is installed to the device handler to specify that the device is a StdErr device.\r

-  \r

 \r
 \r

-Copyright (c) 2006 - 2010, Intel Corporation. All rights reserved.<BR>\r
-This program and the accompanying materials are licensed and made available under \r
-the terms and conditions of the BSD License that accompanies this distribution.  \r
+\r
+Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r
+This program and the accompanying materials are licensed and made available under\r
+the terms and conditions of the BSD License that accompanies this distribution.\r

 The full text of the license may be found at\r
 The full text of the license may be found at\r

-http://opensource.org/licenses/bsd-license.php.                                            \r
+http://opensource.org/licenses/bsd-license.php.\r

 \r
 \r

-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     \r
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r

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

diff --git a/MdeModulePkg/Include/Guid/StatusCodeCallbackGuid.h b/MdeModulePkg/Include/Guid/StatusCodeCallbackGuid.h
index 2a83471a9983d837a9ea0a1def1d27c2bec7d313..9eeab10aa2f6e99430bbd8e5cc2cdae780cdedad 100644 (file)
--- a/MdeModulePkg/Include/Guid/StatusCodeCallbackGuid.h
+++ b/MdeModulePkg/Include/Guid/StatusCodeCallbackGuid.h
@@ -1,15 +1,15 @@
 /** @file\r
   GUID used to identify HOB for pointers to callback functios registered on\r
   PEI report status code router.\r
 /** @file\r
   GUID used to identify HOB for pointers to callback functios registered on\r
   PEI report status code router.\r

-  \r
-Copyright (c) 2009 - 2010, Intel Corporation. All rights reserved.<BR>\r
-This program and the accompanying materials are licensed and made available under \r
-the terms and conditions of the BSD License that accompanies this distribution.  \r
+\r
+Copyright (c) 2009 - 2018, Intel Corporation. All rights reserved.<BR>\r
+This program and the accompanying materials are licensed and made available under\r
+the terms and conditions of the BSD License that accompanies this distribution.\r

 The full text of the license may be found at\r
 The full text of the license may be found at\r

-http://opensource.org/licenses/bsd-license.php.                                            \r
+http://opensource.org/licenses/bsd-license.php.\r

 \r
 \r

-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     \r
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             \r
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r

 \r
 **/\r
 \r
 \r
 **/\r
 \r

diff --git a/MdeModulePkg/Include/Guid/StatusCodeDataTypeDebug.h b/MdeModulePkg/Include/Guid/StatusCodeDataTypeDebug.h
index f478f801b6b86c570e9b4a6de1a5a5e4106fbe9d..11f4c5fa3b61bf50b2d0fad6a23d377c512cf8b9 100644 (file)
--- a/MdeModulePkg/Include/Guid/StatusCodeDataTypeDebug.h
+++ b/MdeModulePkg/Include/Guid/StatusCodeDataTypeDebug.h
@@ -1,14 +1,14 @@
 /** @file\r
 /** @file\r

-  This file defines the GUID and data structure used to pass DEBUG() macro \r
+  This file defines the GUID and data structure used to pass DEBUG() macro\r

   information to the Status Code Protocol and Status Code PPI.\r
 \r
   information to the Status Code Protocol and Status Code PPI.\r
 \r

-Copyright (c) 2007 - 2010, Intel Corporation. All rights reserved.<BR>\r
-This program and the accompanying materials are licensed and made available under \r
-the terms and conditions of the BSD License that accompanies this distribution.  \r
+Copyright (c) 2007 - 2018, Intel Corporation. All rights reserved.<BR>\r
+This program and the accompanying materials are licensed and made available under\r
+the terms and conditions of the BSD License that accompanies this distribution.\r

 The full text of the license may be found at\r
 The full text of the license may be found at\r

-http://opensource.org/licenses/bsd-license.php.                                            \r
+http://opensource.org/licenses/bsd-license.php.\r

 \r
 \r

-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     \r
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r

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


@@ -30,11 +30,11 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #define EFI_STATUS_CODE_DATA_MAX_SIZE 200\r
 \r
 ///\r
 #define EFI_STATUS_CODE_DATA_MAX_SIZE 200\r
 \r
 ///\r

-/// This structure contains the ErrorLevel passed into the DEBUG() macro, followed \r
-/// by a 96-byte buffer that contains the variable argument list passed to the \r
-/// DEBUG() macro that has been converted to a BASE_LIST.  The 96-byte buffer is \r
-/// followed by a Null-terminated ASCII string that is the Format string passed \r
-/// to the DEBUG() macro.  The maximum size of this structure is defined by \r
+/// This structure contains the ErrorLevel passed into the DEBUG() macro, followed\r
+/// by a 96-byte buffer that contains the variable argument list passed to the\r
+/// DEBUG() macro that has been converted to a BASE_LIST.  The 96-byte buffer is\r
+/// followed by a Null-terminated ASCII string that is the Format string passed\r
+/// to the DEBUG() macro.  The maximum size of this structure is defined by\r

 /// EFI_STATUS_CODE_DATA_MAX_SIZE.\r
 ///\r
 typedef struct {\r
 /// EFI_STATUS_CODE_DATA_MAX_SIZE.\r
 ///\r
 typedef struct {\r

diff --git a/MdeModulePkg/Include/Guid/StatusCodeDataTypeVariable.h b/MdeModulePkg/Include/Guid/StatusCodeDataTypeVariable.h
index 9ea85f80990d09d2809ec3b4ebc80da401f3f780..f051fa43cbbc87dd1a3eadc22f198f711173edc3 100644 (file)
--- a/MdeModulePkg/Include/Guid/StatusCodeDataTypeVariable.h
+++ b/MdeModulePkg/Include/Guid/StatusCodeDataTypeVariable.h
@@ -1,10 +1,10 @@
 /** @file\r
 /** @file\r

-  This file defines the GUID and data structure used to pass variable setting \r
+  This file defines the GUID and data structure used to pass variable setting\r

   failure information to the Status Code Protocol.\r
 \r
   failure information to the Status Code Protocol.\r
 \r

-Copyright (c) 2014, Intel Corporation. All rights reserved.<BR>\r
-This program and the accompanying materials are licensed and made available under \r
-the terms and conditions of the BSD License that accompanies this distribution.  \r
+Copyright (c) 2014 - 2018, Intel Corporation. All rights reserved.<BR>\r
+This program and the accompanying materials are licensed and made available under\r
+the terms and conditions of the BSD License that accompanies this distribution.\r

 The full text of the license may be found at\r
 http://opensource.org/licenses/bsd-license.php.\r
 \r
 The full text of the license may be found at\r
 http://opensource.org/licenses/bsd-license.php.\r
 \r

diff --git a/MdeModulePkg/Include/Guid/SystemNvDataGuid.h b/MdeModulePkg/Include/Guid/SystemNvDataGuid.h
index 67c666259fb6ea609164adac7a74a982f13d376f..2232ab314b971854ed622980c69bd66b13089a6d 100644 (file)
--- a/MdeModulePkg/Include/Guid/SystemNvDataGuid.h
+++ b/MdeModulePkg/Include/Guid/SystemNvDataGuid.h
@@ -1,17 +1,17 @@
-/** @file  \r
+/** @file\r

   This file defines NvDataFv GUID and FTW working block structures.\r
   This file defines NvDataFv GUID and FTW working block structures.\r

-  The NvDataFv GUID can be used as FileSystemGuid in EFI_FIRMWARE_VOLUME_HEADER if \r
+  The NvDataFv GUID can be used as FileSystemGuid in EFI_FIRMWARE_VOLUME_HEADER if\r

   this FV image contains NV data, such as NV variable data.\r
   This file also defines WorkingBlockSignature GUID for FTW working block signature.\r
 \r
   this FV image contains NV data, such as NV variable data.\r
   This file also defines WorkingBlockSignature GUID for FTW working block signature.\r
 \r

-Copyright (c) 2006 - 2015, Intel Corporation. All rights reserved.<BR>\r
-This program and the accompanying materials are licensed and made available under \r
-the terms and conditions of the BSD License that accompanies this distribution.  \r
+Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r
+This program and the accompanying materials are licensed and made available under\r
+the terms and conditions of the BSD License that accompanies this distribution.\r

 The full text of the license may be found at\r
 The full text of the license may be found at\r

-http://opensource.org/licenses/bsd-license.php.                                            \r
+http://opensource.org/licenses/bsd-license.php.\r

 \r
 \r

-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     \r
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             \r
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r

 \r
 **/\r
 \r
 \r
 **/\r
 \r

diff --git a/MdeModulePkg/Include/Guid/UsbKeyBoardLayout.h b/MdeModulePkg/Include/Guid/UsbKeyBoardLayout.h
index 57d81643c6ad34562d5067542320be171513311b..b88a543f62052537391667d42656a33902d57803 100644 (file)
--- a/MdeModulePkg/Include/Guid/UsbKeyBoardLayout.h
+++ b/MdeModulePkg/Include/Guid/UsbKeyBoardLayout.h
@@ -1,13 +1,13 @@
 /** @file\r
   USB KeyBoard Layout GUIDs\r
 \r
 /** @file\r
   USB KeyBoard Layout GUIDs\r
 \r

-Copyright (c) 2011, Intel Corporation. All rights reserved.<BR>\r
-This program and the accompanying materials are licensed and made available under \r
-the terms and conditions of the BSD License that accompanies this distribution.  \r
+Copyright (c) 2011 - 2018, Intel Corporation. All rights reserved.<BR>\r
+This program and the accompanying materials are licensed and made available under\r
+the terms and conditions of the BSD License that accompanies this distribution.\r

 The full text of the license may be found at\r
 The full text of the license may be found at\r

-http://opensource.org/licenses/bsd-license.php.                                            \r
+http://opensource.org/licenses/bsd-license.php.\r

 \r
 \r

-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     \r
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r

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

diff --git a/MdeModulePkg/Include/Guid/VariableIndexTable.h b/MdeModulePkg/Include/Guid/VariableIndexTable.h
index ee0722fd4896362de05f79e5c8f1f8d82c967436..4c86f0cced964d3612261aed145061933174d701 100644 (file)
--- a/MdeModulePkg/Include/Guid/VariableIndexTable.h
+++ b/MdeModulePkg/Include/Guid/VariableIndexTable.h
@@ -2,13 +2,13 @@
   The variable data structures are related to EDK II-specific implementation of UEFI variables.\r
   VariableFormat.h defines variable data headers and variable storage region headers.\r
 \r
   The variable data structures are related to EDK II-specific implementation of UEFI variables.\r
   VariableFormat.h defines variable data headers and variable storage region headers.\r
 \r

-Copyright (c) 2006 - 2011, Intel Corporation. All rights reserved.<BR>\r
-This program and the accompanying materials are licensed and made available under \r
-the terms and conditions of the BSD License that accompanies this distribution.  \r
+Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r
+This program and the accompanying materials are licensed and made available under\r
+the terms and conditions of the BSD License that accompanies this distribution.\r

 The full text of the license may be found at\r
 The full text of the license may be found at\r

-http://opensource.org/licenses/bsd-license.php.                                            \r
+http://opensource.org/licenses/bsd-license.php.\r

 \r
 \r

-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     \r
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r

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

diff --git a/MdeModulePkg/Include/Guid/VlanConfigHii.h b/MdeModulePkg/Include/Guid/VlanConfigHii.h
index 3848ce733d15eec22ed2ed5b6b4b82043349e2f8..3cd2f8bbb013e2b499289ff02f871610a848239e 100644 (file)
--- a/MdeModulePkg/Include/Guid/VlanConfigHii.h
+++ b/MdeModulePkg/Include/Guid/VlanConfigHii.h
@@ -1,13 +1,13 @@
 /** @file\r
 /** @file\r

-  GUIDs used as HII FormSet and HII Package list GUID in VlanConfig driver. \r
-  \r
-Copyright (c) 2011, Intel Corporation. All rights reserved.<BR>\r
-This program and the accompanying materials are licensed and made available under \r
-the terms and conditions of the BSD License that accompanies this distribution.  \r
+  GUIDs used as HII FormSet and HII Package list GUID in VlanConfig driver.\r
+\r
+Copyright (c) 2011 - 2018, Intel Corporation. All rights reserved.<BR>\r
+This program and the accompanying materials are licensed and made available under\r
+the terms and conditions of the BSD License that accompanies this distribution.\r

 The full text of the license may be found at\r
 The full text of the license may be found at\r

-http://opensource.org/licenses/bsd-license.php.                                            \r
+http://opensource.org/licenses/bsd-license.php.\r

 \r
 \r

-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     \r
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r

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

diff --git a/MdeModulePkg/Include/Guid/ZeroGuid.h b/MdeModulePkg/Include/Guid/ZeroGuid.h
index 7ba8dda20529ba54a4615ccd86c06984301d88ff..bf113a5ebdb5a3729ea74faa6bbf526b722c320a 100644 (file)
--- a/MdeModulePkg/Include/Guid/ZeroGuid.h
+++ b/MdeModulePkg/Include/Guid/ZeroGuid.h
@@ -1,13 +1,13 @@
 /** @file\r
   GUID has all zero values.\r
 /** @file\r
   GUID has all zero values.\r

-  \r
-Copyright (c) 2011, Intel Corporation. All rights reserved.<BR>\r
-This program and the accompanying materials are licensed and made available under \r
-the terms and conditions of the BSD License that accompanies this distribution.  \r
+\r
+Copyright (c) 2011 - 2018, Intel Corporation. All rights reserved.<BR>\r
+This program and the accompanying materials are licensed and made available under\r
+the terms and conditions of the BSD License that accompanies this distribution.\r

 The full text of the license may be found at\r
 The full text of the license may be found at\r

-http://opensource.org/licenses/bsd-license.php.                                            \r
+http://opensource.org/licenses/bsd-license.php.\r

 \r
 \r

-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     \r
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r

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

diff --git a/MdeModulePkg/Include/Library/BootLogoLib.h b/MdeModulePkg/Include/Library/BootLogoLib.h
index cacdd29ded942797a49a8f77f8fde179f2ac4b4d..4f017afd5c9f87fd91a1b67573595bc413b76b7f 100644 (file)
--- a/MdeModulePkg/Include/Library/BootLogoLib.h
+++ b/MdeModulePkg/Include/Library/BootLogoLib.h
@@ -2,7 +2,7 @@
   This library is only intended to be used by PlatformBootManagerLib\r
   to show progress bar and LOGO.\r
 \r
   This library is only intended to be used by PlatformBootManagerLib\r
   to show progress bar and LOGO.\r
 \r

-Copyright (c) 2011 - 2016, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2011 - 2018, Intel Corporation. All rights reserved.<BR>\r

 This program and the accompanying materials are licensed and made available under\r
 the terms and conditions of the BSD License that accompanies this distribution.\r
 The full text of the license may be found at\r
 This program and the accompanying materials are licensed and made available under\r
 the terms and conditions of the BSD License that accompanies this distribution.\r
 The full text of the license may be found at\r


@@ -30,7 +30,7 @@ BootLogoEnableLogo (
 \r
 \r
 /**\r
 \r
 \r
 /**\r

-  Use SystemTable ConOut to turn on video based Simple Text Out consoles. The \r
+  Use SystemTable ConOut to turn on video based Simple Text Out consoles. The\r

   Simple Text Out screens will now be synced up with all non-video output devices.\r
 \r
   @retval EFI_SUCCESS     UGA devices are back in text mode and synced up.\r
   Simple Text Out screens will now be synced up with all non-video output devices.\r
 \r
   @retval EFI_SUCCESS     UGA devices are back in text mode and synced up.\r

diff --git a/MdeModulePkg/Include/Library/CapsuleLib.h b/MdeModulePkg/Include/Library/CapsuleLib.h
index 26c14a09cd7deab0f1bb9df61716d698c6cb0871..376cb39d387cb754b0e695a0f2b7b1867c91a0a6 100644 (file)
--- a/MdeModulePkg/Include/Library/CapsuleLib.h
+++ b/MdeModulePkg/Include/Library/CapsuleLib.h
@@ -2,13 +2,13 @@
 \r
   This library class defines a set of interfaces for how to process capsule image updates.\r
 \r
 \r
   This library class defines a set of interfaces for how to process capsule image updates.\r
 \r

-Copyright (c) 2007 - 2016, Intel Corporation. All rights reserved.<BR>\r
-This program and the accompanying materials are licensed and made available under \r
-the terms and conditions of the BSD License that accompanies this distribution.  \r
+Copyright (c) 2007 - 2018, Intel Corporation. All rights reserved.<BR>\r
+This program and the accompanying materials are licensed and made available under\r
+the terms and conditions of the BSD License that accompanies this distribution.\r

 The full text of the license may be found at\r
 The full text of the license may be found at\r

-http://opensource.org/licenses/bsd-license.php.                                            \r
+http://opensource.org/licenses/bsd-license.php.\r

 \r
 \r

-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     \r
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r

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


@@ -17,14 +17,14 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #define __CAPSULE_LIB_H__\r
 \r
 /**\r
 #define __CAPSULE_LIB_H__\r
 \r
 /**\r

-  The firmware checks whether the capsule image is supported \r
-  by the CapsuleGuid in CapsuleHeader or if there is other specific information in \r
+  The firmware checks whether the capsule image is supported\r
+  by the CapsuleGuid in CapsuleHeader or if there is other specific information in\r

   the capsule image.\r
 \r
   Caution: This function may receive untrusted input.\r
 \r
   @param  CapsuleHeader    Pointer to the UEFI capsule image to be checked.\r
   the capsule image.\r
 \r
   Caution: This function may receive untrusted input.\r
 \r
   @param  CapsuleHeader    Pointer to the UEFI capsule image to be checked.\r

-  \r
+\r

   @retval EFI_SUCESS       Input capsule is supported by firmware.\r
   @retval EFI_UNSUPPORTED  Input capsule is not supported by the firmware.\r
 **/\r
   @retval EFI_SUCESS       Input capsule is supported by firmware.\r
   @retval EFI_UNSUPPORTED  Input capsule is not supported by the firmware.\r
 **/\r


@@ -40,9 +40,9 @@ SupportCapsuleImage (
 \r
   Caution: This function may receive untrusted input.\r
 \r
 \r
   Caution: This function may receive untrusted input.\r
 \r

-  @param  CapsuleHeader    Pointer to the UEFI capsule image to be processed. \r
-   \r
-  @retval EFI_SUCESS       Capsule Image processed successfully. \r
+  @param  CapsuleHeader    Pointer to the UEFI capsule image to be processed.\r
+\r
+  @retval EFI_SUCESS       Capsule Image processed successfully.\r

   @retval EFI_UNSUPPORTED  Capsule image is not supported by the firmware.\r
 **/\r
 EFI_STATUS\r
   @retval EFI_UNSUPPORTED  Capsule image is not supported by the firmware.\r
 **/\r
 EFI_STATUS\r

diff --git a/MdeModulePkg/Include/Library/CpuExceptionHandlerLib.h b/MdeModulePkg/Include/Library/CpuExceptionHandlerLib.h
index 8cc9bac7609a0a2fc52a088350e055f51ff450bf..751de6dacf2316d51f2a4110eb62e0d301155969 100644 (file)
--- a/MdeModulePkg/Include/Library/CpuExceptionHandlerLib.h
+++ b/MdeModulePkg/Include/Library/CpuExceptionHandlerLib.h
@@ -2,7 +2,7 @@
   CPU Exception library provides the default CPU interrupt/exception handler.\r
   It also provides capability to register user interrupt/exception handler.\r
 \r
   CPU Exception library provides the default CPU interrupt/exception handler.\r
   It also provides capability to register user interrupt/exception handler.\r
 \r

-  Copyright (c) 2012 - 2017, Intel Corporation. All rights reserved.<BR>\r
+  Copyright (c) 2012 - 2018, Intel Corporation. All rights reserved.<BR>\r

   This program and the accompanying materials\r
   are licensed and made available under the terms and conditions of the BSD License\r
   which accompanies this distribution.  The full text of the license may be found at\r
   This program and the accompanying materials\r
   are licensed and made available under the terms and conditions of the BSD License\r
   which accompanies this distribution.  The full text of the license may be found at\r


@@ -88,15 +88,15 @@ typedef union {
 \r
 /**\r
   Initializes all CPU exceptions entries and provides the default exception handlers.\r
 \r
 /**\r
   Initializes all CPU exceptions entries and provides the default exception handlers.\r

-  \r
+\r

   Caller should try to get an array of interrupt and/or exception vectors that are in use and need to\r
   persist by EFI_VECTOR_HANDOFF_INFO defined in PI 1.3 specification.\r
   Caller should try to get an array of interrupt and/or exception vectors that are in use and need to\r
   persist by EFI_VECTOR_HANDOFF_INFO defined in PI 1.3 specification.\r

-  If caller cannot get reserved vector list or it does not exists, set VectorInfo to NULL. \r
+  If caller cannot get reserved vector list or it does not exists, set VectorInfo to NULL.\r

   If VectorInfo is not NULL, the exception vectors will be initialized per vector attribute accordingly.\r
 \r
   @param[in]  VectorInfo    Pointer to reserved vector list.\r
   If VectorInfo is not NULL, the exception vectors will be initialized per vector attribute accordingly.\r
 \r
   @param[in]  VectorInfo    Pointer to reserved vector list.\r

-  \r
-  @retval EFI_SUCCESS           CPU Exception Entries have been successfully initialized \r
+\r
+  @retval EFI_SUCCESS           CPU Exception Entries have been successfully initialized\r

                                 with default exception handlers.\r
   @retval EFI_INVALID_PARAMETER VectorInfo includes the invalid content if VectorInfo is not NULL.\r
   @retval EFI_UNSUPPORTED       This function is not supported.\r
                                 with default exception handlers.\r
   @retval EFI_INVALID_PARAMETER VectorInfo includes the invalid content if VectorInfo is not NULL.\r
   @retval EFI_UNSUPPORTED       This function is not supported.\r


@@ -140,15 +140,15 @@ InitializeCpuExceptionHandlersEx (
 \r
 /**\r
   Initializes all CPU interrupt/exceptions entries and provides the default interrupt/exception handlers.\r
 \r
 /**\r
   Initializes all CPU interrupt/exceptions entries and provides the default interrupt/exception handlers.\r

-  \r
+\r

   Caller should try to get an array of interrupt and/or exception vectors that are in use and need to\r
   persist by EFI_VECTOR_HANDOFF_INFO defined in PI 1.3 specification.\r
   Caller should try to get an array of interrupt and/or exception vectors that are in use and need to\r
   persist by EFI_VECTOR_HANDOFF_INFO defined in PI 1.3 specification.\r

-  If caller cannot get reserved vector list or it does not exists, set VectorInfo to NULL. \r
+  If caller cannot get reserved vector list or it does not exists, set VectorInfo to NULL.\r

   If VectorInfo is not NULL, the exception vectors will be initialized per vector attribute accordingly.\r
 \r
   @param[in]  VectorInfo    Pointer to reserved vector list.\r
   If VectorInfo is not NULL, the exception vectors will be initialized per vector attribute accordingly.\r
 \r
   @param[in]  VectorInfo    Pointer to reserved vector list.\r

-  \r
-  @retval EFI_SUCCESS           All CPU interrupt/exception entries have been successfully initialized \r
+\r
+  @retval EFI_SUCCESS           All CPU interrupt/exception entries have been successfully initialized\r

                                 with default interrupt/exception handlers.\r
   @retval EFI_INVALID_PARAMETER VectorInfo includes the invalid content if VectorInfo is not NULL.\r
   @retval EFI_UNSUPPORTED       This function is not supported.\r
                                 with default interrupt/exception handlers.\r
   @retval EFI_INVALID_PARAMETER VectorInfo includes the invalid content if VectorInfo is not NULL.\r
   @retval EFI_UNSUPPORTED       This function is not supported.\r


@@ -163,9 +163,9 @@ InitializeCpuInterruptHandlers (
 /**\r
   Registers a function to be called from the processor interrupt handler.\r
 \r
 /**\r
   Registers a function to be called from the processor interrupt handler.\r
 \r

-  This function registers and enables the handler specified by InterruptHandler for a processor \r
-  interrupt or exception type specified by InterruptType. If InterruptHandler is NULL, then the \r
-  handler for the processor interrupt or exception type specified by InterruptType is uninstalled. \r
+  This function registers and enables the handler specified by InterruptHandler for a processor\r
+  interrupt or exception type specified by InterruptType. If InterruptHandler is NULL, then the\r
+  handler for the processor interrupt or exception type specified by InterruptType is uninstalled.\r

   The installed handler is called once for each processor interrupt or exception.\r
   NOTE: This function should be invoked after InitializeCpuExceptionHandlers() or\r
   InitializeCpuInterruptHandlers() invoked, otherwise EFI_UNSUPPORTED returned.\r
   The installed handler is called once for each processor interrupt or exception.\r
   NOTE: This function should be invoked after InitializeCpuExceptionHandlers() or\r
   InitializeCpuInterruptHandlers() invoked, otherwise EFI_UNSUPPORTED returned.\r


@@ -202,5 +202,5 @@ DumpCpuContext (
   IN EFI_EXCEPTION_TYPE   ExceptionType,\r
   IN EFI_SYSTEM_CONTEXT   SystemContext\r
   );\r
   IN EFI_EXCEPTION_TYPE   ExceptionType,\r
   IN EFI_SYSTEM_CONTEXT   SystemContext\r
   );\r

-  \r
+\r

 #endif\r
 #endif\r

diff --git a/MdeModulePkg/Include/Library/CustomizedDisplayLib.h b/MdeModulePkg/Include/Library/CustomizedDisplayLib.h
index 1689e2c4f693211e59cd9d2ee37c0f5034b7363e..f664778508419f1efab1ff6ee32c28a69cace9b1 100644 (file)
--- a/MdeModulePkg/Include/Library/CustomizedDisplayLib.h
+++ b/MdeModulePkg/Include/Library/CustomizedDisplayLib.h
@@ -1,13 +1,13 @@
 /** @file\r
   This library class defines a set of interfaces to customize Display module\r
 \r
 /** @file\r
   This library class defines a set of interfaces to customize Display module\r
 \r

-Copyright (c) 2013, Intel Corporation. All rights reserved.<BR>\r
-This program and the accompanying materials are licensed and made available under \r
-the terms and conditions of the BSD License that accompanies this distribution.  \r
+Copyright (c) 2013 - 2018, Intel Corporation. All rights reserved.<BR>\r
+This program and the accompanying materials are licensed and made available under\r
+the terms and conditions of the BSD License that accompanies this distribution.\r

 The full text of the license may be found at\r
 The full text of the license may be found at\r

-http://opensource.org/licenses/bsd-license.php.                                            \r
+http://opensource.org/licenses/bsd-license.php.\r

 \r
 \r

-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     \r
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r

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


@@ -38,14 +38,14 @@ Statement
 **/\r
 \r
 /**\r
 **/\r
 \r
 /**\r

-  This funtion defines Page Frame and Backgroud. \r
-  \r
-  Based on the above layout, it will be responsible for HeaderHeight, FooterHeight, \r
-  StatusBarHeight and Backgroud. And, it will reserve Screen for Statement. \r
+  This funtion defines Page Frame and Backgroud.\r
+\r
+  Based on the above layout, it will be responsible for HeaderHeight, FooterHeight,\r
+  StatusBarHeight and Backgroud. And, it will reserve Screen for Statement.\r

 \r
   @param[in]  FormData             Form Data to be shown in Page.\r
   @param[out] ScreenForStatement   Screen to be used for Statement. (Prompt, Value and Help)\r
 \r
   @param[in]  FormData             Form Data to be shown in Page.\r
   @param[out] ScreenForStatement   Screen to be used for Statement. (Prompt, Value and Help)\r

-  \r
+\r

   @return Status\r
 **/\r
 EFI_STATUS\r
   @return Status\r
 **/\r
 EFI_STATUS\r


@@ -59,7 +59,7 @@ DisplayPageFrame (
   Clear Screen to the initial state.\r
 **/\r
 VOID\r
   Clear Screen to the initial state.\r
 **/\r
 VOID\r

-EFIAPI \r
+EFIAPI\r

 ClearDisplayPage (\r
   VOID\r
   );\r
 ClearDisplayPage (\r
   VOID\r
   );\r


@@ -68,8 +68,8 @@ ClearDisplayPage (
   This function updates customized key panel's help information.\r
   The library will prepare those Strings for the basic key, ESC, Enter, Up/Down/Left/Right, +/-.\r
   and arrange them in Footer panel.\r
   This function updates customized key panel's help information.\r
   The library will prepare those Strings for the basic key, ESC, Enter, Up/Down/Left/Right, +/-.\r
   and arrange them in Footer panel.\r

-  \r
-  @param[in]  FormData       Form Data to be shown in Page. FormData has the highlighted statement. \r
+\r
+  @param[in]  FormData       Form Data to be shown in Page. FormData has the highlighted statement.\r

   @param[in]  Statement      The statement current selected.\r
   @param[in]  Selected       Whether or not a tag be selected. TRUE means Enter has hit this question.\r
 **/\r
   @param[in]  Statement      The statement current selected.\r
   @param[in]  Selected       Whether or not a tag be selected. TRUE means Enter has hit this question.\r
 **/\r


@@ -84,10 +84,10 @@ RefreshKeyHelp (
 /**\r
   Update status bar.\r
 \r
 /**\r
   Update status bar.\r
 \r

-  This function updates the status bar on the bottom of menu screen. It just shows StatusBar. \r
+  This function updates the status bar on the bottom of menu screen. It just shows StatusBar.\r

   Original logic in this function should be splitted out.\r
 \r
   Original logic in this function should be splitted out.\r
 \r

-  @param[in]  MessageType            The type of message to be shown. InputError or Configuration Changed. \r
+  @param[in]  MessageType            The type of message to be shown. InputError or Configuration Changed.\r

   @param[in]  State                  Show or Clear Message.\r
 **/\r
 VOID\r
   @param[in]  State                  Show or Clear Message.\r
 **/\r
 VOID\r


@@ -98,13 +98,13 @@ UpdateStatusBar (
   );\r
 \r
 /**\r
   );\r
 \r
 /**\r

-  Create popup window. \r
+  Create popup window.\r

 \r
   This function draws OEM/Vendor specific pop up windows.\r
 \r
   @param[out]  Key    User Input Key\r
   @param       ...    String to be shown in Popup. The variable argument list is terminated by a NULL.\r
 \r
   This function draws OEM/Vendor specific pop up windows.\r
 \r
   @param[out]  Key    User Input Key\r
   @param       ...    String to be shown in Popup. The variable argument list is terminated by a NULL.\r

-  \r
+\r

 **/\r
 VOID\r
 EFIAPI\r
 **/\r
 VOID\r
 EFIAPI\r


@@ -114,8 +114,8 @@ CreateDialog (
   );\r
 \r
 /**\r
   );\r
 \r
 /**\r

-  Confirm how to handle the changed data. \r
-  \r
+  Confirm how to handle the changed data.\r
+\r

   @return Action BROWSER_ACTION_SUBMIT, BROWSER_ACTION_DISCARD or other values.\r
 **/\r
 UINTN\r
   @return Action BROWSER_ACTION_SUBMIT, BROWSER_ACTION_DISCARD or other values.\r
 **/\r
 UINTN\r


@@ -127,7 +127,7 @@ ConfirmDataChange (
 /**\r
   OEM specifies whether Setup exits Page by ESC key.\r
 \r
 /**\r
   OEM specifies whether Setup exits Page by ESC key.\r
 \r

-  This function customized the behavior that whether Setup exits Page so that \r
+  This function customized the behavior that whether Setup exits Page so that\r

   system able to boot when configuration is not changed.\r
 \r
   @retval  TRUE     Exits FrontPage\r
   system able to boot when configuration is not changed.\r
 \r
   @retval  TRUE     Exits FrontPage\r


@@ -140,14 +140,14 @@ FormExitPolicy (
   );\r
 \r
 /**\r
   );\r
 \r
 /**\r

-  Set Timeout value for a ceratain Form to get user response. \r
-  \r
+  Set Timeout value for a ceratain Form to get user response.\r
+\r

   This function allows to set timeout value on a ceratain form if necessary.\r
   This function allows to set timeout value on a ceratain form if necessary.\r

-  If timeout is not zero, the form will exit if user has no response in timeout. \r
-  \r
+  If timeout is not zero, the form will exit if user has no response in timeout.\r
+\r

   @param[in]  FormData   Form Data to be shown in Page\r
 \r
   @param[in]  FormData   Form Data to be shown in Page\r
 \r

-  @return 0     No timeout for this form. \r
+  @return 0     No timeout for this form.\r

   @return > 0   Timeout value in 100 ns units.\r
 **/\r
 UINT64\r
   @return > 0   Timeout value in 100 ns units.\r
 **/\r
 UINT64\r


@@ -186,8 +186,8 @@ PrintStringAt (
   @param  Column     The cursor position to print the string at. When it is -1, use current Position.\r
   @param  Row        The cursor position to print the string at. When it is -1, use current Position.\r
   @param  String     String pointer.\r
   @param  Column     The cursor position to print the string at. When it is -1, use current Position.\r
   @param  Row        The cursor position to print the string at. When it is -1, use current Position.\r
   @param  String     String pointer.\r

-  @param  Width      Width for String to be printed. If the print length of String < Width, \r
-                     Space char (L' ') will be used to append String. \r
+  @param  Width      Width for String to be printed. If the print length of String < Width,\r
+                     Space char (L' ') will be used to append String.\r

 \r
   @return Length of string printed to the console\r
 \r
 \r
   @return Length of string printed to the console\r
 \r

diff --git a/MdeModulePkg/Include/Library/DpcLib.h b/MdeModulePkg/Include/Library/DpcLib.h
index c392e3e3d78679781d8e8660955a9219bd40f6f5..41a49892fe3bd416b874e0801eb7d3ea80e10894 100644 (file)
--- a/MdeModulePkg/Include/Library/DpcLib.h
+++ b/MdeModulePkg/Include/Library/DpcLib.h
@@ -1,13 +1,13 @@
 /** @file\r
   DpcLib.h.\r
 /** @file\r
   DpcLib.h.\r

-  \r
-Copyright (c) 2007 - 2010, Intel Corporation. All rights reserved.<BR>\r
-This program and the accompanying materials are licensed and made available under \r
-the terms and conditions of the BSD License that accompanies this distribution.  \r
+\r
+Copyright (c) 2007 - 2018, Intel Corporation. All rights reserved.<BR>\r
+This program and the accompanying materials are licensed and made available under\r
+the terms and conditions of the BSD License that accompanies this distribution.\r

 The full text of the license may be found at\r
 The full text of the license may be found at\r

-http://opensource.org/licenses/bsd-license.php.                                            \r
+http://opensource.org/licenses/bsd-license.php.\r

 \r
 \r

-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     \r
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r

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

diff --git a/MdeModulePkg/Include/Library/FileExplorerLib.h b/MdeModulePkg/Include/Library/FileExplorerLib.h
index 2ae8ec61069c2716ab2f67fd323365c2d3baa0c2..c077541102c0326744e17e03195db815c7feb948 100644 (file)
--- a/MdeModulePkg/Include/Library/FileExplorerLib.h
+++ b/MdeModulePkg/Include/Library/FileExplorerLib.h
@@ -2,13 +2,13 @@
 \r
   This library class defines a set of interfaces for how to do file explorer.\r
 \r
 \r
   This library class defines a set of interfaces for how to do file explorer.\r
 \r

-Copyright (c) 2007 - 2015, Intel Corporation. All rights reserved.<BR>\r
-This program and the accompanying materials are licensed and made available under \r
-the terms and conditions of the BSD License that accompanies this distribution.  \r
+Copyright (c) 2007 - 2018, Intel Corporation. All rights reserved.<BR>\r
+This program and the accompanying materials are licensed and made available under\r
+the terms and conditions of the BSD License that accompanies this distribution.\r

 The full text of the license may be found at\r
 The full text of the license may be found at\r

-http://opensource.org/licenses/bsd-license.php.                                            \r
+http://opensource.org/licenses/bsd-license.php.\r

 \r
 \r

-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     \r
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r

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


@@ -19,7 +19,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #include <Protocol/FileExplorer.h>\r
 \r
 /**\r
 #include <Protocol/FileExplorer.h>\r
 \r
 /**\r

-  Choose a file in the specified directory. \r
+  Choose a file in the specified directory.\r

 \r
   If user input NULL for the RootDirectory, will choose file in the system.\r
 \r
 \r
   If user input NULL for the RootDirectory, will choose file in the system.\r
 \r

diff --git a/MdeModulePkg/Include/Library/HiiLib.h b/MdeModulePkg/Include/Library/HiiLib.h
index 3d87677b2fb89b36fe0370d4bf882e19839509bd..8d0ecca46a65dfb626c50ffd3139ade965e510ab 100644 (file)
--- a/MdeModulePkg/Include/Library/HiiLib.h
+++ b/MdeModulePkg/Include/Library/HiiLib.h
@@ -1,14 +1,14 @@
 /** @file\r
   Public include file for the HII Library\r
 \r
 /** @file\r
   Public include file for the HII Library\r
 \r

-Copyright (c) 2007 - 2013, Intel Corporation. All rights reserved.<BR>\r
-This program and the accompanying materials are licensed and made available under \r
-the terms and conditions of the BSD License that accompanies this distribution.  \r
+Copyright (c) 2007 - 2018, Intel Corporation. All rights reserved.<BR>\r
+This program and the accompanying materials are licensed and made available under\r
+the terms and conditions of the BSD License that accompanies this distribution.\r

 The full text of the license may be found at\r
 The full text of the license may be found at\r

-http://opensource.org/licenses/bsd-license.php.                                            \r
+http://opensource.org/licenses/bsd-license.php.\r

 \r
 \r

-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     \r
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             \r
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r

 \r
 **/\r
 \r
 \r
 **/\r
 \r


@@ -29,7 +29,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   If an empty list of packages is passed in, then NULL is returned.  If the size of\r
   the list of package is 0, then NULL is returned.\r
 \r
   If an empty list of packages is passed in, then NULL is returned.  If the size of\r
   the list of package is 0, then NULL is returned.\r
 \r

-  The variable arguments are pointers that point to package headers defined \r
+  The variable arguments are pointers that point to package headers defined\r

   by UEFI VFR compiler and StringGather tool.\r
 \r
   #pragma pack (push, 1)\r
   by UEFI VFR compiler and StringGather tool.\r
 \r
   #pragma pack (push, 1)\r


@@ -38,13 +38,13 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     EFI_HII_PACKAGE_HEADER  PackageHeader;\r
   } EDKII_AUTOGEN_PACKAGES_HEADER;\r
   #pragma pack (pop)\r
     EFI_HII_PACKAGE_HEADER  PackageHeader;\r
   } EDKII_AUTOGEN_PACKAGES_HEADER;\r
   #pragma pack (pop)\r

-  \r
+\r

   @param[in]  PackageListGuid  The GUID of the package list.\r
   @param[in]  PackageListGuid  The GUID of the package list.\r

-  @param[in]  DeviceHandle     If not NULL, the Device Handle on which \r
+  @param[in]  DeviceHandle     If not NULL, the Device Handle on which\r

                                an instance of DEVICE_PATH_PROTOCOL is installed.\r
                                an instance of DEVICE_PATH_PROTOCOL is installed.\r

-                               This Device Handle uniquely defines the device that \r
+                               This Device Handle uniquely defines the device that\r

                                the added packages are associated with.\r
                                the added packages are associated with.\r

-  @param[in]  ...              The variable argument list that contains pointers \r
+  @param[in]  ...              The variable argument list that contains pointers\r

                                to packages terminated by a NULL.\r
 \r
   @retval NULL   An HII Handle has already been registered in the HII Database with\r
                                to packages terminated by a NULL.\r
 \r
   @retval NULL   An HII Handle has already been registered in the HII Database with\r


@@ -81,37 +81,37 @@ HiiRemovePackages (
 ;\r
 \r
 /**\r
 ;\r
 \r
 /**\r

-  This function creates a new string in String Package or updates an existing \r
+  This function creates a new string in String Package or updates an existing\r

   string in a String Package.  If StringId is 0, then a new string is added to\r
   a String Package.  If StringId is not zero, then a string in String Package is\r
   updated.  If SupportedLanguages is NULL, then the string is added or updated\r
   for all the languages that the String Package supports.  If SupportedLanguages\r
   string in a String Package.  If StringId is 0, then a new string is added to\r
   a String Package.  If StringId is not zero, then a string in String Package is\r
   updated.  If SupportedLanguages is NULL, then the string is added or updated\r
   for all the languages that the String Package supports.  If SupportedLanguages\r

-  is not NULL, then the string is added or updated for the set of languages \r
+  is not NULL, then the string is added or updated for the set of languages\r

   specified by SupportedLanguages.\r
   specified by SupportedLanguages.\r

-    \r
+\r

   If HiiHandle is NULL, then ASSERT().\r
   If String is NULL, then ASSERT().\r
 \r
   If HiiHandle is NULL, then ASSERT().\r
   If String is NULL, then ASSERT().\r
 \r

-  @param[in]  HiiHandle           A handle that was previously registered in the \r
+  @param[in]  HiiHandle           A handle that was previously registered in the\r

                                   HII Database.\r
                                   HII Database.\r

-  @param[in]  StringId            If zero, then a new string is created in the \r
-                                  String Package associated with HiiHandle.  If \r
-                                  non-zero, then the string specified by StringId \r
-                                  is updated in the String Package associated \r
-                                  with HiiHandle. \r
-  @param[in]  String              A pointer to the Null-terminated Unicode string \r
-                                  to add or update in the String Package associated \r
+  @param[in]  StringId            If zero, then a new string is created in the\r
+                                  String Package associated with HiiHandle.  If\r
+                                  non-zero, then the string specified by StringId\r
+                                  is updated in the String Package associated\r

                                   with HiiHandle.\r
                                   with HiiHandle.\r

-  @param[in]  SupportedLanguages  A pointer to a Null-terminated ASCII string of \r
-                                  language codes.  If this parameter is NULL, then \r
-                                  String is added or updated in the String Package \r
-                                  associated with HiiHandle for all the languages \r
-                                  that the String Package supports.  If this \r
-                                  parameter is not NULL, then String is added \r
-                                  or updated in the String Package associated with \r
-                                  HiiHandle for the set of languages specified by \r
-                                  SupportedLanguages.  The format of \r
-                                  SupportedLanguages must follow the language \r
+  @param[in]  String              A pointer to the Null-terminated Unicode string\r
+                                  to add or update in the String Package associated\r
+                                  with HiiHandle.\r
+  @param[in]  SupportedLanguages  A pointer to a Null-terminated ASCII string of\r
+                                  language codes.  If this parameter is NULL, then\r
+                                  String is added or updated in the String Package\r
+                                  associated with HiiHandle for all the languages\r
+                                  that the String Package supports.  If this\r
+                                  parameter is not NULL, then String is added\r
+                                  or updated in the String Package associated with\r
+                                  HiiHandle for the set of languages specified by\r
+                                  SupportedLanguages.  The format of\r
+                                  SupportedLanguages must follow the language\r

                                   format assumed in the HII Database.\r
 \r
   @retval 0      The string could not be added or updated in the String Package.\r
                                   format assumed in the HII Database.\r
 \r
   @retval 0      The string could not be added or updated in the String Package.\r


@@ -130,21 +130,21 @@ HiiSetString (
 \r
 /**\r
   Retrieves a string from a string package in a specific language.  If the language\r
 \r
 /**\r
   Retrieves a string from a string package in a specific language.  If the language\r

-  is not specified, then a string from a string package in the current platform \r
-  language is retrieved.  If the string cannot be retrieved using the specified \r
-  language or the current platform language, then the string is retrieved from \r
-  the string package in the first language the string package supports.  The \r
-  returned string is allocated using AllocatePool().  The caller is responsible \r
+  is not specified, then a string from a string package in the current platform\r
+  language is retrieved.  If the string cannot be retrieved using the specified\r
+  language or the current platform language, then the string is retrieved from\r
+  the string package in the first language the string package supports.  The\r
+  returned string is allocated using AllocatePool().  The caller is responsible\r

   for freeing the allocated buffer using FreePool().\r
   for freeing the allocated buffer using FreePool().\r

-  \r
+\r

   If HiiHandle is NULL, then ASSERT().\r
   If StringId is 0, then ASSERT().\r
 \r
   @param[in]  HiiHandle  A handle that was previously registered in the HII Database.\r
   If HiiHandle is NULL, then ASSERT().\r
   If StringId is 0, then ASSERT().\r
 \r
   @param[in]  HiiHandle  A handle that was previously registered in the HII Database.\r

-  @param[in]  StringId   The identifier of the string to retrieved from the string \r
+  @param[in]  StringId   The identifier of the string to retrieved from the string\r

                          package associated with HiiHandle.\r
                          package associated with HiiHandle.\r

-  @param[in]  Language   The language of the string to retrieve.  If this parameter \r
-                         is NULL, then the current platform language is used.  The \r
+  @param[in]  Language   The language of the string to retrieve.  If this parameter\r
+                         is NULL, then the current platform language is used.  The\r

                          format of Language must follow the language format assumed in\r
                          the HII Database.\r
 \r
                          format of Language must follow the language format assumed in\r
                          the HII Database.\r
 \r


@@ -162,24 +162,24 @@ HiiGetString (
 ;\r
 \r
 /**\r
 ;\r
 \r
 /**\r

-  Retrieves a string from a string package named by GUID, in the specified language.  \r
-  If the language is not specified, then a string from a string package in the \r
-  current platform  language is retrieved.  If the string cannot be retrieved \r
-  using the specified language or the current platform language, then the string \r
-  is retrieved from the string package in the first language the string package \r
-  supports.  The returned string is allocated using AllocatePool().  The caller \r
+  Retrieves a string from a string package named by GUID, in the specified language.\r
+  If the language is not specified, then a string from a string package in the\r
+  current platform  language is retrieved.  If the string cannot be retrieved\r
+  using the specified language or the current platform language, then the string\r
+  is retrieved from the string package in the first language the string package\r
+  supports.  The returned string is allocated using AllocatePool().  The caller\r

   is responsible for freeing the allocated buffer using FreePool().\r
   is responsible for freeing the allocated buffer using FreePool().\r

-  \r
+\r

   If PackageListGuid is NULL, then ASSERT().\r
   If StringId is 0, then ASSERT().\r
 \r
   If PackageListGuid is NULL, then ASSERT().\r
   If StringId is 0, then ASSERT().\r
 \r

-  @param[in]  PackageListGuid  The GUID of a package list that was previously \r
+  @param[in]  PackageListGuid  The GUID of a package list that was previously\r

                                registered in the HII Database.\r
                                registered in the HII Database.\r

-  @param[in]  StringId         The identifier of the string to retrieved from the \r
+  @param[in]  StringId         The identifier of the string to retrieved from the\r

                                string package associated with PackageListGuid.\r
                                string package associated with PackageListGuid.\r

-  @param[in]  Language         The language of the string to retrieve.  If this \r
-                               parameter is NULL, then the current platform \r
-                               language is used.  The format of Language must \r
+  @param[in]  Language         The language of the string to retrieve.  If this\r
+                               parameter is NULL, then the current platform\r
+                               language is used.  The format of Language must\r

                                follow the language format assumed in the HII Database.\r
 \r
   @retval NULL   The package list specified by PackageListGuid is not present in the\r
                                follow the language format assumed in the HII Database.\r
 \r
   @retval NULL   The package list specified by PackageListGuid is not present in the\r


@@ -204,12 +204,12 @@ HiiGetPackageString (
   This function allocates the returned array using AllocatePool().\r
   The caller is responsible for freeing the array with FreePool().\r
 \r
   This function allocates the returned array using AllocatePool().\r
   The caller is responsible for freeing the array with FreePool().\r
 \r

-  @param[in]  PackageListGuid  An optional parameter that is used to request \r
+  @param[in]  PackageListGuid  An optional parameter that is used to request\r

                                HII Handles associated with a specific\r
                                Package List GUID.  If this parameter is NULL,\r
                                then all the HII Handles in the HII Database\r
                                are returned.  If this parameter is not NULL,\r
                                HII Handles associated with a specific\r
                                Package List GUID.  If this parameter is NULL,\r
                                then all the HII Handles in the HII Database\r
                                are returned.  If this parameter is not NULL,\r

-                               then zero or more HII Handles associated with \r
+                               then zero or more HII Handles associated with\r

                                PackageListGuid are returned.\r
 \r
   @retval NULL   No HII handles were found in the HII database\r
                                PackageListGuid are returned.\r
 \r
   @retval NULL   No HII handles were found in the HII database\r


@@ -226,7 +226,7 @@ HiiGetHiiHandles (
 \r
 /**\r
   This function allows a caller to extract the form set opcode form the Hii Handle.\r
 \r
 /**\r
   This function allows a caller to extract the form set opcode form the Hii Handle.\r

-  The returned buffer is allocated using AllocatePool().The caller is responsible \r
+  The returned buffer is allocated using AllocatePool().The caller is responsible\r

   for freeing the allocated buffer using FreePool().\r
 \r
   @param Handle            The HII handle.\r
   for freeing the allocated buffer using FreePool().\r
 \r
   @param Handle            The HII handle.\r


@@ -248,12 +248,12 @@ HiiGetFormSetFromHiiHandle(
   );\r
 \r
 /**\r
   );\r
 \r
 /**\r

-  Retrieves a pointer to a Null-terminated ASCII string containing the list \r
-  of languages that an HII handle in the HII Database supports.  The returned \r
+  Retrieves a pointer to a Null-terminated ASCII string containing the list\r
+  of languages that an HII handle in the HII Database supports.  The returned\r

   string is allocated using AllocatePool().  The caller is responsible for freeing\r
   the returned string using FreePool().  The format of the returned string follows\r
   the language format assumed in the HII Database.\r
   string is allocated using AllocatePool().  The caller is responsible for freeing\r
   the returned string using FreePool().  The format of the returned string follows\r
   the language format assumed in the HII Database.\r

-  \r
+\r

   If HiiHandle is NULL, then ASSERT().\r
 \r
   @param[in]  HiiHandle  A handle that was previously registered in the HII Database.\r
   If HiiHandle is NULL, then ASSERT().\r
 \r
   @param[in]  HiiHandle  A handle that was previously registered in the HII Database.\r


@@ -273,23 +273,23 @@ HiiGetSupportedLanguages (
 ;\r
 \r
 /**\r
 ;\r
 \r
 /**\r

-  Allocates and returns a Null-terminated Unicode <ConfigHdr> string using routing \r
+  Allocates and returns a Null-terminated Unicode <ConfigHdr> string using routing\r

   information that includes a GUID, an optional Unicode string name, and a device\r
   information that includes a GUID, an optional Unicode string name, and a device\r

-  path. The string returned is allocated with AllocatePool().  The caller is \r
+  path. The string returned is allocated with AllocatePool().  The caller is\r

   responsible for freeing the allocated string with FreePool().\r
   responsible for freeing the allocated string with FreePool().\r

-  \r
+\r

   The format of a <ConfigHdr> is as follows:\r
 \r
     GUID=<HexCh>32&NAME=<Char>NameLength&PATH=<HexChar>DevicePathSize<Null>\r
 \r
   @param[in]  Guid          The pointer to an EFI_GUID that is the routing information\r
   The format of a <ConfigHdr> is as follows:\r
 \r
     GUID=<HexCh>32&NAME=<Char>NameLength&PATH=<HexChar>DevicePathSize<Null>\r
 \r
   @param[in]  Guid          The pointer to an EFI_GUID that is the routing information\r

-                            GUID.  Each of the 16 bytes in Guid is converted to \r
+                            GUID.  Each of the 16 bytes in Guid is converted to\r

                             a 2 Unicode character hexadecimal string.  This is\r
                             an optional parameter that may be NULL.\r
                             a 2 Unicode character hexadecimal string.  This is\r
                             an optional parameter that may be NULL.\r

-  @param[in]  Name          The pointer to a Null-terminated Unicode string that is \r
-                            the routing information NAME.  This is an optional \r
-                            parameter that may be NULL.  Each 16-bit Unicode \r
-                            character in Name is converted to a 4 character Unicode \r
+  @param[in]  Name          The pointer to a Null-terminated Unicode string that is\r
+                            the routing information NAME.  This is an optional\r
+                            parameter that may be NULL.  Each 16-bit Unicode\r
+                            character in Name is converted to a 4 character Unicode\r

                             hexadecimal string.\r
   @param[in]  DriverHandle  The driver handle that supports a Device Path Protocol\r
                             that is the routing information PATH.  Each byte of\r
                             hexadecimal string.\r
   @param[in]  DriverHandle  The driver handle that supports a Device Path Protocol\r
                             that is the routing information PATH.  Each byte of\r


@@ -311,23 +311,23 @@ HiiConstructConfigHdr (
 \r
 /**\r
   Reset the default value specified by DefaultId to the driver\r
 \r
 /**\r
   Reset the default value specified by DefaultId to the driver\r

-  configuration specified by the Request string. \r
+  configuration specified by the Request string.\r

 \r
   NULL request string support depends on the ExportConfig interface of\r
   HiiConfigRouting protocol in UEFI specification.\r
 \r
   NULL request string support depends on the ExportConfig interface of\r
   HiiConfigRouting protocol in UEFI specification.\r

-  \r
-  @param Request    A null-terminated Unicode string in \r
+\r
+  @param Request    A null-terminated Unicode string in\r

                     <MultiConfigRequest> format. It can be NULL.\r
                     If it is NULL, all configurations for the\r
                     entirety of the current HII database will be reset.\r
   @param DefaultId  Specifies the type of defaults to retrieve.\r
                     <MultiConfigRequest> format. It can be NULL.\r
                     If it is NULL, all configurations for the\r
                     entirety of the current HII database will be reset.\r
   @param DefaultId  Specifies the type of defaults to retrieve.\r

-  \r
+\r

   @retval TRUE    The default value was set successfully.\r
   @retval FALSE   The default value was not found.\r
 **/\r
 BOOLEAN\r
   @retval TRUE    The default value was set successfully.\r
   @retval FALSE   The default value was not found.\r
 **/\r
 BOOLEAN\r

-EFIAPI                               \r
-HiiSetToDefaults (     \r
+EFIAPI\r
+HiiSetToDefaults (\r

   IN CONST EFI_STRING  Request,  OPTIONAL\r
   IN UINT16            DefaultId\r
   );\r
   IN CONST EFI_STRING  Request,  OPTIONAL\r
   IN UINT16            DefaultId\r
   );\r


@@ -337,17 +337,17 @@ HiiSetToDefaults (
 \r
   NULL request string support depends on the ExportConfig interface of\r
   HiiConfigRouting protocol in the UEFI specification.\r
 \r
   NULL request string support depends on the ExportConfig interface of\r
   HiiConfigRouting protocol in the UEFI specification.\r

-  \r
-  @param  Request   A null-terminated Unicode string in \r
+\r
+  @param  Request   A null-terminated Unicode string in\r

                     <MultiConfigRequest> format. It can be NULL.\r
                     If it is NULL, all current configurations for the\r
                     entirety of the current HII database will be validated.\r
                     <MultiConfigRequest> format. It can be NULL.\r
                     If it is NULL, all current configurations for the\r
                     entirety of the current HII database will be validated.\r

-  \r
+\r

   @retval TRUE    The current configuration is valid.\r
   @retval FALSE   The current configuration is invalid.\r
 **/\r
 BOOLEAN\r
   @retval TRUE    The current configuration is valid.\r
   @retval FALSE   The current configuration is invalid.\r
 **/\r
 BOOLEAN\r

-EFIAPI                               \r
+EFIAPI\r

 HiiValidateSettings (\r
   IN CONST EFI_STRING  Request  OPTIONAL\r
   );\r
 HiiValidateSettings (\r
   IN CONST EFI_STRING  Request  OPTIONAL\r
   );\r


@@ -377,11 +377,11 @@ HiiIsConfigHdrMatch (
   Retrieves uncommitted data from the Form Browser and converts it to a binary\r
   buffer.\r
 \r
   Retrieves uncommitted data from the Form Browser and converts it to a binary\r
   buffer.\r
 \r

-  @param[in]  VariableGuid  The pointer to an EFI_GUID structure.  This is an optional \r
+  @param[in]  VariableGuid  The pointer to an EFI_GUID structure.  This is an optional\r

                             parameter that may be NULL.\r
                             parameter that may be NULL.\r

-  @param[in]  VariableName  The pointer to a Null-terminated Unicode string.  This \r
+  @param[in]  VariableName  The pointer to a Null-terminated Unicode string.  This\r

                             is an optional parameter that may be NULL.\r
                             is an optional parameter that may be NULL.\r

-  @param[in]  BufferSize    The length in bytes of buffer to hold retrieved data. \r
+  @param[in]  BufferSize    The length in bytes of buffer to hold retrieved data.\r

   @param[out] Buffer        The buffer of data to be updated.\r
 \r
   @retval FALSE  The uncommitted data could not be retrieved.\r
   @param[out] Buffer        The buffer of data to be updated.\r
 \r
   @retval FALSE  The uncommitted data could not be retrieved.\r


@@ -411,7 +411,7 @@ HiiGetBrowserData (
   @param[in]  RequestElement  An optional field to specify which part of the\r
                               buffer data will be send back to Browser. If NULL,\r
                               the whole buffer of data will be committed to\r
   @param[in]  RequestElement  An optional field to specify which part of the\r
                               buffer data will be send back to Browser. If NULL,\r
                               the whole buffer of data will be committed to\r

-                              Browser. \r
+                              Browser.\r

                               <RequestElement> ::= &OFFSET=<Number>&WIDTH=<Number>*\r
 \r
   @retval FALSE  The uncommitted data could not be updated.\r
                               <RequestElement> ::= &OFFSET=<Number>&WIDTH=<Number>*\r
 \r
   @retval FALSE  The uncommitted data could not be updated.\r


@@ -436,9 +436,9 @@ HiiSetBrowserData (
 \r
 /**\r
   Returns a UINT64 value that contains bitfields for Hour, Minute, and Second.\r
 \r
 /**\r
   Returns a UINT64 value that contains bitfields for Hour, Minute, and Second.\r

-  The lower 8-bits of Hour are placed in bits 0..7.  The lower 8-bits of Minute \r
-  are placed in bits 8..15, and the lower 8-bits of Second are placed in bits \r
-  16..23.  This format was selected because it can be easily translated to \r
+  The lower 8-bits of Hour are placed in bits 0..7.  The lower 8-bits of Minute\r
+  are placed in bits 8..15, and the lower 8-bits of Second are placed in bits\r
+  16..23.  This format was selected because it can be easily translated to\r

   an EFI_HII_TIME structure in an EFI_IFR_TYPE_VALUE union.\r
 \r
   @param  Hour    The hour value to be encoded.\r
   an EFI_HII_TIME structure in an EFI_IFR_TYPE_VALUE union.\r
 \r
   @param  Hour    The hour value to be encoded.\r


@@ -452,9 +452,9 @@ HiiSetBrowserData (
 \r
 /**\r
   Returns a UINT64 value that contains bit fields for Year, Month, and Day.\r
 \r
 /**\r
   Returns a UINT64 value that contains bit fields for Year, Month, and Day.\r

-  The lower 16-bits of Year are placed in bits 0..15.  The lower 8-bits of Month \r
-  are placed in bits 16..23, and the lower 8-bits of Day are placed in bits \r
-  24..31.  This format was selected because it can be easily translated to \r
+  The lower 16-bits of Year are placed in bits 0..15.  The lower 8-bits of Month\r
+  are placed in bits 16..23, and the lower 8-bits of Day are placed in bits\r
+  24..31.  This format was selected because it can be easily translated to\r

   an EFI_HII_DATE structure in an EFI_IFR_TYPE_VALUE union.\r
 \r
   @param  Year   The year value to be encoded.\r
   an EFI_HII_DATE structure in an EFI_IFR_TYPE_VALUE union.\r
 \r
   @param  Year   The year value to be encoded.\r


@@ -467,7 +467,7 @@ HiiSetBrowserData (
   (UINT64)((Year & 0xffff) | ((Month & 0xff) << 16) | ((Day & 0xff) << 24))\r
 \r
 /**\r
   (UINT64)((Year & 0xffff) | ((Month & 0xff) << 16) | ((Day & 0xff) << 24))\r
 \r
 /**\r

-  Allocates and returns a new OpCode Handle.  OpCode Handles must be freed with \r
+  Allocates and returns a new OpCode Handle.  OpCode Handles must be freed with\r

   HiiFreeOpCodeHandle().\r
 \r
   @retval NULL   There are not enough resources to allocate a new OpCode Handle.\r
   HiiFreeOpCodeHandle().\r
 \r
   @retval NULL   There are not enough resources to allocate a new OpCode Handle.\r


@@ -595,14 +595,14 @@ HiiCreateDefaultOpCode (
 \r
   @param[in]  OpCodeHandle  The handle to the buffer of opcodes.\r
   @param[in]  Guid          The pointer to EFI_GUID of this guided opcode.\r
 \r
   @param[in]  OpCodeHandle  The handle to the buffer of opcodes.\r
   @param[in]  Guid          The pointer to EFI_GUID of this guided opcode.\r

-  @param[in]  GuidOpCode    The pointer to an EFI_IFR_GUID opcode.  This is an \r
+  @param[in]  GuidOpCode    The pointer to an EFI_IFR_GUID opcode.  This is an\r

                             optional parameter that may be NULL.  If this\r
                             optional parameter that may be NULL.  If this\r

-                            parameter is NULL, then the GUID extension \r
+                            parameter is NULL, then the GUID extension\r

                             region of the created opcode is filled with zeros.\r
                             region of the created opcode is filled with zeros.\r

-                            If this parameter is not NULL, then the GUID \r
-                            extension region of GuidData will be copied to \r
+                            If this parameter is not NULL, then the GUID\r
+                            extension region of GuidData will be copied to\r

                             the GUID extension region of the created opcode.\r
                             the GUID extension region of the created opcode.\r

-  @param[in]  OpCodeSize    The size, in bytes, of created opcode.  This value \r
+  @param[in]  OpCodeSize    The size, in bytes, of created opcode.  This value\r

                             must be >= sizeof(EFI_IFR_GUID).\r
 \r
   @retval NULL   There is not enough space left in Buffer to add the opcode.\r
                             must be >= sizeof(EFI_IFR_GUID).\r
 \r
   @retval NULL   There is not enough space left in Buffer to add the opcode.\r


@@ -705,7 +705,7 @@ HiiCreateGotoOpCode (
 /**\r
   Create EFI_IFR_REF_OP, EFI_IFR_REF2_OP, EFI_IFR_REF3_OP and EFI_IFR_REF4_OP opcode.\r
 \r
 /**\r
   Create EFI_IFR_REF_OP, EFI_IFR_REF2_OP, EFI_IFR_REF3_OP and EFI_IFR_REF4_OP opcode.\r
 \r

-  When RefDevicePath is not zero, EFI_IFR_REF4 opcode will be created. \r
+  When RefDevicePath is not zero, EFI_IFR_REF4 opcode will be created.\r

   When RefDevicePath is zero and RefFormSetId is not NULL, EFI_IFR_REF3 opcode will be created.\r
   When RefDevicePath is zero, RefFormSetId is NULL and RefQuestionId is not zero, EFI_IFR_REF2 opcode will be created.\r
   When RefDevicePath is zero, RefFormSetId is NULL and RefQuestionId is zero, EFI_IFR_REF opcode will be created.\r
   When RefDevicePath is zero and RefFormSetId is not NULL, EFI_IFR_REF3 opcode will be created.\r
   When RefDevicePath is zero, RefFormSetId is NULL and RefQuestionId is not zero, EFI_IFR_REF2 opcode will be created.\r
   When RefDevicePath is zero, RefFormSetId is NULL and RefQuestionId is zero, EFI_IFR_REF opcode will be created.\r


@@ -719,11 +719,11 @@ HiiCreateGotoOpCode (
   @param[in]  Help           The string ID for Help.\r
   @param[in]  QuestionFlags  The flags in Question Header\r
   @param[in]  QuestionId     Question ID.\r
   @param[in]  Help           The string ID for Help.\r
   @param[in]  QuestionFlags  The flags in Question Header\r
   @param[in]  QuestionId     Question ID.\r

-  @param[in]  RefQuestionId  The question on the form to which this link is referring. \r
+  @param[in]  RefQuestionId  The question on the form to which this link is referring.\r

                              If its value is zero, then the link refers to the top of the form.\r
                              If its value is zero, then the link refers to the top of the form.\r

-  @param[in]  RefFormSetId   The form set to which this link is referring. If its value is NULL, and RefDevicePath is \r
+  @param[in]  RefFormSetId   The form set to which this link is referring. If its value is NULL, and RefDevicePath is\r

                              zero, then the link is to the current form set.\r
                              zero, then the link is to the current form set.\r

-  @param[in]  RefDevicePath  The string identifier that specifies the string containing the text representation of \r
+  @param[in]  RefDevicePath  The string identifier that specifies the string containing the text representation of\r

                              the device path to which the form set containing the form specified by FormId.\r
                              If its value is zero, then the link refers to the current page.\r
 \r
                              the device path to which the form set containing the form specified by FormId.\r
                              If its value is zero, then the link refers to the current page.\r
 \r


@@ -1050,26 +1050,26 @@ HiiCreateTimeOpCode (
   );\r
 \r
 /**\r
   );\r
 \r
 /**\r

-  This function updates a form that has previously been registered with the HII \r
+  This function updates a form that has previously been registered with the HII\r

   Database.  This function will perform at most one update operation.\r
   Database.  This function will perform at most one update operation.\r

-    \r
-  The form to update is specified by Handle, FormSetGuid, and FormId.  Binary \r
-  comparisons of IFR opcodes are performed from the beginning of the form being \r
-  updated until an IFR opcode is found that exactly matches the first IFR opcode \r
+\r
+  The form to update is specified by Handle, FormSetGuid, and FormId.  Binary\r
+  comparisons of IFR opcodes are performed from the beginning of the form being\r
+  updated until an IFR opcode is found that exactly matches the first IFR opcode\r

   specified by StartOpCodeHandle.  The following rules are used to determine if\r
   an insert, replace, or delete operation is performed:\r
   specified by StartOpCodeHandle.  The following rules are used to determine if\r
   an insert, replace, or delete operation is performed:\r

-  \r
-  1) If no matches are found, then NULL is returned.  \r
+\r
+  1) If no matches are found, then NULL is returned.\r

   2) If a match is found, and EndOpCodeHandle is NULL, then all of the IFR opcodes\r
   2) If a match is found, and EndOpCodeHandle is NULL, then all of the IFR opcodes\r

-     from StartOpCodeHandle except the first opcode are inserted immediately after \r
+     from StartOpCodeHandle except the first opcode are inserted immediately after\r

      the matching IFR opcode in the form to be updated.\r
      the matching IFR opcode in the form to be updated.\r

-  3) If a match is found, and EndOpCodeHandle is not NULL, then a search is made \r
-     from the matching IFR opcode until an IFR opcode exactly matches the first \r
+  3) If a match is found, and EndOpCodeHandle is not NULL, then a search is made\r
+     from the matching IFR opcode until an IFR opcode exactly matches the first\r

      IFR opcode specified by EndOpCodeHandle.  If no match is found for the first\r
      IFR opcode specified by EndOpCodeHandle, then NULL is returned.  If a match\r
      IFR opcode specified by EndOpCodeHandle.  If no match is found for the first\r
      IFR opcode specified by EndOpCodeHandle, then NULL is returned.  If a match\r

-     is found, then all of the IFR opcodes between the start match and the end \r
+     is found, then all of the IFR opcodes between the start match and the end\r

      match are deleted from the form being updated and all of the IFR opcodes\r
      match are deleted from the form being updated and all of the IFR opcodes\r

-     from StartOpCodeHandle except the first opcode are inserted immediately after \r
+     from StartOpCodeHandle except the first opcode are inserted immediately after\r

      the matching start IFR opcode.  If StartOpCcodeHandle only contains one\r
      IFR instruction, then the result of this operation will delete all of the IFR\r
      opcodes between the start end matches.\r
      the matching start IFR opcode.  If StartOpCcodeHandle only contains one\r
      IFR instruction, then the result of this operation will delete all of the IFR\r
      opcodes between the start end matches.\r


@@ -1082,26 +1082,26 @@ HiiCreateTimeOpCode (
                                  is an optional parameter that may be NULL.\r
                                  If it is NULL, all FormSet will be updated.\r
   @param[in]  FormId             The ID of the form to update.\r
                                  is an optional parameter that may be NULL.\r
                                  If it is NULL, all FormSet will be updated.\r
   @param[in]  FormId             The ID of the form to update.\r

-  @param[in]  StartOpCodeHandle  An OpCode Handle that contains the set of IFR \r
+  @param[in]  StartOpCodeHandle  An OpCode Handle that contains the set of IFR\r

                                  opcodes to be inserted or replaced in the form.\r
                                  opcodes to be inserted or replaced in the form.\r

-                                 The first IFR instruction in StartOpCodeHandle \r
-                                 is used to find matching IFR opcode in the \r
-                                 form. \r
+                                 The first IFR instruction in StartOpCodeHandle\r
+                                 is used to find matching IFR opcode in the\r
+                                 form.\r

   @param[in]  EndOpCodeHandle    An OpCcode Handle that contains the IFR opcode\r
                                  that marks the end of a replace operation in\r
                                  the form.  This is an optional parameter that\r
                                  may be NULL.  If it is NULL, then the IFR\r
   @param[in]  EndOpCodeHandle    An OpCcode Handle that contains the IFR opcode\r
                                  that marks the end of a replace operation in\r
                                  the form.  This is an optional parameter that\r
                                  may be NULL.  If it is NULL, then the IFR\r

-                                 opcodes specified by StartOpCodeHandle are \r
+                                 opcodes specified by StartOpCodeHandle are\r

                                  inserted into the form.\r
                                  inserted into the form.\r

-  \r
+\r

   @retval EFI_OUT_OF_RESOURCES   Not enough memory resources are allocated.\r
   @retval EFI_NOT_FOUND          The following cases will return EFI_NOT_FOUND:\r
   @retval EFI_OUT_OF_RESOURCES   Not enough memory resources are allocated.\r
   @retval EFI_NOT_FOUND          The following cases will return EFI_NOT_FOUND:\r

-                                 1) The form specified by HiiHandle, FormSetGuid, \r
+                                 1) The form specified by HiiHandle, FormSetGuid,\r

                                  and FormId could not be found in the HII Database.\r
                                  2) No IFR opcodes in the target form match the first\r
                                  IFR opcode in StartOpCodeHandle.\r
                                  and FormId could not be found in the HII Database.\r
                                  2) No IFR opcodes in the target form match the first\r
                                  IFR opcode in StartOpCodeHandle.\r

-                                 3) EndOpCOde is not NULL, and no IFR opcodes in the \r
-                                 target form following a matching start opcode match \r
+                                 3) EndOpCOde is not NULL, and no IFR opcodes in the\r
+                                 target form following a matching start opcode match\r

                                  the first IFR opcode in EndOpCodeHandle.\r
   @retval EFI_SUCCESS            The matched form is updated by StartOpcode.\r
 \r
                                  the first IFR opcode in EndOpCodeHandle.\r
   @retval EFI_SUCCESS            The matched form is updated by StartOpcode.\r
 \r

diff --git a/MdeModulePkg/Include/Library/HttpLib.h b/MdeModulePkg/Include/Library/HttpLib.h
index 9975aea676de09bd7b02b90bd37cd9d698824095..d3d7735d89e9ef83c42cdb49c2a30098568ebea4 100644 (file)
--- a/MdeModulePkg/Include/Library/HttpLib.h
+++ b/MdeModulePkg/Include/Library/HttpLib.h
@@ -2,7 +2,7 @@
   This library is used to share code between UEFI network stack modules.\r
   It provides the helper routines to parse the HTTP message byte stream.\r
 \r
   This library is used to share code between UEFI network stack modules.\r
   It provides the helper routines to parse the HTTP message byte stream.\r
 \r

-Copyright (c) 2015 - 2016, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2015 - 2018, Intel Corporation. All rights reserved.<BR>\r

 (C) Copyright 2016 Hewlett Packard Enterprise Development LP<BR>\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 (C) Copyright 2016 Hewlett Packard Enterprise Development LP<BR>\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r


@@ -22,10 +22,10 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 \r
 /**\r
   Decode a percent-encoded URI component to the ASCII character.\r
 \r
 /**\r
   Decode a percent-encoded URI component to the ASCII character.\r

-  \r
-  Decode the input component in Buffer according to RFC 3986. The caller is responsible to make \r
+\r
+  Decode the input component in Buffer according to RFC 3986. The caller is responsible to make\r

   sure ResultBuffer points to a buffer with size equal or greater than ((AsciiStrSize (Buffer))\r
   sure ResultBuffer points to a buffer with size equal or greater than ((AsciiStrSize (Buffer))\r

-  in bytes. \r
+  in bytes.\r

 \r
   @param[in]    Buffer           The pointer to a percent-encoded URI component.\r
   @param[in]    BufferLength     Length of Buffer in bytes.\r
 \r
   @param[in]    Buffer           The pointer to a percent-encoded URI component.\r
   @param[in]    BufferLength     Length of Buffer in bytes.\r


@@ -34,7 +34,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 \r
   @retval EFI_SUCCESS            Successfully decoded the URI.\r
   @retval EFI_INVALID_PARAMETER  Buffer is not a valid percent-encoded string.\r
 \r
   @retval EFI_SUCCESS            Successfully decoded the URI.\r
   @retval EFI_INVALID_PARAMETER  Buffer is not a valid percent-encoded string.\r

-  \r
+\r

 **/\r
 EFI_STATUS\r
 EFIAPI\r
 **/\r
 EFI_STATUS\r
 EFIAPI\r


@@ -61,7 +61,7 @@ UriPercentDecode (
   @retval EFI_SUCCESS              Successfully dereferenced the HTTP URL.\r
   @retval EFI_INVALID_PARAMETER    UrlParser is NULL or Url is not a valid HTTP URL.\r
   @retval EFI_OUT_OF_RESOURCES     Could not allocate needed resources.\r
   @retval EFI_SUCCESS              Successfully dereferenced the HTTP URL.\r
   @retval EFI_INVALID_PARAMETER    UrlParser is NULL or Url is not a valid HTTP URL.\r
   @retval EFI_OUT_OF_RESOURCES     Could not allocate needed resources.\r

-  \r
+\r

 **/\r
 EFI_STATUS\r
 EFIAPI\r
 **/\r
 EFI_STATUS\r
 EFIAPI\r


@@ -86,7 +86,7 @@ HttpParseUrl (
   @retval EFI_INVALID_PARAMETER    Uri is NULL or HostName is NULL or UrlParser is invalid.\r
   @retval EFI_NOT_FOUND            No hostName component in the URL.\r
   @retval EFI_OUT_OF_RESOURCES     Could not allocate needed resources.\r
   @retval EFI_INVALID_PARAMETER    Uri is NULL or HostName is NULL or UrlParser is invalid.\r
   @retval EFI_NOT_FOUND            No hostName component in the URL.\r
   @retval EFI_OUT_OF_RESOURCES     Could not allocate needed resources.\r

-  \r
+\r

 **/\r
 EFI_STATUS\r
 EFIAPI\r
 **/\r
 EFI_STATUS\r
 EFIAPI\r


@@ -109,7 +109,7 @@ HttpUrlGetHostName (
   @retval EFI_INVALID_PARAMETER    Uri is NULL or Ip4Address is NULL or UrlParser is invalid.\r
   @retval EFI_NOT_FOUND            No IPv4 address component in the URL.\r
   @retval EFI_OUT_OF_RESOURCES     Could not allocate needed resources.\r
   @retval EFI_INVALID_PARAMETER    Uri is NULL or Ip4Address is NULL or UrlParser is invalid.\r
   @retval EFI_NOT_FOUND            No IPv4 address component in the URL.\r
   @retval EFI_OUT_OF_RESOURCES     Could not allocate needed resources.\r

-  \r
+\r

 **/\r
 EFI_STATUS\r
 EFIAPI\r
 **/\r
 EFI_STATUS\r
 EFIAPI\r


@@ -132,7 +132,7 @@ HttpUrlGetIp4 (
   @retval EFI_INVALID_PARAMETER    Uri is NULL or Ip6Address is NULL or UrlParser is invalid.\r
   @retval EFI_NOT_FOUND            No IPv6 address component in the URL.\r
   @retval EFI_OUT_OF_RESOURCES     Could not allocate needed resources.\r
   @retval EFI_INVALID_PARAMETER    Uri is NULL or Ip6Address is NULL or UrlParser is invalid.\r
   @retval EFI_NOT_FOUND            No IPv6 address component in the URL.\r
   @retval EFI_OUT_OF_RESOURCES     Could not allocate needed resources.\r

-  \r
+\r

 **/\r
 EFI_STATUS\r
 EFIAPI\r
 **/\r
 EFI_STATUS\r
 EFIAPI\r


@@ -155,7 +155,7 @@ HttpUrlGetIp6 (
   @retval EFI_INVALID_PARAMETER    Uri is NULL or Port is NULL or UrlParser is invalid.\r
   @retval EFI_NOT_FOUND            No port number in the URL.\r
   @retval EFI_OUT_OF_RESOURCES     Could not allocate needed resources.\r
   @retval EFI_INVALID_PARAMETER    Uri is NULL or Port is NULL or UrlParser is invalid.\r
   @retval EFI_NOT_FOUND            No port number in the URL.\r
   @retval EFI_OUT_OF_RESOURCES     Could not allocate needed resources.\r

-  \r
+\r

 **/\r
 EFI_STATUS\r
 EFIAPI\r
 **/\r
 EFI_STATUS\r
 EFIAPI\r


@@ -179,7 +179,7 @@ HttpUrlGetPort (
   @retval EFI_INVALID_PARAMETER    Uri is NULL or HostName is NULL or UrlParser is invalid.\r
   @retval EFI_NOT_FOUND            No hostName component in the URL.\r
   @retval EFI_OUT_OF_RESOURCES     Could not allocate needed resources.\r
   @retval EFI_INVALID_PARAMETER    Uri is NULL or HostName is NULL or UrlParser is invalid.\r
   @retval EFI_NOT_FOUND            No hostName component in the URL.\r
   @retval EFI_OUT_OF_RESOURCES     Could not allocate needed resources.\r

-  \r
+\r

 **/\r
 EFI_STATUS\r
 EFIAPI\r
 **/\r
 EFI_STATUS\r
 EFIAPI\r


@@ -193,7 +193,7 @@ HttpUrlGetPath (
   Release the resource of the URL parser.\r
 \r
   @param[in]    UrlParser            Pointer to the parser.\r
   Release the resource of the URL parser.\r
 \r
   @param[in]    UrlParser            Pointer to the parser.\r

-  \r
+\r

 **/\r
 VOID\r
 EFIAPI\r
 **/\r
 VOID\r
 EFIAPI\r


@@ -231,7 +231,7 @@ typedef enum {
 \r
   @retval EFI_SUCCESS              Continue to parser the message body.\r
   @retval Others                   Abort the parse.\r
 \r
   @retval EFI_SUCCESS              Continue to parser the message body.\r
   @retval Others                   Abort the parse.\r

- \r
+\r

 **/\r
 typedef\r
 EFI_STATUS\r
 **/\r
 typedef\r
 EFI_STATUS\r


@@ -288,7 +288,7 @@ HttpInitMsgParser (
   @retval EFI_INVALID_PARAMETER      MsgParser is NULL or Body is NULL or BodyLength is 0.\r
   @retval EFI_ABORTED                Operation aborted.\r
   @retval Other                      Error happened while parsing message body.\r
   @retval EFI_INVALID_PARAMETER      MsgParser is NULL or Body is NULL or BodyLength is 0.\r
   @retval EFI_ABORTED                Operation aborted.\r
   @retval Other                      Error happened while parsing message body.\r

-  \r
+\r

 **/\r
 EFI_STATUS\r
 EFIAPI\r
 **/\r
 EFI_STATUS\r
 EFIAPI\r


@@ -324,7 +324,7 @@ HttpIsMessageComplete (
   @retval EFI_SUCCESS                Successfully to get the entity length.\r
   @retval EFI_NOT_READY              Entity length is not valid yet.\r
   @retval EFI_INVALID_PARAMETER      MsgParser is NULL or ContentLength is NULL.\r
   @retval EFI_SUCCESS                Successfully to get the entity length.\r
   @retval EFI_NOT_READY              Entity length is not valid yet.\r
   @retval EFI_INVALID_PARAMETER      MsgParser is NULL or ContentLength is NULL.\r

-  \r
+\r

 **/\r
 EFI_STATUS\r
 EFIAPI\r
 **/\r
 EFI_STATUS\r
 EFIAPI\r


@@ -337,7 +337,7 @@ HttpGetEntityLength (
   Release the resource of the message parser.\r
 \r
   @param[in]    MsgParser            Pointer to the message parser.\r
   Release the resource of the message parser.\r
 \r
   @param[in]    MsgParser            Pointer to the message parser.\r

-  \r
+\r

 **/\r
 VOID\r
 EFIAPI\r
 **/\r
 VOID\r
 EFIAPI\r

diff --git a/MdeModulePkg/Include/Library/IpIoLib.h b/MdeModulePkg/Include/Library/IpIoLib.h
index 61653b0418e3f894e36a549e842d1336dc599b3b..fe136c16fca69b9e4c8db5d5a29c7b4537a901df 100644 (file)
--- a/MdeModulePkg/Include/Library/IpIoLib.h
+++ b/MdeModulePkg/Include/Library/IpIoLib.h
@@ -2,13 +2,13 @@
   This library is only intended to be used by UEFI network stack modules.\r
   It provides the combined IpIo layer on the EFI IP4 Protocol and EFI IP6 protocol.\r
 \r
   This library is only intended to be used by UEFI network stack modules.\r
   It provides the combined IpIo layer on the EFI IP4 Protocol and EFI IP6 protocol.\r
 \r

-Copyright (c) 2005 - 2017, Intel Corporation. All rights reserved.<BR>\r
-This program and the accompanying materials are licensed and made available under \r
-the terms and conditions of the BSD License that accompanies this distribution.  \r
+Copyright (c) 2005 - 2018, Intel Corporation. All rights reserved.<BR>\r
+This program and the accompanying materials are licensed and made available under\r
+the terms and conditions of the BSD License that accompanies this distribution.\r

 The full text of the license may be found at\r
 The full text of the license may be found at\r

-http://opensource.org/licenses/bsd-license.php.                                            \r
+http://opensource.org/licenses/bsd-license.php.\r

 \r
 \r

-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     \r
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r

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


@@ -22,7 +22,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #include <Library/NetLib.h>\r
 \r
 //\r
 #include <Library/NetLib.h>\r
 \r
 //\r

-// type and code define for ICMP protocol error \r
+// type and code define for ICMP protocol error\r

 // from IP\r
 //\r
 #define ICMP_TYPE_UNREACH              3\r
 // from IP\r
 //\r
 #define ICMP_TYPE_UNREACH              3\r


@@ -48,20 +48,20 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   Get the IP header length from the struct EFI_IP4_HEADER. HeaderLength is\r
   Internet header length in 32-bit words, so HeaderLength<<2 is the real\r
   length of IP header.\r
   Get the IP header length from the struct EFI_IP4_HEADER. HeaderLength is\r
   Internet header length in 32-bit words, so HeaderLength<<2 is the real\r
   length of IP header.\r

-  \r
+\r

   @param[out] HdrPtr   A pointer to EFI_IP4_HEADER.\r
   @param[out] HdrPtr   A pointer to EFI_IP4_HEADER.\r

-  \r
+\r

   @return The IP header length.\r
 **/\r
 #define EFI_IP4_HEADER_LEN(HdrPtr) ((HdrPtr)->HeaderLength << 2)\r
 \r
 /**\r
   @return The IP header length.\r
 **/\r
 #define EFI_IP4_HEADER_LEN(HdrPtr) ((HdrPtr)->HeaderLength << 2)\r
 \r
 /**\r

-  To types of ICMP error which consist of ICMP header, IP header and original \r
-  datagram's data, get length from sum of ICMP header length, IP header length \r
+  To types of ICMP error which consist of ICMP header, IP header and original\r
+  datagram's data, get length from sum of ICMP header length, IP header length\r

   and first 64 bits of datagram's data length.\r
   and first 64 bits of datagram's data length.\r

-  \r
+\r

   @param[in] IpHdr   A pointer to EFI_IP4_HEADER.\r
   @param[in] IpHdr   A pointer to EFI_IP4_HEADER.\r

-  \r
+\r

   @return The ICMP error length.\r
 **/\r
 #define ICMP_ERRLEN(IpHdr) \\r
   @return The ICMP error length.\r
 **/\r
 #define ICMP_ERRLEN(IpHdr) \\r


@@ -69,15 +69,15 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 \r
 /**\r
   Get the packet header from NET_BUF.\r
 \r
 /**\r
   Get the packet header from NET_BUF.\r

-  \r
+\r

   @param[out]  Buf    A pointer to NET_BUF.\r
   @param[in]   Type   Header type.\r
   @param[out]  Buf    A pointer to NET_BUF.\r
   @param[in]   Type   Header type.\r

-  \r
+\r

   @return The pointer to packet header.\r
 **/\r
 #define NET_PROTO_HDR(Buf, Type)  ((Type *) ((Buf)->BlockOp[0].Head))\r
 \r
   @return The pointer to packet header.\r
 **/\r
 #define NET_PROTO_HDR(Buf, Type)  ((Type *) ((Buf)->BlockOp[0].Head))\r
 \r

-  \r
+\r

 extern EFI_IP4_CONFIG_DATA  mIp4IoDefaultIpConfigData;\r
 extern EFI_IP6_CONFIG_DATA  mIp6IoDefaultIpConfigData;\r
 \r
 extern EFI_IP4_CONFIG_DATA  mIp4IoDefaultIpConfigData;\r
 extern EFI_IP6_CONFIG_DATA  mIp6IoDefaultIpConfigData;\r
 \r


@@ -165,8 +165,8 @@ typedef struct _EFI_NET_SESSION_DATA {
   EFI_IP_ADDRESS        Source;     ///< Source IP of the received packet.\r
   EFI_IP_ADDRESS        Dest;       ///< Destination IP of the received packet.\r
   IP_IO_IP_HEADER       IpHdr;      ///< IP header of the received packet.\r
   EFI_IP_ADDRESS        Source;     ///< Source IP of the received packet.\r
   EFI_IP_ADDRESS        Dest;       ///< Destination IP of the received packet.\r
   IP_IO_IP_HEADER       IpHdr;      ///< IP header of the received packet.\r

-  UINT32                IpHdrLen;   ///< IP header length of the received packet. \r
-                                    ///< For IPv6, it includes the IP6 header \r
+  UINT32                IpHdrLen;   ///< IP header length of the received packet.\r
+                                    ///< For IPv6, it includes the IP6 header\r

                                     ///< length and extension header length. For\r
                                     ///< IPv4, it includes the IP4 header length\r
                                     ///< and options length.\r
                                     ///< length and extension header length. For\r
                                     ///< IPv4, it includes the IP4 header length\r
                                     ///< and options length.\r


@@ -175,19 +175,19 @@ typedef struct _EFI_NET_SESSION_DATA {
 \r
 /**\r
   The prototype is called back when an IP packet is received.\r
 \r
 /**\r
   The prototype is called back when an IP packet is received.\r

-  \r
+\r

   @param[in] Status        The result of the receive request.\r
   @param[in] IcmpErr       Valid when Status is EFI_ICMP_ERROR.\r
   @param[in] NetSession    The IP session for the received packet.\r
   @param[in] Pkt           The packet received.\r
   @param[in] Context       The data provided by the user for the received packet when\r
                            the callback is registered in IP_IO_OPEN_DATA::RcvdContext.\r
   @param[in] Status        The result of the receive request.\r
   @param[in] IcmpErr       Valid when Status is EFI_ICMP_ERROR.\r
   @param[in] NetSession    The IP session for the received packet.\r
   @param[in] Pkt           The packet received.\r
   @param[in] Context       The data provided by the user for the received packet when\r
                            the callback is registered in IP_IO_OPEN_DATA::RcvdContext.\r

-  \r
+\r

 **/\r
 typedef\r
 VOID\r
 (EFIAPI *PKT_RCVD_NOTIFY) (\r
 **/\r
 typedef\r
 VOID\r
 (EFIAPI *PKT_RCVD_NOTIFY) (\r

-  IN EFI_STATUS           Status, \r
+  IN EFI_STATUS           Status,\r

   IN UINT8                IcmpErr,\r
   IN EFI_NET_SESSION_DATA *NetSession,\r
   IN NET_BUF              *Pkt,\r
   IN UINT8                IcmpErr,\r
   IN EFI_NET_SESSION_DATA *NetSession,\r
   IN NET_BUF              *Pkt,\r


@@ -196,14 +196,14 @@ VOID
 \r
 /**\r
   The prototype is called back when an IP packet is sent.\r
 \r
 /**\r
   The prototype is called back when an IP packet is sent.\r

-  \r
+\r

   @param[in] Status        Result of the IP packet being sent.\r
   @param[in] Context       The data provided by user for the received packet when\r
                            the callback is registered in IP_IO_OPEN_DATA::SndContext.\r
   @param[in] Status        Result of the IP packet being sent.\r
   @param[in] Context       The data provided by user for the received packet when\r
                            the callback is registered in IP_IO_OPEN_DATA::SndContext.\r

-  @param[in] Sender        A Union type to specify a pointer of EFI_IP4_PROTOCOL \r
+  @param[in] Sender        A Union type to specify a pointer of EFI_IP4_PROTOCOL\r

                            or EFI_IP6_PROTOCOL.\r
   @param[in] NotifyData    The Context data specified when calling IpIoSend()\r
                            or EFI_IP6_PROTOCOL.\r
   @param[in] NotifyData    The Context data specified when calling IpIoSend()\r

-  \r
+\r

 **/\r
 typedef\r
 VOID\r
 **/\r
 typedef\r
 VOID\r


@@ -228,7 +228,7 @@ typedef struct _IP_IO {
   /// The list used to maintain the IP instance for different sending purpose.\r
   ///\r
   LIST_ENTRY                    IpList;\r
   /// The list used to maintain the IP instance for different sending purpose.\r
   ///\r
   LIST_ENTRY                    IpList;\r

-  \r
+\r

   EFI_HANDLE                    Controller;\r
   EFI_HANDLE                    Image;\r
   EFI_HANDLE                    ChildHandle;\r
   EFI_HANDLE                    Controller;\r
   EFI_HANDLE                    Image;\r
   EFI_HANDLE                    ChildHandle;\r


@@ -246,7 +246,7 @@ typedef struct _IP_IO {
   ///\r
   /// Token and event used to get data from IP.\r
   ///\r
   ///\r
   /// Token and event used to get data from IP.\r
   ///\r

-  IP_IO_IP_COMPLETION_TOKEN     RcvToken; \r
+  IP_IO_IP_COMPLETION_TOKEN     RcvToken;\r

 \r
   ///\r
   /// List entry used to link the token passed to IP_IO.\r
 \r
   ///\r
   /// List entry used to link the token passed to IP_IO.\r


@@ -312,7 +312,7 @@ typedef struct _IP_IO_IP_INFO {
   Create a new IP_IO instance.\r
 \r
   If IpVersion is not IP_VERSION_4 or IP_VERSION_6, then ASSERT().\r
   Create a new IP_IO instance.\r
 \r
   If IpVersion is not IP_VERSION_4 or IP_VERSION_6, then ASSERT().\r

-  \r
+\r

   This function uses IP4/IP6 service binding protocol in Controller to create\r
   an IP4/IP6 child (aka IP4/IP6 instance).\r
 \r
   This function uses IP4/IP6 service binding protocol in Controller to create\r
   an IP4/IP6 child (aka IP4/IP6 instance).\r
 \r


@@ -321,7 +321,7 @@ typedef struct _IP_IO_IP_INFO {
   @param[in]  Controller        The controller handle that has IP4 or IP6 service\r
                                 binding protocol installed.\r
   @param[in]  IpVersion         The version of the IP protocol to use, either\r
   @param[in]  Controller        The controller handle that has IP4 or IP6 service\r
                                 binding protocol installed.\r
   @param[in]  IpVersion         The version of the IP protocol to use, either\r

-                                IPv4 or IPv6.                            \r
+                                IPv4 or IPv6.\r

 \r
   @return The pointer to a newly created IP_IO instance, or NULL if failed.\r
 \r
 \r
   @return The pointer to a newly created IP_IO instance, or NULL if failed.\r
 \r


@@ -336,7 +336,7 @@ IpIoCreate (
 \r
 /**\r
   Destroy an IP_IO instance.\r
 \r
 /**\r
   Destroy an IP_IO instance.\r

-  \r
+\r

   This function is paired with IpIoCreate(). The IP_IO will be closed first.\r
   Resource will be freed afterwards. See IpIoClose().\r
 \r
   This function is paired with IpIoCreate(). The IP_IO will be closed first.\r
   Resource will be freed afterwards. See IpIoClose().\r
 \r


@@ -357,7 +357,7 @@ IpIoDestroy (
   Stop an IP_IO instance.\r
 \r
   If Ip version is not IP_VERSION_4 or IP_VERSION_6, then ASSERT().\r
   Stop an IP_IO instance.\r
 \r
   If Ip version is not IP_VERSION_4 or IP_VERSION_6, then ASSERT().\r

-  \r
+\r

   This function is paired with IpIoOpen(). The IP_IO will be unconfigured, and all\r
   pending send/receive tokens will be canceled.\r
 \r
   This function is paired with IpIoOpen(). The IP_IO will be unconfigured, and all\r
   pending send/receive tokens will be canceled.\r
 \r


@@ -390,7 +390,7 @@ IpIoStop (
 \r
   @retval          EFI_SUCCESS            The IP_IO instance opened with OpenData\r
                                           successfully.\r
 \r
   @retval          EFI_SUCCESS            The IP_IO instance opened with OpenData\r
                                           successfully.\r

-  @retval          EFI_ACCESS_DENIED      The IP_IO instance is configured, avoid to \r
+  @retval          EFI_ACCESS_DENIED      The IP_IO instance is configured, avoid to\r

                                           reopen it.\r
   @retval          EFI_UNSUPPORTED        IPv4 RawData mode is no supported.\r
   @retval          EFI_INVALID_PARAMETER  Invalid input parameter.\r
                                           reopen it.\r
   @retval          EFI_UNSUPPORTED        IPv4 RawData mode is no supported.\r
   @retval          EFI_INVALID_PARAMETER  Invalid input parameter.\r


@@ -406,7 +406,7 @@ IpIoOpen (
 \r
 /**\r
   Send out an IP packet.\r
 \r
 /**\r
   Send out an IP packet.\r

-  \r
+\r

   This function is called after IpIoOpen(). The data to be sent is wrapped in\r
   Pkt. The IP instance wrapped in IpIo is used for sending by default but can be\r
   overriden by Sender. Other sending configs, like source address and gateway\r
   This function is called after IpIoOpen(). The data to be sent is wrapped in\r
   Pkt. The IP instance wrapped in IpIo is used for sending by default but can be\r
   overriden by Sender. Other sending configs, like source address and gateway\r


@@ -464,7 +464,7 @@ IpIoCancelTxToken (
 \r
   If IpIo is NULL, then ASSERT().\r
   If Ip version is not IP_VERSION_4 or IP_VERSION_6, then ASSERT().\r
 \r
   If IpIo is NULL, then ASSERT().\r
   If Ip version is not IP_VERSION_4 or IP_VERSION_6, then ASSERT().\r

-  \r
+\r

   The function is used to add the IP_IO to the IP_IO sending list. The caller\r
   can later use IpIoFindSender() to get the IP_IO and call IpIoSend() to send\r
   data.\r
   The function is used to add the IP_IO to the IP_IO sending list. The caller\r
   can later use IpIoFindSender() to get the IP_IO and call IpIoSend() to send\r
   data.\r


@@ -488,7 +488,7 @@ IpIoAddIp (
   If Ip version is not IP_VERSION_4 or IP_VERSION_6, then ASSERT().\r
 \r
   @param[in, out]  IpInfo          The pointer to the IP_IO_IP_INFO instance.\r
   If Ip version is not IP_VERSION_4 or IP_VERSION_6, then ASSERT().\r
 \r
   @param[in, out]  IpInfo          The pointer to the IP_IO_IP_INFO instance.\r

-  @param[in, out]  IpConfigData    The IP4 or IP6 configure data used to configure \r
+  @param[in, out]  IpConfigData    The IP4 or IP6 configure data used to configure\r

                                    the IP instance. If NULL, the IP instance is reset.\r
                                    If UseDefaultAddress is set to TRUE, and the configure\r
                                    operation succeeds, the default address information\r
                                    the IP instance. If NULL, the IP instance is reset.\r
                                    If UseDefaultAddress is set to TRUE, and the configure\r
                                    operation succeeds, the default address information\r


@@ -510,8 +510,8 @@ IpIoConfigIp (
   Destroy an IP instance maintained in IpIo->IpList for\r
   sending purpose.\r
 \r
   Destroy an IP instance maintained in IpIo->IpList for\r
   sending purpose.\r
 \r

-  If Ip version is not IP_VERSION_4 or IP_VERSION_6, then ASSERT().  \r
-  \r
+  If Ip version is not IP_VERSION_4 or IP_VERSION_6, then ASSERT().\r
+\r

   This function pairs with IpIoAddIp(). The IpInfo is previously created by\r
   IpIoAddIp(). The IP_IO_IP_INFO::RefCnt is decremented and the IP instance\r
   will be dstroyed if the RefCnt is zero.\r
   This function pairs with IpIoAddIp(). The IpInfo is previously created by\r
   IpIoAddIp(). The IP_IO_IP_INFO::RefCnt is decremented and the IP instance\r
   will be dstroyed if the RefCnt is zero.\r


@@ -530,7 +530,7 @@ IpIoRemoveIp (
 /**\r
   Find the first IP protocol maintained in IpIo whose local\r
   address is the same as Src.\r
 /**\r
   Find the first IP protocol maintained in IpIo whose local\r
   address is the same as Src.\r

-  \r
+\r

   This function is called when the caller needs the IpIo to send data to the\r
   specified Src. The IpIo was added previously by IpIoAddIp().\r
 \r
   This function is called when the caller needs the IpIo to send data to the\r
   specified Src. The IpIo was added previously by IpIoAddIp().\r
 \r


@@ -553,13 +553,13 @@ IpIoFindSender (
 \r
 /**\r
   Get the ICMP error map information.\r
 \r
 /**\r
   Get the ICMP error map information.\r

-  \r
+\r

   The ErrorStatus will be returned. The IsHard and Notify are optional. If they\r
   are not NULL, this routine will fill them.\r
 \r
   @param[in]   IcmpError             IcmpError Type.\r
   @param[in]   IpVersion             The version of the IP protocol to use,\r
   The ErrorStatus will be returned. The IsHard and Notify are optional. If they\r
   are not NULL, this routine will fill them.\r
 \r
   @param[in]   IcmpError             IcmpError Type.\r
   @param[in]   IpVersion             The version of the IP protocol to use,\r

-                                     either IPv4 or IPv6. \r
+                                     either IPv4 or IPv6.\r

   @param[out]  IsHard                If TRUE, indicates that it is a hard error.\r
   @param[out]  Notify                If TRUE, SockError needs to be notified.\r
 \r
   @param[out]  IsHard                If TRUE, indicates that it is a hard error.\r
   @param[out]  Notify                If TRUE, SockError needs to be notified.\r
 \r


@@ -580,23 +580,23 @@ IpIoGetIcmpErrStatus (
   Refresh the remote peer's Neighbor Cache entries.\r
 \r
   This function is called when the caller needs the IpIo to refresh the existing\r
   Refresh the remote peer's Neighbor Cache entries.\r
 \r
   This function is called when the caller needs the IpIo to refresh the existing\r

-  IPv6 neighbor cache entries since the neighbor is considered reachable by the \r
-  node has recently received a confirmation that packets sent recently to the \r
-  neighbor were received by its IP layer. \r
+  IPv6 neighbor cache entries since the neighbor is considered reachable by the\r
+  node has recently received a confirmation that packets sent recently to the\r
+  neighbor were received by its IP layer.\r

 \r
   @param[in]   IpIo                  The pointer to an IP_IO instance\r
   @param[in]   Neighbor              The IP address of the neighbor\r
   @param[in]   Timeout               The time in 100-ns units that this entry will\r
 \r
   @param[in]   IpIo                  The pointer to an IP_IO instance\r
   @param[in]   Neighbor              The IP address of the neighbor\r
   @param[in]   Timeout               The time in 100-ns units that this entry will\r

-                                     remain in the neighbor cache. A value of \r
-                                     zero means that the entry is permanent. \r
-                                     A value of non-zero means that the entry is \r
+                                     remain in the neighbor cache. A value of\r
+                                     zero means that the entry is permanent.\r
+                                     A value of non-zero means that the entry is\r

                                      dynamic and will be deleted after Timeout.\r
 \r
   @retval      EFI_SUCCESS           The operation completed successfully.\r
   @retval      EFI_NOT_STARTED       The IpIo is not configured.\r
   @retval      EFI_INVALID_PARAMETER The Neighbor Address is invalid.\r
                                      dynamic and will be deleted after Timeout.\r
 \r
   @retval      EFI_SUCCESS           The operation completed successfully.\r
   @retval      EFI_NOT_STARTED       The IpIo is not configured.\r
   @retval      EFI_INVALID_PARAMETER The Neighbor Address is invalid.\r

-  @retval      EFI_NOT_FOUND         The neighbor cache entry is not in the \r
-                                     neighbor table.  \r
+  @retval      EFI_NOT_FOUND         The neighbor cache entry is not in the\r
+                                     neighbor table.\r

   @retval      EFI_UNSUPPORTED       IP version is IPv4, which doesn't support neighbor cache refresh.\r
   @retval      EFI_OUT_OF_RESOURCES  Failed due to resource limitations.\r
 \r
   @retval      EFI_UNSUPPORTED       IP version is IPv4, which doesn't support neighbor cache refresh.\r
   @retval      EFI_OUT_OF_RESOURCES  Failed due to resource limitations.\r
 \r


@@ -606,7 +606,7 @@ EFIAPI
 IpIoRefreshNeighbor (\r
   IN IP_IO           *IpIo,\r
   IN EFI_IP_ADDRESS  *Neighbor,\r
 IpIoRefreshNeighbor (\r
   IN IP_IO           *IpIo,\r
   IN EFI_IP_ADDRESS  *Neighbor,\r

-  IN UINT32          Timeout  \r
+  IN UINT32          Timeout\r

   );\r
 \r
 #endif\r
   );\r
 \r
 #endif\r

diff --git a/MdeModulePkg/Include/Library/LockBoxLib.h b/MdeModulePkg/Include/Library/LockBoxLib.h
index 80beb4d0f880aa23816d4c1e074e8d9ccd344c7c..59217314190bf9305b3eea29c461b5e46246de3e 100644 (file)
--- a/MdeModulePkg/Include/Library/LockBoxLib.h
+++ b/MdeModulePkg/Include/Library/LockBoxLib.h
@@ -109,7 +109,7 @@ UpdateLockBox (
 \r
   @retval RETURN_SUCCESS            the information is restored successfully.\r
   @retval RETURN_INVALID_PARAMETER  the Guid is NULL, or one of Buffer and Length is NULL.\r
 \r
   @retval RETURN_SUCCESS            the information is restored successfully.\r
   @retval RETURN_INVALID_PARAMETER  the Guid is NULL, or one of Buffer and Length is NULL.\r

-  @retval RETURN_WRITE_PROTECTED    Buffer and Length are NULL, but the LockBox has no \r
+  @retval RETURN_WRITE_PROTECTED    Buffer and Length are NULL, but the LockBox has no\r

                                     LOCK_BOX_ATTRIBUTE_RESTORE_IN_PLACE attribute.\r
   @retval RETURN_BUFFER_TOO_SMALL   the Length is too small to hold the confidential information.\r
   @retval RETURN_NOT_FOUND          the requested GUID not found.\r
                                     LOCK_BOX_ATTRIBUTE_RESTORE_IN_PLACE attribute.\r
   @retval RETURN_BUFFER_TOO_SMALL   the Length is too small to hold the confidential information.\r
   @retval RETURN_NOT_FOUND          the requested GUID not found.\r

diff --git a/MdeModulePkg/Include/Library/MemoryProfileLib.h b/MdeModulePkg/Include/Library/MemoryProfileLib.h
index 8543801391eb70443d83981232fbcdadd4286313..dd2b3aaad1a51089e313d92f8349ebe597213d85 100644 (file)
--- a/MdeModulePkg/Include/Library/MemoryProfileLib.h
+++ b/MdeModulePkg/Include/Library/MemoryProfileLib.h
@@ -1,14 +1,14 @@
 /** @file\r
   Provides services to record memory profile of multilevel caller.\r
 \r
 /** @file\r
   Provides services to record memory profile of multilevel caller.\r
 \r

-  Copyright (c) 2016, Intel Corporation. All rights reserved.<BR>\r
-  This program and the accompanying materials                          \r
-  are licensed and made available under the terms and conditions of the BSD License         \r
-  which accompanies this distribution.  The full text of the license may be found at        \r
-  http://opensource.org/licenses/bsd-license.php.                                            \r
-\r
-  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     \r
-  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             \r
+  Copyright (c) 2016 - 2018, Intel Corporation. All rights reserved.<BR>\r
+  This program and the accompanying materials\r
+  are licensed and made available under the terms and conditions of the BSD License\r
+  which accompanies this distribution.  The full text of the license may be found at\r
+  http://opensource.org/licenses/bsd-license.php.\r
+\r
+  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
+  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r

 \r
 **/\r
 \r
 \r
 **/\r
 \r

diff --git a/MdeModulePkg/Include/Library/NetLib.h b/MdeModulePkg/Include/Library/NetLib.h
index b0bbaf22a7732896878c059e2183a6978b97fec8..ef7bc429c13826c94b3a39a842e9718948af3b75 100644 (file)
--- a/MdeModulePkg/Include/Library/NetLib.h
+++ b/MdeModulePkg/Include/Library/NetLib.h
@@ -52,7 +52,7 @@ typedef UINT16          TCP_PORTNO;
 #define  IP4_MASK_NUM          33\r
 #define  IP6_PREFIX_NUM        129\r
 \r
 #define  IP4_MASK_NUM          33\r
 #define  IP6_PREFIX_NUM        129\r
 \r

-#define  IP4_MASK_MAX          32 \r
+#define  IP4_MASK_MAX          32\r

 #define  IP6_PREFIX_MAX        128\r
 \r
 #define  IP6_HOP_BY_HOP        0\r
 #define  IP6_PREFIX_MAX        128\r
 \r
 #define  IP6_HOP_BY_HOP        0\r


@@ -416,14 +416,14 @@ NetGetIpClass (
 \r
 /**\r
   Check whether the IP is a valid unicast address according to\r
 \r
 /**\r
   Check whether the IP is a valid unicast address according to\r

-  the netmask. \r
+  the netmask.\r

 \r
   ASSERT if NetMask is zero.\r
 \r
   ASSERT if NetMask is zero.\r

-  \r
+\r

   If all bits of the host address of IP are 0 or 1, IP is also not a valid unicast address,\r
   except when the originator is one of the endpoints of a point-to-point link with a 31-bit\r
   mask (RFC3021).\r
   If all bits of the host address of IP are 0 or 1, IP is also not a valid unicast address,\r
   except when the originator is one of the endpoints of a point-to-point link with a 31-bit\r
   mask (RFC3021).\r

-  \r
+\r

   @param[in]  Ip                    The IP to check against.\r
   @param[in]  NetMask               The mask of the IP.\r
 \r
   @param[in]  Ip                    The IP to check against.\r
   @param[in]  NetMask               The mask of the IP.\r
 \r


@@ -593,7 +593,7 @@ NetPutUint32 (
 /**\r
   Initialize a random seed using current time and monotonic count.\r
 \r
 /**\r
   Initialize a random seed using current time and monotonic count.\r
 \r

-  Get current time and monotonic count first. Then initialize a random seed \r
+  Get current time and monotonic count first. Then initialize a random seed\r

   based on some basic mathematics operation on the hour, day, minute, second,\r
   nanosecond and year of the current time and the monotonic count value.\r
 \r
   based on some basic mathematics operation on the hour, day, minute, second,\r
   nanosecond and year of the current time and the monotonic count value.\r
 \r


@@ -729,7 +729,7 @@ NetListInsertBefore (
 \r
 /**\r
   Callback function which provided by user to remove one node in NetDestroyLinkList process.\r
 \r
 /**\r
   Callback function which provided by user to remove one node in NetDestroyLinkList process.\r

-  \r
+\r

   @param[in]    Entry           The entry to be removed.\r
   @param[in]    Context         Pointer to the callback context corresponds to the Context in NetDestroyLinkList.\r
 \r
   @param[in]    Entry           The entry to be removed.\r
   @param[in]    Context         Pointer to the callback context corresponds to the Context in NetDestroyLinkList.\r
 \r


@@ -753,7 +753,7 @@ EFI_STATUS
   If it has been removed, then restart the traversal from the head.\r
   If it hasn't been removed, then continue with the next node directly.\r
   This function will end the iterate and return the CallBack's last return value if error happens,\r
   If it has been removed, then restart the traversal from the head.\r
   If it hasn't been removed, then continue with the next node directly.\r
   This function will end the iterate and return the CallBack's last return value if error happens,\r

-  or retrun EFI_SUCCESS if 2 complete passes are made with no changes in the number of children in the list.  \r
+  or retrun EFI_SUCCESS if 2 complete passes are made with no changes in the number of children in the list.\r

 \r
   @param[in]    List             The head of the list.\r
   @param[in]    CallBack         Pointer to the callback function to destroy one node in the list.\r
 \r
   @param[in]    List             The head of the list.\r
   @param[in]    CallBack         Pointer to the callback function to destroy one node in the list.\r


@@ -1255,8 +1255,8 @@ NetLibGetMacString (
   GET_STATUS command (PXE_STATFLAGS_GET_STATUS_NO_MEDIA_SUPPORTED). This routine\r
   will try to invoke Snp->GetStatus() to get the media status. If media is already\r
   present, it returns directly. If media is not present, it will stop SNP and then\r
   GET_STATUS command (PXE_STATFLAGS_GET_STATUS_NO_MEDIA_SUPPORTED). This routine\r
   will try to invoke Snp->GetStatus() to get the media status. If media is already\r
   present, it returns directly. If media is not present, it will stop SNP and then\r

-  restart SNP to get the latest media status. This provides an opportunity to get \r
-  the correct media status for old UNDI driver, which doesn't support reporting \r
+  restart SNP to get the latest media status. This provides an opportunity to get\r
+  the correct media status for old UNDI driver, which doesn't support reporting\r

   media status from GET_STATUS command.\r
   Note: there are two limitations for the current algorithm:\r
   1) For UNDI with this capability, when the cable is not attached, there will\r
   media status from GET_STATUS command.\r
   Note: there are two limitations for the current algorithm:\r
   1) For UNDI with this capability, when the cable is not attached, there will\r


@@ -1284,13 +1284,13 @@ NetLibDetectMedia (
   );\r
 \r
 /**\r
   );\r
 \r
 /**\r

-  Detect media state for a network device. This routine will wait for a period of time at \r
-  a specified checking interval when a certain network is under connecting until connection \r
+  Detect media state for a network device. This routine will wait for a period of time at\r
+  a specified checking interval when a certain network is under connecting until connection\r

   process finishes or timeout. If Aip protocol is supported by low layer drivers, three kinds\r
   of media states can be detected: EFI_SUCCESS, EFI_NOT_READY and EFI_NO_MEDIA, represents\r
   process finishes or timeout. If Aip protocol is supported by low layer drivers, three kinds\r
   of media states can be detected: EFI_SUCCESS, EFI_NOT_READY and EFI_NO_MEDIA, represents\r

-  connected state, connecting state and no media state respectively. When function detects \r
-  the current state is EFI_NOT_READY, it will loop to wait for next time's check until state \r
-  turns to be EFI_SUCCESS or EFI_NO_MEDIA. If Aip protocol is not supported, function will \r
+  connected state, connecting state and no media state respectively. When function detects\r
+  the current state is EFI_NOT_READY, it will loop to wait for next time's check until state\r
+  turns to be EFI_SUCCESS or EFI_NO_MEDIA. If Aip protocol is not supported, function will\r

   call NetLibDetectMedia() and return state directly.\r
 \r
   @param[in]   ServiceHandle    The handle where network service binding protocols are\r
   call NetLibDetectMedia() and return state directly.\r
 \r
   @param[in]   ServiceHandle    The handle where network service binding protocols are\r


@@ -1301,7 +1301,7 @@ NetLibDetectMedia (
   @param[out]  MediaState       The pointer to the detected media state.\r
 \r
   @retval EFI_SUCCESS           Media detection success.\r
   @param[out]  MediaState       The pointer to the detected media state.\r
 \r
   @retval EFI_SUCCESS           Media detection success.\r

-  @retval EFI_INVALID_PARAMETER ServiceHandle is not a valid network device handle or \r
+  @retval EFI_INVALID_PARAMETER ServiceHandle is not a valid network device handle or\r

                                 MediaState pointer is NULL.\r
   @retval EFI_DEVICE_ERROR      A device error occurred.\r
   @retval EFI_TIMEOUT           Network is connecting but timeout.\r
                                 MediaState pointer is NULL.\r
   @retval EFI_DEVICE_ERROR      A device error occurred.\r
   @retval EFI_TIMEOUT           Network is connecting but timeout.\r


@@ -1522,14 +1522,14 @@ NetLibStrToIp6andPrefix (
 \r
   Convert one EFI_IPv6_ADDRESS to Null-terminated Unicode string.\r
   The text representation of address is defined in RFC 4291.\r
 \r
   Convert one EFI_IPv6_ADDRESS to Null-terminated Unicode string.\r
   The text representation of address is defined in RFC 4291.\r

-  \r
+\r

   @param[in]       Ip6Address     The pointer to the IPv6 address.\r
   @param[out]      String         The buffer to return the converted string.\r
   @param[in]       StringSize     The length in bytes of the input String.\r
   @param[in]       Ip6Address     The pointer to the IPv6 address.\r
   @param[out]      String         The buffer to return the converted string.\r
   @param[in]       StringSize     The length in bytes of the input String.\r

-                                  \r
+\r

   @retval EFI_SUCCESS             Convert to string successfully.\r
   @retval EFI_INVALID_PARAMETER   The input parameter is invalid.\r
   @retval EFI_SUCCESS             Convert to string successfully.\r
   @retval EFI_INVALID_PARAMETER   The input parameter is invalid.\r

-  @retval EFI_BUFFER_TOO_SMALL    The BufferSize is too small for the result. BufferSize has been \r
+  @retval EFI_BUFFER_TOO_SMALL    The BufferSize is too small for the result. BufferSize has been\r

                                   updated with the size needed to complete the request.\r
 **/\r
 EFI_STATUS\r
                                   updated with the size needed to complete the request.\r
 **/\r
 EFI_STATUS\r


@@ -1862,7 +1862,7 @@ NetbufAllocSpace (
 \r
   @param[in, out]  Nbuf         The pointer to the net buffer.\r
   @param[in]       Len          The length of the data to be trimmed.\r
 \r
   @param[in, out]  Nbuf         The pointer to the net buffer.\r
   @param[in]       Len          The length of the data to be trimmed.\r

-  @param[in]      FromHead      The flag to indicate whether trim data is from the \r
+  @param[in]      FromHead      The flag to indicate whether trim data is from the\r

                                 head (TRUE) or the tail (FALSE).\r
 \r
   @return    The length of the actual trimmed data, which may be less\r
                                 head (TRUE) or the tail (FALSE).\r
 \r
   @return    The length of the actual trimmed data, which may be less\r


@@ -2213,11 +2213,11 @@ NetIp6PseudoHeadChecksum (
   );\r
 \r
 /**\r
   );\r
 \r
 /**\r

-  The function frees the net buffer which allocated by the IP protocol. It releases \r
-  only the net buffer and doesn't call the external free function. \r
+  The function frees the net buffer which allocated by the IP protocol. It releases\r
+  only the net buffer and doesn't call the external free function.\r

 \r
 \r

-  This function should be called after finishing the process of mIpSec->ProcessExt() \r
-  for outbound traffic. The (EFI_IPSEC2_PROTOCOL)->ProcessExt() allocates a new \r
+  This function should be called after finishing the process of mIpSec->ProcessExt()\r
+  for outbound traffic. The (EFI_IPSEC2_PROTOCOL)->ProcessExt() allocates a new\r

   buffer for the ESP, so there needs a function to free the old net buffer.\r
 \r
   @param[in]  Nbuf       The network buffer to be freed.\r
   buffer for the ESP, so there needs a function to free the old net buffer.\r
 \r
   @param[in]  Nbuf       The network buffer to be freed.\r


@@ -2250,18 +2250,18 @@ NetLibGetSystemGuid (
 \r
   If DomainName is NULL, then ASSERT().\r
 \r
 \r
   If DomainName is NULL, then ASSERT().\r
 \r

-  QName is a domain name represented as a sequence of labels, \r
-  where each label consists of a length octet followed by that \r
-  number of octets. The QName terminates with the zero \r
-  length octet for the null label of the root. Caller should \r
+  QName is a domain name represented as a sequence of labels,\r
+  where each label consists of a length octet followed by that\r
+  number of octets. The QName terminates with the zero\r
+  length octet for the null label of the root. Caller should\r

   take responsibility to free the buffer in returned pointer.\r
 \r
   take responsibility to free the buffer in returned pointer.\r
 \r

-  @param  DomainName    The pointer to the queried domain name string.  \r
+  @param  DomainName    The pointer to the queried domain name string.\r

 \r
   @retval NULL          Failed to fill QName.\r
   @return               QName filled successfully.\r
 \r
   @retval NULL          Failed to fill QName.\r
   @return               QName filled successfully.\r

-  \r
-**/ \r
+\r
+**/\r

 CHAR8 *\r
 EFIAPI\r
 NetLibCreateDnsQName (\r
 CHAR8 *\r
 EFIAPI\r
 NetLibCreateDnsQName (\r

diff --git a/MdeModulePkg/Include/Library/OemHookStatusCodeLib.h b/MdeModulePkg/Include/Library/OemHookStatusCodeLib.h
index edd370deb69d5e46bcf8c093d73b190238e0b2ef..e82db854d632d06762e9e882b0bef0a254cc64db 100644 (file)
--- a/MdeModulePkg/Include/Library/OemHookStatusCodeLib.h
+++ b/MdeModulePkg/Include/Library/OemHookStatusCodeLib.h
@@ -1,14 +1,14 @@
 /** @file\r
 /** @file\r

-  OEM hook status code library. Platform can implement an instance to \r
+  OEM hook status code library. Platform can implement an instance to\r

   initialize the OEM devices to report status code information.\r
 \r
   initialize the OEM devices to report status code information.\r
 \r

-Copyright (c) 2006 - 2010, Intel Corporation. All rights reserved.<BR>\r
-This program and the accompanying materials are licensed and made available under \r
-the terms and conditions of the BSD License that accompanies this distribution.  \r
+Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r
+This program and the accompanying materials are licensed and made available under\r
+the terms and conditions of the BSD License that accompanies this distribution.\r

 The full text of the license may be found at\r
 The full text of the license may be found at\r

-http://opensource.org/licenses/bsd-license.php.                                            \r
+http://opensource.org/licenses/bsd-license.php.\r

 \r
 \r

-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     \r
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r

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


@@ -22,7 +22,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 \r
 \r
   @return    Status of initialization of OEM status code device.\r
 \r
 \r
   @return    Status of initialization of OEM status code device.\r

- \r
+\r

 **/\r
 EFI_STATUS\r
 EFIAPI\r
 **/\r
 EFI_STATUS\r
 EFIAPI\r


@@ -32,36 +32,36 @@ OemHookStatusCodeInitialize (
 \r
 /**\r
   Report status code to OEM device.\r
 \r
 /**\r
   Report status code to OEM device.\r

- \r
-  @param  CodeType      Indicates the type of status code being reported.  \r
- \r
-  @param  Value         Describes the current status of a hardware or software entity.  \r
-                        This includes both an operation and classification information \r
+\r
+  @param  CodeType      Indicates the type of status code being reported.\r
+\r
+  @param  Value         Describes the current status of a hardware or software entity.\r
+                        This includes both an operation and classification information\r

                         about the class and subclass.\r
                         about the class and subclass.\r

-                        For progress codes, the operation is the current activity. \r
-                        For error codes, it is the exception.  For debug codes, \r
-                        it is not defined at this time. \r
-                        Specific values are discussed in the Intel Platform Innovation \r
+                        For progress codes, the operation is the current activity.\r
+                        For error codes, it is the exception.  For debug codes,\r
+                        it is not defined at this time.\r
+                        Specific values are discussed in the Intel Platform Innovation\r

                         Framework for EFI Status Code Specification.\r
                         Framework for EFI Status Code Specification.\r

- \r
-  @param  Instance      The enumeration of a hardware or software entity within the system.  \r
-                        A system may contain multiple entities that match a class/subclass \r
-                        pairing. \r
-                        The instance differentiates between them.  An instance of 0 \r
-                        indicates that instance information is unavailable, \r
-                        not meaningful, or not relevant.  Valid instance numbers \r
+\r
+  @param  Instance      The enumeration of a hardware or software entity within the system.\r
+                        A system may contain multiple entities that match a class/subclass\r
+                        pairing.\r
+                        The instance differentiates between them.  An instance of 0\r
+                        indicates that instance information is unavailable,\r
+                        not meaningful, or not relevant.  Valid instance numbers\r

                         start with 1.\r
 \r
 \r
                         start with 1.\r
 \r
 \r

-  @param  CallerId      This optional parameter may be used to identify the caller. \r
-                        This parameter allows the status code driver to apply \r
-                        different rules to different callers. \r
-                        Type EFI_GUID is defined in InstallProtocolInterface() \r
+  @param  CallerId      This optional parameter may be used to identify the caller.\r
+                        This parameter allows the status code driver to apply\r
+                        different rules to different callers.\r
+                        Type EFI_GUID is defined in InstallProtocolInterface()\r

                         in the UEFI 2.0 Specification.\r
 \r
 \r
   @param  Data          This optional parameter may be used to pass additional data.\r
                         in the UEFI 2.0 Specification.\r
 \r
 \r
   @param  Data          This optional parameter may be used to pass additional data.\r

- \r
+\r

   @return               The function always returns EFI_SUCCESS.\r
 \r
 **/\r
   @return               The function always returns EFI_SUCCESS.\r
 \r
 **/\r

diff --git a/MdeModulePkg/Include/Library/PlatformBootManagerLib.h b/MdeModulePkg/Include/Library/PlatformBootManagerLib.h
index 52745032e472481ae7338e1f79832859d40ff98b..65630ce2bbef0b1d665e6ffebc30ceefb26a875d 100644 (file)
--- a/MdeModulePkg/Include/Library/PlatformBootManagerLib.h
+++ b/MdeModulePkg/Include/Library/PlatformBootManagerLib.h
@@ -1,8 +1,8 @@
 /** @file\r
 /** @file\r

-  Platform Boot Manager library definition. A platform can implement \r
+  Platform Boot Manager library definition. A platform can implement\r

   instances to support platform-specific behavior.\r
 \r
   instances to support platform-specific behavior.\r
 \r

-Copyright (c) 2011 - 2015, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2011 - 2018, Intel Corporation. All rights reserved.<BR>\r

 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r

diff --git a/MdeModulePkg/Include/Library/PlatformHookLib.h b/MdeModulePkg/Include/Library/PlatformHookLib.h
index 0f265d49a3fee8bf9f4302a657a47b092e53efe8..3a42ccd1be99349c0832281a2b1b757760bd6034 100644 (file)
--- a/MdeModulePkg/Include/Library/PlatformHookLib.h
+++ b/MdeModulePkg/Include/Library/PlatformHookLib.h
@@ -1,15 +1,15 @@
 /** @file\r
   Platform hook library. Platform can provide an implementation of this\r
 /** @file\r
   Platform hook library. Platform can provide an implementation of this\r

-  library class to provide hooks that may be required for some type of \r
+  library class to provide hooks that may be required for some type of\r

   platform initialization.\r
 \r
   platform initialization.\r
 \r

-Copyright (c) 2010, Intel Corporation. All rights reserved.<BR>\r
-This program and the accompanying materials are licensed and made available under \r
-the terms and conditions of the BSD License that accompanies this distribution.  \r
+Copyright (c) 2010 - 2018, Intel Corporation. All rights reserved.<BR>\r
+This program and the accompanying materials are licensed and made available under\r
+the terms and conditions of the BSD License that accompanies this distribution.\r

 The full text of the license may be found at\r
 The full text of the license may be found at\r

-http://opensource.org/licenses/bsd-license.php.                                            \r
+http://opensource.org/licenses/bsd-license.php.\r

 \r
 \r

-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     \r
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r

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


@@ -20,13 +20,13 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 /**\r
   Performs platform specific initialization required for the CPU to access\r
   the hardware associated with a SerialPortLib instance.  This function does\r
 /**\r
   Performs platform specific initialization required for the CPU to access\r
   the hardware associated with a SerialPortLib instance.  This function does\r

-  not intiailzie the serial port hardware itself.  Instead, it initializes \r
-  hardware devices that are required for the CPU to access the serial port \r
+  not intiailzie the serial port hardware itself.  Instead, it initializes\r
+  hardware devices that are required for the CPU to access the serial port\r

   hardware.  This function may be called more than once.\r
 \r
   @retval RETURN_SUCCESS       The platform specific initialization succeeded.\r
   @retval RETURN_DEVICE_ERROR  The platform specific initialization could not be completed.\r
   hardware.  This function may be called more than once.\r
 \r
   @retval RETURN_SUCCESS       The platform specific initialization succeeded.\r
   @retval RETURN_DEVICE_ERROR  The platform specific initialization could not be completed.\r

- \r
+\r

 **/\r
 RETURN_STATUS\r
 EFIAPI\r
 **/\r
 RETURN_STATUS\r
 EFIAPI\r

diff --git a/MdeModulePkg/Include/Library/RecoveryLib.h b/MdeModulePkg/Include/Library/RecoveryLib.h
index f49394a8224c237e7004c66e7adc6ff14037e6ba..da5cb771bf022e3d4a6c0b6b2eb3aa12bb796684 100644 (file)
--- a/MdeModulePkg/Include/Library/RecoveryLib.h
+++ b/MdeModulePkg/Include/Library/RecoveryLib.h
@@ -1,15 +1,15 @@
 /** @file\r
 /** @file\r

-  Recovery library class defines a set of methods related recovery boot mode. \r
+  Recovery library class defines a set of methods related recovery boot mode.\r

   This library class is no longer used and modules using this library should\r
   directly locate EFI_PEI_RECOVERY_MODULE_PPI, defined in the PI 1.2 specification.\r
 \r
   This library class is no longer used and modules using this library should\r
   directly locate EFI_PEI_RECOVERY_MODULE_PPI, defined in the PI 1.2 specification.\r
 \r

-Copyright (c) 2005 - 2010, Intel Corporation. All rights reserved.<BR>\r
-This program and the accompanying materials are licensed and made available under \r
-the terms and conditions of the BSD License that accompanies this distribution.  \r
+Copyright (c) 2005 - 2018, Intel Corporation. All rights reserved.<BR>\r
+This program and the accompanying materials are licensed and made available under\r
+the terms and conditions of the BSD License that accompanies this distribution.\r

 The full text of the license may be found at\r
 The full text of the license may be found at\r

-http://opensource.org/licenses/bsd-license.php.                                            \r
+http://opensource.org/licenses/bsd-license.php.\r

 \r
 \r

-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     \r
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r

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


@@ -19,7 +19,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 \r
 /**\r
   Calling this function causes the system to carry out a recovery boot path.\r
 \r
 /**\r
   Calling this function causes the system to carry out a recovery boot path.\r

-  \r
+\r

   @retval EFI_SUCCESS   Recovery boot path succeeded.\r
   @retval Others        Recovery boot path failure.\r
 \r
   @retval EFI_SUCCESS   Recovery boot path succeeded.\r
   @retval Others        Recovery boot path failure.\r
 \r

diff --git a/MdeModulePkg/Include/Library/ResetSystemLib.h b/MdeModulePkg/Include/Library/ResetSystemLib.h
index f98c9a6549d945b3129691e193762baea7d82439..55d1923ae1081f8c2b5830bda499e4af6691a676 100644 (file)
--- a/MdeModulePkg/Include/Library/ResetSystemLib.h
+++ b/MdeModulePkg/Include/Library/ResetSystemLib.h
@@ -2,13 +2,13 @@
   System reset Library Services.  This library class defines a set of\r
   methods that reset the whole system.\r
 \r
   System reset Library Services.  This library class defines a set of\r
   methods that reset the whole system.\r
 \r

-Copyright (c) 2005 - 2016, Intel Corporation. All rights reserved.<BR>\r
-This program and the accompanying materials are licensed and made available under \r
-the terms and conditions of the BSD License that accompanies this distribution.  \r
+Copyright (c) 2005 - 2018, Intel Corporation. All rights reserved.<BR>\r
+This program and the accompanying materials are licensed and made available under\r
+the terms and conditions of the BSD License that accompanies this distribution.\r

 The full text of the license may be found at\r
 The full text of the license may be found at\r

-http://opensource.org/licenses/bsd-license.php.                                            \r
+http://opensource.org/licenses/bsd-license.php.\r

 \r
 \r

-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     \r
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r

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


@@ -18,11 +18,11 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 \r
 /**\r
   This function causes a system-wide reset (cold reset), in which\r
 \r
 /**\r
   This function causes a system-wide reset (cold reset), in which\r

-  all circuitry within the system returns to its initial state. This type of reset \r
-  is asynchronous to system operation and operates without regard to \r
+  all circuitry within the system returns to its initial state. This type of reset\r
+  is asynchronous to system operation and operates without regard to\r

   cycle boundaries.\r
 \r
   cycle boundaries.\r
 \r

-  If this function returns, it means that the system does not support cold reset. \r
+  If this function returns, it means that the system does not support cold reset.\r

 **/\r
 VOID\r
 EFIAPI\r
 **/\r
 VOID\r
 EFIAPI\r


@@ -31,7 +31,7 @@ ResetCold (
   );\r
 \r
 /**\r
   );\r
 \r
 /**\r

-  This function causes a system-wide initialization (warm reset), in which all processors \r
+  This function causes a system-wide initialization (warm reset), in which all processors\r

   are set to their initial state. Pending cycles are not corrupted.\r
 \r
   If this function returns, it means that the system does not support warm reset.\r
   are set to their initial state. Pending cycles are not corrupted.\r
 \r
   If this function returns, it means that the system does not support warm reset.\r


@@ -43,9 +43,9 @@ ResetWarm (
   );\r
 \r
 /**\r
   );\r
 \r
 /**\r

-  This function causes the system to enter a power state equivalent \r
+  This function causes the system to enter a power state equivalent\r

   to the ACPI G2/S5 or G3 states.\r
   to the ACPI G2/S5 or G3 states.\r

-  \r
+\r

   If this function returns, it means that the system does not support shutdown reset.\r
 **/\r
 VOID\r
   If this function returns, it means that the system does not support shutdown reset.\r
 **/\r
 VOID\r


@@ -56,7 +56,7 @@ ResetShutdown (
 \r
 /**\r
   This function causes the system to enter S3 and then wake up immediately.\r
 \r
 /**\r
   This function causes the system to enter S3 and then wake up immediately.\r

-  \r
+\r

   If this function returns, it means that the system does not support S3 feature.\r
 **/\r
 VOID\r
   If this function returns, it means that the system does not support S3 feature.\r
 **/\r
 VOID\r

diff --git a/MdeModulePkg/Include/Library/ResetUtilityLib.h b/MdeModulePkg/Include/Library/ResetUtilityLib.h
index c556dca729cf5efb16622931484579a21b4f1f1e..b5c2c1492f92292c864a68f94e17e5f281a6c24e 100644 (file)
--- a/MdeModulePkg/Include/Library/ResetUtilityLib.h
+++ b/MdeModulePkg/Include/Library/ResetUtilityLib.h
@@ -41,7 +41,7 @@ ResetPlatformSpecificGuid (
 /**\r
   This function examines the DataSize and ResetData parameters passed to\r
   to ResetSystem() and detemrines if the ResetData contains a Null-terminated\r
 /**\r
   This function examines the DataSize and ResetData parameters passed to\r
   to ResetSystem() and detemrines if the ResetData contains a Null-terminated\r

-  Unicode string followed by a GUID specific subtype.  If the GUID specific \r
+  Unicode string followed by a GUID specific subtype.  If the GUID specific\r

   subtype is present, then a pointer to the GUID value in ResetData is returned.\r
 \r
   @param[in]  DataSize    The size, in bytes, of ResetData.\r
   subtype is present, then a pointer to the GUID value in ResetData is returned.\r
 \r
   @param[in]  DataSize    The size, in bytes, of ResetData.\r


@@ -64,7 +64,7 @@ GetResetPlatformSpecificGuid (
   );\r
 \r
 /**\r
   );\r
 \r
 /**\r

-  This is a helper function that creates the reset data buffer that can be \r
+  This is a helper function that creates the reset data buffer that can be\r

   passed into ResetSystem().\r
 \r
   The reset data buffer is returned in ResetData and contains ResetString\r
   passed into ResetSystem().\r
 \r
   The reset data buffer is returned in ResetData and contains ResetString\r

diff --git a/MdeModulePkg/Include/Library/S3Lib.h b/MdeModulePkg/Include/Library/S3Lib.h
index fcb8abd8022cbc998c71fe7c441cd047b858a47c..2a309034fac9b910df7f8da05faa9f900e56573e 100644 (file)
--- a/MdeModulePkg/Include/Library/S3Lib.h
+++ b/MdeModulePkg/Include/Library/S3Lib.h
@@ -3,13 +3,13 @@
   This library class is no longer used and modules using this library should\r
   directly locate EFI_PEI_S3_RESUME_PPI, defined in the PI 1.2 specification.\r
 \r
   This library class is no longer used and modules using this library should\r
   directly locate EFI_PEI_S3_RESUME_PPI, defined in the PI 1.2 specification.\r
 \r

-Copyright (c) 2005 - 2010, Intel Corporation. All rights reserved.<BR>\r
-This program and the accompanying materials are licensed and made available under \r
-the terms and conditions of the BSD License that accompanies this distribution.  \r
+Copyright (c) 2005 - 2018, Intel Corporation. All rights reserved.<BR>\r
+This program and the accompanying materials are licensed and made available under\r
+the terms and conditions of the BSD License that accompanies this distribution.\r

 The full text of the license may be found at\r
 The full text of the license may be found at\r

-http://opensource.org/licenses/bsd-license.php.                                            \r
+http://opensource.org/licenses/bsd-license.php.\r

 \r
 \r

-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     \r
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r

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


@@ -19,7 +19,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 \r
 /**\r
   This function is responsible for calling the S3 resume vector in the ACPI Tables.\r
 \r
 /**\r
   This function is responsible for calling the S3 resume vector in the ACPI Tables.\r

-  \r
+\r

   @retval EFI_SUCCESS   Successfully restored the configuration from S3.\r
   @retval Others       Failed to restore the configuration from S3.\r
 \r
   @retval EFI_SUCCESS   Successfully restored the configuration from S3.\r
   @retval Others       Failed to restore the configuration from S3.\r
 \r

diff --git a/MdeModulePkg/Include/Library/SecurityManagementLib.h b/MdeModulePkg/Include/Library/SecurityManagementLib.h
index de87d09c54c737f2a6f0a9e83a9719c3088aff7e..dd4d2e6f7574d205834b9757a36012fcdab28db2 100644 (file)
--- a/MdeModulePkg/Include/Library/SecurityManagementLib.h
+++ b/MdeModulePkg/Include/Library/SecurityManagementLib.h
@@ -1,15 +1,15 @@
 /** @file\r
 /** @file\r

-  This library class defines a set of interfaces to abstract the policy of \r
+  This library class defines a set of interfaces to abstract the policy of\r

   security measurement by managing the different security measurement services.\r
   The library instances can be implemented according to the different security policy.\r
 \r
   security measurement by managing the different security measurement services.\r
   The library instances can be implemented according to the different security policy.\r
 \r

-Copyright (c) 2009 - 2012, Intel Corporation. All rights reserved.<BR>\r
-This program and the accompanying materials are licensed and made available under \r
-the terms and conditions of the BSD License that accompanies this distribution.  \r
+Copyright (c) 2009 - 2018, Intel Corporation. All rights reserved.<BR>\r
+This program and the accompanying materials are licensed and made available under\r
+the terms and conditions of the BSD License that accompanies this distribution.\r

 The full text of the license may be found at\r
 The full text of the license may be found at\r

-http://opensource.org/licenses/bsd-license.php.                                            \r
+http://opensource.org/licenses/bsd-license.php.\r

 \r
 \r

-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     \r
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r

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


@@ -36,33 +36,33 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #define EFI_AUTH_OPERATION_IMAGE_REQUIRED      0x80000000\r
 \r
 /**\r
 #define EFI_AUTH_OPERATION_IMAGE_REQUIRED      0x80000000\r
 \r
 /**\r

-  The security handler is used to abstract platform-specific policy \r
-  from the DXE core response to an attempt to use a file that returns a \r
-  given status for the authentication check from the section extraction protocol.  \r
+  The security handler is used to abstract platform-specific policy\r
+  from the DXE core response to an attempt to use a file that returns a\r
+  given status for the authentication check from the section extraction protocol.\r

 \r
 \r

-  The possible responses in a given SAP implementation may include locking \r
-  flash upon failure to authenticate, attestation logging for all signed drivers, \r
-  and other exception operations.  The File parameter allows for possible logging \r
+  The possible responses in a given SAP implementation may include locking\r
+  flash upon failure to authenticate, attestation logging for all signed drivers,\r
+  and other exception operations.  The File parameter allows for possible logging\r

   within the SAP of the driver.\r
   within the SAP of the driver.\r

-  \r
+\r

   If File is NULL, then EFI_INVALID_PARAMETER is returned.\r
 \r
   If File is NULL, then EFI_INVALID_PARAMETER is returned.\r
 \r

-  If the file specified by File with an authentication status specified by \r
+  If the file specified by File with an authentication status specified by\r

   AuthenticationStatus is safe for the DXE Core to use, then EFI_SUCCESS is returned.\r
 \r
   AuthenticationStatus is safe for the DXE Core to use, then EFI_SUCCESS is returned.\r
 \r

-  If the file specified by File with an authentication status specified by \r
-  AuthenticationStatus is not safe for the DXE Core to use under any circumstances, \r
+  If the file specified by File with an authentication status specified by\r
+  AuthenticationStatus is not safe for the DXE Core to use under any circumstances,\r

   then EFI_ACCESS_DENIED is returned.\r
 \r
   then EFI_ACCESS_DENIED is returned.\r
 \r

-  If the file specified by File with an authentication status specified by \r
-  AuthenticationStatus is not safe for the DXE Core to use at the time, but it \r
-  might be possible to use it at a future time, then EFI_SECURITY_VIOLATION is \r
+  If the file specified by File with an authentication status specified by\r
+  AuthenticationStatus is not safe for the DXE Core to use at the time, but it\r
+  might be possible to use it at a future time, then EFI_SECURITY_VIOLATION is\r

   returned.\r
 \r
   returned.\r
 \r

-  FileBuffer will be NULL and FileSize will be 0 if the handler being called \r
+  FileBuffer will be NULL and FileSize will be 0 if the handler being called\r

   did not set EFI_AUTH_OPERATION_IMAGE_REQUIRED when it was registered.\r
 \r
   did not set EFI_AUTH_OPERATION_IMAGE_REQUIRED when it was registered.\r
 \r

-  @param[in]    AuthenticationStatus \r
+  @param[in]    AuthenticationStatus\r

                            The authentication status returned from the security\r
                            measurement services for the input file.\r
   @param[in]    File       The pointer to the device path of the file that is\r
                            The authentication status returned from the security\r
                            measurement services for the input file.\r
   @param[in]    File       The pointer to the device path of the file that is\r


@@ -83,7 +83,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
                                  used for any purpose.\r
 \r
 **/\r
                                  used for any purpose.\r
 \r
 **/\r

-typedef \r
+typedef\r

 EFI_STATUS\r
 (EFIAPI *SECURITY_FILE_AUTHENTICATION_STATE_HANDLER)(\r
   IN  OUT   UINT32                     AuthenticationStatus,\r
 EFI_STATUS\r
 (EFIAPI *SECURITY_FILE_AUTHENTICATION_STATE_HANDLER)(\r
   IN  OUT   UINT32                     AuthenticationStatus,\r


@@ -117,12 +117,12 @@ RegisterSecurityHandler (
   Execute registered handlers until one returns an error and that error is returned.\r
   If none of the handlers return an error, then EFI_SUCCESS is returned.\r
 \r
   Execute registered handlers until one returns an error and that error is returned.\r
   If none of the handlers return an error, then EFI_SUCCESS is returned.\r
 \r

-  Before exectue handler, get the image buffer by file device path if a handler \r
+  Before exectue handler, get the image buffer by file device path if a handler\r

   requires the image file. And return the image buffer to each handler when exectue handler.\r
 \r
   The handlers are executed in same order to their registered order.\r
 \r
   requires the image file. And return the image buffer to each handler when exectue handler.\r
 \r
   The handlers are executed in same order to their registered order.\r
 \r

-  @param[in]  AuthenticationStatus \r
+  @param[in]  AuthenticationStatus\r

                            This is the authentication type returned from the Section\r
                            Extraction protocol. See the Section Extraction Protocol\r
                            Specification for details on this type.\r
                            This is the authentication type returned from the Section\r
                            Extraction protocol. See the Section Extraction Protocol\r
                            Specification for details on this type.\r


@@ -130,9 +130,9 @@ RegisterSecurityHandler (
                            being dispatched. This will optionally be used for logging.\r
 \r
   @retval EFI_SUCCESS            The file specified by File authenticated when more\r
                            being dispatched. This will optionally be used for logging.\r
 \r
   @retval EFI_SUCCESS            The file specified by File authenticated when more\r

-                                 than one security handler services were registered, \r
-                                 or the file did not authenticate when no security \r
-                                 handler service was registered. And the platform policy \r
+                                 than one security handler services were registered,\r
+                                 or the file did not authenticate when no security\r
+                                 handler service was registered. And the platform policy\r

                                  dictates that the DXE Core may use File.\r
   @retval EFI_INVALID_PARAMETER  File is NULL.\r
   @retval EFI_SECURITY_VIOLATION The file specified by File did not authenticate, and\r
                                  dictates that the DXE Core may use File.\r
   @retval EFI_INVALID_PARAMETER  File is NULL.\r
   @retval EFI_SECURITY_VIOLATION The file specified by File did not authenticate, and\r


@@ -152,13 +152,13 @@ ExecuteSecurityHandlers (
   );\r
 \r
 /**\r
   );\r
 \r
 /**\r

-  The security handler is used to abstracts security-specific functions from the DXE \r
-  Foundation of UEFI Image Verification, Trusted Computing Group (TCG) measured boot, \r
-  User Identity policy for image loading and consoles, and for purposes of \r
-  handling GUIDed section encapsulations. \r
-  \r
-  @param[in]    AuthenticationStatus \r
-                           The authentication status for the input file. \r
+  The security handler is used to abstracts security-specific functions from the DXE\r
+  Foundation of UEFI Image Verification, Trusted Computing Group (TCG) measured boot,\r
+  User Identity policy for image loading and consoles, and for purposes of\r
+  handling GUIDed section encapsulations.\r
+\r
+  @param[in]    AuthenticationStatus\r
+                           The authentication status for the input file.\r

   @param[in]    File       The pointer to the device path of the file that is\r
                            being dispatched. This will optionally be used for logging.\r
   @param[in]    FileBuffer A pointer to the buffer with the UEFI file image\r
   @param[in]    File       The pointer to the device path of the file that is\r
                            being dispatched. This will optionally be used for logging.\r
   @param[in]    FileBuffer A pointer to the buffer with the UEFI file image\r


@@ -188,7 +188,7 @@ ExecuteSecurityHandlers (
                                   drivers from the device path specified by DevicePath. The\r
                                   image has been added into the list of the deferred images.\r
 **/\r
                                   drivers from the device path specified by DevicePath. The\r
                                   image has been added into the list of the deferred images.\r
 **/\r

-typedef \r
+typedef\r

 EFI_STATUS\r
 (EFIAPI *SECURITY2_FILE_AUTHENTICATION_HANDLER) (\r
   IN  UINT32                           AuthenticationStatus,\r
 EFI_STATUS\r
 (EFIAPI *SECURITY2_FILE_AUTHENTICATION_HANDLER) (\r
   IN  UINT32                           AuthenticationStatus,\r


@@ -221,16 +221,16 @@ RegisterSecurity2Handler (
   );\r
 \r
 /**\r
   );\r
 \r
 /**\r

-  Execute registered handlers based on input AuthenticationOperation until \r
-  one returns an error and that error is returned. \r
-  \r
+  Execute registered handlers based on input AuthenticationOperation until\r
+  one returns an error and that error is returned.\r
+\r

   If none of the handlers return an error, then EFI_SUCCESS is returned.\r
   The handlers those satisfy AuthenticationOperation will only be executed.\r
   The handlers are executed in same order to their registered order.\r
 \r
   If none of the handlers return an error, then EFI_SUCCESS is returned.\r
   The handlers those satisfy AuthenticationOperation will only be executed.\r
   The handlers are executed in same order to their registered order.\r
 \r

-  @param[in]  AuthenticationOperation   \r
+  @param[in]  AuthenticationOperation\r

                            The operation type specifies which handlers will be executed.\r
                            The operation type specifies which handlers will be executed.\r

-  @param[in]  AuthenticationStatus \r
+  @param[in]  AuthenticationStatus\r

                            The authentication status for the input file.\r
   @param[in]  File         This is a pointer to the device path of the file that is\r
                            being dispatched. This will optionally be used for logging.\r
                            The authentication status for the input file.\r
   @param[in]  File         This is a pointer to the device path of the file that is\r
                            being dispatched. This will optionally be used for logging.\r


@@ -260,7 +260,7 @@ RegisterSecurity2Handler (
   @retval EFI_SECURITY_VIOLATION  FileBuffer is not NULL and the user has no permission to load\r
                                   drivers from the device path specified by DevicePath. The\r
                                   image has been added into the list of the deferred images.\r
   @retval EFI_SECURITY_VIOLATION  FileBuffer is not NULL and the user has no permission to load\r
                                   drivers from the device path specified by DevicePath. The\r
                                   image has been added into the list of the deferred images.\r

-  @retval EFI_INVALID_PARAMETER   File and FileBuffer are both NULL. \r
+  @retval EFI_INVALID_PARAMETER   File and FileBuffer are both NULL.\r

 **/\r
 EFI_STATUS\r
 EFIAPI\r
 **/\r
 EFI_STATUS\r
 EFIAPI\r

diff --git a/MdeModulePkg/Include/Library/SmmCorePlatformHookLib.h b/MdeModulePkg/Include/Library/SmmCorePlatformHookLib.h
index 773d0615b7c59bc0d704aec99d55c62f536fc1b8..5771c5156f315bb1a494cd6e622894cde5ac0135 100644 (file)
--- a/MdeModulePkg/Include/Library/SmmCorePlatformHookLib.h
+++ b/MdeModulePkg/Include/Library/SmmCorePlatformHookLib.h
@@ -2,13 +2,13 @@
   Smm Core Platform Hook Library.  This library class defines a set of platform\r
   hooks called by the SMM Core.\r
 \r
   Smm Core Platform Hook Library.  This library class defines a set of platform\r
   hooks called by the SMM Core.\r
 \r

-Copyright (c) 2011, Intel Corporation. All rights reserved.<BR>\r
-This program and the accompanying materials are licensed and made available under \r
-the terms and conditions of the BSD License that accompanies this distribution.  \r
+Copyright (c) 2011 - 2018, Intel Corporation. All rights reserved.<BR>\r
+This program and the accompanying materials are licensed and made available under\r
+the terms and conditions of the BSD License that accompanies this distribution.\r

 The full text of the license may be found at\r
 The full text of the license may be found at\r

-http://opensource.org/licenses/bsd-license.php.                                            \r
+http://opensource.org/licenses/bsd-license.php.\r

 \r
 \r

-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     \r
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r

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


@@ -18,9 +18,9 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 \r
 /**\r
   Performs platform specific tasks before invoking registered SMI handlers.\r
 \r
 /**\r
   Performs platform specific tasks before invoking registered SMI handlers.\r

-  \r
+\r

   This function performs platform specific tasks before invoking registered SMI handlers.\r
   This function performs platform specific tasks before invoking registered SMI handlers.\r

-  \r
+\r

   @retval EFI_SUCCESS       The platform hook completes successfully.\r
   @retval Other values      The paltform hook cannot complete due to some error.\r
 \r
   @retval EFI_SUCCESS       The platform hook completes successfully.\r
   @retval Other values      The paltform hook cannot complete due to some error.\r
 \r


@@ -34,9 +34,9 @@ PlatformHookBeforeSmmDispatch (
 \r
 /**\r
   Performs platform specific tasks after invoking registered SMI handlers.\r
 \r
 /**\r
   Performs platform specific tasks after invoking registered SMI handlers.\r

-  \r
+\r

   This function performs platform specific tasks after invoking registered SMI handlers.\r
   This function performs platform specific tasks after invoking registered SMI handlers.\r

-  \r
+\r

   @retval EFI_SUCCESS       The platform hook completes successfully.\r
   @retval Other values      The paltform hook cannot complete due to some error.\r
 \r
   @retval EFI_SUCCESS       The platform hook completes successfully.\r
   @retval Other values      The paltform hook cannot complete due to some error.\r
 \r


@@ -46,5 +46,5 @@ EFIAPI
 PlatformHookAfterSmmDispatch (\r
   VOID\r
   );\r
 PlatformHookAfterSmmDispatch (\r
   VOID\r
   );\r

-  \r
+\r

 #endif\r
 #endif\r

diff --git a/MdeModulePkg/Include/Library/TcpIoLib.h b/MdeModulePkg/Include/Library/TcpIoLib.h
index 22629dbcd5596d5361776276c793f0467e1735ba..e73bec2ee2ab12ec50449e040da36372ac27bd3c 100644 (file)
--- a/MdeModulePkg/Include/Library/TcpIoLib.h
+++ b/MdeModulePkg/Include/Library/TcpIoLib.h
@@ -2,7 +2,7 @@
   This library is used to share code between UEFI network stack modules.\r
   It provides the helper routines to access TCP service.\r
 \r
   This library is used to share code between UEFI network stack modules.\r
   It provides the helper routines to access TCP service.\r
 \r

-Copyright (c) 2010 - 2017, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2010 - 2018, Intel Corporation. All rights reserved.<BR>\r

 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at<BR>\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at<BR>\r


@@ -85,7 +85,7 @@ typedef struct {
   EFI_HANDLE                Image;\r
   EFI_HANDLE                Controller;\r
   EFI_HANDLE                Handle;\r
   EFI_HANDLE                Image;\r
   EFI_HANDLE                Controller;\r
   EFI_HANDLE                Handle;\r

-  \r
+\r

   TCP_IO_PROTOCOL           Tcp;\r
   TCP_IO_PROTOCOL           NewTcp;\r
   TCP_IO_CONNECTION_TOKEN   ConnToken;\r
   TCP_IO_PROTOCOL           Tcp;\r
   TCP_IO_PROTOCOL           NewTcp;\r
   TCP_IO_CONNECTION_TOKEN   ConnToken;\r


@@ -93,7 +93,7 @@ typedef struct {
   TCP_IO_IO_TOKEN           RxToken;\r
   TCP_IO_CLOSE_TOKEN        CloseToken;\r
   TCP_IO_LISTEN_TOKEN       ListenToken;\r
   TCP_IO_IO_TOKEN           RxToken;\r
   TCP_IO_CLOSE_TOKEN        CloseToken;\r
   TCP_IO_LISTEN_TOKEN       ListenToken;\r

-  \r
+\r

   BOOLEAN                   IsConnDone;\r
   BOOLEAN                   IsTxDone;\r
   BOOLEAN                   IsRxDone;\r
   BOOLEAN                   IsConnDone;\r
   BOOLEAN                   IsTxDone;\r
   BOOLEAN                   IsRxDone;\r


@@ -102,14 +102,14 @@ typedef struct {
 } TCP_IO;\r
 \r
 /**\r
 } TCP_IO;\r
 \r
 /**\r

-  Create a TCP socket with the specified configuration data. \r
+  Create a TCP socket with the specified configuration data.\r

 \r
   @param[in]  Image      The handle of the driver image.\r
   @param[in]  Controller The handle of the controller.\r
   @param[in]  TcpVersion The version of Tcp, TCP_VERSION_4 or TCP_VERSION_6.\r
   @param[in]  ConfigData The Tcp configuration data.\r
   @param[out] TcpIo      The TcpIo.\r
 \r
   @param[in]  Image      The handle of the driver image.\r
   @param[in]  Controller The handle of the controller.\r
   @param[in]  TcpVersion The version of Tcp, TCP_VERSION_4 or TCP_VERSION_6.\r
   @param[in]  ConfigData The Tcp configuration data.\r
   @param[out] TcpIo      The TcpIo.\r

-  \r
+\r

   @retval EFI_SUCCESS            The TCP socket is created and configured.\r
   @retval EFI_INVALID_PARAMETER  One or more parameters are invalid.\r
   @retval EFI_UNSUPPORTED        One or more of the control options are not\r
   @retval EFI_SUCCESS            The TCP socket is created and configured.\r
   @retval EFI_INVALID_PARAMETER  One or more parameters are invalid.\r
   @retval EFI_UNSUPPORTED        One or more of the control options are not\r


@@ -129,7 +129,7 @@ TcpIoCreateSocket (
   );\r
 \r
 /**\r
   );\r
 \r
 /**\r

-  Destroy the socket. \r
+  Destroy the socket.\r

 \r
   @param[in]  TcpIo The TcpIo which wraps the socket to be destroyed.\r
 \r
 \r
   @param[in]  TcpIo The TcpIo which wraps the socket to be destroyed.\r
 \r


@@ -145,7 +145,7 @@ TcpIoDestroySocket (
 \r
   @param[in, out]  TcpIo     The TcpIo wrapping the TCP socket.\r
   @param[in]       Timeout   The time to wait for connection done. Set to NULL for infinite wait.\r
 \r
   @param[in, out]  TcpIo     The TcpIo wrapping the TCP socket.\r
   @param[in]       Timeout   The time to wait for connection done. Set to NULL for infinite wait.\r

-  \r
+\r

   @retval EFI_SUCCESS            Connect to the other endpoint of the TCP socket\r
                                  successfully.\r
   @retval EFI_TIMEOUT            Failed to connect to the other endpoint of the\r
   @retval EFI_SUCCESS            Connect to the other endpoint of the TCP socket\r
                                  successfully.\r
   @retval EFI_TIMEOUT            Failed to connect to the other endpoint of the\r


@@ -169,7 +169,7 @@ TcpIoConnect (
   @param[in, out]  TcpIo     The TcpIo wrapping the TCP socket.\r
   @param[in]       Timeout   The time to wait for connection done. Set to NULL for infinite wait.\r
 \r
   @param[in, out]  TcpIo     The TcpIo wrapping the TCP socket.\r
   @param[in]       Timeout   The time to wait for connection done. Set to NULL for infinite wait.\r
 \r

-  \r
+\r

   @retval EFI_SUCCESS            Connect to the other endpoint of the TCP socket\r
                                  successfully.\r
   @retval EFI_INVALID_PARAMETER  One or more parameters are invalid.\r
   @retval EFI_SUCCESS            Connect to the other endpoint of the TCP socket\r
                                  successfully.\r
   @retval EFI_INVALID_PARAMETER  One or more parameters are invalid.\r


@@ -187,7 +187,7 @@ TcpIoAccept (
   IN OUT TCP_IO             *TcpIo,\r
   IN     EFI_EVENT          Timeout        OPTIONAL\r
   );\r
   IN OUT TCP_IO             *TcpIo,\r
   IN     EFI_EVENT          Timeout        OPTIONAL\r
   );\r

-  \r
+\r

 /**\r
   Reset the socket.\r
 \r
 /**\r
   Reset the socket.\r
 \r


@@ -205,7 +205,7 @@ TcpIoReset (
 \r
   @param[in]   TcpIo           The TcpIo wrapping the TCP socket.\r
   @param[in]   Packet          The packet to transmit.\r
 \r
   @param[in]   TcpIo           The TcpIo wrapping the TCP socket.\r
   @param[in]   Packet          The packet to transmit.\r

-  \r
+\r

   @retval EFI_SUCCESS            The packet is trasmitted.\r
   @retval EFI_INVALID_PARAMETER  One or more parameters are invalid.\r
   @retval EFI_UNSUPPORTED        One or more of the control options are not\r
   @retval EFI_SUCCESS            The packet is trasmitted.\r
   @retval EFI_INVALID_PARAMETER  One or more parameters are invalid.\r
   @retval EFI_UNSUPPORTED        One or more of the control options are not\r

diff --git a/MdeModulePkg/Include/Library/UdpIoLib.h b/MdeModulePkg/Include/Library/UdpIoLib.h
index 9bfa80e143630599eda354e2ee0cbc94219eceb7..ca65622adf7afec4534bb58375a3b868d330dcc8 100644 (file)
--- a/MdeModulePkg/Include/Library/UdpIoLib.h
+++ b/MdeModulePkg/Include/Library/UdpIoLib.h
@@ -49,7 +49,7 @@ typedef struct {
 \r
   This prototype is used by both receive and sending when calling\r
   UdpIoRecvDatagram() or UdpIoSendDatagram(). When receiving, Netbuf is allocated by the\r
 \r
   This prototype is used by both receive and sending when calling\r
   UdpIoRecvDatagram() or UdpIoSendDatagram(). When receiving, Netbuf is allocated by the\r

-  UDP access point and released by the user. When sending, the user allocates the the NetBuf, \r
+  UDP access point and released by the user. When sending, the user allocates the the NetBuf,\r

   which is then provided to the callback as a reference.\r
 \r
   @param[in] Packet       The packet received or sent.\r
   which is then provided to the callback as a reference.\r
 \r
   @param[in] Packet       The packet received or sent.\r


@@ -97,7 +97,7 @@ typedef struct {
 /// This structure is used internally by UdpIo Library.\r
 ///\r
 /// Each transmit request is wrapped in an UDP_TX_TOKEN. Upon completion,\r
 /// This structure is used internally by UdpIo Library.\r
 ///\r
 /// Each transmit request is wrapped in an UDP_TX_TOKEN. Upon completion,\r

-/// the CallBack will be called. There can be several transmit requests. All transmit \r
+/// the CallBack will be called. There can be several transmit requests. All transmit\r

 /// requests are linked in a list.\r
 ///\r
 \r
 /// requests are linked in a list.\r
 ///\r
 \r

diff --git a/MdeModulePkg/Include/Library/UefiBootManagerLib.h b/MdeModulePkg/Include/Library/UefiBootManagerLib.h
index 1d862a4b2684074264a6891351854712f8dd94fc..bfc0cb86f87738d61c2b37d01f04947bc1c6de82 100644 (file)
--- a/MdeModulePkg/Include/Library/UefiBootManagerLib.h
+++ b/MdeModulePkg/Include/Library/UefiBootManagerLib.h
@@ -1,7 +1,7 @@
 /** @file\r
   Provide Boot Manager related library APIs.\r
 \r
 /** @file\r
   Provide Boot Manager related library APIs.\r
 \r

-Copyright (c) 2011 - 2016, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2011 - 2018, Intel Corporation. All rights reserved.<BR>\r

 (C) Copyright 2015-2016 Hewlett Packard Enterprise Development LP<BR>\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 (C) Copyright 2015-2016 Hewlett Packard Enterprise Development LP<BR>\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r


@@ -60,14 +60,14 @@ typedef struct {
   // Used at runtime\r
   //\r
   EFI_STATUS                        Status;             // Status returned from boot attempt gBS->StartImage ()\r
   // Used at runtime\r
   //\r
   EFI_STATUS                        Status;             // Status returned from boot attempt gBS->StartImage ()\r

-  CHAR16                            *ExitData;          // Exit data returned from gBS->StartImage () \r
+  CHAR16                            *ExitData;          // Exit data returned from gBS->StartImage ()\r

   UINTN                             ExitDataSize;       // Size of ExitData\r
 } EFI_BOOT_MANAGER_LOAD_OPTION;\r
 \r
 /**\r
   Returns an array of load options based on the EFI variable\r
   L"BootOrder"/L"DriverOrder" and the L"Boot####"/L"Driver####" variables impled by it.\r
   UINTN                             ExitDataSize;       // Size of ExitData\r
 } EFI_BOOT_MANAGER_LOAD_OPTION;\r
 \r
 /**\r
   Returns an array of load options based on the EFI variable\r
   L"BootOrder"/L"DriverOrder" and the L"Boot####"/L"Driver####" variables impled by it.\r

-  #### is the hex value of the UINT16 in each BootOrder/DriverOrder entry. \r
+  #### is the hex value of the UINT16 in each BootOrder/DriverOrder entry.\r

 \r
   @param  LoadOptionCount   Returns number of entries in the array.\r
   @param  LoadOptionType    The type of the load option.\r
 \r
   @param  LoadOptionCount   Returns number of entries in the array.\r
   @param  LoadOptionType    The type of the load option.\r


@@ -163,7 +163,7 @@ EfiBootManagerVariableToLoadOption (
 \r
 /**\r
   Create the Boot#### or Driver#### variable from the load option.\r
 \r
 /**\r
   Create the Boot#### or Driver#### variable from the load option.\r

-  \r
+\r

   @param  LoadOption      Pointer to the load option.\r
 \r
   @retval EFI_SUCCESS     The variable was created.\r
   @param  LoadOption      Pointer to the load option.\r
 \r
   @retval EFI_SUCCESS     The variable was created.\r


@@ -204,9 +204,9 @@ EfiBootManagerAddLoadOptionVariable (
 \r
 /**\r
   Delete the load option according to the OptionNumber and OptionType.\r
 \r
 /**\r
   Delete the load option according to the OptionNumber and OptionType.\r

-  \r
+\r

   Only the BootOrder/DriverOrder is updated to remove the reference of the OptionNumber.\r
   Only the BootOrder/DriverOrder is updated to remove the reference of the OptionNumber.\r

-  \r
+\r

   @param  OptionNumber        Option number of the load option.\r
   @param  OptionType          Type of the load option.\r
 \r
   @param  OptionNumber        Option number of the load option.\r
   @param  OptionType          Type of the load option.\r
 \r


@@ -221,7 +221,7 @@ EfiBootManagerDeleteLoadOptionVariable (
   );\r
 \r
 /**\r
   );\r
 \r
 /**\r

-  Sort the load options. The DriverOrder/BootOrder variables will be re-created to \r
+  Sort the load options. The DriverOrder/BootOrder variables will be re-created to\r

   reflect the new order.\r
 \r
   @param OptionType        The type of the load option.\r
   reflect the new order.\r
 \r
   @param OptionType        The type of the load option.\r


@@ -237,7 +237,7 @@ EfiBootManagerSortLoadOptionVariable (
 /**\r
   Return the index of the load option in the load option array.\r
 \r
 /**\r
   Return the index of the load option in the load option array.\r
 \r

-  The function consider two load options are equal when the \r
+  The function consider two load options are equal when the\r

   OptionType, Attributes, Description, FilePath and OptionalData are equal.\r
 \r
   @param Key    Pointer to the load option to be found.\r
   OptionType, Attributes, Description, FilePath and OptionalData are equal.\r
 \r
   @param Key    Pointer to the load option to be found.\r


@@ -292,7 +292,7 @@ typedef struct {
 /**\r
   Start the hot key service so that the key press can trigger the boot option.\r
 \r
 /**\r
   Start the hot key service so that the key press can trigger the boot option.\r
 \r

-  @param HotkeyTriggered  Return the waitable event and it will be signaled \r
+  @param HotkeyTriggered  Return the waitable event and it will be signaled\r

                           when a valid hot key is pressed.\r
 \r
   @retval EFI_SUCCESS     The hot key service is started.\r
                           when a valid hot key is pressed.\r
 \r
   @retval EFI_SUCCESS     The hot key service is started.\r


@@ -391,7 +391,7 @@ EfiBootManagerHotkeyBoot (
   3. Non-BlockIo SimpleFileSystem - The boot option points to a device supporting\r
                                     SimpleFileSystem Protocol, but not supporting BlockIo\r
                                     protocol.\r
   3. Non-BlockIo SimpleFileSystem - The boot option points to a device supporting\r
                                     SimpleFileSystem Protocol, but not supporting BlockIo\r
                                     protocol.\r

-  4. LoadFile                     - The boot option points to the media supporting \r
+  4. LoadFile                     - The boot option points to the media supporting\r

                                     LoadFile protocol.\r
   Reference: UEFI Spec chapter 3.3 Boot Option Variables Default Boot Behavior\r
 \r
                                     LoadFile protocol.\r
   Reference: UEFI Spec chapter 3.3 Boot Option Variables Default Boot Behavior\r
 \r


@@ -407,9 +407,9 @@ EfiBootManagerRefreshAllBootOption (
   Attempt to boot the EFI boot option. This routine sets L"BootCurent" and\r
   signals the EFI ready to boot event. If the device path for the option starts\r
   with a BBS device path a legacy boot is attempted. Short form device paths are\r
   Attempt to boot the EFI boot option. This routine sets L"BootCurent" and\r
   signals the EFI ready to boot event. If the device path for the option starts\r
   with a BBS device path a legacy boot is attempted. Short form device paths are\r

-  also supported via this rountine. A device path starting with \r
+  also supported via this rountine. A device path starting with\r

   MEDIA_HARDDRIVE_DP, MSG_USB_WWID_DP, MSG_USB_CLASS_DP gets expaned out\r
   MEDIA_HARDDRIVE_DP, MSG_USB_WWID_DP, MSG_USB_CLASS_DP gets expaned out\r

-  to find the first device that matches. If the BootOption Device Path \r
+  to find the first device that matches. If the BootOption Device Path\r

   fails the removable media boot algorithm is attempted (\EFI\BOOTIA32.EFI,\r
   \EFI\BOOTX64.EFI,... only one file type is tried per processor type)\r
 \r
   fails the removable media boot algorithm is attempted (\EFI\BOOTIA32.EFI,\r
   \EFI\BOOTX64.EFI,... only one file type is tried per processor type)\r
 \r


@@ -467,7 +467,7 @@ EfiBootManagerGetLoadOptionBuffer (
   );\r
 \r
 /**\r
   );\r
 \r
 /**\r

-  The function enumerates all the legacy boot options, creates them and \r
+  The function enumerates all the legacy boot options, creates them and\r

   registers them in the BootOrder variable.\r
 **/\r
 typedef\r
   registers them in the BootOrder variable.\r
 **/\r
 typedef\r


@@ -560,7 +560,7 @@ EfiBootManagerConnectAll (
   @retval EFI_OUT_OF_RESOURCES   There is no resource to create new handles.\r
   @retval EFI_NOT_FOUND          Create the handle associate with one device path\r
                                  node failed.\r
   @retval EFI_OUT_OF_RESOURCES   There is no resource to create new handles.\r
   @retval EFI_NOT_FOUND          Create the handle associate with one device path\r
                                  node failed.\r

-  @retval EFI_SECURITY_VIOLATION The user has no permission to start UEFI device \r
+  @retval EFI_SECURITY_VIOLATION The user has no permission to start UEFI device\r

                                  drivers on the DevicePath.\r
 **/\r
 EFI_STATUS\r
                                  drivers on the DevicePath.\r
 **/\r
 EFI_STATUS\r


@@ -571,8 +571,8 @@ EfiBootManagerConnectDevicePath (
   );\r
 \r
 /**\r
   );\r
 \r
 /**\r

-  This function will disconnect all current system handles. \r
-  \r
+  This function will disconnect all current system handles.\r
+\r

   gBS->DisconnectController() is invoked for each handle exists in system handle buffer.\r
   If handle is a bus type handle, all childrens also are disconnected recursively by\r
   gBS->DisconnectController().\r
   gBS->DisconnectController() is invoked for each handle exists in system handle buffer.\r
   If handle is a bus type handle, all childrens also are disconnected recursively by\r
   gBS->DisconnectController().\r


@@ -656,7 +656,7 @@ EfiBootManagerConnectConsoleVariable (
   );\r
 \r
 /**\r
   );\r
 \r
 /**\r

-  Query all the children of VideoController and return the device paths of all the \r
+  Query all the children of VideoController and return the device paths of all the\r

   children that support GraphicsOutput protocol.\r
 \r
   @param VideoController       PCI handle of video controller.\r
   children that support GraphicsOutput protocol.\r
 \r
   @param VideoController       PCI handle of video controller.\r


@@ -698,7 +698,7 @@ typedef struct {
   EFI_HANDLE                      ChildHandle;\r
 \r
   ///\r
   EFI_HANDLE                      ChildHandle;\r
 \r
   ///\r

-  /// Driver health messages of the specify Driver \r
+  /// Driver health messages of the specify Driver\r

   ///\r
   EFI_DRIVER_HEALTH_HII_MESSAGE   *MessageList;\r
 \r
   ///\r
   EFI_DRIVER_HEALTH_HII_MESSAGE   *MessageList;\r
 \r


@@ -756,7 +756,7 @@ EfiBootManagerFreeDriverHealthInfo (
 \r
   @param LoadOption  Pointer to the load option.\r
 \r
 \r
   @param LoadOption  Pointer to the load option.\r
 \r

-  @retval EFI_INVALID_PARAMETER  The load option type is invalid, \r
+  @retval EFI_INVALID_PARAMETER  The load option type is invalid,\r

                                  or the load option file path doesn't point to a valid file.\r
   @retval EFI_UNSUPPORTED        The load option type is of LoadOptionTypeBoot.\r
   @retval EFI_SUCCESS            The load option is inactive, or successfully loaded and executed.\r
                                  or the load option file path doesn't point to a valid file.\r
   @retval EFI_UNSUPPORTED        The load option type is of LoadOptionTypeBoot.\r
   @retval EFI_SUCCESS            The load option is inactive, or successfully loaded and executed.\r

diff --git a/MdeModulePkg/Include/Library/UefiHiiServicesLib.h b/MdeModulePkg/Include/Library/UefiHiiServicesLib.h
index 8c8beee55584315621a75a5b8ed5f72c8c88573a..a2f1b204daee2dc51ca39175063632edcececd02 100644 (file)
--- a/MdeModulePkg/Include/Library/UefiHiiServicesLib.h
+++ b/MdeModulePkg/Include/Library/UefiHiiServicesLib.h
@@ -2,15 +2,15 @@
   Provides global variables that are pointers to the UEFI HII related protocols.\r
   All of the UEFI HII related protocols are optional, so the consumers of this\r
   library class must verify that the global variable pointers are not NULL before\r
   Provides global variables that are pointers to the UEFI HII related protocols.\r
   All of the UEFI HII related protocols are optional, so the consumers of this\r
   library class must verify that the global variable pointers are not NULL before\r

-  use.   \r
+  use.\r

 \r
 \r

-Copyright (c) 2006 - 2010, Intel Corporation. All rights reserved.<BR>\r
-This program and the accompanying materials are licensed and made available under \r
-the terms and conditions of the BSD License that accompanies this distribution.  \r
+Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r
+This program and the accompanying materials are licensed and made available under\r
+the terms and conditions of the BSD License that accompanies this distribution.\r

 The full text of the license may be found at\r
 The full text of the license may be found at\r

-http://opensource.org/licenses/bsd-license.php.                                            \r
+http://opensource.org/licenses/bsd-license.php.\r

 \r
 \r

-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     \r
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r

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

diff --git a/MdeModulePkg/Include/Ppi/AtaController.h b/MdeModulePkg/Include/Ppi/AtaController.h
index 2333bef6aa657f3eda4e53a3339fb27acc031ea5..a24b496f9c0e8559149c898a0a0cd223682bc47b 100644 (file)
--- a/MdeModulePkg/Include/Ppi/AtaController.h
+++ b/MdeModulePkg/Include/Ppi/AtaController.h
@@ -1,8 +1,8 @@
 /** @file\r
   Define the PPI to abstract the functions that enable IDE and SATA channels, and to retrieve\r
   the base I/O port address for each of the enabled IDE and SATA channels.\r
 /** @file\r
   Define the PPI to abstract the functions that enable IDE and SATA channels, and to retrieve\r
   the base I/O port address for each of the enabled IDE and SATA channels.\r

-  \r
-Copyright (c) 2006 - 2011, Intel Corporation. All rights reserved.<BR>\r
+\r
+Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r

 \r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions\r
 \r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions\r


@@ -19,7 +19,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #define _PEI_ATA_CONTROLLER_PPI_H_\r
 \r
 ///\r
 #define _PEI_ATA_CONTROLLER_PPI_H_\r
 \r
 ///\r

-/// Global ID for the PEI_ATA_CONTROLLER_PPI. \r
+/// Global ID for the PEI_ATA_CONTROLLER_PPI.\r

 ///\r
 #define PEI_ATA_CONTROLLER_PPI_GUID \\r
   { \\r
 ///\r
 #define PEI_ATA_CONTROLLER_PPI_GUID \\r
   { \\r


@@ -32,50 +32,50 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 typedef struct _PEI_ATA_CONTROLLER_PPI PEI_ATA_CONTROLLER_PPI;\r
 \r
 ///\r
 typedef struct _PEI_ATA_CONTROLLER_PPI PEI_ATA_CONTROLLER_PPI;\r
 \r
 ///\r

-/// This bit is used in the ChannelMask parameter of EnableAtaChannel() to \r
-/// disable the IDE channels. \r
-/// This is designed for old generation chipset with PATA/SATA controllers. \r
-/// It may be ignored in PPI implementation for new generation chipset without PATA controller. \r
+/// This bit is used in the ChannelMask parameter of EnableAtaChannel() to\r
+/// disable the IDE channels.\r
+/// This is designed for old generation chipset with PATA/SATA controllers.\r
+/// It may be ignored in PPI implementation for new generation chipset without PATA controller.\r

 ///\r
 #define PEI_ICH_IDE_NONE        0x00\r
 \r
 ///\r
 ///\r
 #define PEI_ICH_IDE_NONE        0x00\r
 \r
 ///\r

-/// This bit is used in the ChannelMask parameter of EnableAtaChannel() to \r
+/// This bit is used in the ChannelMask parameter of EnableAtaChannel() to\r

 /// enable the Primary IDE channel.\r
 /// enable the Primary IDE channel.\r

-/// This is designed for old generation chipset with PATA/SATA controllers. \r
-/// It may be ignored in PPI implementation for new generation chipset without PATA controller. \r
+/// This is designed for old generation chipset with PATA/SATA controllers.\r
+/// It may be ignored in PPI implementation for new generation chipset without PATA controller.\r

 ///\r
 #define PEI_ICH_IDE_PRIMARY     0x01\r
 \r
 ///\r
 ///\r
 #define PEI_ICH_IDE_PRIMARY     0x01\r
 \r
 ///\r

-/// This bit is used in the ChannelMask parameter of EnableAtaChannel() to \r
+/// This bit is used in the ChannelMask parameter of EnableAtaChannel() to\r

 /// enable the Secondary IDE channel.\r
 /// enable the Secondary IDE channel.\r

-/// This is designed for old generation chipset with PATA/SATA controllers. \r
-/// It may be ignored in PPI implementation for new generation chipset without PATA controller. \r
+/// This is designed for old generation chipset with PATA/SATA controllers.\r
+/// It may be ignored in PPI implementation for new generation chipset without PATA controller.\r

 ///\r
 #define PEI_ICH_IDE_SECONDARY   0x02\r
 \r
 ///\r
 ///\r
 #define PEI_ICH_IDE_SECONDARY   0x02\r
 \r
 ///\r

-/// This bit is used in the ChannelMask parameter of EnableAtaChannel() to \r
+/// This bit is used in the ChannelMask parameter of EnableAtaChannel() to\r

 /// disable the SATA channel.\r
 /// disable the SATA channel.\r

-/// This is designed for old generation chipset with PATA/SATA controllers. \r
-/// It may be ignored in PPI implementation for new generation chipset without PATA controller. \r
+/// This is designed for old generation chipset with PATA/SATA controllers.\r
+/// It may be ignored in PPI implementation for new generation chipset without PATA controller.\r

 ///\r
 #define PEI_ICH_SATA_NONE       0x04\r
 \r
 ///\r
 ///\r
 #define PEI_ICH_SATA_NONE       0x04\r
 \r
 ///\r

-/// This bit is used in the ChannelMask parameter of EnableAtaChannel() to \r
+/// This bit is used in the ChannelMask parameter of EnableAtaChannel() to\r

 /// enable the Primary SATA channel.\r
 /// enable the Primary SATA channel.\r

-/// This is designed for old generation chipset with PATA/SATA controllers. \r
-/// It may be ignored in PPI implementation for new generation chipset without PATA controller. \r
+/// This is designed for old generation chipset with PATA/SATA controllers.\r
+/// It may be ignored in PPI implementation for new generation chipset without PATA controller.\r

 ///\r
 #define PEI_ICH_SATA_PRIMARY    0x08\r
 \r
 ///\r
 ///\r
 #define PEI_ICH_SATA_PRIMARY    0x08\r
 \r
 ///\r

-/// This bit is used in the ChannelMask parameter of EnableAtaChannel() to \r
+/// This bit is used in the ChannelMask parameter of EnableAtaChannel() to\r

 /// enable the Secondary SATA channel.\r
 /// enable the Secondary SATA channel.\r

-/// This is designed for old generation chipset with PATA/SATA controllers. \r
-/// It may be ignored in PPI implementation for new generation chipset without PATA controller. \r
+/// This is designed for old generation chipset with PATA/SATA controllers.\r
+/// It may be ignored in PPI implementation for new generation chipset without PATA controller.\r

 ///\r
 #define PEI_ICH_SATA_SECONDARY  0x010\r
 \r
 ///\r
 #define PEI_ICH_SATA_SECONDARY  0x010\r
 \r


@@ -97,15 +97,15 @@ typedef struct {
   Sets IDE and SATA channels to an enabled or disabled state.\r
 \r
   This service enables or disables the IDE and SATA channels specified by ChannelMask.\r
   Sets IDE and SATA channels to an enabled or disabled state.\r
 \r
   This service enables or disables the IDE and SATA channels specified by ChannelMask.\r

-  It may ignore ChannelMask setting to enable or disable IDE and SATA channels based on the platform policy. \r
-  The number of the enabled channels will be returned by GET_IDE_REGS_BASE_ADDR() function. \r
+  It may ignore ChannelMask setting to enable or disable IDE and SATA channels based on the platform policy.\r
+  The number of the enabled channels will be returned by GET_IDE_REGS_BASE_ADDR() function.\r

 \r
   If the new state is set, then EFI_SUCCESS is returned.  If the new state can\r
   not be set, then EFI_DEVICE_ERROR is returned.\r
 \r
   @param[in] PeiServices   The pointer to the PEI Services Table.\r
   @param[in] This          The pointer to this instance of the PEI_ATA_CONTROLLER_PPI.\r
 \r
   If the new state is set, then EFI_SUCCESS is returned.  If the new state can\r
   not be set, then EFI_DEVICE_ERROR is returned.\r
 \r
   @param[in] PeiServices   The pointer to the PEI Services Table.\r
   @param[in] This          The pointer to this instance of the PEI_ATA_CONTROLLER_PPI.\r

-  @param[in] ChannelMask   The bitmask that identifies the IDE and SATA channels to \r
+  @param[in] ChannelMask   The bitmask that identifies the IDE and SATA channels to\r

                            enable or disable. This parameter is optional.\r
 \r
   @retval EFI_SUCCESS        The IDE or SATA channels were enabled or disabled successfully.\r
                            enable or disable. This parameter is optional.\r
 \r
   @retval EFI_SUCCESS        The IDE or SATA channels were enabled or disabled successfully.\r


@@ -121,18 +121,18 @@ EFI_STATUS
   );\r
 \r
 /**\r
   );\r
 \r
 /**\r

-  Retrieves the I/O port base addresses for command and control registers of the \r
+  Retrieves the I/O port base addresses for command and control registers of the\r

   enabled IDE/SATA channels.\r
 \r
   This service fills in the structure poionted to by IdeRegsBaseAddr with the I/O\r
   port base addresses for the command and control registers of the IDE and SATA\r
   enabled IDE/SATA channels.\r
 \r
   This service fills in the structure poionted to by IdeRegsBaseAddr with the I/O\r
   port base addresses for the command and control registers of the IDE and SATA\r

-  channels that were previously enabled in EnableAtaChannel().  The number of \r
+  channels that were previously enabled in EnableAtaChannel().  The number of\r

   enabled IDE and SATA channels is returned.\r
 \r
   @param[in]  PeiServices       The pointer to the PEI Services Table.\r
   @param[in]  This              The pointer to this instance of the PEI_ATA_CONTROLLER_PPI.\r
   enabled IDE and SATA channels is returned.\r
 \r
   @param[in]  PeiServices       The pointer to the PEI Services Table.\r
   @param[in]  This              The pointer to this instance of the PEI_ATA_CONTROLLER_PPI.\r

-  @param[out] IdeRegsBaseAddr   The pointer to caller allocated space to return the \r
-                                I/O port base addresses of the IDE and SATA channels \r
+  @param[out] IdeRegsBaseAddr   The pointer to caller allocated space to return the\r
+                                I/O port base addresses of the IDE and SATA channels\r

                                 that were previosuly enabled with EnableAtaChannel().\r
 \r
   @return   The number of enabled IDE and SATA channels in the platform.\r
                                 that were previosuly enabled with EnableAtaChannel().\r
 \r
   @return   The number of enabled IDE and SATA channels in the platform.\r


@@ -143,7 +143,7 @@ UINT32
 (EFIAPI *GET_IDE_REGS_BASE_ADDR)(\r
   IN  EFI_PEI_SERVICES        **PeiServices,\r
   IN  PEI_ATA_CONTROLLER_PPI  *This,\r
 (EFIAPI *GET_IDE_REGS_BASE_ADDR)(\r
   IN  EFI_PEI_SERVICES        **PeiServices,\r
   IN  PEI_ATA_CONTROLLER_PPI  *This,\r

-  OUT IDE_REGS_BASE_ADDR      *IdeRegsBaseAddr \r
+  OUT IDE_REGS_BASE_ADDR      *IdeRegsBaseAddr\r

   );\r
 \r
 ///\r
   );\r
 \r
 ///\r

diff --git a/MdeModulePkg/Include/Ppi/SerialPortPei.h b/MdeModulePkg/Include/Ppi/SerialPortPei.h
index 2b754f9ccaedce5b46bbd4a2c3e6c025a281063b..28c2328f9d443df3d990a4d79b6dd024928424ff 100644 (file)
--- a/MdeModulePkg/Include/Ppi/SerialPortPei.h
+++ b/MdeModulePkg/Include/Ppi/SerialPortPei.h
@@ -1,8 +1,8 @@
 /** @file\r
 /** @file\r

-  PPI that is installed after the initialization of a serial stream device \r
-  is complete.  \r
+  PPI that is installed after the initialization of a serial stream device\r
+  is complete.\r

 \r
 \r

-  Copyright (c) 2010 - 2014, Intel Corporation. All rights reserved.<BR>\r
+  Copyright (c) 2010 - 2018, Intel Corporation. All rights reserved.<BR>\r

   This program and the accompanying materials\r
   are licensed and made available under the terms and conditions of the BSD License\r
   which accompanies this distribution.  The full text of the license may be found at\r
   This program and the accompanying materials\r
   are licensed and made available under the terms and conditions of the BSD License\r
   which accompanies this distribution.  The full text of the license may be found at\r

diff --git a/MdeModulePkg/Include/Ppi/SmmAccess.h b/MdeModulePkg/Include/Ppi/SmmAccess.h
index d91374ef720ed81f4fe67f8aa4a17d14ff21d0b8..795c8815a9c139eab78e31a340e0be272df43712 100644 (file)
--- a/MdeModulePkg/Include/Ppi/SmmAccess.h
+++ b/MdeModulePkg/Include/Ppi/SmmAccess.h
@@ -5,13 +5,13 @@
   It abstracts the location and characteristics of SMRAM.  The expectation is\r
   that the north bridge or memory controller would publish this PPI.\r
 \r
   It abstracts the location and characteristics of SMRAM.  The expectation is\r
   that the north bridge or memory controller would publish this PPI.\r
 \r

-  The principal functionality found in the memory controller includes the following: \r
+  The principal functionality found in the memory controller includes the following:\r

   - Exposing the SMRAM to all non-SMM agents, or the "open" state\r
   - Shrouding the SMRAM to all but the SMM agents, or the "closed" state\r
   - Exposing the SMRAM to all non-SMM agents, or the "open" state\r
   - Shrouding the SMRAM to all but the SMM agents, or the "closed" state\r

-  - Preserving the system integrity, or "locking" the SMRAM, such that the settings cannot be \r
-    perturbed by either boot service or runtime agents \r
+  - Preserving the system integrity, or "locking" the SMRAM, such that the settings cannot be\r
+    perturbed by either boot service or runtime agents\r

 \r
 \r

-Copyright (c) 2010, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2010 - 2018, Intel Corporation. All rights reserved.<BR>\r

 \r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions\r
 \r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions\r


@@ -35,18 +35,18 @@ typedef struct _PEI_SMM_ACCESS_PPI  PEI_SMM_ACCESS_PPI;
 /**\r
   Opens the SMRAM area to be accessible by a PEIM driver.\r
 \r
 /**\r
   Opens the SMRAM area to be accessible by a PEIM driver.\r
 \r

-  This function "opens" SMRAM so that it is visible while not inside of SMM. The function should \r
-  return EFI_UNSUPPORTED if the hardware does not support hiding of SMRAM. The function \r
+  This function "opens" SMRAM so that it is visible while not inside of SMM. The function should\r
+  return EFI_UNSUPPORTED if the hardware does not support hiding of SMRAM. The function\r

   should return EFI_DEVICE_ERROR if the SMRAM configuration is locked.\r
 \r
   @param  PeiServices            General purpose services available to every PEIM.\r
   @param  This                   The pointer to the SMM Access Interface.\r
   @param  DescriptorIndex        The region of SMRAM to Open.\r
   should return EFI_DEVICE_ERROR if the SMRAM configuration is locked.\r
 \r
   @param  PeiServices            General purpose services available to every PEIM.\r
   @param  This                   The pointer to the SMM Access Interface.\r
   @param  DescriptorIndex        The region of SMRAM to Open.\r

-  \r
+\r

   @retval EFI_SUCCESS            The region was successfully opened.\r
   @retval EFI_DEVICE_ERROR       The region could not be opened because locked by chipset.\r
   @retval EFI_INVALID_PARAMETER  The descriptor index was out of bounds.\r
   @retval EFI_SUCCESS            The region was successfully opened.\r
   @retval EFI_DEVICE_ERROR       The region could not be opened because locked by chipset.\r
   @retval EFI_INVALID_PARAMETER  The descriptor index was out of bounds.\r

-  \r
+\r

 **/\r
 typedef\r
 EFI_STATUS\r
 **/\r
 typedef\r
 EFI_STATUS\r


@@ -59,15 +59,15 @@ EFI_STATUS
 /**\r
   Inhibits access to the SMRAM.\r
 \r
 /**\r
   Inhibits access to the SMRAM.\r
 \r

-  This function "closes" SMRAM so that it is not visible while outside of SMM. The function should \r
+  This function "closes" SMRAM so that it is not visible while outside of SMM. The function should\r

   return EFI_UNSUPPORTED if the hardware does not support hiding of SMRAM.\r
 \r
   @param  PeiServices              General purpose services available to every PEIM.\r
   @param  This                     The pointer to the SMM Access Interface.\r
   @param  DescriptorIndex          The region of SMRAM to Close.\r
   return EFI_UNSUPPORTED if the hardware does not support hiding of SMRAM.\r
 \r
   @param  PeiServices              General purpose services available to every PEIM.\r
   @param  This                     The pointer to the SMM Access Interface.\r
   @param  DescriptorIndex          The region of SMRAM to Close.\r

-  \r
+\r

   @retval EFI_SUCCESS              The region was successfully closed.\r
   @retval EFI_SUCCESS              The region was successfully closed.\r

-  @retval EFI_DEVICE_ERROR         The region could not be closed because locked by chipset.                           \r
+  @retval EFI_DEVICE_ERROR         The region could not be closed because locked by chipset.\r

   @retval EFI_INVALID_PARAMETER    The descriptor index was out of bounds.\r
 \r
 **/\r
   @retval EFI_INVALID_PARAMETER    The descriptor index was out of bounds.\r
 \r
 **/\r


@@ -82,13 +82,13 @@ EFI_STATUS
 /**\r
   Inhibits access to the SMRAM.\r
 \r
 /**\r
   Inhibits access to the SMRAM.\r
 \r

-  This function prohibits access to the SMRAM region.  This function is usually implemented such \r
-  that it is a write-once operation. \r
+  This function prohibits access to the SMRAM region.  This function is usually implemented such\r
+  that it is a write-once operation.\r

 \r
   @param  PeiServices              General purpose services available to every PEIM.\r
   @param  This                     The pointer to the SMM Access Interface.\r
   @param  DescriptorIndex          The region of SMRAM to Close.\r
 \r
   @param  PeiServices              General purpose services available to every PEIM.\r
   @param  This                     The pointer to the SMM Access Interface.\r
   @param  DescriptorIndex          The region of SMRAM to Close.\r

-  \r
+\r

   @retval EFI_SUCCESS            The region was successfully locked.\r
   @retval EFI_DEVICE_ERROR       The region could not be locked because at least\r
                                  one range is still open.\r
   @retval EFI_SUCCESS            The region was successfully locked.\r
   @retval EFI_DEVICE_ERROR       The region could not be locked because at least\r
                                  one range is still open.\r


@@ -112,7 +112,7 @@ EFI_STATUS
                                 buffer to contain the description information.\r
   @param SmramMap               The buffer containing the data describing the Smram\r
                                 region descriptors.\r
                                 buffer to contain the description information.\r
   @param SmramMap               The buffer containing the data describing the Smram\r
                                 region descriptors.\r

-  \r
+\r

   @retval EFI_BUFFER_TOO_SMALL  The user did not provide a sufficient buffer.\r
   @retval EFI_SUCCESS           The user provided a sufficiently-sized buffer.\r
 \r
   @retval EFI_BUFFER_TOO_SMALL  The user did not provide a sufficient buffer.\r
   @retval EFI_SUCCESS           The user provided a sufficiently-sized buffer.\r
 \r


@@ -128,10 +128,10 @@ EFI_STATUS
 \r
 ///\r
 ///  EFI SMM Access PPI is used to control the visibility of the SMRAM on the platform.\r
 \r
 ///\r
 ///  EFI SMM Access PPI is used to control the visibility of the SMRAM on the platform.\r

-///  It abstracts the location and characteristics of SMRAM. The platform should report \r
-///  all MMRAM via PEI_SMM_ACCESS_PPI. The expectation is that the north bridge or \r
+///  It abstracts the location and characteristics of SMRAM. The platform should report\r
+///  all MMRAM via PEI_SMM_ACCESS_PPI. The expectation is that the north bridge or\r

 ///  memory controller would publish this PPI.\r
 ///  memory controller would publish this PPI.\r

-/// \r
+///\r

 struct _PEI_SMM_ACCESS_PPI {\r
   PEI_SMM_OPEN          Open;\r
   PEI_SMM_CLOSE         Close;\r
 struct _PEI_SMM_ACCESS_PPI {\r
   PEI_SMM_OPEN          Open;\r
   PEI_SMM_CLOSE         Close;\r

diff --git a/MdeModulePkg/Include/Ppi/SmmCommunication.h b/MdeModulePkg/Include/Ppi/SmmCommunication.h
index a22ed9f6d36972199dbc46130345f56c60d46e81..8ac86a443a15fe5f7c7f91491949da0bcb8a2144 100644 (file)
--- a/MdeModulePkg/Include/Ppi/SmmCommunication.h
+++ b/MdeModulePkg/Include/Ppi/SmmCommunication.h
@@ -1,12 +1,12 @@
 /** @file\r
   EFI SMM Communication PPI definition.\r
 \r
 /** @file\r
   EFI SMM Communication PPI definition.\r
 \r

-  This Ppi provides a means of communicating between PEIM and SMI \r
+  This Ppi provides a means of communicating between PEIM and SMI\r

   handlers inside of SMM.\r
   This Ppi is produced and consumed only in S3 resume boot path.\r
   It is NOT available in normal boot path.\r
 \r
   handlers inside of SMM.\r
   This Ppi is produced and consumed only in S3 resume boot path.\r
   It is NOT available in normal boot path.\r
 \r

-Copyright (c) 2010, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2010 - 2018, Intel Corporation. All rights reserved.<BR>\r

 \r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions\r
 \r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions\r


@@ -32,7 +32,7 @@ typedef struct _EFI_PEI_SMM_COMMUNICATION_PPI  EFI_PEI_SMM_COMMUNICATION_PPI;
 \r
 /**\r
   Communicates with a registered handler.\r
 \r
 /**\r
   Communicates with a registered handler.\r

-  \r
+\r

   This function provides a service to send and receive messages from a registered UEFI service.\r
 \r
   @param[in] This                The EFI_PEI_SMM_COMMUNICATION_PPI instance.\r
   This function provides a service to send and receive messages from a registered UEFI service.\r
 \r
   @param[in] This                The EFI_PEI_SMM_COMMUNICATION_PPI instance.\r

diff --git a/MdeModulePkg/Include/Ppi/SmmControl.h b/MdeModulePkg/Include/Ppi/SmmControl.h
index 341a29ba2a8d4833e521127b5dea8dad27b94eb6..0c62196fb44cb461cb83b9fca2e6bb8af8d3f2ae 100644 (file)
--- a/MdeModulePkg/Include/Ppi/SmmControl.h
+++ b/MdeModulePkg/Include/Ppi/SmmControl.h
@@ -9,7 +9,7 @@
   event from a platform chipset agent is an optional capability for both IA-32 and Itanium-based\r
   systems.\r
 \r
   event from a platform chipset agent is an optional capability for both IA-32 and Itanium-based\r
   systems.\r
 \r

-  Copyright (c) 2010, Intel Corporation. All rights reserved.<BR>\r
+  Copyright (c) 2010 - 2018, Intel Corporation. All rights reserved.<BR>\r

 \r
   This program and the accompanying materials\r
   are licensed and made available under the terms and conditions\r
 \r
   This program and the accompanying materials\r
   are licensed and made available under the terms and conditions\r


@@ -64,7 +64,7 @@ EFI_STATUS
 \r
   @param  PeiServices           General purpose services available to every PEIM.\r
   @param  This                  The PEI_SMM_CONTROL_PPI instance.\r
 \r
   @param  PeiServices           General purpose services available to every PEIM.\r
   @param  This                  The PEI_SMM_CONTROL_PPI instance.\r

-  @param  Periodic              Optional parameter to repeat at this period one \r
+  @param  Periodic              Optional parameter to repeat at this period one\r

                                 time or, if the Periodic Boolean is set, periodically.\r
 \r
   @retval EFI_SUCCESS           The SMI/PMI has been engendered.\r
                                 time or, if the Periodic Boolean is set, periodically.\r
 \r
   @retval EFI_SUCCESS           The SMI/PMI has been engendered.\r


@@ -85,7 +85,7 @@ EFI_STATUS
 ///  - A processor driver to abstract the SMI/PMI IPI\r
 ///  - The driver that abstracts the ASIC that is supporting the APM port, such as the ICH in an\r
 ///  Intel chipset\r
 ///  - A processor driver to abstract the SMI/PMI IPI\r
 ///  - The driver that abstracts the ASIC that is supporting the APM port, such as the ICH in an\r
 ///  Intel chipset\r

-/// \r
+///\r

 struct _PEI_SMM_CONTROL_PPI {\r
   PEI_SMM_ACTIVATE    Trigger;\r
   PEI_SMM_DEACTIVATE  Clear;\r
 struct _PEI_SMM_CONTROL_PPI {\r
   PEI_SMM_ACTIVATE    Trigger;\r
   PEI_SMM_DEACTIVATE  Clear;\r

diff --git a/MdeModulePkg/Include/Ppi/Usb2HostController.h b/MdeModulePkg/Include/Ppi/Usb2HostController.h
index 7bcb341a943c0413351a7187298f76ebc34862bc..5e0b300ca7f34c25dae352c37c9f7ddfe8540167 100644 (file)
--- a/MdeModulePkg/Include/Ppi/Usb2HostController.h
+++ b/MdeModulePkg/Include/Ppi/Usb2HostController.h
@@ -1,11 +1,11 @@
 /** @file\r
 /** @file\r

-  Defines the USB Host Controller PPI that provides I/O services for a USB Host \r
-  Controller that may be used to access recovery devices.  These interfaces are \r
+  Defines the USB Host Controller PPI that provides I/O services for a USB Host\r
+  Controller that may be used to access recovery devices.  These interfaces are\r

   modeled on the UEFI 2.3 specification EFI_USB2_HOST_CONTROLLER_PROTOCOL.\r
   modeled on the UEFI 2.3 specification EFI_USB2_HOST_CONTROLLER_PROTOCOL.\r

-  Refer to section 16.1 of the UEFI 2.3 Specification for more information on \r
+  Refer to section 16.1 of the UEFI 2.3 Specification for more information on\r

   these interfaces.\r
   these interfaces.\r

- \r
-Copyright (c) 2010 - 2013, Intel Corporation. All rights reserved. <BR>\r
+\r
+Copyright (c) 2010 - 2018, Intel Corporation. All rights reserved. <BR>\r

 \r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions\r
 \r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions\r


@@ -37,45 +37,45 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 typedef struct _PEI_USB2_HOST_CONTROLLER_PPI PEI_USB2_HOST_CONTROLLER_PPI;\r
 \r
 /**\r
 typedef struct _PEI_USB2_HOST_CONTROLLER_PPI PEI_USB2_HOST_CONTROLLER_PPI;\r
 \r
 /**\r

-  Initiate a USB control transfer using a specific USB Host controller on the USB bus. \r
+  Initiate a USB control transfer using a specific USB Host controller on the USB bus.\r

 \r
   @param[in]     PeiServices           The pointer to the PEI Services Table.\r
 \r
   @param[in]     PeiServices           The pointer to the PEI Services Table.\r

-  @param[in]     This                  The pointer to this instance of the \r
+  @param[in]     This                  The pointer to this instance of the\r

                                        PEI_USB2_HOST_CONTROLLER_PPI.\r
                                        PEI_USB2_HOST_CONTROLLER_PPI.\r

-  @param[in]     DeviceAddress         Represents the address of the target device \r
+  @param[in]     DeviceAddress         Represents the address of the target device\r

                                        on the USB.\r
   @param[in]     DeviceSpeed           Indicates device speed.\r
                                        on the USB.\r
   @param[in]     DeviceSpeed           Indicates device speed.\r

-  @param[in]     MaximumPacketLength   Indicates the maximum packet size that the \r
+  @param[in]     MaximumPacketLength   Indicates the maximum packet size that the\r

                                        default control transfer\r
                                        endpoint is capable of sending or receiving.\r
                                        default control transfer\r
                                        endpoint is capable of sending or receiving.\r

-  @param[in]     Request               A pointer to the USB device request that \r
+  @param[in]     Request               A pointer to the USB device request that\r

                                        will be sent to the USB device.\r
                                        will be sent to the USB device.\r

-  @param[in]     TransferDirection     Specifies the data direction for the transfer. \r
-                                       There are three values available: \r
+  @param[in]     TransferDirection     Specifies the data direction for the transfer.\r
+                                       There are three values available:\r

                                        EfiUsbDataIn, EfiUsbDataOut and EfiUsbNoData.\r
                                        EfiUsbDataIn, EfiUsbDataOut and EfiUsbNoData.\r

-  @param[in,out] Data                  A pointer to the buffer of data that will \r
+  @param[in,out] Data                  A pointer to the buffer of data that will\r

                                        be transmitted to USB device or\r
                                        received from USB device.\r
                                        be transmitted to USB device or\r
                                        received from USB device.\r

-  @param[in,out] DataLength            On input, indicates the size, in bytes, of \r
+  @param[in,out] DataLength            On input, indicates the size, in bytes, of\r

                                        the data buffer specified by Data.\r
                                        the data buffer specified by Data.\r

-                                       On output, indicates the amount of data \r
+                                       On output, indicates the amount of data\r

                                        actually transferred.\r
                                        actually transferred.\r

-  @param[in]     TimeOut               Indicates the maximum time, in milliseconds, \r
+  @param[in]     TimeOut               Indicates the maximum time, in milliseconds,\r

                                        that the transfer is allowed to complete.\r
                                        If Timeout is 0, then the caller must wait for\r
                                        the function to be completed until EFI_SUCCESS\r
                                        or EFI_DEVICE_ERROR is returned.\r
   @param[in]     Translator            A pointer to the transaction translator data.\r
                                        that the transfer is allowed to complete.\r
                                        If Timeout is 0, then the caller must wait for\r
                                        the function to be completed until EFI_SUCCESS\r
                                        or EFI_DEVICE_ERROR is returned.\r
   @param[in]     Translator            A pointer to the transaction translator data.\r

-  @param[out]    TransferResult        A pointer to the detailed result information \r
+  @param[out]    TransferResult        A pointer to the detailed result information\r

                                        generated by this control transfer.\r
 \r
   @retval EFI_SUCCESS           The control transfer was completed successfully.\r
                                        generated by this control transfer.\r
 \r
   @retval EFI_SUCCESS           The control transfer was completed successfully.\r

-  @retval EFI_DEVICE_ERROR      The control transfer failed due to host controller \r
+  @retval EFI_DEVICE_ERROR      The control transfer failed due to host controller\r

                                 or device error.\r
   @retval EFI_INVALID_PARAMETER Some parameters are invalid.\r
   @retval EFI_OUT_OF_RESOURCES  The control transfer could not be completed due to a lack of resources.\r
   @retval EFI_TIMEOUT           The control transfer failed due to timeout.\r
                                 or device error.\r
   @retval EFI_INVALID_PARAMETER Some parameters are invalid.\r
   @retval EFI_OUT_OF_RESOURCES  The control transfer could not be completed due to a lack of resources.\r
   @retval EFI_TIMEOUT           The control transfer failed due to timeout.\r

-  \r
+\r

 \r
 **/\r
 typedef\r
 \r
 **/\r
 typedef\r


@@ -96,22 +96,22 @@ EFI_STATUS
   );\r
 \r
 /**\r
   );\r
 \r
 /**\r

-  Initiate a USB bulk transfer using a specific USB Host controller on the USB bus. \r
+  Initiate a USB bulk transfer using a specific USB Host controller on the USB bus.\r

 \r
   @param[in]     PeiServices           The pointer to the PEI Services Table.\r
 \r
   @param[in]     PeiServices           The pointer to the PEI Services Table.\r

-  @param[in]     This                  The pointer to this instance of the \r
+  @param[in]     This                  The pointer to this instance of the\r

                                        PEI_USB2_HOST_CONTROLLER_PPI.\r
                                        PEI_USB2_HOST_CONTROLLER_PPI.\r

-  @param[in]     DeviceAddress         Represents the address of the target device \r
+  @param[in]     DeviceAddress         Represents the address of the target device\r

                                        on the USB.\r
                                        on the USB.\r

-  @param[in]     EndPointAddress       The combination of an endpoint number and \r
+  @param[in]     EndPointAddress       The combination of an endpoint number and\r

                                        an endpoint direction of the target USB device.\r
   @param[in]     DeviceSpeed           Indicates device speed.\r
                                        an endpoint direction of the target USB device.\r
   @param[in]     DeviceSpeed           Indicates device speed.\r

-  @param[in]     MaximumPacketLength   Indicates the maximum packet size the target \r
+  @param[in]     MaximumPacketLength   Indicates the maximum packet size the target\r

                                        endpoint is capable of sending or receiving.\r
                                        endpoint is capable of sending or receiving.\r

-  @param[in,out] Data                  Array of pointers to the buffers of data \r
-                                       that will be transmitted to USB device or \r
+  @param[in,out] Data                  Array of pointers to the buffers of data\r
+                                       that will be transmitted to USB device or\r

                                        received from USB device.\r
                                        received from USB device.\r

-  @param[in,out] DataLength            When input, indicates the size, in bytes, of  \r
+  @param[in,out] DataLength            When input, indicates the size, in bytes, of\r

                                        the data buffers specified by Data. When output,\r
                                        indicates the data size actually transferred.\r
   @param[in,out] DataToggle            A pointer to the data toggle value.\r
                                        the data buffers specified by Data. When output,\r
                                        indicates the data size actually transferred.\r
   @param[in,out] DataToggle            A pointer to the data toggle value.\r


@@ -121,7 +121,7 @@ EFI_STATUS
                                        the function to be completed until EFI_SUCCESS\r
                                        or EFI_DEVICE_ERROR is returned.\r
   @param[in]     Translator            A pointer to the transaction translator data.\r
                                        the function to be completed until EFI_SUCCESS\r
                                        or EFI_DEVICE_ERROR is returned.\r
   @param[in]     Translator            A pointer to the transaction translator data.\r

-  @param[out]    TransferResult        A pointer to the detailed result information \r
+  @param[out]    TransferResult        A pointer to the detailed result information\r

                                        of the bulk transfer.\r
 \r
   @retval EFI_SUCCESS           The bulk transfer was completed successfully.\r
                                        of the bulk transfer.\r
 \r
   @retval EFI_SUCCESS           The bulk transfer was completed successfully.\r


@@ -129,8 +129,8 @@ EFI_STATUS
                                 Caller should check TransferResult for detailed error information.\r
   @retval EFI_INVALID_PARAMETER Some parameters are invalid.\r
   @retval EFI_OUT_OF_RESOURCES  The bulk transfer could not be submitted due to a lack of resources.\r
                                 Caller should check TransferResult for detailed error information.\r
   @retval EFI_INVALID_PARAMETER Some parameters are invalid.\r
   @retval EFI_OUT_OF_RESOURCES  The bulk transfer could not be submitted due to a lack of resources.\r

-  @retval EFI_TIMEOUT           The bulk transfer failed due to timeout.  \r
-  \r
+  @retval EFI_TIMEOUT           The bulk transfer failed due to timeout.\r
+\r

 \r
 **/\r
 typedef\r
 \r
 **/\r
 typedef\r


@@ -140,7 +140,7 @@ EFI_STATUS
   IN     PEI_USB2_HOST_CONTROLLER_PPI        *This,\r
   IN     UINT8                               DeviceAddress,\r
   IN     UINT8                               EndPointAddress,\r
   IN     PEI_USB2_HOST_CONTROLLER_PPI        *This,\r
   IN     UINT8                               DeviceAddress,\r
   IN     UINT8                               EndPointAddress,\r

-  IN     UINT8                               DeviceSpeed,  \r
+  IN     UINT8                               DeviceSpeed,\r

   IN     UINTN                               MaximumPacketLength,\r
   IN OUT VOID                                *Data[EFI_USB_MAX_BULK_BUFFER_NUM],\r
   IN OUT UINTN                               *DataLength,\r
   IN     UINTN                               MaximumPacketLength,\r
   IN OUT VOID                                *Data[EFI_USB_MAX_BULK_BUFFER_NUM],\r
   IN OUT UINTN                               *DataLength,\r


@@ -154,10 +154,10 @@ EFI_STATUS
   Retrieves the number of root hub ports.\r
 \r
   @param[in]  PeiServices       The pointer to the PEI Services Table.\r
   Retrieves the number of root hub ports.\r
 \r
   @param[in]  PeiServices       The pointer to the PEI Services Table.\r

-  @param[in]  This              The pointer to this instance of the \r
+  @param[in]  This              The pointer to this instance of the\r

                                 PEI_USB2_HOST_CONTROLLER_PPI.\r
                                 PEI_USB2_HOST_CONTROLLER_PPI.\r

-  @param[out] PortNumber        The pointer to the number of the root hub ports.                                \r
-                                \r
+  @param[out] PortNumber        The pointer to the number of the root hub ports.\r
+\r

   @retval EFI_SUCCESS           The port number was retrieved successfully.\r
   @retval EFI_INVALID_PARAMETER PortNumber is NULL.\r
 \r
   @retval EFI_SUCCESS           The port number was retrieved successfully.\r
   @retval EFI_INVALID_PARAMETER PortNumber is NULL.\r
 \r


@@ -174,15 +174,15 @@ EFI_STATUS
   Retrieves the current status of a USB root hub port.\r
 \r
   @param[in]  PeiServices       The pointer to the PEI Services Table.\r
   Retrieves the current status of a USB root hub port.\r
 \r
   @param[in]  PeiServices       The pointer to the PEI Services Table.\r

-  @param[in]  This              The pointer to this instance of the \r
+  @param[in]  This              The pointer to this instance of the\r

                                 PEI_USB2_HOST_CONTROLLER_PPI.\r
                                 PEI_USB2_HOST_CONTROLLER_PPI.\r

-  @param[in]  PortNumber        Specifies the root hub port from which the status is \r
+  @param[in]  PortNumber        Specifies the root hub port from which the status is\r

                                 to be retrieved.\r
                                 This value is zero based.\r
                                 to be retrieved.\r
                                 This value is zero based.\r

-  @param[out] PortStatus        A pointer to the current port status bits and port \r
+  @param[out] PortStatus        A pointer to the current port status bits and port\r

                                 status change bits.\r
                                 status change bits.\r

-  \r
-  @retval EFI_SUCCESS           The status of the USB root hub port specified by \r
+\r
+  @retval EFI_SUCCESS           The status of the USB root hub port specified by\r

                                 PortNumber was returned in PortStatus.\r
   @retval EFI_INVALID_PARAMETER PortNumber is invalid.\r
 \r
                                 PortNumber was returned in PortStatus.\r
   @retval EFI_INVALID_PARAMETER PortNumber is invalid.\r
 \r


@@ -200,18 +200,18 @@ EFI_STATUS
   Sets a feature for the specified root hub port.\r
 \r
   @param[in] PeiServices        The pointer to the PEI Services Table.\r
   Sets a feature for the specified root hub port.\r
 \r
   @param[in] PeiServices        The pointer to the PEI Services Table.\r

-  @param[in] This               The pointer to this instance of the \r
+  @param[in] This               The pointer to this instance of the\r

                                 PEI_USB2_HOST_CONTROLLER_PPI.\r
                                 PEI_USB2_HOST_CONTROLLER_PPI.\r

-  @param[in] PortNumber         Specifies the root hub port whose feature is requested \r
+  @param[in] PortNumber         Specifies the root hub port whose feature is requested\r

                                 to be set. This value is zero based.\r
                                 to be set. This value is zero based.\r

-  @param[in] PortFeature        Indicates the feature selector associated with the feature \r
+  @param[in] PortFeature        Indicates the feature selector associated with the feature\r

                                 set request.\r
                                 set request.\r

-  \r
-  @retval EFI_SUCCESS           The feature specified by PortFeature was set for \r
+\r
+  @retval EFI_SUCCESS           The feature specified by PortFeature was set for\r

                                 the USB root hub port specified by PortNumber.\r
                                 the USB root hub port specified by PortNumber.\r

-  @retval EFI_INVALID_PARAMETER PortNumber is invalid or PortFeature is invalid \r
+  @retval EFI_INVALID_PARAMETER PortNumber is invalid or PortFeature is invalid\r

                                 for this function.\r
                                 for this function.\r

-  @retval EFI_TIMEOUT           The time out occurred                                \r
+  @retval EFI_TIMEOUT           The time out occurred\r

 \r
 **/\r
 typedef\r
 \r
 **/\r
 typedef\r


@@ -227,7 +227,7 @@ EFI_STATUS
   Clears a feature for the specified root hub port.\r
 \r
   @param[in] PeiServices          The pointer to the PEI Services Table.\r
   Clears a feature for the specified root hub port.\r
 \r
   @param[in] PeiServices          The pointer to the PEI Services Table.\r

-  @param[in] This                 The pointer to this instance of the \r
+  @param[in] This                 The pointer to this instance of the\r

                                   PEI_USB2_HOST_CONTROLLER_PPI.\r
   @param[in] PortNumber           Specifies the root hub port whose feature is\r
                                   requested to be cleared.\r
                                   PEI_USB2_HOST_CONTROLLER_PPI.\r
   @param[in] PortNumber           Specifies the root hub port whose feature is\r
                                   requested to be cleared.\r


@@ -251,7 +251,7 @@ EFI_STATUS
 ///\r
 /// This PPI contains a set of services to interact with the USB host controller.\r
 /// These interfaces are modeled on the UEFI 2.3 specification protocol\r
 ///\r
 /// This PPI contains a set of services to interact with the USB host controller.\r
 /// These interfaces are modeled on the UEFI 2.3 specification protocol\r

-/// EFI_USB2_HOST_CONTROLLER_PROTOCOL.  Refer to section 16.1 of the UEFI 2.3 \r
+/// EFI_USB2_HOST_CONTROLLER_PROTOCOL.  Refer to section 16.1 of the UEFI 2.3\r

 /// Specification for more information on these interfaces.\r
 ///\r
 struct _PEI_USB2_HOST_CONTROLLER_PPI {\r
 /// Specification for more information on these interfaces.\r
 ///\r
 struct _PEI_USB2_HOST_CONTROLLER_PPI {\r

diff --git a/MdeModulePkg/Include/Ppi/UsbController.h b/MdeModulePkg/Include/Ppi/UsbController.h
index f0537ecb6684c9fc5108ab70d86568a51a3e8510..39e378b71dfda026b0748c7b1397e76804370f2c 100644 (file)
--- a/MdeModulePkg/Include/Ppi/UsbController.h
+++ b/MdeModulePkg/Include/Ppi/UsbController.h
@@ -1,8 +1,8 @@
 /** @file\r
 /** @file\r

-  Define APIs to retrieve USB Host Controller Info such as controller type and \r
+  Define APIs to retrieve USB Host Controller Info such as controller type and\r

   I/O Port Base Address.\r
 \r
   I/O Port Base Address.\r
 \r

-Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r

 \r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions\r
 \r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions\r


@@ -63,11 +63,11 @@ typedef struct _PEI_USB_CONTROLLER_PPI PEI_USB_CONTROLLER_PPI;
   @param[in]  ControllerId     The ID of the USB controller.\r
   @param[out] ControllerType   On output, returns the type of the USB controller.\r
   @param[out] BaseAddress      On output, returns the base address of UHCI's I/O ports\r
   @param[in]  ControllerId     The ID of the USB controller.\r
   @param[out] ControllerType   On output, returns the type of the USB controller.\r
   @param[out] BaseAddress      On output, returns the base address of UHCI's I/O ports\r

-                               if UHCI is enabled or the base address of EHCI's MMIO \r
+                               if UHCI is enabled or the base address of EHCI's MMIO\r

                                if EHCI is enabled.\r
 \r
   @retval EFI_SUCCESS             USB controller attributes were returned successfully.\r
                                if EHCI is enabled.\r
 \r
   @retval EFI_SUCCESS             USB controller attributes were returned successfully.\r

-  @retval EFI_INVALID_PARAMETER   ControllerId is greater than the maximum number \r
+  @retval EFI_INVALID_PARAMETER   ControllerId is greater than the maximum number\r

                                   of USB controller supported by this platform.\r
 \r
 **/\r
                                   of USB controller supported by this platform.\r
 \r
 **/\r

diff --git a/MdeModulePkg/Include/Ppi/UsbHostController.h b/MdeModulePkg/Include/Ppi/UsbHostController.h
index 232a6667348b3ff9c97d840cfaaec585dfd7d26f..627b0fda2ca26181f3288e7ffbdb414de0db5324 100644 (file)
--- a/MdeModulePkg/Include/Ppi/UsbHostController.h
+++ b/MdeModulePkg/Include/Ppi/UsbHostController.h
@@ -1,11 +1,11 @@
 /** @file\r
 /** @file\r

-  Defines the USB Host Controller PPI that provides I/O services for a USB Host \r
-  Controller that may be used to access recovery devices.  These interfaces are \r
+  Defines the USB Host Controller PPI that provides I/O services for a USB Host\r
+  Controller that may be used to access recovery devices.  These interfaces are\r

   modeled on the UEFI 2.3 specification EFI_USB2_HOST_CONTROLLER_PROTOCOL.\r
   modeled on the UEFI 2.3 specification EFI_USB2_HOST_CONTROLLER_PROTOCOL.\r

-  Refer to section 16.1 of the UEFI 2.3 Specification for more information on \r
+  Refer to section 16.1 of the UEFI 2.3 Specification for more information on\r

   these interfaces.\r
   these interfaces.\r

- \r
-Copyright (c) 2006 - 2013, Intel Corporation. All rights reserved.<BR>\r
+\r
+Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r

 \r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions\r
 \r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions\r


@@ -37,38 +37,38 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 typedef struct _PEI_USB_HOST_CONTROLLER_PPI PEI_USB_HOST_CONTROLLER_PPI;\r
 \r
 /**\r
 typedef struct _PEI_USB_HOST_CONTROLLER_PPI PEI_USB_HOST_CONTROLLER_PPI;\r
 \r
 /**\r

-  Initiate a USB control transfer using a specific USB Host controller on the USB bus. \r
+  Initiate a USB control transfer using a specific USB Host controller on the USB bus.\r

 \r
   @param[in]     PeiServices           The pointer to the PEI Services Table.\r
 \r
   @param[in]     PeiServices           The pointer to the PEI Services Table.\r

-  @param[in]     This                  The pointer to this instance of the \r
+  @param[in]     This                  The pointer to this instance of the\r

                                        PEI_USB_HOST_CONTROLLER_PPI.\r
                                        PEI_USB_HOST_CONTROLLER_PPI.\r

-  @param[in]     DeviceAddress         Represents the address of the target device \r
+  @param[in]     DeviceAddress         Represents the address of the target device\r

                                        on the USB.\r
   @param[in]     DeviceSpeed           Indicates device speed.\r
                                        on the USB.\r
   @param[in]     DeviceSpeed           Indicates device speed.\r

-  @param[in]     MaximumPacketLength   Indicates the maximum packet size that the \r
+  @param[in]     MaximumPacketLength   Indicates the maximum packet size that the\r

                                        default control transfer\r
                                        endpoint is capable of sending or receiving.\r
                                        default control transfer\r
                                        endpoint is capable of sending or receiving.\r

-  @param[in]     Request               A pointer to the USB device request that \r
+  @param[in]     Request               A pointer to the USB device request that\r

                                        will be sent to the USB device.\r
                                        will be sent to the USB device.\r

-  @param[in]     TransferDirection     Specifies the data direction for the transfer. \r
-                                       There are three values available: \r
+  @param[in]     TransferDirection     Specifies the data direction for the transfer.\r
+                                       There are three values available:\r

                                        EfiUsbDataIn, EfiUsbDataOut and EfiUsbNoData.\r
                                        EfiUsbDataIn, EfiUsbDataOut and EfiUsbNoData.\r

-  @param[in,out] Data                  A pointer to the buffer of data that will \r
+  @param[in,out] Data                  A pointer to the buffer of data that will\r

                                        be transmitted to USB device or\r
                                        received from USB device.\r
                                        be transmitted to USB device or\r
                                        received from USB device.\r

-  @param[in,out] DataLength            On input, indicates the size, in bytes, of \r
+  @param[in,out] DataLength            On input, indicates the size, in bytes, of\r

                                        the data buffer specified by Data.\r
                                        the data buffer specified by Data.\r

-                                       On output, indicates the amount of data \r
+                                       On output, indicates the amount of data\r

                                        actually transferred.\r
                                        actually transferred.\r

-  @param[in]     TimeOut               Indicates the maximum time, in milliseconds, \r
-                                       that the transfer is allowed to complete. \r
+  @param[in]     TimeOut               Indicates the maximum time, in milliseconds,\r
+                                       that the transfer is allowed to complete.\r

                                        If Timeout is 0, then the caller must wait for\r
                                        the function to be completed until EFI_SUCCESS\r
                                        or EFI_DEVICE_ERROR is returned.\r
                                        If Timeout is 0, then the caller must wait for\r
                                        the function to be completed until EFI_SUCCESS\r
                                        or EFI_DEVICE_ERROR is returned.\r

-  @param[out]    TransferResult        A pointer to the detailed result information \r
+  @param[out]    TransferResult        A pointer to the detailed result information\r

                                        generated by this control transfer.\r
 \r
                                        generated by this control transfer.\r
 \r

-  @retval EFI_DEVICE_ERROR   The control transfer failed due to host controller \r
+  @retval EFI_DEVICE_ERROR   The control transfer failed due to host controller\r

                              or device error.\r
   @retval EFI_SUCCESS        The control transfer was completed successfully.\r
 \r
                              or device error.\r
   @retval EFI_SUCCESS        The control transfer was completed successfully.\r
 \r


@@ -90,21 +90,21 @@ EFI_STATUS
   );\r
 \r
 /**\r
   );\r
 \r
 /**\r

-  Initiate a USB bulk transfer using a specific USB Host controller on the USB bus. \r
+  Initiate a USB bulk transfer using a specific USB Host controller on the USB bus.\r

 \r
   @param[in]     PeiServices           The pointer to the PEI Services Table.\r
 \r
   @param[in]     PeiServices           The pointer to the PEI Services Table.\r

-  @param[in]     This                  The pointer to this instance of the \r
+  @param[in]     This                  The pointer to this instance of the\r

                                        PEI_USB_HOST_CONTROLLER_PPI.\r
                                        PEI_USB_HOST_CONTROLLER_PPI.\r

-  @param[in]     DeviceAddress         Represents the address of the target device \r
+  @param[in]     DeviceAddress         Represents the address of the target device\r

                                        on the USB.\r
                                        on the USB.\r

-  @param[in]     EndPointAddress       The combination of an endpoint number and \r
+  @param[in]     EndPointAddress       The combination of an endpoint number and\r

                                        an endpoint direction of the target USB device.\r
                                        an endpoint direction of the target USB device.\r

-  @param[in]     MaximumPacketLength   Indicates the maximum packet size the target \r
+  @param[in]     MaximumPacketLength   Indicates the maximum packet size the target\r

                                        endpoint is capable of sending or receiving.\r
                                        endpoint is capable of sending or receiving.\r

-  @param[in,out] Data                  Array of pointers to the buffers of data \r
-                                       that will be transmitted to USB device or \r
+  @param[in,out] Data                  Array of pointers to the buffers of data\r
+                                       that will be transmitted to USB device or\r

                                        received from USB device.\r
                                        received from USB device.\r

-  @param[in,out] DataLength            When input, indicates the size, in bytes, of  \r
+  @param[in,out] DataLength            When input, indicates the size, in bytes, of\r

                                        the data buffers specified by Data. When output,\r
                                        indicates the data size actually transferred.\r
   @param[in,out] DataToggle            A pointer to the data toggle value.\r
                                        the data buffers specified by Data. When output,\r
                                        indicates the data size actually transferred.\r
   @param[in,out] DataToggle            A pointer to the data toggle value.\r


@@ -113,7 +113,7 @@ EFI_STATUS
                                        If Timeout is 0, then the caller must wait for\r
                                        the function to be completed until EFI_SUCCESS\r
                                        or EFI_DEVICE_ERROR is returned.\r
                                        If Timeout is 0, then the caller must wait for\r
                                        the function to be completed until EFI_SUCCESS\r
                                        or EFI_DEVICE_ERROR is returned.\r

-  @param[out]    TransferResult        A pointer to the detailed result information \r
+  @param[out]    TransferResult        A pointer to the detailed result information\r

                                        of the bulk transfer.\r
 \r
   @retval EFI_SUCCESS           The bulk transfer was completed successfully.\r
                                        of the bulk transfer.\r
 \r
   @retval EFI_SUCCESS           The bulk transfer was completed successfully.\r


@@ -140,12 +140,12 @@ EFI_STATUS
   Retrieves the number of root hub ports.\r
 \r
   @param[in]  PeiServices   The pointer to the PEI Services Table.\r
   Retrieves the number of root hub ports.\r
 \r
   @param[in]  PeiServices   The pointer to the PEI Services Table.\r

-  @param[in]  This          The pointer to this instance of the \r
+  @param[in]  This          The pointer to this instance of the\r

                             PEI_USB_HOST_CONTROLLER_PPI.\r
                             PEI_USB_HOST_CONTROLLER_PPI.\r

-  @param[out] PortNumber    The pointer to the number of the root hub ports.                                \r
-                                \r
+  @param[out] PortNumber    The pointer to the number of the root hub ports.\r
+\r

   @retval EFI_SUCCESS           The port number was retrieved successfully.\r
   @retval EFI_SUCCESS           The port number was retrieved successfully.\r

-  @retval EFI_DEVICE_ERROR      An error was encountered while attempting to retrieve \r
+  @retval EFI_DEVICE_ERROR      An error was encountered while attempting to retrieve\r

                                 the port number.\r
   @retval EFI_INVALID_PARAMETER PortNumber is NULL.\r
 \r
                                 the port number.\r
   @retval EFI_INVALID_PARAMETER PortNumber is NULL.\r
 \r


@@ -162,15 +162,15 @@ EFI_STATUS
   Retrieves the current status of a USB root hub port.\r
 \r
   @param[in]  PeiServices   The pointer to the PEI Services Table.\r
   Retrieves the current status of a USB root hub port.\r
 \r
   @param[in]  PeiServices   The pointer to the PEI Services Table.\r

-  @param[in]  This          The pointer to this instance of the \r
+  @param[in]  This          The pointer to this instance of the\r

                             PEI_USB_HOST_CONTROLLER_PPI.\r
                             PEI_USB_HOST_CONTROLLER_PPI.\r

-  @param[in]  PortNumber    Specifies the root hub port from which the status is \r
+  @param[in]  PortNumber    Specifies the root hub port from which the status is\r

                             to be retrieved.\r
                             This value is zero based.\r
                             to be retrieved.\r
                             This value is zero based.\r

-  @param[out] PortStatus    A pointer to the current port status bits and port \r
+  @param[out] PortStatus    A pointer to the current port status bits and port\r

                             status change bits.\r
                             status change bits.\r

-  \r
-  @retval EFI_SUCCESS           The status of the USB root hub port specified by \r
+\r
+  @retval EFI_SUCCESS           The status of the USB root hub port specified by\r

                                 PortNumber was returned in PortStatus.\r
   @retval EFI_INVALID_PARAMETER PortNumber is invalid.\r
 \r
                                 PortNumber was returned in PortStatus.\r
   @retval EFI_INVALID_PARAMETER PortNumber is invalid.\r
 \r


@@ -188,16 +188,16 @@ EFI_STATUS
   Sets a feature for the specified root hub port.\r
 \r
   @param[in] PeiServices   The pointer to the PEI Services Table.\r
   Sets a feature for the specified root hub port.\r
 \r
   @param[in] PeiServices   The pointer to the PEI Services Table.\r

-  @param[in] This          The pointer to this instance of the \r
+  @param[in] This          The pointer to this instance of the\r

                            PEI_USB_HOST_CONTROLLER_PPI.\r
                            PEI_USB_HOST_CONTROLLER_PPI.\r

-  @param[in] PortNumber    Specifies the root hub port whose feature is requested \r
+  @param[in] PortNumber    Specifies the root hub port whose feature is requested\r

                            to be set. This value is zero based.\r
                            to be set. This value is zero based.\r

-  @param[in] PortFeature   Indicates the feature selector associated with the feature \r
+  @param[in] PortFeature   Indicates the feature selector associated with the feature\r

                            set request.\r
                            set request.\r

-  \r
-  @retval EFI_SUCCESS           The feature specified by PortFeature was set for \r
+\r
+  @retval EFI_SUCCESS           The feature specified by PortFeature was set for\r

                                 the USB root hub port specified by PortNumber.\r
                                 the USB root hub port specified by PortNumber.\r

-  @retval EFI_INVALID_PARAMETER PortNumber is invalid or PortFeature is invalid \r
+  @retval EFI_INVALID_PARAMETER PortNumber is invalid or PortFeature is invalid\r

                                 for this function.\r
 \r
 **/\r
                                 for this function.\r
 \r
 **/\r


@@ -214,7 +214,7 @@ EFI_STATUS
   Clears a feature for the specified root hub port.\r
 \r
   @param[in] PeiServices   The pointer to the PEI Services Table.\r
   Clears a feature for the specified root hub port.\r
 \r
   @param[in] PeiServices   The pointer to the PEI Services Table.\r

-  @param[in] This          The pointer to this instance of the \r
+  @param[in] This          The pointer to this instance of the\r

                            PEI_USB_HOST_CONTROLLER_PPI.\r
   @param[in] PortNumber    Specifies the root hub port whose feature is\r
                            requested to be cleared.\r
                            PEI_USB_HOST_CONTROLLER_PPI.\r
   @param[in] PortNumber    Specifies the root hub port whose feature is\r
                            requested to be cleared.\r


@@ -239,7 +239,7 @@ EFI_STATUS
 ///\r
 /// This PPI contains a set of services to interact with the USB host controller.\r
 /// These interfaces are modeled on the UEFI 2.3 specification protocol\r
 ///\r
 /// This PPI contains a set of services to interact with the USB host controller.\r
 /// These interfaces are modeled on the UEFI 2.3 specification protocol\r

-/// EFI_USB2_HOST_CONTROLLER_PROTOCOL.  Refer to section 16.1 of the UEFI 2.3 \r
+/// EFI_USB2_HOST_CONTROLLER_PROTOCOL.  Refer to section 16.1 of the UEFI 2.3\r

 /// Specification for more information on these interfaces.\r
 ///\r
 struct _PEI_USB_HOST_CONTROLLER_PPI {\r
 /// Specification for more information on these interfaces.\r
 ///\r
 struct _PEI_USB_HOST_CONTROLLER_PPI {\r

diff --git a/MdeModulePkg/Include/Ppi/UsbIo.h b/MdeModulePkg/Include/Ppi/UsbIo.h
index b024d4640a090cfe80089a6f1e4270a7db33ade6..fc52b8a48bcd690d05c039aa1a20ef7d154c6caa 100644 (file)
--- a/MdeModulePkg/Include/Ppi/UsbIo.h
+++ b/MdeModulePkg/Include/Ppi/UsbIo.h
@@ -1,12 +1,12 @@
 /** @file\r
 /** @file\r

-  Defines the PEI_USB_IO_PPI that the USB-related PEIM can use for I/O operations \r
-  on the USB BUS.  This interface enables recovery from a \r
-  USB-class storage device, such as USB CD/DVD, USB hard drive, or USB FLASH \r
+  Defines the PEI_USB_IO_PPI that the USB-related PEIM can use for I/O operations\r
+  on the USB BUS.  This interface enables recovery from a\r
+  USB-class storage device, such as USB CD/DVD, USB hard drive, or USB FLASH\r

   drive.  These interfaces are modeled on the UEFI 2.3 specification EFI_USB_IO_PROTOCOL.\r
   drive.  These interfaces are modeled on the UEFI 2.3 specification EFI_USB_IO_PROTOCOL.\r

-  Refer to section 16.2.4 of the UEFI 2.3 Specification for more information on \r
+  Refer to section 16.2.4 of the UEFI 2.3 Specification for more information on\r

   these interfaces.\r
 \r
   these interfaces.\r
 \r

-Copyright (c) 2006 - 2013, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r

 \r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions\r
 \r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions\r


@@ -42,29 +42,29 @@ typedef struct _PEI_USB_IO_PPI  PEI_USB_IO_PPI;
 \r
   @param[in]     PeiServices   The pointer to the PEI Services Table.\r
   @param[in]     This          The pointer to this instance of the PEI_USB_IO_PPI.\r
 \r
   @param[in]     PeiServices   The pointer to the PEI Services Table.\r
   @param[in]     This          The pointer to this instance of the PEI_USB_IO_PPI.\r

-  @param[in]     Request       A pointer to the USB device request that will be \r
+  @param[in]     Request       A pointer to the USB device request that will be\r

                                sent to the USB device.\r
                                sent to the USB device.\r

-  @param[in]     Direction     Specifies the data direction for the transfer. There \r
-                               are three values available: \r
+  @param[in]     Direction     Specifies the data direction for the transfer. There\r
+                               are three values available:\r

                                EfiUsbDataIn, EfiUsbDataOut and EfiUsbNoData.\r
                                EfiUsbDataIn, EfiUsbDataOut and EfiUsbNoData.\r

-  @param[in]     Timeout       Indicates the maximum time, in milliseconds, that \r
+  @param[in]     Timeout       Indicates the maximum time, in milliseconds, that\r

                                the transfer is allowed to complete.\r
                                If Timeout is 0, then the caller must wait for the\r
                                function to be completed until EFI_SUCCESS or\r
                                EFI_DEVICE_ERROR is returned.\r
                                the transfer is allowed to complete.\r
                                If Timeout is 0, then the caller must wait for the\r
                                function to be completed until EFI_SUCCESS or\r
                                EFI_DEVICE_ERROR is returned.\r

-  @param[in,out] Data          A pointer to the buffer of data that will be \r
+  @param[in,out] Data          A pointer to the buffer of data that will be\r

                                transmitted to or received from the USB device.\r
                                transmitted to or received from the USB device.\r

-  @param[in]     DataLength    On input, indicates the size, in bytes, of the data \r
+  @param[in]     DataLength    On input, indicates the size, in bytes, of the data\r

                                buffer specified by Data.\r
                                buffer specified by Data.\r

-                               \r
+\r

   @retval EFI_SUCCESS             The control transfer was completed successfully.\r
   @retval EFI_INVALID_PARAMETER   Some parameters are invalid.\r
   @retval EFI_SUCCESS             The control transfer was completed successfully.\r
   @retval EFI_INVALID_PARAMETER   Some parameters are invalid.\r

-  @retval EFI_OUT_OF_RESOURCES    The control transfer could not be completed due \r
+  @retval EFI_OUT_OF_RESOURCES    The control transfer could not be completed due\r

                                   to a lack of resources.\r
   @retval EFI_TIMEOUT             The control transfer failed due to timeout.\r
                                   to a lack of resources.\r
   @retval EFI_TIMEOUT             The control transfer failed due to timeout.\r

-  @retval EFI_DEVICE_ERROR        The control transfer failed due to host controller \r
+  @retval EFI_DEVICE_ERROR        The control transfer failed due to host controller\r

                                   or device error.\r
                                   or device error.\r

-                                  Caller should check TransferResult for detailed \r
+                                  Caller should check TransferResult for detailed\r

                                   error information.\r
 \r
 **/\r
                                   error information.\r
 \r
 **/\r


@@ -95,12 +95,12 @@ EFI_STATUS
 \r
   @retval EFI_SUCCESS             The bulk transfer completed successfully.\r
   @retval EFI_INVALID_PARAMETER   Some parameters are invalid.\r
 \r
   @retval EFI_SUCCESS             The bulk transfer completed successfully.\r
   @retval EFI_INVALID_PARAMETER   Some parameters are invalid.\r

-  @retval EFI_OUT_OF_RESOURCES    The bulk transfer could not be completed due to \r
+  @retval EFI_OUT_OF_RESOURCES    The bulk transfer could not be completed due to\r

                                   a lack of resources.\r
   @retval EFI_TIMEOUT             The bulk transfer failed due to timeout.\r
                                   a lack of resources.\r
   @retval EFI_TIMEOUT             The bulk transfer failed due to timeout.\r

-  @retval EFI_DEVICE_ERROR        The bulk transfer failed due to host controller \r
+  @retval EFI_DEVICE_ERROR        The bulk transfer failed due to host controller\r

                                   or device error.\r
                                   or device error.\r

-                                  Caller should check TransferResult for detailed \r
+                                  Caller should check TransferResult for detailed\r

                                   error information.\r
 \r
 **/\r
                                   error information.\r
 \r
 **/\r


@@ -124,7 +124,7 @@ EFI_STATUS
 \r
   @retval EFI_SUCCESS             The interface descriptor was returned.\r
   @retval EFI_INVALID_PARAMETER   Some parameters are invalid.\r
 \r
   @retval EFI_SUCCESS             The interface descriptor was returned.\r
   @retval EFI_INVALID_PARAMETER   Some parameters are invalid.\r

-  @retval EFI_DEVICE_ERROR        A device error occurred, the function failed to \r
+  @retval EFI_DEVICE_ERROR        A device error occurred, the function failed to\r

                                   get the interface descriptor.\r
 \r
 **/\r
                                   get the interface descriptor.\r
 \r
 **/\r


@@ -146,7 +146,7 @@ EFI_STATUS
 \r
   @retval EFI_SUCCESS             The endpoint descriptor was returned.\r
   @retval EFI_INVALID_PARAMETER   Some parameters are invalid.\r
 \r
   @retval EFI_SUCCESS             The endpoint descriptor was returned.\r
   @retval EFI_INVALID_PARAMETER   Some parameters are invalid.\r

-  @retval EFI_DEVICE_ERROR        A device error occurred, the function failed to \r
+  @retval EFI_DEVICE_ERROR        A device error occurred, the function failed to\r

                                   get the endpoint descriptor.\r
 \r
 **/\r
                                   get the endpoint descriptor.\r
 \r
 **/\r


@@ -180,7 +180,7 @@ EFI_STATUS
 ///\r
 /// This PPI contains a set of services to interact with the USB host controller.\r
 /// These interfaces are modeled on the UEFI 2.3 specification EFI_USB_IO_PROTOCOL.\r
 ///\r
 /// This PPI contains a set of services to interact with the USB host controller.\r
 /// These interfaces are modeled on the UEFI 2.3 specification EFI_USB_IO_PROTOCOL.\r

-/// Refer to section 16.2.4 of the UEFI 2.3 Specification for more information on \r
+/// Refer to section 16.2.4 of the UEFI 2.3 Specification for more information on\r

 /// these interfaces.\r
 ///\r
 struct _PEI_USB_IO_PPI {\r
 /// these interfaces.\r
 ///\r
 struct _PEI_USB_IO_PPI {\r

diff --git a/MdeModulePkg/Include/Protocol/DisplayProtocol.h b/MdeModulePkg/Include/Protocol/DisplayProtocol.h
index 8ea9350419582bca50c749617da94fb62ec2dbe1..57fda68ca379734cfd9e13034fff86ed8bcbca8d 100644 (file)
--- a/MdeModulePkg/Include/Protocol/DisplayProtocol.h
+++ b/MdeModulePkg/Include/Protocol/DisplayProtocol.h
@@ -1,13 +1,13 @@
 /** @file\r
   FormDiplay protocol to show Form\r
 \r
 /** @file\r
   FormDiplay protocol to show Form\r
 \r

-Copyright (c) 2013 - 2015, Intel Corporation. All rights reserved.<BR>\r
-This program and the accompanying materials are licensed and made available under \r
-the terms and conditions of the BSD License that accompanies this distribution.  \r
+Copyright (c) 2013 - 2018, Intel Corporation. All rights reserved.<BR>\r
+This program and the accompanying materials are licensed and made available under\r
+the terms and conditions of the BSD License that accompanies this distribution.\r

 The full text of the license may be found at\r
 The full text of the license may be found at\r

-http://opensource.org/licenses/bsd-license.php.                                            \r
+http://opensource.org/licenses/bsd-license.php.\r

 \r
 \r

-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     \r
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r

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


@@ -20,7 +20,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #define EDKII_FORM_DISPLAY_ENGINE_PROTOCOL_GUID  \\r
   { 0x9bbe29e9, 0xfda1, 0x41ec, { 0xad, 0x52, 0x45, 0x22, 0x13, 0x74, 0x2d, 0x2e } }\r
 \r
 #define EDKII_FORM_DISPLAY_ENGINE_PROTOCOL_GUID  \\r
   { 0x9bbe29e9, 0xfda1, 0x41ec, { 0xad, 0x52, 0x45, 0x22, 0x13, 0x74, 0x2d, 0x2e } }\r
 \r

-// \r
+//\r

 // Do nothing.\r
 //\r
 #define BROWSER_ACTION_NONE         BIT16\r
 // Do nothing.\r
 //\r
 #define BROWSER_ACTION_NONE         BIT16\r


@@ -101,11 +101,11 @@ typedef struct {
 \r
 /**\r
   Perform value check for a question.\r
 \r
 /**\r
   Perform value check for a question.\r

-  \r
+\r

   @param  Form       Form where Statement is in.\r
   @param  Statement  Value will check for it.\r
   @param  Value      New value will be checked.\r
   @param  Form       Form where Statement is in.\r
   @param  Statement  Value will check for it.\r
   @param  Value      New value will be checked.\r

-  \r
+\r

   @retval Status     Value Status\r
 \r
 **/\r
   @retval Status     Value Status\r
 \r
 **/\r


@@ -114,20 +114,20 @@ UINT32
 (EFIAPI *VALIDATE_QUESTION) (\r
   IN FORM_DISPLAY_ENGINE_FORM      *Form,\r
   IN FORM_DISPLAY_ENGINE_STATEMENT *Statement,\r
 (EFIAPI *VALIDATE_QUESTION) (\r
   IN FORM_DISPLAY_ENGINE_FORM      *Form,\r
   IN FORM_DISPLAY_ENGINE_STATEMENT *Statement,\r

-  IN EFI_HII_VALUE                 *Value, \r
+  IN EFI_HII_VALUE                 *Value,\r

   OUT STATEMENT_ERROR_INFO         *ErrorInfo\r
   );\r
 \r
 /**\r
   OUT STATEMENT_ERROR_INFO         *ErrorInfo\r
   );\r
 \r
 /**\r

-  Perform Password check. \r
+  Perform Password check.\r

   Passwork may be encrypted by driver that requires the specific check.\r
   Passwork may be encrypted by driver that requires the specific check.\r

-  \r
+\r

   @param  Form             Form where Password Statement is in.\r
   @param  Statement        Password statement\r
   @param  PasswordString   Password string to be checked. It may be NULL.\r
                            NULL means to restore password.\r
                            "" string can be used to checked whether old password does exist.\r
   @param  Form             Form where Password Statement is in.\r
   @param  Statement        Password statement\r
   @param  PasswordString   Password string to be checked. It may be NULL.\r
                            NULL means to restore password.\r
                            "" string can be used to checked whether old password does exist.\r

-  \r
+\r

   @return Status     Status of Password check.\r
 **/\r
 typedef\r
   @return Status     Status of Password check.\r
 **/\r
 typedef\r


@@ -171,7 +171,7 @@ struct _FORM_DISPLAY_ENGINE_STATEMENT{
   EFI_HII_VALUE         CurrentValue;\r
   //\r
   // Flag to describe whether setting is changed or not.\r
   EFI_HII_VALUE         CurrentValue;\r
   //\r
   // Flag to describe whether setting is changed or not.\r

-  // Displayer may depend on it to show it with the different color. \r
+  // Displayer may depend on it to show it with the different color.\r

   //\r
   BOOLEAN               SettingChangedFlag;\r
   //\r
   //\r
   BOOLEAN               SettingChangedFlag;\r
   //\r


@@ -192,7 +192,7 @@ struct _FORM_DISPLAY_ENGINE_STATEMENT{
   // It may be NULL if any value is valid.\r
   //\r
   VALIDATE_QUESTION     ValidateQuestion;\r
   // It may be NULL if any value is valid.\r
   //\r
   VALIDATE_QUESTION     ValidateQuestion;\r

-  \r
+\r

   //\r
   // Password additional check. It may be NULL when the additional check is not required.\r
   //\r
   //\r
   // Password additional check. It may be NULL when the additional check is not required.\r
   //\r


@@ -212,7 +212,7 @@ struct _FORM_DISPLAY_ENGINE_STATEMENT{
 typedef struct {\r
   UINTN                 Signature;\r
   LIST_ENTRY            Link;\r
 typedef struct {\r
   UINTN                 Signature;\r
   LIST_ENTRY            Link;\r

-  \r
+\r

   EFI_INPUT_KEY         *KeyData;\r
   //\r
   // Action is Discard, Default, Submit, Reset and Exit.\r
   EFI_INPUT_KEY         *KeyData;\r
   //\r
   // Action is Discard, Default, Submit, Reset and Exit.\r


@@ -240,7 +240,7 @@ struct _FORM_DISPLAY_ENGINE_FORM {
   //\r
   LIST_ENTRY            StatementListHead;\r
   //\r
   //\r
   LIST_ENTRY            StatementListHead;\r
   //\r

-  // Statement List outside of Form  \r
+  // Statement List outside of Form\r

   //\r
   LIST_ENTRY            StatementListOSF;\r
   //\r
   //\r
   LIST_ENTRY            StatementListOSF;\r
   //\r


@@ -255,7 +255,7 @@ struct _FORM_DISPLAY_ENGINE_FORM {
   // HiiHandle can be used to get String, Image or Animation\r
   //\r
   EFI_HII_HANDLE       HiiHandle;\r
   // HiiHandle can be used to get String, Image or Animation\r
   //\r
   EFI_HII_HANDLE       HiiHandle;\r

-  \r
+\r

   //\r
   // Form ID and Title.\r
   //\r
   //\r
   // Form ID and Title.\r
   //\r


@@ -289,13 +289,13 @@ struct _FORM_DISPLAY_ENGINE_FORM {
   //\r
   EFI_IMAGE_ID         ImageId;\r
   EFI_ANIMATION_ID     AnimationId;\r
   //\r
   EFI_IMAGE_ID         ImageId;\r
   EFI_ANIMATION_ID     AnimationId;\r

-  \r
+\r

   //\r
   //\r

-  // If Status is error, display needs to handle it.  \r
+  // If Status is error, display needs to handle it.\r

   //\r
   UINT32               BrowserStatus;\r
   //\r
   //\r
   UINT32               BrowserStatus;\r
   //\r

-  // String for error status. It may be NULL. \r
+  // String for error status. It may be NULL.\r

   //\r
   EFI_STRING           ErrorString;\r
 };\r
   //\r
   EFI_STRING           ErrorString;\r
 };\r


@@ -304,9 +304,9 @@ struct _FORM_DISPLAY_ENGINE_FORM {
 \r
 typedef struct {\r
   FORM_DISPLAY_ENGINE_STATEMENT  *SelectedStatement; // Selected Statement and InputValue\r
 \r
 typedef struct {\r
   FORM_DISPLAY_ENGINE_STATEMENT  *SelectedStatement; // Selected Statement and InputValue\r

-  \r
+\r

   EFI_HII_VALUE                  InputValue;\r
   EFI_HII_VALUE                  InputValue;\r

-  \r
+\r

   UINT32                         Action;             // If SelectedStatement is NULL, Action will be used.\r
                                                      // Trig Action (Discard, Default, Submit, Reset and Exit)\r
   UINT16                         DefaultId;\r
   UINT32                         Action;             // If SelectedStatement is NULL, Action will be used.\r
                                                      // Trig Action (Discard, Default, Submit, Reset and Exit)\r
   UINT16                         DefaultId;\r


@@ -314,10 +314,10 @@ typedef struct {
 \r
 /**\r
   Display one form, and return user input.\r
 \r
 /**\r
   Display one form, and return user input.\r

-  \r
+\r

   @param FormData                Form Data to be shown.\r
   @param UserInputData           User input data.\r
   @param FormData                Form Data to be shown.\r
   @param UserInputData           User input data.\r

-  \r
+\r

   @retval EFI_SUCCESS            Form Data is shown, and user input is got.\r
 **/\r
 typedef\r
   @retval EFI_SUCCESS            Form Data is shown, and user input is got.\r
 **/\r
 typedef\r


@@ -338,8 +338,8 @@ VOID
 );\r
 \r
 /**\r
 );\r
 \r
 /**\r

-  Confirm how to handle the changed data. \r
-  \r
+  Confirm how to handle the changed data.\r
+\r

   @return Action of Submit, Discard and None\r
 **/\r
 typedef\r
   @return Action of Submit, Discard and None\r
 **/\r
 typedef\r

diff --git a/MdeModulePkg/Include/Protocol/Dpc.h b/MdeModulePkg/Include/Protocol/Dpc.h
index 99293e29876b52f500db44c037ba2670aa697243..acabe2b8d68fb570dd60d573a3aa36eb1a840506 100644 (file)
--- a/MdeModulePkg/Include/Protocol/Dpc.h
+++ b/MdeModulePkg/Include/Protocol/Dpc.h
@@ -2,13 +2,13 @@
 \r
   EFI Deferred Procedure Call Protocol.\r
 \r
 \r
   EFI Deferred Procedure Call Protocol.\r
 \r

-Copyright (c) 2007 - 2010, Intel Corporation. All rights reserved.<BR>\r
-This program and the accompanying materials are licensed and made available under \r
-the terms and conditions of the BSD License that accompanies this distribution.  \r
+Copyright (c) 2007 - 2018, Intel Corporation. All rights reserved.<BR>\r
+This program and the accompanying materials are licensed and made available under\r
+the terms and conditions of the BSD License that accompanies this distribution.\r

 The full text of the license may be found at\r
 The full text of the license may be found at\r

-http://opensource.org/licenses/bsd-license.php.                                            \r
+http://opensource.org/licenses/bsd-license.php.\r

 \r
 \r

-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     \r
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r

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


@@ -70,11 +70,11 @@ EFI_STATUS
   );\r
 \r
 /**\r
   );\r
 \r
 /**\r

-  Dispatch the queue of DPCs.  \r
-  \r
+  Dispatch the queue of DPCs.\r
+\r

   DPCs with DpcTpl value greater than the current TPL value are queued, and then DPCs\r
   DPCs with DpcTpl value greater than the current TPL value are queued, and then DPCs\r

-  with DpcTpl value lower than the current TPL value are queued. All DPCs in the first \r
-  group (higher DpcTpl values) are invoked before DPCs in the second group (lower DpcTpl values). \r
+  with DpcTpl value lower than the current TPL value are queued. All DPCs in the first\r
+  group (higher DpcTpl values) are invoked before DPCs in the second group (lower DpcTpl values).\r

 \r
   @param  This  Protocol instance pointer.\r
 \r
 \r
   @param  This  Protocol instance pointer.\r
 \r

diff --git a/MdeModulePkg/Include/Protocol/EbcSimpleDebugger.h b/MdeModulePkg/Include/Protocol/EbcSimpleDebugger.h
index 43b55b48eb2c513e320f106465ecafca4dfb73ba..71911a357211cc050ff08509fb910f22fdd79e67 100644 (file)
--- a/MdeModulePkg/Include/Protocol/EbcSimpleDebugger.h
+++ b/MdeModulePkg/Include/Protocol/EbcSimpleDebugger.h
@@ -1,7 +1,7 @@
 /** @file\r
   EBC Simple Debugger protocol for debug EBC code.\r
 \r
 /** @file\r
   EBC Simple Debugger protocol for debug EBC code.\r
 \r

-Copyright (c) 2011, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2011 - 2018, Intel Corporation. All rights reserved.<BR>\r

 \r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions\r
 \r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions\r


@@ -71,7 +71,7 @@ VOID
 \r
   @param[in] This           A pointer to the EFI_EBC_SIMPLE_DEBUGGER_PROTOCOL structure.\r
   @param[in] VmPtr          A pointer to a VM context.\r
 \r
   @param[in] This           A pointer to the EFI_EBC_SIMPLE_DEBUGGER_PROTOCOL structure.\r
   @param[in] VmPtr          A pointer to a VM context.\r

-  @param[in] DasmString     Dump string buffer. \r
+  @param[in] DasmString     Dump string buffer.\r

   @param[in] DasmStringSize Dump string size.\r
 \r
   @retval EFI_UNSUPPORTED       No support for it.\r
   @param[in] DasmStringSize Dump string size.\r
 \r
   @retval EFI_UNSUPPORTED       No support for it.\r

diff --git a/MdeModulePkg/Include/Protocol/EbcVmTest.h b/MdeModulePkg/Include/Protocol/EbcVmTest.h
index 9eedca1906a2848f1195fd2f3b24c0a158e18bce..a1bb46a0a718172e050a957888cd8313c79d03b0 100644 (file)
--- a/MdeModulePkg/Include/Protocol/EbcVmTest.h
+++ b/MdeModulePkg/Include/Protocol/EbcVmTest.h
@@ -1,7 +1,7 @@
 /** @file\r
   EBC VM Test protocol for test purposes.\r
 \r
 /** @file\r
   EBC VM Test protocol for test purposes.\r
 \r

-Copyright (c) 2011 - 2016, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2011 - 2018, Intel Corporation. All rights reserved.<BR>\r

 \r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions\r
 \r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions\r


@@ -144,7 +144,7 @@ EFI_STATUS
   @param[out] BufferLen         Size of buffer that is required to store data.\r
 \r
   @retval EFI_UNSUPPORTED       This functionality is unsupported.\r
   @param[out] BufferLen         Size of buffer that is required to store data.\r
 \r
   @retval EFI_UNSUPPORTED       This functionality is unsupported.\r

-  @retval EFI_SUCCESS           Successfully convert AsmText to the instruction. \r
+  @retval EFI_SUCCESS           Successfully convert AsmText to the instruction.\r

 \r
 **/\r
 typedef\r
 \r
 **/\r
 typedef\r

diff --git a/MdeModulePkg/Include/Protocol/EsrtManagement.h b/MdeModulePkg/Include/Protocol/EsrtManagement.h
index 305fd5c90885293d9fcf3a7cc6f817ec4b5c4306..f72cc0224b8913a974a092b0a61b1c930c863d38 100644 (file)
--- a/MdeModulePkg/Include/Protocol/EsrtManagement.h
+++ b/MdeModulePkg/Include/Protocol/EsrtManagement.h
@@ -1,13 +1,13 @@
 /** @file\r
   The Esrt Management Protocol used to register/set/update an updatable firmware resource .\r
 \r
 /** @file\r
   The Esrt Management Protocol used to register/set/update an updatable firmware resource .\r
 \r

-Copyright (c) 2015, Intel Corporation. All rights reserved.<BR>\r
-This program and the accompanying materials are licensed and made available under \r
-the terms and conditions of the BSD License that accompanies this distribution.  \r
+Copyright (c) 2015 - 2018, Intel Corporation. All rights reserved.<BR>\r
+This program and the accompanying materials are licensed and made available under\r
+the terms and conditions of the BSD License that accompanies this distribution.\r

 The full text of the license may be found at\r
 The full text of the license may be found at\r

-http://opensource.org/licenses/bsd-license.php.                                              \r
+http://opensource.org/licenses/bsd-license.php.\r

 \r
 \r

-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     \r
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r

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


@@ -31,11 +31,11 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 typedef struct _ESRT_MANAGEMENT_PROTOCOL  ESRT_MANAGEMENT_PROTOCOL;\r
 \r
 /**\r
 typedef struct _ESRT_MANAGEMENT_PROTOCOL  ESRT_MANAGEMENT_PROTOCOL;\r
 \r
 /**\r

-  Get Variable name and data by Esrt Entry FwClass \r
+  Get Variable name and data by Esrt Entry FwClass\r
+\r
+  @param[in]       FwClass                FwClass of Esrt entry to get\r
+  @param[in out]  Entry                   Esrt entry returned\r

 \r
 \r

-  @param[in]       FwClass                FwClass of Esrt entry to get  \r
-  @param[in out]  Entry                   Esrt entry returned \r
-  \r

   @retval EFI_SUCCESS                  The variable saving this Esrt Entry exists.\r
   @retval EF_NOT_FOUND                   No correct variable found.\r
 \r
   @retval EFI_SUCCESS                  The variable saving this Esrt Entry exists.\r
   @retval EF_NOT_FOUND                   No correct variable found.\r
 \r


@@ -46,13 +46,13 @@ EFI_STATUS
   IN     EFI_GUID                  *FwClass,\r
   IN OUT EFI_SYSTEM_RESOURCE_ENTRY *Entry\r
   );\r
   IN     EFI_GUID                  *FwClass,\r
   IN OUT EFI_SYSTEM_RESOURCE_ENTRY *Entry\r
   );\r

- \r
+\r

 \r
 /**\r
   Update one ESRT entry in ESRT Cache.\r
 \r
   @param[in]  Entry                         Esrt entry to be updated\r
 \r
 /**\r
   Update one ESRT entry in ESRT Cache.\r
 \r
   @param[in]  Entry                         Esrt entry to be updated\r

-  \r
+\r

   @retval EFI_SUCCESS                   Successfully update an ESRT entry in cache.\r
   @retval EFI_INVALID_PARAMETER  Entry does't exist in ESRT Cache\r
   @retval EFI_WRITE_PROTECTED     ESRT Cache repositoy is locked\r
   @retval EFI_SUCCESS                   Successfully update an ESRT entry in cache.\r
   @retval EFI_INVALID_PARAMETER  Entry does't exist in ESRT Cache\r
   @retval EFI_WRITE_PROTECTED     ESRT Cache repositoy is locked\r


@@ -66,11 +66,11 @@ EFI_STATUS
 \r
 \r
 /**\r
 \r
 \r
 /**\r

-  Non-FMP instance to unregister Esrt Entry from ESRT Cache. \r
+  Non-FMP instance to unregister Esrt Entry from ESRT Cache.\r
+\r
+  @param[in]    FwClass                FwClass of Esrt entry to Unregister\r

 \r
 \r

-  @param[in]    FwClass                FwClass of Esrt entry to Unregister  \r
-  \r
-  @retval EFI_SUCCESS         Insert all entries Successfully \r
+  @retval EFI_SUCCESS         Insert all entries Successfully\r

   @retval EFI_NOT_FOUND     FwClass does not exsit\r
 \r
 **/\r
   @retval EFI_NOT_FOUND     FwClass does not exsit\r
 \r
 **/\r


@@ -116,10 +116,10 @@ EFI_STATUS
 \r
 \r
 /**\r
 \r
 \r
 /**\r

-  This function locks up Esrt repository to be readonly. It should be called \r
+  This function locks up Esrt repository to be readonly. It should be called\r

   before gEfiEndOfDxeEventGroupGuid event signaled\r
 \r
   before gEfiEndOfDxeEventGroupGuid event signaled\r
 \r

-  @retval EFI_SUCCESS              Locks up FMP Non-FMP repository successfully \r
+  @retval EFI_SUCCESS              Locks up FMP Non-FMP repository successfully\r

 \r
 **/\r
 typedef\r
 \r
 **/\r
 typedef\r

diff --git a/MdeModulePkg/Include/Protocol/FaultTolerantWrite.h b/MdeModulePkg/Include/Protocol/FaultTolerantWrite.h
index b96edfb68fb810e9a3aaf9df30f9a1890f0597a2..dc2a6e73ce4222f9aa72c210a0b73d591eeac1fc 100644 (file)
--- a/MdeModulePkg/Include/Protocol/FaultTolerantWrite.h
+++ b/MdeModulePkg/Include/Protocol/FaultTolerantWrite.h
@@ -1,17 +1,17 @@
 /** @file\r
 /** @file\r

-  Fault Tolerant Write protocol provides boot-time service for fault tolerant \r
-  write capability for block devices.  The protocol provides for non-volatile \r
-  storage of the intermediate data and private information a caller would need to \r
-  recover from a critical fault, such as a power failure.   \r
-\r
-Copyright (c) 2009 - 2010, Intel Corporation. All rights reserved.<BR>\r
-This program and the accompanying materials are licensed and made available under \r
-the terms and conditions of the BSD License that accompanies this distribution.  \r
+  Fault Tolerant Write protocol provides boot-time service for fault tolerant\r
+  write capability for block devices.  The protocol provides for non-volatile\r
+  storage of the intermediate data and private information a caller would need to\r
+  recover from a critical fault, such as a power failure.\r
+\r
+Copyright (c) 2009 - 2018, Intel Corporation. All rights reserved.<BR>\r
+This program and the accompanying materials are licensed and made available under\r
+the terms and conditions of the BSD License that accompanies this distribution.\r

 The full text of the license may be found at\r
 The full text of the license may be found at\r

-http://opensource.org/licenses/bsd-license.php.                                            \r
+http://opensource.org/licenses/bsd-license.php.\r

 \r
 \r

-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     \r
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. \r
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r

 \r
 **/\r
 \r
 \r
 **/\r
 \r

diff --git a/MdeModulePkg/Include/Protocol/FileExplorer.h b/MdeModulePkg/Include/Protocol/FileExplorer.h
index 62daca3ab7eb6b3a6222b3fe171bb7baffbf14ea..609f5bfec0dcbe7961190447e7e93e1af0b7ff3d 100644 (file)
--- a/MdeModulePkg/Include/Protocol/FileExplorer.h
+++ b/MdeModulePkg/Include/Protocol/FileExplorer.h
@@ -1,15 +1,15 @@
 /** @file\r
 \r
 /** @file\r
 \r

-  This file explorer protocol defines defines a set of interfaces for \r
+  This file explorer protocol defines defines a set of interfaces for\r

   how to do file explorer.\r
 \r
   how to do file explorer.\r
 \r

-Copyright (c) 2006 - 2015, Intel Corporation. All rights reserved.<BR>\r
-This program and the accompanying materials are licensed and made available under \r
-the terms and conditions of the BSD License that accompanies this distribution.  \r
+Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r
+This program and the accompanying materials are licensed and made available under\r
+the terms and conditions of the BSD License that accompanies this distribution.\r

 The full text of the license may be found at\r
 The full text of the license may be found at\r

-http://opensource.org/licenses/bsd-license.php.                                            \r
+http://opensource.org/licenses/bsd-license.php.\r

 \r
 \r

-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     \r
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r

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


@@ -41,7 +41,7 @@ BOOLEAN
   );\r
 \r
 /**\r
   );\r
 \r
 /**\r

-  Choose a file in the specified directory. \r
+  Choose a file in the specified directory.\r

 \r
   If user input NULL for the RootDirectory, will choose file in the system.\r
 \r
 \r
   If user input NULL for the RootDirectory, will choose file in the system.\r
 \r

diff --git a/MdeModulePkg/Include/Protocol/FormBrowserEx.h b/MdeModulePkg/Include/Protocol/FormBrowserEx.h
index 512de448d33b43e78565c364c9d0cf7f63dbd36a..5d5aa8fa4ee7b8921c4a74c4cd4552af9a0bb008 100644 (file)
--- a/MdeModulePkg/Include/Protocol/FormBrowserEx.h
+++ b/MdeModulePkg/Include/Protocol/FormBrowserEx.h
@@ -1,14 +1,14 @@
 /** @file\r
 /** @file\r

-  Extension Form Browser Protocol provides the services that can be used to \r
+  Extension Form Browser Protocol provides the services that can be used to\r

   register the different hot keys for the standard Browser actions described in UEFI specification.\r
 \r
   register the different hot keys for the standard Browser actions described in UEFI specification.\r
 \r

-Copyright (c) 2011 - 2016, Intel Corporation. All rights reserved.<BR>\r
-This program and the accompanying materials are licensed and made available under \r
-the terms and conditions of the BSD License that accompanies this distribution.  \r
+Copyright (c) 2011 - 2018, Intel Corporation. All rights reserved.<BR>\r
+This program and the accompanying materials are licensed and made available under\r
+the terms and conditions of the BSD License that accompanies this distribution.\r

 The full text of the license may be found at\r
 The full text of the license may be found at\r

-http://opensource.org/licenses/bsd-license.php.                                            \r
+http://opensource.org/licenses/bsd-license.php.\r

 \r
 \r

-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     \r
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r

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


@@ -35,8 +35,8 @@ typedef EDKII_FORM_BROWSER_EXTENSION_PROTOCOL   EFI_FORM_BROWSER_EXTENSION_PROTO
 #define BROWSER_KEEP_CURRENT        3\r
 \r
 //\r
 #define BROWSER_KEEP_CURRENT        3\r
 \r
 //\r

-// Browser actions. They can be cominbed together. \r
-// If more than one actions are specified, the action with low bit will be executed first. \r
+// Browser actions. They can be cominbed together.\r
+// If more than one actions are specified, the action with low bit will be executed first.\r

 //\r
 #define BROWSER_ACTION_UNREGISTER   0\r
 #define BROWSER_ACTION_DISCARD      BIT0\r
 //\r
 #define BROWSER_ACTION_UNREGISTER   0\r
 #define BROWSER_ACTION_DISCARD      BIT0\r


@@ -61,11 +61,11 @@ typedef enum {
   All hot keys have the same scope. The mixed hot keys with the different level are not supported.\r
   If no scope is set, the default scope will be FormSet level.\r
   After all registered hot keys are removed, previous Scope can reset to another level.\r
   All hot keys have the same scope. The mixed hot keys with the different level are not supported.\r
   If no scope is set, the default scope will be FormSet level.\r
   After all registered hot keys are removed, previous Scope can reset to another level.\r

-  \r
-  @param[in] Scope               Scope level to be set. \r
-  \r
+\r
+  @param[in] Scope               Scope level to be set.\r
+\r

   @retval EFI_SUCCESS            Scope is set correctly.\r
   @retval EFI_SUCCESS            Scope is set correctly.\r

-  @retval EFI_INVALID_PARAMETER  Scope is not the valid value specified in BROWSER_SETTING_SCOPE. \r
+  @retval EFI_INVALID_PARAMETER  Scope is not the valid value specified in BROWSER_SETTING_SCOPE.\r

   @retval EFI_UNSPPORTED         Scope level is different from current one that the registered hot keys have.\r
 \r
 **/\r
   @retval EFI_UNSPPORTED         Scope level is different from current one that the registered hot keys have.\r
 \r
 **/\r


@@ -79,15 +79,15 @@ EFI_STATUS
   Register the hot key with its browser action, or unregistered the hot key.\r
   If the action value is zero, the hot key will be unregistered if it has been registered.\r
   If the same hot key has been registered, the new action and help string will override the previous ones.\r
   Register the hot key with its browser action, or unregistered the hot key.\r
   If the action value is zero, the hot key will be unregistered if it has been registered.\r
   If the same hot key has been registered, the new action and help string will override the previous ones.\r

-  \r
+\r

   @param[in] KeyData     A pointer to a buffer that describes the keystroke\r
   @param[in] KeyData     A pointer to a buffer that describes the keystroke\r

-                         information for the hot key. Its type is EFI_INPUT_KEY to \r
+                         information for the hot key. Its type is EFI_INPUT_KEY to\r

                          be supported by all ConsoleIn devices.\r
                          be supported by all ConsoleIn devices.\r

-  @param[in] Action      Action value that describes what action will be trigged when the hot key is pressed. \r
+  @param[in] Action      Action value that describes what action will be trigged when the hot key is pressed.\r

   @param[in] DefaultId   Specifies the type of defaults to retrieve, which is only for DEFAULT action.\r
   @param[in] HelpString  Help string that describes the hot key information.\r
                          Its value may be NULL for the unregistered hot key.\r
   @param[in] DefaultId   Specifies the type of defaults to retrieve, which is only for DEFAULT action.\r
   @param[in] HelpString  Help string that describes the hot key information.\r
                          Its value may be NULL for the unregistered hot key.\r

-  \r
+\r

   @retval EFI_SUCCESS            Hot key is registered or unregistered.\r
   @retval EFI_INVALID_PARAMETER  KeyData is NULL.\r
 **/\r
   @retval EFI_SUCCESS            Hot key is registered or unregistered.\r
   @retval EFI_INVALID_PARAMETER  KeyData is NULL.\r
 **/\r


@@ -102,7 +102,7 @@ EFI_STATUS
 \r
 /**\r
   This handler is responsbile for the left things on normal boot after all UI forms are closed.\r
 \r
 /**\r
   This handler is responsbile for the left things on normal boot after all UI forms are closed.\r

-  For example, it can continue to boot the first boot option. \r
+  For example, it can continue to boot the first boot option.\r

 \r
   It will be used only when EXIT action is trigged as system level.\r
 **/\r
 \r
   It will be used only when EXIT action is trigged as system level.\r
 **/\r


@@ -113,11 +113,11 @@ VOID
   );\r
 \r
 /**\r
   );\r
 \r
 /**\r

-  Register Exit handler function. \r
-  When more than one handler function is registered, the latter one will override the previous one. \r
-  When NULL handler is specified, the previous Exit handler will be unregistered. \r
-  \r
-  @param[in] Handler      Pointer to handler function. \r
+  Register Exit handler function.\r
+  When more than one handler function is registered, the latter one will override the previous one.\r
+  When NULL handler is specified, the previous Exit handler will be unregistered.\r
+\r
+  @param[in] Handler      Pointer to handler function.\r

 \r
 **/\r
 typedef\r
 \r
 **/\r
 typedef\r

diff --git a/MdeModulePkg/Include/Protocol/FormBrowserEx2.h b/MdeModulePkg/Include/Protocol/FormBrowserEx2.h
index 1ccc5bd964d44e940a31c9a537f608a7f492ca98..ffb50598984f1c01128b22c7cb6d4b530d0c73fe 100644 (file)
--- a/MdeModulePkg/Include/Protocol/FormBrowserEx2.h
+++ b/MdeModulePkg/Include/Protocol/FormBrowserEx2.h
@@ -1,14 +1,14 @@
 /** @file\r
 /** @file\r

-  Extension Form Browser Protocol provides the services that can be used to \r
+  Extension Form Browser Protocol provides the services that can be used to\r

   register the different hot keys for the standard Browser actions described in UEFI specification.\r
 \r
   register the different hot keys for the standard Browser actions described in UEFI specification.\r
 \r

-Copyright (c) 2013 - 2014, Intel Corporation. All rights reserved.<BR>\r
-This program and the accompanying materials are licensed and made available under \r
-the terms and conditions of the BSD License that accompanies this distribution.  \r
+Copyright (c) 2013 - 2018, Intel Corporation. All rights reserved.<BR>\r
+This program and the accompanying materials are licensed and made available under\r
+the terms and conditions of the BSD License that accompanies this distribution.\r

 The full text of the license may be found at\r
 The full text of the license may be found at\r

-http://opensource.org/licenses/bsd-license.php.                                            \r
+http://opensource.org/licenses/bsd-license.php.\r

 \r
 \r

-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     \r
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r

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


@@ -48,8 +48,8 @@ BOOLEAN
   @retval EFI_SUCCESS              Execute the request action succss.\r
 \r
 **/\r
   @retval EFI_SUCCESS              Execute the request action succss.\r
 \r
 **/\r

-typedef \r
-EFI_STATUS \r
+typedef\r
+EFI_STATUS\r

 (EFIAPI *EXECUTE_ACTION) (\r
   IN UINT32        Action,\r
   IN UINT16        DefaultId\r
 (EFIAPI *EXECUTE_ACTION) (\r
   IN UINT32        Action,\r
   IN UINT16        DefaultId\r


@@ -92,7 +92,7 @@ typedef struct {
   EFI_FORM_ID      FormId;               // Find the form\r
   EFI_GUID         FormSetGuid;          // Find the formset.\r
   EFI_HII_HANDLE   HiiHandle;            // Find the HII handle\r
   EFI_FORM_ID      FormId;               // Find the form\r
   EFI_GUID         FormSetGuid;          // Find the formset.\r
   EFI_HII_HANDLE   HiiHandle;            // Find the HII handle\r

-  UINT32           Attribute;            // Hide or grayout ... \r
+  UINT32           Attribute;            // Hide or grayout ...\r

 } QUESTION_ATTRIBUTE_OVERRIDE;\r
 \r
 #define FORM_QUESTION_ATTRIBUTE_OVERRIDE_FROM_LINK(a)  CR (a, QUESTION_ATTRIBUTE_OVERRIDE, Link, FORM_QUESTION_ATTRIBUTE_OVERRIDE_SIGNATURE)\r
 } QUESTION_ATTRIBUTE_OVERRIDE;\r
 \r
 #define FORM_QUESTION_ATTRIBUTE_OVERRIDE_FROM_LINK(a)  CR (a, QUESTION_ATTRIBUTE_OVERRIDE, Link, FORM_QUESTION_ATTRIBUTE_OVERRIDE_SIGNATURE)\r

diff --git a/MdeModulePkg/Include/Protocol/GenericMemoryTest.h b/MdeModulePkg/Include/Protocol/GenericMemoryTest.h
index 163e76d8f46eb73389f28835c99ae98c22f591b3..f0ac3d79f36ebfd0ffdd9951b357a91d5d20a832 100644 (file)
--- a/MdeModulePkg/Include/Protocol/GenericMemoryTest.h
+++ b/MdeModulePkg/Include/Protocol/GenericMemoryTest.h
@@ -1,13 +1,13 @@
 /** @file\r
   This protocol defines the generic memory test interfaces in Dxe phase.\r
 \r
 /** @file\r
   This protocol defines the generic memory test interfaces in Dxe phase.\r
 \r

-Copyright (c) 2006 - 2010, Intel Corporation. All rights reserved.<BR>\r
-This program and the accompanying materials are licensed and made available under \r
-the terms and conditions of the BSD License that accompanies this distribution.  \r
+Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r
+This program and the accompanying materials are licensed and made available under\r
+the terms and conditions of the BSD License that accompanies this distribution.\r

 The full text of the license may be found at\r
 The full text of the license may be found at\r

-http://opensource.org/licenses/bsd-license.php.                                            \r
+http://opensource.org/licenses/bsd-license.php.\r

 \r
 \r

-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     \r
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r

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


@@ -36,12 +36,12 @@ typedef enum {
 /**\r
   Initialize the generic memory test.\r
 \r
 /**\r
   Initialize the generic memory test.\r
 \r

-  @param  This                The protocol instance pointer. \r
-  @param  Level               The coverage level of the memory test. \r
-  @param  RequireSoftECCInit  Indicate if the memory need software ECC init. \r
+  @param  This                The protocol instance pointer.\r
+  @param  Level               The coverage level of the memory test.\r
+  @param  RequireSoftECCInit  Indicate if the memory need software ECC init.\r

 \r
 \r

-  @retval EFI_SUCCESS         The generic memory test is initialized correctly. \r
-  @retval EFI_NO_MEDIA        The system had no memory to be tested. \r
+  @retval EFI_SUCCESS         The generic memory test is initialized correctly.\r
+  @retval EFI_NO_MEDIA        The system had no memory to be tested.\r

 \r
 **/\r
 typedef\r
 \r
 **/\r
 typedef\r


@@ -56,12 +56,12 @@ EFI_STATUS
 /**\r
   Perform the memory test.\r
 \r
 /**\r
   Perform the memory test.\r
 \r

-  @param  This                The protocol instance pointer. \r
-  @param  TestedMemorySize    Return the tested extended memory size. \r
-  @param  TotalMemorySize     Return the whole system physical memory size. \r
-                              The total memory size does not include memory in a slot with a disabled DIMM.  \r
+  @param  This                The protocol instance pointer.\r
+  @param  TestedMemorySize    Return the tested extended memory size.\r
+  @param  TotalMemorySize     Return the whole system physical memory size.\r
+                              The total memory size does not include memory in a slot with a disabled DIMM.\r

   @param  ErrorOut            TRUE if the memory error occured.\r
   @param  ErrorOut            TRUE if the memory error occured.\r

-  @param  IfTestAbort         Indicates that the user pressed "ESC" to skip the memory test. \r
+  @param  IfTestAbort         Indicates that the user pressed "ESC" to skip the memory test.\r

 \r
   @retval EFI_SUCCESS         One block of memory passed the test.\r
   @retval EFI_NOT_FOUND       All memory blocks have already been tested.\r
 \r
   @retval EFI_SUCCESS         One block of memory passed the test.\r
   @retval EFI_NOT_FOUND       All memory blocks have already been tested.\r


@@ -82,7 +82,7 @@ EFI_STATUS
 /**\r
   Finish the memory test.\r
 \r
 /**\r
   Finish the memory test.\r
 \r

-  @param  This                The protocol instance pointer. \r
+  @param  This                The protocol instance pointer.\r

 \r
   @retval EFI_SUCCESS         Success. All resources used in the memory test are freed.\r
 \r
 \r
   @retval EFI_SUCCESS         Success. All resources used in the memory test are freed.\r
 \r


@@ -96,12 +96,12 @@ EFI_STATUS
 /**\r
   Provides the capability to test the compatible range used by some special drivers.\r
 \r
 /**\r
   Provides the capability to test the compatible range used by some special drivers.\r
 \r

-  @param  This                The protocol instance pointer. \r
+  @param  This                The protocol instance pointer.\r

   @param  StartAddress        The start address of the compatible memory range that\r
                               must be below 16M.\r
   @param  StartAddress        The start address of the compatible memory range that\r
                               must be below 16M.\r

-  @param  Length              The compatible memory range's length. \r
-  \r
-  @retval EFI_SUCCESS           The compatible memory range pass the memory test. \r
+  @param  Length              The compatible memory range's length.\r
+\r
+  @retval EFI_SUCCESS           The compatible memory range pass the memory test.\r

   @retval EFI_INVALID_PARAMETER The compatible memory range are not below Low 16M.\r
 \r
 **/\r
   @retval EFI_INVALID_PARAMETER The compatible memory range are not below Low 16M.\r
 \r
 **/\r

diff --git a/MdeModulePkg/Include/Protocol/LoadPe32Image.h b/MdeModulePkg/Include/Protocol/LoadPe32Image.h
index b56dd37ad0aa880f38975d01a7a3181cd9eae564..41bf17e0a4acec7260cd34688c39303b9721af7d 100644 (file)
--- a/MdeModulePkg/Include/Protocol/LoadPe32Image.h
+++ b/MdeModulePkg/Include/Protocol/LoadPe32Image.h
@@ -3,13 +3,13 @@
   Load Pe32 Image protocol enables loading and unloading EFI images into memory and executing those images.\r
   This protocol uses File Device Path to get an EFI image.\r
 \r
   Load Pe32 Image protocol enables loading and unloading EFI images into memory and executing those images.\r
   This protocol uses File Device Path to get an EFI image.\r
 \r

-Copyright (c) 2006 - 2011, Intel Corporation. All rights reserved.<BR>\r
-This program and the accompanying materials are licensed and made available under \r
-the terms and conditions of the BSD License that accompanies this distribution.  \r
+Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r
+This program and the accompanying materials are licensed and made available under\r
+the terms and conditions of the BSD License that accompanies this distribution.\r

 The full text of the license may be found at\r
 The full text of the license may be found at\r

-http://opensource.org/licenses/bsd-license.php.                                            \r
+http://opensource.org/licenses/bsd-license.php.\r

 \r
 \r

-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     \r
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r

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


@@ -52,10 +52,10 @@ typedef struct _EFI_PE32_IMAGE_PROTOCOL   EFI_PE32_IMAGE_PROTOCOL;
   @retval EFI_LOAD_ERROR        Image was not loaded because the image format was corrupt or not\r
                                 understood.\r
   @retval EFI_DEVICE_ERROR      Image was not loaded because the device returned a read error.\r
   @retval EFI_LOAD_ERROR        Image was not loaded because the image format was corrupt or not\r
                                 understood.\r
   @retval EFI_DEVICE_ERROR      Image was not loaded because the device returned a read error.\r

-  @retval EFI_ACCESS_DENIED     Image was not loaded because the platform policy prohibits the \r
+  @retval EFI_ACCESS_DENIED     Image was not loaded because the platform policy prohibits the\r

                                 image from being loaded. NULL is returned in *ImageHandle.\r
                                 image from being loaded. NULL is returned in *ImageHandle.\r

-  @retval EFI_SECURITY_VIOLATION Image was loaded and an ImageHandle was created with a \r
-                                valid EFI_LOADED_IMAGE_PROTOCOL. However, the current \r
+  @retval EFI_SECURITY_VIOLATION Image was loaded and an ImageHandle was created with a\r
+                                valid EFI_LOADED_IMAGE_PROTOCOL. However, the current\r

                                 platform policy specifies that the image should not be started.\r
 **/\r
 typedef\r
                                 platform policy specifies that the image should not be started.\r
 **/\r
 typedef\r

diff --git a/MdeModulePkg/Include/Protocol/PlatformLogo.h b/MdeModulePkg/Include/Protocol/PlatformLogo.h
index c25e7b04cbd62b5d95c538fdac7ab40590f37822..3582ea26701dcbabe7a1231fb2dea54d38462199 100644 (file)
--- a/MdeModulePkg/Include/Protocol/PlatformLogo.h
+++ b/MdeModulePkg/Include/Protocol/PlatformLogo.h
@@ -3,12 +3,12 @@
   image with the display attribute.\r
 \r
 Copyright (c) 2015 - 2018, Intel Corporation. All rights reserved.<BR>\r
   image with the display attribute.\r
 \r
 Copyright (c) 2015 - 2018, Intel Corporation. All rights reserved.<BR>\r

-This program and the accompanying materials are licensed and made available under \r
-the terms and conditions of the BSD License that accompanies this distribution.  \r
+This program and the accompanying materials are licensed and made available under\r
+the terms and conditions of the BSD License that accompanies this distribution.\r

 The full text of the license may be found at\r
 The full text of the license may be found at\r

-http://opensource.org/licenses/bsd-license.php.                                          \r
-    \r
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     \r
+http://opensource.org/licenses/bsd-license.php.\r
+\r
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r

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

diff --git a/MdeModulePkg/Include/Protocol/Print2.h b/MdeModulePkg/Include/Protocol/Print2.h
index 61b574e78a4ac1ba434fe39f7e4ba504973e6f52..dd5dd741c273a4895140d3ef84ccdf64c55197c5 100644 (file)
--- a/MdeModulePkg/Include/Protocol/Print2.h
+++ b/MdeModulePkg/Include/Protocol/Print2.h
@@ -4,13 +4,13 @@
   These protocols define basic print functions to  print the format unicode and\r
   ascii string.\r
 \r
   These protocols define basic print functions to  print the format unicode and\r
   ascii string.\r
 \r

-Copyright (c) 2006 - 2017, Intel Corporation. All rights reserved.<BR>\r
-This program and the accompanying materials are licensed and made available under \r
-the terms and conditions of the BSD License that accompanies this distribution.  \r
+Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r
+This program and the accompanying materials are licensed and made available under\r
+the terms and conditions of the BSD License that accompanies this distribution.\r

 The full text of the license may be found at\r
 The full text of the license may be found at\r

-http://opensource.org/licenses/bsd-license.php.                                            \r
+http://opensource.org/licenses/bsd-license.php.\r

 \r
 \r

-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     \r
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r

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


@@ -219,26 +219,26 @@ UINTN
 \r
 /**\r
   Converts a decimal value to a Null-terminated Unicode string.\r
 \r
 /**\r
   Converts a decimal value to a Null-terminated Unicode string.\r

-  \r
-  Converts the decimal number specified by Value to a Null-terminated Unicode \r
-  string specified by Buffer containing at most Width characters. No padding of spaces \r
+\r
+  Converts the decimal number specified by Value to a Null-terminated Unicode\r
+  string specified by Buffer containing at most Width characters. No padding of spaces\r

   is ever performed. If Width is 0, then a width of MAXIMUM_VALUE_CHARACTERS is assumed.\r
   This function returns the number of Unicode characters in Buffer, not including\r
   the Null-terminator.\r
   is ever performed. If Width is 0, then a width of MAXIMUM_VALUE_CHARACTERS is assumed.\r
   This function returns the number of Unicode characters in Buffer, not including\r
   the Null-terminator.\r

-  If the conversion contains more than Width characters, this function returns \r
+  If the conversion contains more than Width characters, this function returns\r

   the first Width characters in the conversion, along with the total number of characters in the conversion.\r
   the first Width characters in the conversion, along with the total number of characters in the conversion.\r

-  Additional conversion parameters are specified in Flags.  \r
-  \r
+  Additional conversion parameters are specified in Flags.\r
+\r

   The Flags bit LEFT_JUSTIFY is always ignored.\r
   All conversions are left justified in Buffer.\r
   If Width is 0, PREFIX_ZERO is ignored in Flags.\r
   If COMMA_TYPE is set in Flags, then PREFIX_ZERO is ignored in Flags, and commas\r
   are inserted every 3rd digit starting from the right.\r
   The Flags bit LEFT_JUSTIFY is always ignored.\r
   All conversions are left justified in Buffer.\r
   If Width is 0, PREFIX_ZERO is ignored in Flags.\r
   If COMMA_TYPE is set in Flags, then PREFIX_ZERO is ignored in Flags, and commas\r
   are inserted every 3rd digit starting from the right.\r

-  If RADIX_HEX is set in Flags, then the output buffer will be \r
+  If RADIX_HEX is set in Flags, then the output buffer will be\r

   formatted in hexadecimal format.\r
   If Value is < 0 and RADIX_HEX is not set in Flags, then the fist character in Buffer is a '-'.\r
   formatted in hexadecimal format.\r
   If Value is < 0 and RADIX_HEX is not set in Flags, then the fist character in Buffer is a '-'.\r

-  If PREFIX_ZERO is set in Flags and PREFIX_ZERO is not being ignored, \r
-  then Buffer is padded with '0' characters so the combination of the optional '-' \r
+  If PREFIX_ZERO is set in Flags and PREFIX_ZERO is not being ignored,\r
+  then Buffer is padded with '0' characters so the combination of the optional '-'\r

   sign character, '0' characters, digit characters for Value, and the Null-terminator\r
   add up to Width characters.\r
   If both COMMA_TYPE and RADIX_HEX are set in Flags, then ASSERT().\r
   sign character, '0' characters, digit characters for Value, and the Null-terminator\r
   add up to Width characters.\r
   If both COMMA_TYPE and RADIX_HEX are set in Flags, then ASSERT().\r


@@ -254,7 +254,7 @@ UINTN
   @param  Value   The 64-bit signed value to convert to a string.\r
   @param  Width   The maximum number of Unicode characters to place in Buffer, not including\r
                   the Null-terminator.\r
   @param  Value   The 64-bit signed value to convert to a string.\r
   @param  Width   The maximum number of Unicode characters to place in Buffer, not including\r
                   the Null-terminator.\r

-  \r
+\r

   @return The number of Unicode characters in Buffer not including the Null-terminator.\r
 \r
 **/\r
   @return The number of Unicode characters in Buffer not including the Null-terminator.\r
 \r
 **/\r


@@ -455,28 +455,28 @@ UINTN
 \r
 /**\r
   Converts a decimal value to a Null-terminated ASCII string.\r
 \r
 /**\r
   Converts a decimal value to a Null-terminated ASCII string.\r

-  \r
-  Converts the decimal number specified by Value to a Null-terminated ASCII string \r
+\r
+  Converts the decimal number specified by Value to a Null-terminated ASCII string\r

   specified by Buffer containing at most Width characters. No padding of spaces is ever performed.\r
   If Width is 0 then a width of MAXIMUM_VALUE_CHARACTERS is assumed.\r
   The number of ASCII characters in Buffer is returned not including the Null-terminator.\r
   If the conversion contains more than Width characters, then only the first Width\r
   characters are returned, and the total number of characters required to perform\r
   the conversion is returned.\r
   specified by Buffer containing at most Width characters. No padding of spaces is ever performed.\r
   If Width is 0 then a width of MAXIMUM_VALUE_CHARACTERS is assumed.\r
   The number of ASCII characters in Buffer is returned not including the Null-terminator.\r
   If the conversion contains more than Width characters, then only the first Width\r
   characters are returned, and the total number of characters required to perform\r
   the conversion is returned.\r

-  Additional conversion parameters are specified in Flags.  \r
+  Additional conversion parameters are specified in Flags.\r

   The Flags bit LEFT_JUSTIFY is always ignored.\r
   All conversions are left justified in Buffer.\r
   If Width is 0, PREFIX_ZERO is ignored in Flags.\r
   If COMMA_TYPE is set in Flags, then PREFIX_ZERO is ignored in Flags, and commas\r
   are inserted every 3rd digit starting from the right.\r
   The Flags bit LEFT_JUSTIFY is always ignored.\r
   All conversions are left justified in Buffer.\r
   If Width is 0, PREFIX_ZERO is ignored in Flags.\r
   If COMMA_TYPE is set in Flags, then PREFIX_ZERO is ignored in Flags, and commas\r
   are inserted every 3rd digit starting from the right.\r

-  If RADIX_HEX is set in Flags, then the output buffer will be \r
+  If RADIX_HEX is set in Flags, then the output buffer will be\r

   formatted in hexadecimal format.\r
   If Value is < 0 and RADIX_HEX is not set in Flags, then the fist character in Buffer is a '-'.\r
   formatted in hexadecimal format.\r
   If Value is < 0 and RADIX_HEX is not set in Flags, then the fist character in Buffer is a '-'.\r

-  If PREFIX_ZERO is set in Flags and PREFIX_ZERO is not being ignored, \r
-  then Buffer is padded with '0' characters so the combination of the optional '-' \r
+  If PREFIX_ZERO is set in Flags and PREFIX_ZERO is not being ignored,\r
+  then Buffer is padded with '0' characters so the combination of the optional '-'\r

   sign character, '0' characters, digit characters for Value, and the Null-terminator\r
   add up to Width characters.\r
   sign character, '0' characters, digit characters for Value, and the Null-terminator\r
   add up to Width characters.\r

-  \r
+\r

   If Buffer is NULL, then ASSERT().\r
   If unsupported bits are set in Flags, then ASSERT().\r
   If both COMMA_TYPE and RADIX_HEX are set in Flags, then ASSERT().\r
   If Buffer is NULL, then ASSERT().\r
   If unsupported bits are set in Flags, then ASSERT().\r
   If both COMMA_TYPE and RADIX_HEX are set in Flags, then ASSERT().\r


@@ -488,7 +488,7 @@ UINTN
   @param  Value   The 64-bit signed value to convert to a string.\r
   @param  Width   The maximum number of ASCII characters to place in Buffer, not including\r
                   the Null-terminator.\r
   @param  Value   The 64-bit signed value to convert to a string.\r
   @param  Width   The maximum number of ASCII characters to place in Buffer, not including\r
                   the Null-terminator.\r

-  \r
+\r

   @return The number of ASCII characters in Buffer not including the Null-terminator.\r
 \r
 **/\r
   @return The number of ASCII characters in Buffer not including the Null-terminator.\r
 \r
 **/\r

diff --git a/MdeModulePkg/Include/Protocol/SmmFaultTolerantWrite.h b/MdeModulePkg/Include/Protocol/SmmFaultTolerantWrite.h
index a12e53b740c23e3b005f948483216b792553559a..ee8f03f4fdc4e527b9dd14f450d592b882e2e142 100644 (file)
--- a/MdeModulePkg/Include/Protocol/SmmFaultTolerantWrite.h
+++ b/MdeModulePkg/Include/Protocol/SmmFaultTolerantWrite.h
@@ -1,18 +1,18 @@
 /** @file\r
   SMM Fault Tolerant Write protocol is related to EDK II-specific implementation of FTW,\r
 /** @file\r
   SMM Fault Tolerant Write protocol is related to EDK II-specific implementation of FTW,\r

-  provides boot-time service for fault tolerant write capability for block devices in \r
-  EFI SMM environment.  The protocol provides for non-volatile storage of the intermediate \r
-  data and private information a caller would need to recover from a critical fault, \r
-  such as a power failure.   \r
-\r
-Copyright (c) 2010, Intel Corporation. All rights reserved.<BR>\r
-This program and the accompanying materials are licensed and made available under \r
-the terms and conditions of the BSD License that accompanies this distribution.  \r
+  provides boot-time service for fault tolerant write capability for block devices in\r
+  EFI SMM environment.  The protocol provides for non-volatile storage of the intermediate\r
+  data and private information a caller would need to recover from a critical fault,\r
+  such as a power failure.\r
+\r
+Copyright (c) 2010 - 2018, Intel Corporation. All rights reserved.<BR>\r
+This program and the accompanying materials are licensed and made available under\r
+the terms and conditions of the BSD License that accompanies this distribution.\r

 The full text of the license may be found at\r
 The full text of the license may be found at\r

-http://opensource.org/licenses/bsd-license.php.                                            \r
+http://opensource.org/licenses/bsd-license.php.\r

 \r
 \r

-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     \r
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. \r
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r

 \r
 **/\r
 \r
 \r
 **/\r
 \r


@@ -27,10 +27,10 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   }\r
 \r
 //\r
   }\r
 \r
 //\r

-// SMM Fault Tolerant Write protocol structure is the same as Fault Tolerant Write protocol.  \r
-// The SMM one is intend to run in SMM environment, which means it can be used by \r
-// SMM drivers after ExitPmAuth. \r
-// \r
+// SMM Fault Tolerant Write protocol structure is the same as Fault Tolerant Write protocol.\r
+// The SMM one is intend to run in SMM environment, which means it can be used by\r
+// SMM drivers after ExitPmAuth.\r
+//\r

 typedef EFI_FAULT_TOLERANT_WRITE_PROTOCOL EFI_SMM_FAULT_TOLERANT_WRITE_PROTOCOL;\r
 \r
 extern EFI_GUID gEfiSmmFaultTolerantWriteProtocolGuid;\r
 typedef EFI_FAULT_TOLERANT_WRITE_PROTOCOL EFI_SMM_FAULT_TOLERANT_WRITE_PROTOCOL;\r
 \r
 extern EFI_GUID gEfiSmmFaultTolerantWriteProtocolGuid;\r

diff --git a/MdeModulePkg/Include/Protocol/SmmFirmwareVolumeBlock.h b/MdeModulePkg/Include/Protocol/SmmFirmwareVolumeBlock.h
index 53480d9737e6c38e3e22163f7848fd641e8ff556..94a234046845428f880995a18bf74cda1819d1e2 100644 (file)
--- a/MdeModulePkg/Include/Protocol/SmmFirmwareVolumeBlock.h
+++ b/MdeModulePkg/Include/Protocol/SmmFirmwareVolumeBlock.h
@@ -1,16 +1,16 @@
 /** @file\r
   SMM Firmware Volume Block protocol is related to EDK II-specific implementation of\r
 /** @file\r
   SMM Firmware Volume Block protocol is related to EDK II-specific implementation of\r

-  FVB driver, provides control over block-oriented firmware devices and is intended \r
+  FVB driver, provides control over block-oriented firmware devices and is intended\r

   to use in the EFI SMM environment.\r
 \r
   to use in the EFI SMM environment.\r
 \r

-Copyright (c) 2010 - 2011, Intel Corporation. All rights reserved.<BR>\r
-This program and the accompanying materials are licensed and made available under \r
-the terms and conditions of the BSD License that accompanies this distribution.  \r
+Copyright (c) 2010 - 2018, Intel Corporation. All rights reserved.<BR>\r
+This program and the accompanying materials are licensed and made available under\r
+the terms and conditions of the BSD License that accompanies this distribution.\r

 The full text of the license may be found at\r
 The full text of the license may be found at\r

-http://opensource.org/licenses/bsd-license.php.                                          \r
-    \r
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     \r
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             \r
+http://opensource.org/licenses/bsd-license.php.\r
+\r
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r

 \r
 **/\r
 \r
 \r
 **/\r
 \r


@@ -25,10 +25,10 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   }\r
 \r
 //\r
   }\r
 \r
 //\r

-// SMM Firmware Volume Block protocol structure is the same as Firmware Volume Block \r
-// protocol. The SMM one is intend to run in SMM environment, which means it can be  \r
-// used by SMM drivers after ExitPmAuth. \r
-// \r
+// SMM Firmware Volume Block protocol structure is the same as Firmware Volume Block\r
+// protocol. The SMM one is intend to run in SMM environment, which means it can be\r
+// used by SMM drivers after ExitPmAuth.\r
+//\r

 typedef EFI_FIRMWARE_VOLUME_BLOCK_PROTOCOL EFI_SMM_FIRMWARE_VOLUME_BLOCK_PROTOCOL;\r
 \r
 extern EFI_GUID gEfiSmmFirmwareVolumeBlockProtocolGuid;\r
 typedef EFI_FIRMWARE_VOLUME_BLOCK_PROTOCOL EFI_SMM_FIRMWARE_VOLUME_BLOCK_PROTOCOL;\r
 \r
 extern EFI_GUID gEfiSmmFirmwareVolumeBlockProtocolGuid;\r

diff --git a/MdeModulePkg/Include/Protocol/SmmSwapAddressRange.h b/MdeModulePkg/Include/Protocol/SmmSwapAddressRange.h
index 60a0a2c4a2424cb20d6bc0edede656458bb9735e..b5fe0488cf2837f3232f1eb27529bfffa5847c57 100644 (file)
--- a/MdeModulePkg/Include/Protocol/SmmSwapAddressRange.h
+++ b/MdeModulePkg/Include/Protocol/SmmSwapAddressRange.h
@@ -1,20 +1,20 @@
 /** @file\r
 /** @file\r

-  The EFI_SMM_SWAP_ADDRESS_RANGE_PROTOCOL is related to EDK II-specific implementation \r
-  and used to abstract the swap operation of boot block and backup block of FV in EFI \r
-  SMM environment. This swap is especially needed when updating the boot block of FV. \r
-  If a power failure happens during the boot block update, the swapped backup block \r
-  (now the boot block) can boot the machine with the old boot block backed up in it. \r
-  The swap operation is platform dependent, so other protocols such as SMM FTW (Fault \r
+  The EFI_SMM_SWAP_ADDRESS_RANGE_PROTOCOL is related to EDK II-specific implementation\r
+  and used to abstract the swap operation of boot block and backup block of FV in EFI\r
+  SMM environment. This swap is especially needed when updating the boot block of FV.\r
+  If a power failure happens during the boot block update, the swapped backup block\r
+  (now the boot block) can boot the machine with the old boot block backed up in it.\r
+  The swap operation is platform dependent, so other protocols such as SMM FTW (Fault\r

   Tolerant Write) should use this protocol instead of handling hardware directly.\r
 \r
   Tolerant Write) should use this protocol instead of handling hardware directly.\r
 \r

-Copyright (c) 2010, Intel Corporation. All rights reserved.<BR>\r
-This program and the accompanying materials are licensed and made available under \r
-the terms and conditions of the BSD License that accompanies this distribution.  \r
+Copyright (c) 2010 - 2018, Intel Corporation. All rights reserved.<BR>\r
+This program and the accompanying materials are licensed and made available under\r
+the terms and conditions of the BSD License that accompanies this distribution.\r

 The full text of the license may be found at\r
 The full text of the license may be found at\r

-http://opensource.org/licenses/bsd-license.php.                                            \r
+http://opensource.org/licenses/bsd-license.php.\r

 \r
 \r

-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     \r
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. \r
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r

 \r
 **/\r
 \r
 \r
 **/\r
 \r


@@ -29,10 +29,10 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   }\r
 \r
 //\r
   }\r
 \r
 //\r

-// SMM Swap Address Range protocol structure is the same as Swap Address Range protocol.  \r
-// The SMM one is intend to run in SMM environment, which means it can be used by \r
-// SMM drivers after ExitPmAuth. \r
-// \r
+// SMM Swap Address Range protocol structure is the same as Swap Address Range protocol.\r
+// The SMM one is intend to run in SMM environment, which means it can be used by\r
+// SMM drivers after ExitPmAuth.\r
+//\r

 typedef EFI_SWAP_ADDRESS_RANGE_PROTOCOL EFI_SMM_SWAP_ADDRESS_RANGE_PROTOCOL;\r
 \r
 extern EFI_GUID gEfiSmmSwapAddressRangeProtocolGuid;\r
 typedef EFI_SWAP_ADDRESS_RANGE_PROTOCOL EFI_SMM_SWAP_ADDRESS_RANGE_PROTOCOL;\r
 \r
 extern EFI_GUID gEfiSmmSwapAddressRangeProtocolGuid;\r

diff --git a/MdeModulePkg/Include/Protocol/SmmVariable.h b/MdeModulePkg/Include/Protocol/SmmVariable.h
index 75ab6c3057b0298fcf40b7fb5f861eed299c96fd..b593977fe18f1b6433a4813b5132df418e2bf57a 100644 (file)
--- a/MdeModulePkg/Include/Protocol/SmmVariable.h
+++ b/MdeModulePkg/Include/Protocol/SmmVariable.h
@@ -2,14 +2,14 @@
   EFI SMM Variable Protocol is related to EDK II-specific implementation of variables\r
   and intended for use as a means to store data in the EFI SMM environment.\r
 \r
   EFI SMM Variable Protocol is related to EDK II-specific implementation of variables\r
   and intended for use as a means to store data in the EFI SMM environment.\r
 \r

-  Copyright (c) 2010, Intel Corporation. All rights reserved.<BR>\r
-  This program and the accompanying materials                          \r
-  are licensed and made available under the terms and conditions of the BSD License         \r
-  which accompanies this distribution.  The full text of the license may be found at        \r
-  http://opensource.org/licenses/bsd-license.php                                            \r
+  Copyright (c) 2010 - 2018, Intel Corporation. All rights reserved.<BR>\r
+  This program and the accompanying materials\r
+  are licensed and made available under the terms and conditions of the BSD License\r
+  which accompanies this distribution.  The full text of the license may be found at\r
+  http://opensource.org/licenses/bsd-license.php\r

 \r
 \r

-  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     \r
-  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             \r
+  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
+  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r

 \r
 **/\r
 \r
 \r
 **/\r
 \r


@@ -24,7 +24,7 @@
 typedef struct _EFI_SMM_VARIABLE_PROTOCOL  EFI_SMM_VARIABLE_PROTOCOL;\r
 \r
 ///\r
 typedef struct _EFI_SMM_VARIABLE_PROTOCOL  EFI_SMM_VARIABLE_PROTOCOL;\r
 \r
 ///\r

-/// EFI SMM Variable Protocol is intended for use as a means \r
+/// EFI SMM Variable Protocol is intended for use as a means\r

 /// to store data in the EFI SMM environment.\r
 ///\r
 struct _EFI_SMM_VARIABLE_PROTOCOL {\r
 /// to store data in the EFI SMM environment.\r
 ///\r
 struct _EFI_SMM_VARIABLE_PROTOCOL {\r


@@ -36,4 +36,4 @@ struct _EFI_SMM_VARIABLE_PROTOCOL {
 \r
 extern EFI_GUID gEfiSmmVariableProtocolGuid;\r
 \r
 \r
 extern EFI_GUID gEfiSmmVariableProtocolGuid;\r
 \r

-#endif  \r
+#endif\r

diff --git a/MdeModulePkg/Include/Protocol/SwapAddressRange.h b/MdeModulePkg/Include/Protocol/SwapAddressRange.h
index 3ca87a0e6e55efedb877f7c5adf39fafb3663570..7a1fc17d46bd495ccdffe6c1f6a6d2940cdbaeeb 100644 (file)
--- a/MdeModulePkg/Include/Protocol/SwapAddressRange.h
+++ b/MdeModulePkg/Include/Protocol/SwapAddressRange.h
@@ -1,18 +1,18 @@
 /** @file\r
 /** @file\r

-The EFI_SWAP_ADDRESS_RANGE_PROTOCOL is used to abstract the swap operation of boot block \r
-and backup block of FV. This swap is especially needed when updating the boot block of FV. If a \r
-power failure happens during the boot block update, the swapped backup block (now the boot block) \r
-can boot the machine with the old boot block backed up in it. The swap operation is platform dependent, so \r
+The EFI_SWAP_ADDRESS_RANGE_PROTOCOL is used to abstract the swap operation of boot block\r
+and backup block of FV. This swap is especially needed when updating the boot block of FV. If a\r
+power failure happens during the boot block update, the swapped backup block (now the boot block)\r
+can boot the machine with the old boot block backed up in it. The swap operation is platform dependent, so\r

 other protocols such as FTW (Fault Tolerant Write) should use this protocol instead of handling hardware directly.\r
 \r
 other protocols such as FTW (Fault Tolerant Write) should use this protocol instead of handling hardware directly.\r
 \r

-Copyright (c) 2009 - 2010, Intel Corporation. All rights reserved.<BR>\r
-This program and the accompanying materials are licensed and made available under \r
-the terms and conditions of the BSD License that accompanies this distribution.  \r
+Copyright (c) 2009 - 2018, Intel Corporation. All rights reserved.<BR>\r
+This program and the accompanying materials are licensed and made available under\r
+the terms and conditions of the BSD License that accompanies this distribution.\r

 The full text of the license may be found at\r
 The full text of the license may be found at\r

-http://opensource.org/licenses/bsd-license.php.                                            \r
+http://opensource.org/licenses/bsd-license.php.\r

 \r
 \r

-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     \r
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. \r
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r

 \r
 **/\r
 \r
 \r
 **/\r
 \r


@@ -40,17 +40,17 @@ typedef UINT8 EFI_SWAP_LOCK_CAPABILITY;
 //\r
 \r
 /**\r
 //\r
 \r
 /**\r

-  This function gets the address range location of \r
-  boot block and backup block. \r
+  This function gets the address range location of\r
+  boot block and backup block.\r

 \r
 \r

-  @param This             Indicates the calling context.  \r
+  @param This             Indicates the calling context.\r

   @param BootBlockBase    The base address of current boot block.\r
   @param BootBlockSize    The size (in bytes) of current boot block.\r
   @param BackupBlockBase  The base address of current backup block.\r
   @param BackupBlockSize  The size (in bytes) of current backup block.\r
 \r
   @retval EFI_SUCCESS  The call was successful.\r
   @param BootBlockBase    The base address of current boot block.\r
   @param BootBlockSize    The size (in bytes) of current boot block.\r
   @param BackupBlockBase  The base address of current backup block.\r
   @param BackupBlockSize  The size (in bytes) of current backup block.\r
 \r
   @retval EFI_SUCCESS  The call was successful.\r

-    \r
+\r

 **/\r
 typedef\r
 EFI_STATUS\r
 **/\r
 typedef\r
 EFI_STATUS\r


@@ -65,12 +65,12 @@ EFI_STATUS
 /**\r
   This service checks if the boot block and backup block has been swapped.\r
 \r
 /**\r
   This service checks if the boot block and backup block has been swapped.\r
 \r

-  @param This          Indicates the calling context.  \r
-  @param SwapState     True if the boot block and backup block has been swapped. \r
+  @param This          Indicates the calling context.\r
+  @param SwapState     True if the boot block and backup block has been swapped.\r

                        False if the boot block and backup block has not been swapped.\r
 \r
   @retval EFI_SUCCESS  The call was successful.\r
                        False if the boot block and backup block has not been swapped.\r
 \r
   @retval EFI_SUCCESS  The call was successful.\r

-    \r
+\r

 **/\r
 typedef\r
 EFI_STATUS\r
 **/\r
 typedef\r
 EFI_STATUS\r


@@ -82,15 +82,15 @@ EFI_STATUS
 /**\r
   This service swaps the boot block and backup block, or swaps them back.\r
 \r
 /**\r
   This service swaps the boot block and backup block, or swaps them back.\r
 \r

-  It also acquires and releases software swap lock during operation. The setting of the new swap state \r
+  It also acquires and releases software swap lock during operation. The setting of the new swap state\r

   is not affected by the old swap state.\r
 \r
   is not affected by the old swap state.\r
 \r

-  @param This            Indicates the calling context.  \r
+  @param This            Indicates the calling context.\r

   @param NewSwapState    True to swap real boot block and backup block, False to swap them back.\r
 \r
   @retval EFI_SUCCESS  The call was successful.\r
   @retval EFI_ABORTED  Set swap state error.\r
   @param NewSwapState    True to swap real boot block and backup block, False to swap them back.\r
 \r
   @retval EFI_SUCCESS  The call was successful.\r
   @retval EFI_ABORTED  Set swap state error.\r

-    \r
+\r

 **/\r
 typedef\r
 EFI_STATUS\r
 **/\r
 typedef\r
 EFI_STATUS\r


@@ -104,14 +104,14 @@ EFI_STATUS
 /**\r
   This service checks if a Real Time Clock (RTC) power failure happened.\r
 \r
 /**\r
   This service checks if a Real Time Clock (RTC) power failure happened.\r
 \r

-  If parameter RtcPowerFailed is true after the function returns, RTC power supply failed or was removed. \r
+  If parameter RtcPowerFailed is true after the function returns, RTC power supply failed or was removed.\r

   It is recommended to check RTC power status before calling GetSwapState().\r
 \r
   It is recommended to check RTC power status before calling GetSwapState().\r
 \r

-  @param This             Indicates the calling context.  \r
-  @param RtcPowerFailed   True if the RTC (Real Time Clock) power failed or was removed. \r
+  @param This             Indicates the calling context.\r
+  @param RtcPowerFailed   True if the RTC (Real Time Clock) power failed or was removed.\r

 \r
   @retval EFI_SUCCESS The call was successful.\r
 \r
   @retval EFI_SUCCESS The call was successful.\r

-    \r
+\r

 **/\r
 typedef\r
 EFI_STATUS\r
 **/\r
 typedef\r
 EFI_STATUS\r


@@ -121,15 +121,15 @@ EFI_STATUS
   );\r
 \r
 /**\r
   );\r
 \r
 /**\r

-  This service returns all lock methods for swap operations that the current platform \r
+  This service returns all lock methods for swap operations that the current platform\r

   supports. Could be software lock, hardware lock, or unsupport lock.\r
   Note that software and hardware lock methods can be used simultaneously.\r
 \r
   @param This             Indicates the calling context.\r
   supports. Could be software lock, hardware lock, or unsupport lock.\r
   Note that software and hardware lock methods can be used simultaneously.\r
 \r
   @param This             Indicates the calling context.\r

-  @param LockCapability   The current lock method for swap operations. \r
+  @param LockCapability   The current lock method for swap operations.\r

 \r
   @retval EFI_SUCCESS The call was successful.\r
 \r
   @retval EFI_SUCCESS The call was successful.\r

-    \r
+\r

 **/\r
 typedef\r
 EFI_STATUS\r
 **/\r
 typedef\r
 EFI_STATUS\r


@@ -150,7 +150,7 @@ EFI_STATUS
   @param NewLockState      True to acquire lock; False to release lock.\r
 \r
   @retval EFI_SUCCESS The call was successful.\r
   @param NewLockState      True to acquire lock; False to release lock.\r
 \r
   @retval EFI_SUCCESS The call was successful.\r

-    \r
+\r

 **/\r
 typedef\r
 EFI_STATUS\r
 **/\r
 typedef\r
 EFI_STATUS\r

diff --git a/MdeModulePkg/Include/Protocol/UfsHostController.h b/MdeModulePkg/Include/Protocol/UfsHostController.h
index 909c981729032ff76d8aefd967e88e42752831c2..694ae3031532f04bb9c839443dcd2052cdaa284e 100644 (file)
--- a/MdeModulePkg/Include/Protocol/UfsHostController.h
+++ b/MdeModulePkg/Include/Protocol/UfsHostController.h
@@ -2,13 +2,13 @@
 \r
   EDKII Universal Flash Storage Host Controller Protocol.\r
 \r
 \r
   EDKII Universal Flash Storage Host Controller Protocol.\r
 \r

-Copyright (c) 2014 - 2015, Intel Corporation. All rights reserved.<BR>\r
-This program and the accompanying materials are licensed and made available under \r
-the terms and conditions of the BSD License that accompanies this distribution.  \r
+Copyright (c) 2014 - 2018, Intel Corporation. All rights reserved.<BR>\r
+This program and the accompanying materials are licensed and made available under\r
+the terms and conditions of the BSD License that accompanies this distribution.\r

 The full text of the license may be found at\r
 The full text of the license may be found at\r

-http://opensource.org/licenses/bsd-license.php.                                            \r
+http://opensource.org/licenses/bsd-license.php.\r

 \r
 \r

-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     \r
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r

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


@@ -70,24 +70,24 @@ typedef enum {
   EdkiiUfsHcOperationMaximum\r
 } EDKII_UFS_HOST_CONTROLLER_OPERATION;\r
 \r
   EdkiiUfsHcOperationMaximum\r
 } EDKII_UFS_HOST_CONTROLLER_OPERATION;\r
 \r

-/**                                                                 \r
+/**\r

   Provides the UFS controller-specific addresses needed to access system memory.\r
   Provides the UFS controller-specific addresses needed to access system memory.\r

-            \r
+\r

   @param  This                  A pointer to the EFI_UFS_HOST_CONTROLLER_PROTOCOL instance.\r
   @param  Operation             Indicates if the bus master is going to read or write to system memory.\r
   @param  HostAddress           The system memory address to map to the UFS controller.\r
   @param  NumberOfBytes         On input the number of bytes to map. On output the number of bytes\r
   @param  This                  A pointer to the EFI_UFS_HOST_CONTROLLER_PROTOCOL instance.\r
   @param  Operation             Indicates if the bus master is going to read or write to system memory.\r
   @param  HostAddress           The system memory address to map to the UFS controller.\r
   @param  NumberOfBytes         On input the number of bytes to map. On output the number of bytes\r

-                                that were mapped.                                                 \r
+                                that were mapped.\r

   @param  DeviceAddress         The resulting map address for the bus master UFS controller to use to\r
   @param  DeviceAddress         The resulting map address for the bus master UFS controller to use to\r

-                                access the hosts HostAddress.                                        \r
+                                access the hosts HostAddress.\r

   @param  Mapping               A resulting value to pass to Unmap().\r
   @param  Mapping               A resulting value to pass to Unmap().\r

-                                  \r
+\r

   @retval EFI_SUCCESS           The range was mapped for the returned NumberOfBytes.\r
   @retval EFI_SUCCESS           The range was mapped for the returned NumberOfBytes.\r

-  @retval EFI_UNSUPPORTED       The HostAddress cannot be mapped as a common buffer.                                \r
+  @retval EFI_UNSUPPORTED       The HostAddress cannot be mapped as a common buffer.\r

   @retval EFI_INVALID_PARAMETER One or more parameters are invalid.\r
   @retval EFI_OUT_OF_RESOURCES  The request could not be completed due to a lack of resources.\r
   @retval EFI_DEVICE_ERROR      The system hardware could not map the requested address.\r
   @retval EFI_INVALID_PARAMETER One or more parameters are invalid.\r
   @retval EFI_OUT_OF_RESOURCES  The request could not be completed due to a lack of resources.\r
   @retval EFI_DEVICE_ERROR      The system hardware could not map the requested address.\r

-                                   \r
+\r

 **/\r
 typedef\r
 EFI_STATUS\r
 **/\r
 typedef\r
 EFI_STATUS\r


@@ -100,15 +100,15 @@ EFI_STATUS
      OUT VOID                                 **Mapping\r
   );\r
 \r
      OUT VOID                                 **Mapping\r
   );\r
 \r

-/**                                                                 \r
+/**\r

   Completes the Map() operation and releases any corresponding resources.\r
   Completes the Map() operation and releases any corresponding resources.\r

-            \r
-  @param  This                  A pointer to the EFI_UFS_HOST_CONTROLLER_PROTOCOL instance.                                      \r
+\r
+  @param  This                  A pointer to the EFI_UFS_HOST_CONTROLLER_PROTOCOL instance.\r

   @param  Mapping               The mapping value returned from Map().\r
   @param  Mapping               The mapping value returned from Map().\r

-                                  \r
+\r

   @retval EFI_SUCCESS           The range was unmapped.\r
   @retval EFI_DEVICE_ERROR      The data was not committed to the target system memory.\r
   @retval EFI_SUCCESS           The range was unmapped.\r
   @retval EFI_DEVICE_ERROR      The data was not committed to the target system memory.\r

-                                   \r
+\r

 **/\r
 typedef\r
 EFI_STATUS\r
 **/\r
 typedef\r
 EFI_STATUS\r


@@ -117,25 +117,25 @@ EFI_STATUS
   IN  VOID                                   *Mapping\r
   );\r
 \r
   IN  VOID                                   *Mapping\r
   );\r
 \r

-/**                                                                 \r
+/**\r

   Allocates pages that are suitable for an EfiUfsHcOperationBusMasterCommonBuffer\r
   Allocates pages that are suitable for an EfiUfsHcOperationBusMasterCommonBuffer\r

-  mapping.                                                                       \r
-            \r
+  mapping.\r
+\r

   @param  This                  A pointer to the EFI_UFS_HOST_CONTROLLER_PROTOCOL instance.\r
   @param  Type                  This parameter is not used and must be ignored.\r
   @param  MemoryType            The type of memory to allocate, EfiBootServicesData or\r
   @param  This                  A pointer to the EFI_UFS_HOST_CONTROLLER_PROTOCOL instance.\r
   @param  Type                  This parameter is not used and must be ignored.\r
   @param  MemoryType            The type of memory to allocate, EfiBootServicesData or\r

-                                EfiRuntimeServicesData.                               \r
-  @param  Pages                 The number of pages to allocate.                                \r
+                                EfiRuntimeServicesData.\r
+  @param  Pages                 The number of pages to allocate.\r

   @param  HostAddress           A pointer to store the base system memory address of the\r
   @param  HostAddress           A pointer to store the base system memory address of the\r

-                                allocated range.                                        \r
+                                allocated range.\r

   @param  Attributes            The requested bit mask of attributes for the allocated range.\r
   @param  Attributes            The requested bit mask of attributes for the allocated range.\r

-                                  \r
+\r

   @retval EFI_SUCCESS           The requested memory pages were allocated.\r
   @retval EFI_UNSUPPORTED       Attributes is unsupported. The only legal attribute bits are\r
   @retval EFI_SUCCESS           The requested memory pages were allocated.\r
   @retval EFI_UNSUPPORTED       Attributes is unsupported. The only legal attribute bits are\r

-                                MEMORY_WRITE_COMBINE and MEMORY_CACHED.                     \r
+                                MEMORY_WRITE_COMBINE and MEMORY_CACHED.\r

   @retval EFI_INVALID_PARAMETER One or more parameters are invalid.\r
   @retval EFI_INVALID_PARAMETER One or more parameters are invalid.\r

-  @retval EFI_OUT_OF_RESOURCES  The memory pages could not be allocated.  \r
-                                   \r
+  @retval EFI_OUT_OF_RESOURCES  The memory pages could not be allocated.\r
+\r

 **/\r
 typedef\r
 EFI_STATUS\r
 **/\r
 typedef\r
 EFI_STATUS\r


@@ -148,17 +148,17 @@ EFI_STATUS
   IN     UINT64                               Attributes\r
   );\r
 \r
   IN     UINT64                               Attributes\r
   );\r
 \r

-/**                                                                 \r
+/**\r

   Frees memory that was allocated with AllocateBuffer().\r
   Frees memory that was allocated with AllocateBuffer().\r

-            \r
-  @param  This                  A pointer to the EFI_UFS_HOST_CONTROLLER_PROTOCOL instance.  \r
-  @param  Pages                 The number of pages to free.                                \r
-  @param  HostAddress           The base system memory address of the allocated range.                                    \r
-                                  \r
+\r
+  @param  This                  A pointer to the EFI_UFS_HOST_CONTROLLER_PROTOCOL instance.\r
+  @param  Pages                 The number of pages to free.\r
+  @param  HostAddress           The base system memory address of the allocated range.\r
+\r

   @retval EFI_SUCCESS           The requested memory pages were freed.\r
   @retval EFI_INVALID_PARAMETER The memory range specified by HostAddress and Pages\r
                                 was not allocated with AllocateBuffer().\r
   @retval EFI_SUCCESS           The requested memory pages were freed.\r
   @retval EFI_INVALID_PARAMETER The memory range specified by HostAddress and Pages\r
                                 was not allocated with AllocateBuffer().\r

-                                     \r
+\r

 **/\r
 typedef\r
 EFI_STATUS\r
 **/\r
 typedef\r
 EFI_STATUS\r


@@ -168,16 +168,16 @@ EFI_STATUS
   IN  VOID                                 *HostAddress\r
   );\r
 \r
   IN  VOID                                 *HostAddress\r
   );\r
 \r

-/**                                                                 \r
+/**\r

   Flushes all posted write transactions from the UFS bus to attached UFS device.\r
   Flushes all posted write transactions from the UFS bus to attached UFS device.\r

-            \r
-  @param  This                  A pointer to the EFI_UFS_HOST_CONTROLLER_PROTOCOL instance.  \r
-                                  \r
+\r
+  @param  This                  A pointer to the EFI_UFS_HOST_CONTROLLER_PROTOCOL instance.\r
+\r

   @retval EFI_SUCCESS           The posted write transactions were flushed from the UFS bus\r
   @retval EFI_SUCCESS           The posted write transactions were flushed from the UFS bus\r

-                                to attached UFS device.                                      \r
+                                to attached UFS device.\r

   @retval EFI_DEVICE_ERROR      The posted write transactions were not flushed from the UFS\r
   @retval EFI_DEVICE_ERROR      The posted write transactions were not flushed from the UFS\r

-                                bus to attached UFS device due to a hardware error.                           \r
-                                     \r
+                                bus to attached UFS device due to a hardware error.\r
+\r

 **/\r
 typedef\r
 EFI_STATUS\r
 **/\r
 typedef\r
 EFI_STATUS\r

diff --git a/MdeModulePkg/Include/Protocol/VariableLock.h b/MdeModulePkg/Include/Protocol/VariableLock.h
index a2a73bc161c75af7d2b76c75a9d2fc6aac2ee792..f57daa4a2f2a1342c0dc46d710c2f54967602251 100644 (file)
--- a/MdeModulePkg/Include/Protocol/VariableLock.h
+++ b/MdeModulePkg/Include/Protocol/VariableLock.h
@@ -3,14 +3,14 @@
   and intended for use as a means to mark a variable read-only after the event\r
   EFI_END_OF_DXE_EVENT_GUID is signaled.\r
 \r
   and intended for use as a means to mark a variable read-only after the event\r
   EFI_END_OF_DXE_EVENT_GUID is signaled.\r
 \r

-  Copyright (c) 2013, Intel Corporation. All rights reserved.<BR>\r
-  This program and the accompanying materials                          \r
-  are licensed and made available under the terms and conditions of the BSD License         \r
-  which accompanies this distribution.  The full text of the license may be found at        \r
-  http://opensource.org/licenses/bsd-license.php                                            \r
+  Copyright (c) 2013 - 2018, Intel Corporation. All rights reserved.<BR>\r
+  This program and the accompanying materials\r
+  are licensed and made available under the terms and conditions of the BSD License\r
+  which accompanies this distribution.  The full text of the license may be found at\r
+  http://opensource.org/licenses/bsd-license.php\r

 \r
 \r

-  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     \r
-  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             \r
+  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
+  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r

 \r
 **/\r
 \r
 \r
 **/\r
 \r


@@ -59,5 +59,5 @@ struct _EDKII_VARIABLE_LOCK_PROTOCOL {
 \r
 extern EFI_GUID gEdkiiVariableLockProtocolGuid;\r
 \r
 \r
 extern EFI_GUID gEdkiiVariableLockProtocolGuid;\r
 \r

-#endif  \r
+#endif\r

 \r
 \r

diff --git a/MdeModulePkg/Library/BasePlatformHookLibNull/BasePlatformHookLibNull.c b/MdeModulePkg/Library/BasePlatformHookLibNull/BasePlatformHookLibNull.c
index bd1a31a36e29ac886df1cf66fe5ccaa68ddd3db6..6c3144621dc67872492ef29d9e02c70f6584469b 100644 (file)
--- a/MdeModulePkg/Library/BasePlatformHookLibNull/BasePlatformHookLibNull.c
+++ b/MdeModulePkg/Library/BasePlatformHookLibNull/BasePlatformHookLibNull.c
@@ -1,7 +1,7 @@
 /** @file\r
   Null Platform Hook Library instance.\r
 \r
 /** @file\r
   Null Platform Hook Library instance.\r
 \r

-  Copyright (c) 2010, Intel Corporation. All rights reserved.<BR>\r
+  Copyright (c) 2010 - 2018, Intel Corporation. All rights reserved.<BR>\r

   This program and the accompanying materials\r
   are licensed and made available under the terms and conditions of the BSD License\r
   which accompanies this distribution.  The full text of the license may be found at\r
   This program and the accompanying materials\r
   are licensed and made available under the terms and conditions of the BSD License\r
   which accompanies this distribution.  The full text of the license may be found at\r


@@ -18,13 +18,13 @@
 /**\r
   Performs platform specific initialization required for the CPU to access\r
   the hardware associated with a SerialPortLib instance.  This function does\r
 /**\r
   Performs platform specific initialization required for the CPU to access\r
   the hardware associated with a SerialPortLib instance.  This function does\r

-  not intiailzie the serial port hardware itself.  Instead, it initializes \r
-  hardware devices that are required for the CPU to access the serial port \r
+  not intiailzie the serial port hardware itself.  Instead, it initializes\r
+  hardware devices that are required for the CPU to access the serial port\r

   hardware.  This function may be called more than once.\r
 \r
   @retval RETURN_SUCCESS       The platform specific initialization succeeded.\r
   @retval RETURN_DEVICE_ERROR  The platform specific initialization could not be completed.\r
   hardware.  This function may be called more than once.\r
 \r
   @retval RETURN_SUCCESS       The platform specific initialization succeeded.\r
   @retval RETURN_DEVICE_ERROR  The platform specific initialization could not be completed.\r

- \r
+\r

 **/\r
 RETURN_STATUS\r
 EFIAPI\r
 **/\r
 RETURN_STATUS\r
 EFIAPI\r

diff --git a/MdeModulePkg/Library/BaseResetSystemLibNull/BaseResetSystemLibNull.c b/MdeModulePkg/Library/BaseResetSystemLibNull/BaseResetSystemLibNull.c
index 1a1242640c09fe1dbae1b98273a853f7b292eebc..59d720895b9273f606f55417e9e5a3a974609bb2 100644 (file)
--- a/MdeModulePkg/Library/BaseResetSystemLibNull/BaseResetSystemLibNull.c
+++ b/MdeModulePkg/Library/BaseResetSystemLibNull/BaseResetSystemLibNull.c
@@ -1,7 +1,7 @@
 /** @file\r
   Null Reset System Library instance that only generates ASSERT() conditions.\r
 \r
 /** @file\r
   Null Reset System Library instance that only generates ASSERT() conditions.\r
 \r

-  Copyright (c) 2006 - 2016, Intel Corporation. All rights reserved.<BR>\r
+  Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r

   This program and the accompanying materials\r
   are licensed and made available under the terms and conditions of the BSD License\r
   which accompanies this distribution.  The full text of the license may be found at\r
   This program and the accompanying materials\r
   are licensed and made available under the terms and conditions of the BSD License\r
   which accompanies this distribution.  The full text of the license may be found at\r


@@ -19,11 +19,11 @@
 \r
 /**\r
   This function causes a system-wide reset (cold reset), in which\r
 \r
 /**\r
   This function causes a system-wide reset (cold reset), in which\r

-  all circuitry within the system returns to its initial state. This type of reset \r
+  all circuitry within the system returns to its initial state. This type of reset\r

   is asynchronous to system operation and operates without regard to\r
   cycle boundaries.\r
 \r
   is asynchronous to system operation and operates without regard to\r
   cycle boundaries.\r
 \r

-  If this function returns, it means that the system does not support cold reset. \r
+  If this function returns, it means that the system does not support cold reset.\r

 **/\r
 VOID\r
 EFIAPI\r
 **/\r
 VOID\r
 EFIAPI\r


@@ -35,7 +35,7 @@ ResetCold (
 }\r
 \r
 /**\r
 }\r
 \r
 /**\r

-  This function causes a system-wide initialization (warm reset), in which all processors \r
+  This function causes a system-wide initialization (warm reset), in which all processors\r

   are set to their initial state. Pending cycles are not corrupted.\r
 \r
   If this function returns, it means that the system does not support warm reset.\r
   are set to their initial state. Pending cycles are not corrupted.\r
 \r
   If this function returns, it means that the system does not support warm reset.\r


@@ -50,7 +50,7 @@ ResetWarm (
 }\r
 \r
 /**\r
 }\r
 \r
 /**\r

-  This function causes the system to enter a power state equivalent \r
+  This function causes the system to enter a power state equivalent\r

   to the ACPI G2/S5 or G3 states.\r
 \r
   If this function returns, it means that the system does not support shut down reset.\r
   to the ACPI G2/S5 or G3 states.\r
 \r
   If this function returns, it means that the system does not support shut down reset.\r

diff --git a/MdeModulePkg/Library/BaseSerialPortLib16550/BaseSerialPortLib16550.c b/MdeModulePkg/Library/BaseSerialPortLib16550/BaseSerialPortLib16550.c
index 6532c4d26d347966482f243877dd68bdc112c377..d1a94b67ebf892aeb140db473822738c59914d62 100644 (file)
--- a/MdeModulePkg/Library/BaseSerialPortLib16550/BaseSerialPortLib16550.c
+++ b/MdeModulePkg/Library/BaseSerialPortLib16550/BaseSerialPortLib16550.c
@@ -2,7 +2,7 @@
   16550 UART Serial Port library functions\r
 \r
   (C) Copyright 2014 Hewlett-Packard Development Company, L.P.<BR>\r
   16550 UART Serial Port library functions\r
 \r
   (C) Copyright 2014 Hewlett-Packard Development Company, L.P.<BR>\r

-  Copyright (c) 2006 - 2016, Intel Corporation. All rights reserved.<BR>\r
+  Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r

   Copyright (c) 2018, AMD Incorporated. All rights reserved.<BR>\r
 \r
   This program and the accompanying materials\r
   Copyright (c) 2018, AMD Incorporated. All rights reserved.<BR>\r
 \r
   This program and the accompanying materials\r


@@ -65,11 +65,11 @@ typedef struct {
 } PCI_UART_DEVICE_INFO;\r
 \r
 /**\r
 } PCI_UART_DEVICE_INFO;\r
 \r
 /**\r

-  Read an 8-bit 16550 register.  If PcdSerialUseMmio is TRUE, then the value is read from \r
+  Read an 8-bit 16550 register.  If PcdSerialUseMmio is TRUE, then the value is read from\r

   MMIO space.  If PcdSerialUseMmio is FALSE, then the value is read from I/O space.  The\r
   MMIO space.  If PcdSerialUseMmio is FALSE, then the value is read from I/O space.  The\r

-  parameter Offset is added to the base address of the 16550 registers that is specified \r
-  by PcdSerialRegisterBase. \r
-  \r
+  parameter Offset is added to the base address of the 16550 registers that is specified\r
+  by PcdSerialRegisterBase.\r
+\r

   @param  Base    The base address register of UART device.\r
   @param  Offset  The offset of the 16550 register to read.\r
 \r
   @param  Base    The base address register of UART device.\r
   @param  Offset  The offset of the 16550 register to read.\r
 \r


@@ -92,9 +92,9 @@ SerialPortReadRegister (
 /**\r
   Write an 8-bit 16550 register.  If PcdSerialUseMmio is TRUE, then the value is written to\r
   MMIO space.  If PcdSerialUseMmio is FALSE, then the value is written to I/O space.  The\r
 /**\r
   Write an 8-bit 16550 register.  If PcdSerialUseMmio is TRUE, then the value is written to\r
   MMIO space.  If PcdSerialUseMmio is FALSE, then the value is written to I/O space.  The\r

-  parameter Offset is added to the base address of the 16550 registers that is specified \r
-  by PcdSerialRegisterBase. \r
-  \r
+  parameter Offset is added to the base address of the 16550 registers that is specified\r
+  by PcdSerialRegisterBase.\r
+\r

   @param  Base    The base address register of UART device.\r
   @param  Offset  The offset of the 16550 register to write.\r
   @param  Value   The value to write to the 16550 register specified by Offset.\r
   @param  Base    The base address register of UART device.\r
   @param  Offset  The offset of the 16550 register to write.\r
   @param  Value   The value to write to the 16550 register specified by Offset.\r


@@ -117,11 +117,11 @@ SerialPortWriteRegister (
 }\r
 \r
 /**\r
 }\r
 \r
 /**\r

-  Update the value of an 16-bit PCI configuration register in a PCI device.  If the  \r
-  PCI Configuration register specified by PciAddress is already programmed with a \r
-  non-zero value, then return the current value.  Otherwise update the PCI configuration \r
+  Update the value of an 16-bit PCI configuration register in a PCI device.  If the\r
+  PCI Configuration register specified by PciAddress is already programmed with a\r
+  non-zero value, then return the current value.  Otherwise update the PCI configuration\r

   register specified by PciAddress with the value specified by Value and return the\r
   register specified by PciAddress with the value specified by Value and return the\r

-  value programmed into the PCI configuration register.  All values must be masked \r
+  value programmed into the PCI configuration register.  All values must be masked\r

   using the bitmask specified by Mask.\r
 \r
   @param  PciAddress  PCI Library address of the PCI Configuration register to update.\r
   using the bitmask specified by Mask.\r
 \r
   @param  PciAddress  PCI Library address of the PCI Configuration register to update.\r


@@ -137,7 +137,7 @@ SerialPortLibUpdatePciRegister16 (
   )\r
 {\r
   UINT16  CurrentValue;\r
   )\r
 {\r
   UINT16  CurrentValue;\r

-  \r
+\r

   CurrentValue = PciRead16 (PciAddress) & Mask;\r
   if (CurrentValue != 0) {\r
     return CurrentValue;\r
   CurrentValue = PciRead16 (PciAddress) & Mask;\r
   if (CurrentValue != 0) {\r
     return CurrentValue;\r


@@ -146,11 +146,11 @@ SerialPortLibUpdatePciRegister16 (
 }\r
 \r
 /**\r
 }\r
 \r
 /**\r

-  Update the value of an 32-bit PCI configuration register in a PCI device.  If the  \r
-  PCI Configuration register specified by PciAddress is already programmed with a \r
-  non-zero value, then return the current value.  Otherwise update the PCI configuration \r
+  Update the value of an 32-bit PCI configuration register in a PCI device.  If the\r
+  PCI Configuration register specified by PciAddress is already programmed with a\r
+  non-zero value, then return the current value.  Otherwise update the PCI configuration\r

   register specified by PciAddress with the value specified by Value and return the\r
   register specified by PciAddress with the value specified by Value and return the\r

-  value programmed into the PCI configuration register.  All values must be masked \r
+  value programmed into the PCI configuration register.  All values must be masked\r

   using the bitmask specified by Mask.\r
 \r
   @param  PciAddress  PCI Library address of the PCI Configuration register to update.\r
   using the bitmask specified by Mask.\r
 \r
   @param  PciAddress  PCI Library address of the PCI Configuration register to update.\r


@@ -168,7 +168,7 @@ SerialPortLibUpdatePciRegister32 (
   )\r
 {\r
   UINT32  CurrentValue;\r
   )\r
 {\r
   UINT32  CurrentValue;\r

-  \r
+\r

   CurrentValue = PciRead32 (PciAddress) & Mask;\r
   if (CurrentValue != 0) {\r
     return CurrentValue;\r
   CurrentValue = PciRead32 (PciAddress) & Mask;\r
   if (CurrentValue != 0) {\r
     return CurrentValue;\r


@@ -177,11 +177,11 @@ SerialPortLibUpdatePciRegister32 (
 }\r
 \r
 /**\r
 }\r
 \r
 /**\r

-  Retrieve the I/O or MMIO base address register for the PCI UART device. \r
-  \r
-  This function assumes Root Bus Numer is Zero, and enables I/O and MMIO in PCI UART \r
-  Device if they are not already enabled. \r
-  \r
+  Retrieve the I/O or MMIO base address register for the PCI UART device.\r
+\r
+  This function assumes Root Bus Numer is Zero, and enables I/O and MMIO in PCI UART\r
+  Device if they are not already enabled.\r
+\r

   @return  The base address register of the UART device.\r
 \r
 **/\r
   @return  The base address register of the UART device.\r
 \r
 **/\r


@@ -210,10 +210,10 @@ GetSerialRegisterBase (
   // Get PCI Device Info\r
   //\r
   DeviceInfo = (PCI_UART_DEVICE_INFO *) PcdGetPtr (PcdSerialPciDeviceInfo);\r
   // Get PCI Device Info\r
   //\r
   DeviceInfo = (PCI_UART_DEVICE_INFO *) PcdGetPtr (PcdSerialPciDeviceInfo);\r

-  \r
+\r

   //\r
   // If PCI Device Info is empty, then assume fixed address UART and return PcdSerialRegisterBase\r
   //\r
   // If PCI Device Info is empty, then assume fixed address UART and return PcdSerialRegisterBase\r

-  //  \r
+  //\r

   if (DeviceInfo->Device == 0xff) {\r
     return (UINTN)PcdGet64 (PcdSerialRegisterBase);\r
   }\r
   if (DeviceInfo->Device == 0xff) {\r
     return (UINTN)PcdGet64 (PcdSerialRegisterBase);\r
   }\r


@@ -225,17 +225,17 @@ GetSerialRegisterBase (
   ParentMemoryLimit = 0xfff00000 >> 16;\r
   ParentIoBase      = 0 >> 12;\r
   ParentIoLimit     = 0xf000 >> 12;\r
   ParentMemoryLimit = 0xfff00000 >> 16;\r
   ParentIoBase      = 0 >> 12;\r
   ParentIoLimit     = 0xf000 >> 12;\r

-  \r
+\r

   //\r
   // Enable I/O and MMIO in PCI Bridge\r
   //\r
   // Enable I/O and MMIO in PCI Bridge\r

-  // Assume Root Bus Numer is Zero. \r
+  // Assume Root Bus Numer is Zero.\r

   //\r
   for (BusNumber = 0; (DeviceInfo + 1)->Device != 0xff; DeviceInfo++) {\r
     //\r
     // Compute PCI Lib Address to PCI to PCI Bridge\r
     //\r
     PciLibAddress = PCI_LIB_ADDRESS (BusNumber, DeviceInfo->Device, DeviceInfo->Function, 0);\r
   //\r
   for (BusNumber = 0; (DeviceInfo + 1)->Device != 0xff; DeviceInfo++) {\r
     //\r
     // Compute PCI Lib Address to PCI to PCI Bridge\r
     //\r
     PciLibAddress = PCI_LIB_ADDRESS (BusNumber, DeviceInfo->Device, DeviceInfo->Function, 0);\r

-    \r
+\r

     //\r
     // Retrieve and verify the bus numbers in the PCI to PCI Bridge\r
     //\r
     //\r
     // Retrieve and verify the bus numbers in the PCI to PCI Bridge\r
     //\r


@@ -258,10 +258,10 @@ GetSerialRegisterBase (
       if (MemoryLimit < MemoryBase) {\r
         return 0;\r
       }\r
       if (MemoryLimit < MemoryBase) {\r
         return 0;\r
       }\r

-      \r
+\r

       //\r
       // If PCI Bridge MMIO window is not in the address range decoded by the parent PCI Bridge, then return 0\r
       //\r
       // If PCI Bridge MMIO window is not in the address range decoded by the parent PCI Bridge, then return 0\r

-      //  \r
+      //\r

       if (MemoryBase < ParentMemoryBase || MemoryBase > ParentMemoryLimit || MemoryLimit > ParentMemoryLimit) {\r
         return 0;\r
       }\r
       if (MemoryBase < ParentMemoryBase || MemoryBase > ParentMemoryLimit || MemoryLimit > ParentMemoryLimit) {\r
         return 0;\r
       }\r


@@ -280,17 +280,17 @@ GetSerialRegisterBase (
       } else {\r
         IoBase = (PciRead16 (PciLibAddress + OFFSET_OF (PCI_TYPE01, Bridge.IoBaseUpper16)) << 4) | (IoBase >> 4);\r
       }\r
       } else {\r
         IoBase = (PciRead16 (PciLibAddress + OFFSET_OF (PCI_TYPE01, Bridge.IoBaseUpper16)) << 4) | (IoBase >> 4);\r
       }\r

-      \r
+\r

       //\r
       // If PCI Bridge I/O window is disabled, then return 0\r
       //\r
       if (IoLimit < IoBase) {\r
         return 0;\r
       }\r
       //\r
       // If PCI Bridge I/O window is disabled, then return 0\r
       //\r
       if (IoLimit < IoBase) {\r
         return 0;\r
       }\r

-      \r
+\r

       //\r
       // If PCI Bridge I/O window is not in the address range decoded by the parent PCI Bridge, then return 0\r
       //\r
       // If PCI Bridge I/O window is not in the address range decoded by the parent PCI Bridge, then return 0\r

-      //  \r
+      //\r

       if (IoBase < ParentIoBase || IoBase > ParentIoLimit || IoLimit > ParentIoLimit) {\r
         return 0;\r
       }\r
       if (IoBase < ParentIoBase || IoBase > ParentIoLimit || IoLimit > ParentIoLimit) {\r
         return 0;\r
       }\r


@@ -303,7 +303,7 @@ GetSerialRegisterBase (
   // Compute PCI Lib Address to PCI UART\r
   //\r
   PciLibAddress = PCI_LIB_ADDRESS (BusNumber, DeviceInfo->Device, DeviceInfo->Function, 0);\r
   // Compute PCI Lib Address to PCI UART\r
   //\r
   PciLibAddress = PCI_LIB_ADDRESS (BusNumber, DeviceInfo->Device, DeviceInfo->Function, 0);\r

-  \r
+\r

   //\r
   // Find the first IO or MMIO BAR\r
   //\r
   //\r
   // Find the first IO or MMIO BAR\r
   //\r


@@ -336,16 +336,16 @@ GetSerialRegisterBase (
 \r
   //\r
   // Program UART BAR\r
 \r
   //\r
   // Program UART BAR\r

-  //  \r
+  //\r

   SerialRegisterBase = SerialPortLibUpdatePciRegister32 (\r
                          PciLibAddress + PCI_BASE_ADDRESSREG_OFFSET + BarIndex * 4,\r
   SerialRegisterBase = SerialPortLibUpdatePciRegister32 (\r
                          PciLibAddress + PCI_BASE_ADDRESSREG_OFFSET + BarIndex * 4,\r

-                         (UINT32)PcdGet64 (PcdSerialRegisterBase), \r
+                         (UINT32)PcdGet64 (PcdSerialRegisterBase),\r

                          RegisterBaseMask\r
                          );\r
 \r
   //\r
   // Verify that the UART BAR is in the address range decoded by the parent PCI Bridge\r
                          RegisterBaseMask\r
                          );\r
 \r
   //\r
   // Verify that the UART BAR is in the address range decoded by the parent PCI Bridge\r

-  //  \r
+  //\r

   if (PcdGetBool (PcdSerialUseMmio)) {\r
     if (((SerialRegisterBase >> 16) & 0xfff0) < ParentMemoryBase || ((SerialRegisterBase >> 16) & 0xfff0) > ParentMemoryLimit) {\r
       return 0;\r
   if (PcdGetBool (PcdSerialUseMmio)) {\r
     if (((SerialRegisterBase >> 16) & 0xfff0) < ParentMemoryBase || ((SerialRegisterBase >> 16) & 0xfff0) > ParentMemoryLimit) {\r
       return 0;\r


@@ -355,7 +355,7 @@ GetSerialRegisterBase (
       return 0;\r
     }\r
   }\r
       return 0;\r
     }\r
   }\r

-  \r
+\r

   //\r
   // Enable I/O and MMIO in PCI UART Device if they are not already enabled\r
   //\r
   //\r
   // Enable I/O and MMIO in PCI UART Device if they are not already enabled\r
   //\r


@@ -376,7 +376,7 @@ GetSerialRegisterBase (
       SerialPortWriteRegister (SerialRegisterBase, R_UART_FCR, (UINT8)(PcdGet8 (PcdSerialFifoControl) & (B_UART_FCR_FIFOE | B_UART_FCR_FIFO64)));\r
     }\r
   }\r
       SerialPortWriteRegister (SerialRegisterBase, R_UART_FCR, (UINT8)(PcdGet8 (PcdSerialFifoControl) & (B_UART_FCR_FIFOE | B_UART_FCR_FIFO64)));\r
     }\r
   }\r

-  \r
+\r

   //\r
   // Get PCI Device Info\r
   //\r
   //\r
   // Get PCI Device Info\r
   //\r


@@ -384,22 +384,22 @@ GetSerialRegisterBase (
 \r
   //\r
   // Enable I/O or MMIO in PCI Bridge\r
 \r
   //\r
   // Enable I/O or MMIO in PCI Bridge\r

-  // Assume Root Bus Numer is Zero. \r
+  // Assume Root Bus Numer is Zero.\r

   //\r
   for (BusNumber = 0; (DeviceInfo + 1)->Device != 0xff; DeviceInfo++) {\r
     //\r
     // Compute PCI Lib Address to PCI to PCI Bridge\r
     //\r
     PciLibAddress = PCI_LIB_ADDRESS (BusNumber, DeviceInfo->Device, DeviceInfo->Function, 0);\r
   //\r
   for (BusNumber = 0; (DeviceInfo + 1)->Device != 0xff; DeviceInfo++) {\r
     //\r
     // Compute PCI Lib Address to PCI to PCI Bridge\r
     //\r
     PciLibAddress = PCI_LIB_ADDRESS (BusNumber, DeviceInfo->Device, DeviceInfo->Function, 0);\r

-    \r
+\r

     //\r
     // Enable the I/O or MMIO decode windows in the PCI to PCI Bridge\r
     //\r
     PciOr16 (\r
     //\r
     // Enable the I/O or MMIO decode windows in the PCI to PCI Bridge\r
     //\r
     PciOr16 (\r

-      PciLibAddress + PCI_COMMAND_OFFSET, \r
+      PciLibAddress + PCI_COMMAND_OFFSET,\r

       PcdGetBool (PcdSerialUseMmio) ? EFI_PCI_COMMAND_MEMORY_SPACE : EFI_PCI_COMMAND_IO_SPACE\r
       );\r
       PcdGetBool (PcdSerialUseMmio) ? EFI_PCI_COMMAND_MEMORY_SPACE : EFI_PCI_COMMAND_IO_SPACE\r
       );\r

-      \r
+\r

     //\r
     // Force D0 state if a Power Management and Status Register is specified\r
     //\r
     //\r
     // Force D0 state if a Power Management and Status Register is specified\r
     //\r


@@ -408,10 +408,10 @@ GetSerialRegisterBase (
         PciAnd16 (PciLibAddress + DeviceInfo->PowerManagementStatusAndControlRegister, (UINT16)~(BIT0 | BIT1));\r
       }\r
     }\r
         PciAnd16 (PciLibAddress + DeviceInfo->PowerManagementStatusAndControlRegister, (UINT16)~(BIT0 | BIT1));\r
       }\r
     }\r

-      \r
+\r

     BusNumber = PciRead8 (PciLibAddress + PCI_BRIDGE_SECONDARY_BUS_REGISTER_OFFSET);\r
   }\r
     BusNumber = PciRead8 (PciLibAddress + PCI_BRIDGE_SECONDARY_BUS_REGISTER_OFFSET);\r
   }\r

-  \r
+\r

   return SerialRegisterBase;\r
 }\r
 \r
   return SerialRegisterBase;\r
 }\r
 \r


@@ -445,7 +445,7 @@ SerialPortWritable (
       return (BOOLEAN) ((SerialPortReadRegister (SerialRegisterBase, R_UART_MSR) & (B_UART_MSR_DSR | B_UART_MSR_CTS)) == (B_UART_MSR_DSR | B_UART_MSR_CTS));\r
     } else {\r
       //\r
       return (BOOLEAN) ((SerialPortReadRegister (SerialRegisterBase, R_UART_MSR) & (B_UART_MSR_DSR | B_UART_MSR_CTS)) == (B_UART_MSR_DSR | B_UART_MSR_CTS));\r
     } else {\r
       //\r

-      // Wait for both DSR and CTS to be set OR for DSR to be clear.  \r
+      // Wait for both DSR and CTS to be set OR for DSR to be clear.\r

       //   DSR is set if a cable is connected.\r
       //   CTS is set if it is ok to transmit data\r
       //\r
       //   DSR is set if a cable is connected.\r
       //   CTS is set if it is ok to transmit data\r
       //\r


@@ -465,11 +465,11 @@ SerialPortWritable (
 \r
 /**\r
   Initialize the serial device hardware.\r
 \r
 /**\r
   Initialize the serial device hardware.\r

-  \r
+\r

   If no initialization is required, then return RETURN_SUCCESS.\r
   If the serial device was successfully initialized, then return RETURN_SUCCESS.\r
   If the serial device could not be initialized, then return RETURN_DEVICE_ERROR.\r
   If no initialization is required, then return RETURN_SUCCESS.\r
   If the serial device was successfully initialized, then return RETURN_SUCCESS.\r
   If the serial device could not be initialized, then return RETURN_DEVICE_ERROR.\r

-  \r
+\r

   @retval RETURN_SUCCESS        The serial device was initialized.\r
   @retval RETURN_DEVICE_ERROR   The serial device could not be initialized.\r
 \r
   @retval RETURN_SUCCESS        The serial device was initialized.\r
   @retval RETURN_DEVICE_ERROR   The serial device could not be initialized.\r
 \r


@@ -483,7 +483,7 @@ SerialPortInitialize (
   RETURN_STATUS  Status;\r
   UINTN          SerialRegisterBase;\r
   UINT32         Divisor;\r
   RETURN_STATUS  Status;\r
   UINTN          SerialRegisterBase;\r
   UINT32         Divisor;\r

-  UINT32         CurrentDivisor;  \r
+  UINT32         CurrentDivisor;\r

   BOOLEAN        Initialized;\r
 \r
   //\r
   BOOLEAN        Initialized;\r
 \r
   //\r


@@ -535,7 +535,7 @@ SerialPortInitialize (
   // Verify that both the transmit FIFO and the shift register are empty.\r
   //\r
   while ((SerialPortReadRegister (SerialRegisterBase, R_UART_LSR) & (B_UART_LSR_TEMT | B_UART_LSR_TXRDY)) != (B_UART_LSR_TEMT | B_UART_LSR_TXRDY));\r
   // Verify that both the transmit FIFO and the shift register are empty.\r
   //\r
   while ((SerialPortReadRegister (SerialRegisterBase, R_UART_LSR) & (B_UART_LSR_TEMT | B_UART_LSR_TXRDY)) != (B_UART_LSR_TEMT | B_UART_LSR_TXRDY));\r

-  \r
+\r

   //\r
   // Configure baud rate\r
   //\r
   //\r
   // Configure baud rate\r
   //\r


@@ -563,20 +563,20 @@ SerialPortInitialize (
 \r
   //\r
   // Put Modem Control Register(MCR) into its reset state of 0x00.\r
 \r
   //\r
   // Put Modem Control Register(MCR) into its reset state of 0x00.\r

-  //  \r
+  //\r

   SerialPortWriteRegister (SerialRegisterBase, R_UART_MCR, 0x00);\r
 \r
   return RETURN_SUCCESS;\r
 }\r
 \r
 /**\r
   SerialPortWriteRegister (SerialRegisterBase, R_UART_MCR, 0x00);\r
 \r
   return RETURN_SUCCESS;\r
 }\r
 \r
 /**\r

-  Write data from buffer to serial device. \r
+  Write data from buffer to serial device.\r

 \r
 \r

-  Writes NumberOfBytes data bytes from Buffer to the serial device.  \r
+  Writes NumberOfBytes data bytes from Buffer to the serial device.\r

   The number of bytes actually written to the serial device is returned.\r
   If the return value is less than NumberOfBytes, then the write operation failed.\r
 \r
   The number of bytes actually written to the serial device is returned.\r
   If the return value is less than NumberOfBytes, then the write operation failed.\r
 \r

-  If Buffer is NULL, then ASSERT(). \r
+  If Buffer is NULL, then ASSERT().\r

 \r
   If NumberOfBytes is zero, then return 0.\r
 \r
 \r
   If NumberOfBytes is zero, then return 0.\r
 \r


@@ -584,7 +584,7 @@ SerialPortInitialize (
   @param  NumberOfBytes    Number of bytes to written to the serial device.\r
 \r
   @retval 0                NumberOfBytes is 0.\r
   @param  NumberOfBytes    Number of bytes to written to the serial device.\r
 \r
   @retval 0                NumberOfBytes is 0.\r

-  @retval >0               The number of bytes written to the serial device.  \r
+  @retval >0               The number of bytes written to the serial device.\r

                            If this value is less than NumberOfBytes, then the write operation failed.\r
 \r
 **/\r
                            If this value is less than NumberOfBytes, then the write operation failed.\r
 \r
 **/\r


@@ -608,7 +608,7 @@ SerialPortWrite (
   if (SerialRegisterBase ==0) {\r
     return 0;\r
   }\r
   if (SerialRegisterBase ==0) {\r
     return 0;\r
   }\r

-  \r
+\r

   if (NumberOfBytes == 0) {\r
     //\r
     // Flush the hardware\r
   if (NumberOfBytes == 0) {\r
     //\r
     // Flush the hardware\r


@@ -671,7 +671,7 @@ SerialPortWrite (
   @param  NumberOfBytes    Number of bytes to read from the serial device.\r
 \r
   @retval 0                NumberOfBytes is 0.\r
   @param  NumberOfBytes    Number of bytes to read from the serial device.\r
 \r
   @retval 0                NumberOfBytes is 0.\r

-  @retval >0               The number of bytes read from the serial device.  \r
+  @retval >0               The number of bytes read from the serial device.\r

                            If this value is less than NumberOfBytes, then the read operation failed.\r
 \r
 **/\r
                            If this value is less than NumberOfBytes, then the read operation failed.\r
 \r
 **/\r


@@ -696,7 +696,7 @@ SerialPortRead (
   }\r
 \r
   Mcr = (UINT8)(SerialPortReadRegister (SerialRegisterBase, R_UART_MCR) & ~B_UART_MCR_RTS);\r
   }\r
 \r
   Mcr = (UINT8)(SerialPortReadRegister (SerialRegisterBase, R_UART_MCR) & ~B_UART_MCR_RTS);\r

-  \r
+\r

   for (Result = 0; NumberOfBytes-- != 0; Result++, Buffer++) {\r
     //\r
     // Wait for the serial port to have some data.\r
   for (Result = 0; NumberOfBytes-- != 0; Result++, Buffer++) {\r
     //\r
     // Wait for the serial port to have some data.\r


@@ -715,13 +715,13 @@ SerialPortRead (
       //\r
       SerialPortWriteRegister (SerialRegisterBase, R_UART_MCR, Mcr);\r
     }\r
       //\r
       SerialPortWriteRegister (SerialRegisterBase, R_UART_MCR, Mcr);\r
     }\r

-    \r
+\r

     //\r
     // Read byte from the receive buffer.\r
     //\r
     *Buffer = SerialPortReadRegister (SerialRegisterBase, R_UART_RXBUF);\r
   }\r
     //\r
     // Read byte from the receive buffer.\r
     //\r
     *Buffer = SerialPortReadRegister (SerialRegisterBase, R_UART_RXBUF);\r
   }\r

-  \r
+\r

   return Result;\r
 }\r
 \r
   return Result;\r
 }\r
 \r


@@ -744,7 +744,7 @@ SerialPortPoll (
   )\r
 {\r
   UINTN  SerialRegisterBase;\r
   )\r
 {\r
   UINTN  SerialRegisterBase;\r

-  \r
+\r

   SerialRegisterBase = GetSerialRegisterBase ();\r
   if (SerialRegisterBase ==0) {\r
     return FALSE;\r
   SerialRegisterBase = GetSerialRegisterBase ();\r
   if (SerialRegisterBase ==0) {\r
     return FALSE;\r


@@ -761,15 +761,15 @@ SerialPortPoll (
       SerialPortWriteRegister (SerialRegisterBase, R_UART_MCR, (UINT8)(SerialPortReadRegister (SerialRegisterBase, R_UART_MCR) & ~B_UART_MCR_RTS));\r
     }\r
     return TRUE;\r
       SerialPortWriteRegister (SerialRegisterBase, R_UART_MCR, (UINT8)(SerialPortReadRegister (SerialRegisterBase, R_UART_MCR) & ~B_UART_MCR_RTS));\r
     }\r
     return TRUE;\r

-  }    \r
-  \r
+  }\r
+\r

   if (PcdGetBool (PcdSerialUseHardwareFlowControl)) {\r
     //\r
     // Set RTS to let the peer send some data\r
     //\r
     SerialPortWriteRegister (SerialRegisterBase, R_UART_MCR, (UINT8)(SerialPortReadRegister (SerialRegisterBase, R_UART_MCR) | B_UART_MCR_RTS));\r
   }\r
   if (PcdGetBool (PcdSerialUseHardwareFlowControl)) {\r
     //\r
     // Set RTS to let the peer send some data\r
     //\r
     SerialPortWriteRegister (SerialRegisterBase, R_UART_MCR, (UINT8)(SerialPortReadRegister (SerialRegisterBase, R_UART_MCR) | B_UART_MCR_RTS));\r
   }\r

-  \r
+\r

   return FALSE;\r
 }\r
 \r
   return FALSE;\r
 }\r
 \r

diff --git a/MdeModulePkg/Library/BaseSerialPortLib16550/BaseSerialPortLib16550.inf b/MdeModulePkg/Library/BaseSerialPortLib16550/BaseSerialPortLib16550.inf
index bb42f89676de484f751817772bfa5b1835364870..64606b117f23b11c93354e72f9fc0493801b734b 100644 (file)
--- a/MdeModulePkg/Library/BaseSerialPortLib16550/BaseSerialPortLib16550.inf
+++ b/MdeModulePkg/Library/BaseSerialPortLib16550/BaseSerialPortLib16550.inf
@@ -1,7 +1,7 @@
 ## @file\r
 #  SerialPortLib instance for 16550 UART.\r
 #\r
 ## @file\r
 #  SerialPortLib instance for 16550 UART.\r
 #\r

-#  Copyright (c) 2006 - 2015, Intel Corporation. All rights reserved.<BR>\r
+#  Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r

 #  This program and the accompanying materials\r
 #  are licensed and made available under the terms and conditions of the BSD License\r
 #  which accompanies this distribution.  The full text of the license may be found at\r
 #  This program and the accompanying materials\r
 #  are licensed and made available under the terms and conditions of the BSD License\r
 #  which accompanies this distribution.  The full text of the license may be found at\r


@@ -33,7 +33,7 @@
 \r
 [Sources]\r
   BaseSerialPortLib16550.c\r
 \r
 [Sources]\r
   BaseSerialPortLib16550.c\r

-  \r
+\r

 [Pcd]\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdSerialUseMmio                 ## CONSUMES\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdSerialUseHardwareFlowControl  ## CONSUMES\r
 [Pcd]\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdSerialUseMmio                 ## CONSUMES\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdSerialUseHardwareFlowControl  ## CONSUMES\r

diff --git a/MdeModulePkg/Library/BaseSerialPortLib16550/BaseSerialPortLib16550.uni b/MdeModulePkg/Library/BaseSerialPortLib16550/BaseSerialPortLib16550.uni
index 04d88b37f30adb873056024f4695e11ccad6fc42..110a2e392168787dae2629c62e888a7ae8c2c207 100644 (file)
--- a/MdeModulePkg/Library/BaseSerialPortLib16550/BaseSerialPortLib16550.uni
+++ b/MdeModulePkg/Library/BaseSerialPortLib16550/BaseSerialPortLib16550.uni
@@ -3,13 +3,13 @@
 //\r
 // SerialPortLib instance for 16550 UART.\r
 //\r
 //\r
 // SerialPortLib instance for 16550 UART.\r
 //\r

-// Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.<BR>\r
+// Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r

 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r
 // which accompanies this distribution.  The full text of the license may be found at\r
 // http://opensource.org/licenses/bsd-license.php\r
 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r
 // which accompanies this distribution.  The full text of the license may be found at\r
 // http://opensource.org/licenses/bsd-license.php\r

-// \r
+//\r

 // THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 // WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 //\r
 // THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 // WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 //\r

diff --git a/MdeModulePkg/Library/BootLogoLib/BootLogoLib.c b/MdeModulePkg/Library/BootLogoLib/BootLogoLib.c
index e14c097510436f4ce1ff3e963eaa14f8b4931976..3293e9e03c7ac68fe7870dd489b3d87f7a7fc8bd 100644 (file)
--- a/MdeModulePkg/Library/BootLogoLib/BootLogoLib.c
+++ b/MdeModulePkg/Library/BootLogoLib/BootLogoLib.c
@@ -2,7 +2,7 @@
   This library is only intended to be used by PlatformBootManagerLib\r
   to show progress bar and LOGO.\r
 \r
   This library is only intended to be used by PlatformBootManagerLib\r
   to show progress bar and LOGO.\r
 \r

-Copyright (c) 2011 - 2016, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2011 - 2018, Intel Corporation. All rights reserved.<BR>\r

 Copyright (c) 2016, Microsoft Corporation<BR>\r
 This program and the accompanying materials are licensed and made available under\r
 the terms and conditions of the BSD License that accompanies this distribution.\r
 Copyright (c) 2016, Microsoft Corporation<BR>\r
 This program and the accompanying materials are licensed and made available under\r
 the terms and conditions of the BSD License that accompanies this distribution.\r


@@ -292,7 +292,7 @@ BootLogoEnableLogo (
     Status = EFI_SUCCESS;\r
   } else {\r
     //\r
     Status = EFI_SUCCESS;\r
   } else {\r
     //\r

-    // More than one Logo displayed, get merged BltBuffer using VideoToBuffer operation. \r
+    // More than one Logo displayed, get merged BltBuffer using VideoToBuffer operation.\r

     //\r
     if (Blt != NULL) {\r
       FreePool (Blt);\r
     //\r
     if (Blt != NULL) {\r
       FreePool (Blt);\r


@@ -366,7 +366,7 @@ BootLogoEnableLogo (
 }\r
 \r
 /**\r
 }\r
 \r
 /**\r

-  Use SystemTable Conout to turn on video based Simple Text Out consoles. The \r
+  Use SystemTable Conout to turn on video based Simple Text Out consoles. The\r

   Simple Text Out screens will now be synced up with all non video output devices\r
 \r
   @retval EFI_SUCCESS     UGA devices are back in text mode and synced up.\r
   Simple Text Out screens will now be synced up with all non video output devices\r
 \r
   @retval EFI_SUCCESS     UGA devices are back in text mode and synced up.\r

diff --git a/MdeModulePkg/Library/BootLogoLib/BootLogoLib.inf b/MdeModulePkg/Library/BootLogoLib/BootLogoLib.inf
index 47969cc05a02fada4275c6d120e5295598788170..a2afc9e089c3f09ce4f89db56a1147e341b95c17 100644 (file)
--- a/MdeModulePkg/Library/BootLogoLib/BootLogoLib.inf
+++ b/MdeModulePkg/Library/BootLogoLib/BootLogoLib.inf
@@ -1,17 +1,17 @@
 ## @file\r
 #  This library is only intended to be used by PlatformBootManagerLib\r
 #  to show progress bar and logo.\r
 ## @file\r
 #  This library is only intended to be used by PlatformBootManagerLib\r
 #  to show progress bar and logo.\r

-#  \r
-#  Copyright (c) 2011 - 2016, Intel Corporation. All rights reserved.<BR>\r
+#\r
+#  Copyright (c) 2011 - 2018, Intel Corporation. All rights reserved.<BR>\r

 #  Copyright (c) 2016, Microsoft Corporation<BR>\r
 #  This program and the accompanying materials are licensed and made available under\r
 #  the terms and conditions of the BSD License that accompanies this distribution.\r
 #  The full text of the license may be found at\r
 #  http://opensource.org/licenses/bsd-license.php.\r
 #  Copyright (c) 2016, Microsoft Corporation<BR>\r
 #  This program and the accompanying materials are licensed and made available under\r
 #  the terms and conditions of the BSD License that accompanies this distribution.\r
 #  The full text of the license may be found at\r
 #  http://opensource.org/licenses/bsd-license.php.\r

-#  \r
+#\r

 #  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 #  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 #  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 #  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r

-#  \r
+#\r

 ##\r
 \r
 [Defines]\r
 ##\r
 \r
 [Defines]\r


@@ -31,7 +31,7 @@
 \r
 [Sources]\r
   BootLogoLib.c\r
 \r
 [Sources]\r
   BootLogoLib.c\r

-  \r
+\r

 [Packages]\r
   MdePkg/MdePkg.dec\r
   MdeModulePkg/MdeModulePkg.dec\r
 [Packages]\r
   MdePkg/MdePkg.dec\r
   MdeModulePkg/MdeModulePkg.dec\r


@@ -49,7 +49,7 @@
 [Protocols]\r
   gEfiGraphicsOutputProtocolGuid                ## SOMETIMES_CONSUMES\r
   gEfiUgaDrawProtocolGuid |PcdUgaConsumeSupport ## SOMETIMES_CONSUMES\r
 [Protocols]\r
   gEfiGraphicsOutputProtocolGuid                ## SOMETIMES_CONSUMES\r
   gEfiUgaDrawProtocolGuid |PcdUgaConsumeSupport ## SOMETIMES_CONSUMES\r

-  gEfiBootLogoProtocolGuid                      ## SOMETIMES_CONSUMES  \r
+  gEfiBootLogoProtocolGuid                      ## SOMETIMES_CONSUMES\r

   gEdkiiBootLogo2ProtocolGuid                   ## SOMETIMES_CONSUMES\r
   gEfiUserManagerProtocolGuid                   ## CONSUMES\r
   gEdkiiPlatformLogoProtocolGuid                ## CONSUMES\r
   gEdkiiBootLogo2ProtocolGuid                   ## SOMETIMES_CONSUMES\r
   gEfiUserManagerProtocolGuid                   ## CONSUMES\r
   gEdkiiPlatformLogoProtocolGuid                ## CONSUMES\r

diff --git a/MdeModulePkg/Library/BootMaintenanceManagerUiLib/BmLib.c b/MdeModulePkg/Library/BootMaintenanceManagerUiLib/BmLib.c
index 0ef9bf09345e779676821ce65ad6c5a91c299744..a12cf77dd562efb2e3b0f97da9c4fa716d9ec0fa 100644 (file)
--- a/MdeModulePkg/Library/BootMaintenanceManagerUiLib/BmLib.c
+++ b/MdeModulePkg/Library/BootMaintenanceManagerUiLib/BmLib.c
@@ -1,7 +1,7 @@
 /** @file\r
 Utility routines used by boot maintenance modules.\r
 \r
 /** @file\r
 Utility routines used by boot maintenance modules.\r
 \r

-Copyright (c) 2004 - 2015, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2004 - 2018, Intel Corporation. All rights reserved.<BR>\r

 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r


@@ -70,7 +70,7 @@ EfiDevicePathInstanceCount (
 }\r
 \r
 /**\r
 }\r
 \r
 /**\r

-  Get a string from the Data Hub record based on \r
+  Get a string from the Data Hub record based on\r

   a device path.\r
 \r
   @param DevPath         The device Path.\r
   a device path.\r
 \r
   @param DevPath         The device Path.\r

diff --git a/MdeModulePkg/Library/BootMaintenanceManagerUiLib/BootMaintenance.c b/MdeModulePkg/Library/BootMaintenanceManagerUiLib/BootMaintenance.c
index fdcb56a9df2b5d7012767eef22c980f12d6d31dc..b4f4dff98d85f0e08b5d8b37a88aeec9f6d613ea 100644 (file)
--- a/MdeModulePkg/Library/BootMaintenanceManagerUiLib/BootMaintenance.c
+++ b/MdeModulePkg/Library/BootMaintenanceManagerUiLib/BootMaintenance.c
@@ -1,7 +1,7 @@
 /** @file\r
 The functions for Boot Maintainence Main menu.\r
 \r
 /** @file\r
 The functions for Boot Maintainence Main menu.\r
 \r

-Copyright (c) 2004 - 2017, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2004 - 2018, Intel Corporation. All rights reserved.<BR>\r

 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r


@@ -61,7 +61,7 @@ HII_VENDOR_DEVICE_PATH  mBmmHiiVendorDevicePath = {
   {\r
     END_DEVICE_PATH_TYPE,\r
     END_ENTIRE_DEVICE_PATH_SUBTYPE,\r
   {\r
     END_DEVICE_PATH_TYPE,\r
     END_ENTIRE_DEVICE_PATH_SUBTYPE,\r

-    { \r
+    {\r

       (UINT8) (END_DEVICE_PATH_LENGTH),\r
       (UINT8) ((END_DEVICE_PATH_LENGTH) >> 8)\r
     }\r
       (UINT8) (END_DEVICE_PATH_LENGTH),\r
       (UINT8) ((END_DEVICE_PATH_LENGTH) >> 8)\r
     }\r


@@ -118,9 +118,9 @@ CustomizeMenus (
 \r
 /**\r
   This function will change video resolution and text mode\r
 \r
 /**\r
   This function will change video resolution and text mode\r

-  according to defined setup mode or defined boot mode  \r
+  according to defined setup mode or defined boot mode\r

 \r
 \r

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

 \r
   @retval  EFI_SUCCESS  Mode is changed successfully.\r
   @retval  Others       Mode failed to be changed.\r
 \r
   @retval  EFI_SUCCESS  Mode is changed successfully.\r
   @retval  Others       Mode failed to be changed.\r


@@ -147,13 +147,13 @@ BmmSetConsoleMode (
   EFI_STATUS                            Status;\r
   UINTN                                 Index;\r
   UINTN                                 CurrentColumn;\r
   EFI_STATUS                            Status;\r
   UINTN                                 Index;\r
   UINTN                                 CurrentColumn;\r

-  UINTN                                 CurrentRow;  \r
+  UINTN                                 CurrentRow;\r

 \r
   MaxGopMode  = 0;\r
   MaxTextMode = 0;\r
 \r
   //\r
 \r
   MaxGopMode  = 0;\r
   MaxTextMode = 0;\r
 \r
   //\r

-  // Get current video resolution and text mode \r
+  // Get current video resolution and text mode\r

   //\r
   Status = gBS->HandleProtocol (\r
                   gST->ConsoleOutHandle,\r
   //\r
   Status = gBS->HandleProtocol (\r
                   gST->ConsoleOutHandle,\r


@@ -171,7 +171,7 @@ BmmSetConsoleMode (
                   );\r
   if (EFI_ERROR (Status)) {\r
     SimpleTextOut = NULL;\r
                   );\r
   if (EFI_ERROR (Status)) {\r
     SimpleTextOut = NULL;\r

-  }  \r
+  }\r

 \r
   if ((GraphicsOutput == NULL) || (SimpleTextOut == NULL)) {\r
     return EFI_UNSUPPORTED;\r
 \r
   if ((GraphicsOutput == NULL) || (SimpleTextOut == NULL)) {\r
     return EFI_UNSUPPORTED;\r


@@ -192,12 +192,12 @@ BmmSetConsoleMode (
     NewHorizontalResolution = mBmmBootHorizontalResolution;\r
     NewVerticalResolution   = mBmmBootVerticalResolution;\r
     NewColumns              = mBmmBootTextModeColumn;\r
     NewHorizontalResolution = mBmmBootHorizontalResolution;\r
     NewVerticalResolution   = mBmmBootVerticalResolution;\r
     NewColumns              = mBmmBootTextModeColumn;\r

-    NewRows                 = mBmmBootTextModeRow;   \r
+    NewRows                 = mBmmBootTextModeRow;\r

   }\r
 \r
   if (GraphicsOutput != NULL) {\r
     MaxGopMode  = GraphicsOutput->Mode->MaxMode;\r
   }\r
 \r
   if (GraphicsOutput != NULL) {\r
     MaxGopMode  = GraphicsOutput->Mode->MaxMode;\r

-  } \r
+  }\r

 \r
   if (SimpleTextOut != NULL) {\r
     MaxTextMode = SimpleTextOut->Mode->MaxMode;\r
 \r
   if (SimpleTextOut != NULL) {\r
     MaxTextMode = SimpleTextOut->Mode->MaxMode;\r


@@ -743,7 +743,7 @@ BootMaintExtractConfig (
 \r
   @param[in]  This                Points to the EFI_HII_CONFIG_ACCESS_PROTOCOL.\r
   @param[in]  Configuration       A null-terminated Unicode string in\r
 \r
   @param[in]  This                Points to the EFI_HII_CONFIG_ACCESS_PROTOCOL.\r
   @param[in]  Configuration       A null-terminated Unicode string in\r

-                                  <ConfigString> format.   \r
+                                  <ConfigString> format.\r

   @param[out] Progress            A pointer to a string filled in with the\r
                                   offset of the most recent '&' before the\r
                                   first failing name / value pair (or the\r
   @param[out] Progress            A pointer to a string filled in with the\r
                                   offset of the most recent '&' before the\r
                                   first failing name / value pair (or the\r


@@ -753,7 +753,7 @@ BootMaintExtractConfig (
                                   successful.\r
 \r
   @retval EFI_SUCCESS             The results have been distributed or are\r
                                   successful.\r
 \r
   @retval EFI_SUCCESS             The results have been distributed or are\r

-                                  awaiting distribution.  \r
+                                  awaiting distribution.\r

   @retval EFI_OUT_OF_RESOURCES    Not enough memory to store the\r
                                   parts of the results that must be\r
                                   stored awaiting possible future\r
   @retval EFI_OUT_OF_RESOURCES    Not enough memory to store the\r
                                   parts of the results that must be\r
                                   stored awaiting possible future\r


@@ -802,15 +802,15 @@ BootMaintRouteConfig (
   }\r
 \r
   Status = gBS->LocateProtocol (\r
   }\r
 \r
   Status = gBS->LocateProtocol (\r

-                  &gEfiHiiConfigRoutingProtocolGuid, \r
-                  NULL, \r
+                  &gEfiHiiConfigRoutingProtocolGuid,\r
+                  NULL,\r

                   (VOID **)&ConfigRouting\r
                   );\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
 \r
                   (VOID **)&ConfigRouting\r
                   );\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
 \r

-  Private = BMM_CALLBACK_DATA_FROM_THIS (This);  \r
+  Private = BMM_CALLBACK_DATA_FROM_THIS (This);\r

   //\r
   // Get Buffer Storage data from EFI variable\r
   //\r
   //\r
   // Get Buffer Storage data from EFI variable\r
   //\r


@@ -828,15 +828,15 @@ BootMaintRouteConfig (
                             &BufferSize,\r
                             Progress\r
                             );\r
                             &BufferSize,\r
                             Progress\r
                             );\r

-  ASSERT_EFI_ERROR (Status);    \r
+  ASSERT_EFI_ERROR (Status);\r

   //\r
   //\r

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

   // avoid setting unnecessary non-volatile variable\r
   //\r
 \r
   //\r
   // Check data which located in BMM main page and save the settings if need\r
   // avoid setting unnecessary non-volatile variable\r
   //\r
 \r
   //\r
   // Check data which located in BMM main page and save the settings if need\r

-  //         \r
+  //\r

   if (CompareMem (&NewBmmData->BootNext, &OldBmmData->BootNext, sizeof (NewBmmData->BootNext)) != 0) {\r
     Status = Var_UpdateBootNext (Private);\r
     if (EFI_ERROR (Status)) {\r
   if (CompareMem (&NewBmmData->BootNext, &OldBmmData->BootNext, sizeof (NewBmmData->BootNext)) != 0) {\r
     Status = Var_UpdateBootNext (Private);\r
     if (EFI_ERROR (Status)) {\r


@@ -847,10 +847,10 @@ BootMaintRouteConfig (
 \r
   //\r
   // Check data which located in Boot Options Menu and save the settings if need\r
 \r
   //\r
   // Check data which located in Boot Options Menu and save the settings if need\r

-  //      \r
-  if (CompareMem (NewBmmData->BootOptionDel, OldBmmData->BootOptionDel, sizeof (NewBmmData->BootOptionDel)) != 0) {  \r
-    for (Index = 0; \r
-         ((Index < BootOptionMenu.MenuNumber) && (Index < (sizeof (NewBmmData->BootOptionDel) / sizeof (NewBmmData->BootOptionDel[0])))); \r
+  //\r
+  if (CompareMem (NewBmmData->BootOptionDel, OldBmmData->BootOptionDel, sizeof (NewBmmData->BootOptionDel)) != 0) {\r
+    for (Index = 0;\r
+         ((Index < BootOptionMenu.MenuNumber) && (Index < (sizeof (NewBmmData->BootOptionDel) / sizeof (NewBmmData->BootOptionDel[0]))));\r

          Index ++) {\r
       NewMenuEntry            = BOpt_GetMenuEntry (&BootOptionMenu, Index);\r
       NewLoadContext          = (BM_LOAD_CONTEXT *) NewMenuEntry->VariableContext;\r
          Index ++) {\r
       NewMenuEntry            = BOpt_GetMenuEntry (&BootOptionMenu, Index);\r
       NewLoadContext          = (BM_LOAD_CONTEXT *) NewMenuEntry->VariableContext;\r


@@ -891,10 +891,10 @@ BootMaintRouteConfig (
 \r
   //\r
   // Check data which located in Driver Options Menu and save the settings if need\r
 \r
   //\r
   // Check data which located in Driver Options Menu and save the settings if need\r

-  //              \r
-  if (CompareMem (NewBmmData->DriverOptionDel, OldBmmData->DriverOptionDel, sizeof (NewBmmData->DriverOptionDel)) != 0) {       \r
-    for (Index = 0; \r
-         ((Index < DriverOptionMenu.MenuNumber) && (Index < (sizeof (NewBmmData->DriverOptionDel) / sizeof (NewBmmData->DriverOptionDel[0])))); \r
+  //\r
+  if (CompareMem (NewBmmData->DriverOptionDel, OldBmmData->DriverOptionDel, sizeof (NewBmmData->DriverOptionDel)) != 0) {\r
+    for (Index = 0;\r
+         ((Index < DriverOptionMenu.MenuNumber) && (Index < (sizeof (NewBmmData->DriverOptionDel) / sizeof (NewBmmData->DriverOptionDel[0]))));\r

          Index++) {\r
       NewMenuEntry            = BOpt_GetMenuEntry (&DriverOptionMenu, Index);\r
       NewLoadContext          = (BM_LOAD_CONTEXT *) NewMenuEntry->VariableContext;\r
          Index++) {\r
       NewMenuEntry            = BOpt_GetMenuEntry (&DriverOptionMenu, Index);\r
       NewLoadContext          = (BM_LOAD_CONTEXT *) NewMenuEntry->VariableContext;\r


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

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

     Status = Var_UpdateDriverOrder (Private);\r
     if (EFI_ERROR (Status)) {\r
       Offset = OFFSET_OF (BMM_FAKE_NV_DATA, DriverOptionOrder);\r
     Status = Var_UpdateDriverOrder (Private);\r
     if (EFI_ERROR (Status)) {\r
       Offset = OFFSET_OF (BMM_FAKE_NV_DATA, DriverOptionOrder);\r


@@ -1128,14 +1128,14 @@ BootMaintCallback (
     if (Value == NULL) {\r
       return EFI_INVALID_PARAMETER;\r
     }\r
     if (Value == NULL) {\r
       return EFI_INVALID_PARAMETER;\r
     }\r

-    \r
+\r

     UpdatePageId (Private, QuestionId);\r
 \r
     if (QuestionId < FILE_OPTION_OFFSET) {\r
       if (QuestionId < CONFIG_OPTION_OFFSET) {\r
         switch (QuestionId) {\r
         case FORM_BOOT_ADD_ID:\r
     UpdatePageId (Private, QuestionId);\r
 \r
     if (QuestionId < FILE_OPTION_OFFSET) {\r
       if (QuestionId < CONFIG_OPTION_OFFSET) {\r
         switch (QuestionId) {\r
         case FORM_BOOT_ADD_ID:\r

-          // Leave BMM and enter FileExplorer. \r
+          // Leave BMM and enter FileExplorer.\r

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


@@ -1213,7 +1213,7 @@ BootMaintCallback (
     if ((Value == NULL) || (ActionRequest == NULL)) {\r
       return EFI_INVALID_PARAMETER;\r
     }\r
     if ((Value == NULL) || (ActionRequest == NULL)) {\r
       return EFI_INVALID_PARAMETER;\r
     }\r

-   \r
+\r

     if (QuestionId == KEY_VALUE_SAVE_AND_EXIT_BOOT) {\r
       CleanUselessBeforeSubmit (Private);\r
       CurrentFakeNVMap->BootOptionChanged = FALSE;\r
     if (QuestionId == KEY_VALUE_SAVE_AND_EXIT_BOOT) {\r
       CleanUselessBeforeSubmit (Private);\r
       CurrentFakeNVMap->BootOptionChanged = FALSE;\r


@@ -1247,7 +1247,7 @@ BootMaintCallback (
       CurrentFakeNVMap->BootOptionChanged = TRUE;\r
     } else if (QuestionId == KEY_VALUE_DRIVER_DESCRIPTION || QuestionId == KEY_VALUE_DRIVER_OPTION) {\r
       CurrentFakeNVMap->DriverOptionChanged = TRUE;\r
       CurrentFakeNVMap->BootOptionChanged = TRUE;\r
     } else if (QuestionId == KEY_VALUE_DRIVER_DESCRIPTION || QuestionId == KEY_VALUE_DRIVER_OPTION) {\r
       CurrentFakeNVMap->DriverOptionChanged = TRUE;\r

-    } \r
+    }\r

 \r
     if ((QuestionId >= BOOT_OPTION_DEL_QUESTION_ID) && (QuestionId < BOOT_OPTION_DEL_QUESTION_ID + MAX_MENU_NUMBER)) {\r
       if (Value->b){\r
 \r
     if ((QuestionId >= BOOT_OPTION_DEL_QUESTION_ID) && (QuestionId < BOOT_OPTION_DEL_QUESTION_ID + MAX_MENU_NUMBER)) {\r
       if (Value->b){\r


@@ -1718,7 +1718,7 @@ BootMaintenanceManagerUiLibConstructor (
 \r
   CreateUpdateData();\r
   //\r
 \r
   CreateUpdateData();\r
   //\r

-  // Update boot maintenance manager page \r
+  // Update boot maintenance manager page\r

   //\r
   InitializeBmmConfig(mBmmCallbackInfo);\r
 \r
   //\r
   InitializeBmmConfig(mBmmCallbackInfo);\r
 \r

diff --git a/MdeModulePkg/Library/BootMaintenanceManagerUiLib/BootMaintenanceManager.h b/MdeModulePkg/Library/BootMaintenanceManagerUiLib/BootMaintenanceManager.h
index 99d1656b9ed90535fcd822b1dd9af41e16ef7e93..e8288b53ad258c3e89ea1710bae94b2f2b36c543 100644 (file)
--- a/MdeModulePkg/Library/BootMaintenanceManagerUiLib/BootMaintenanceManager.h
+++ b/MdeModulePkg/Library/BootMaintenanceManagerUiLib/BootMaintenanceManager.h
@@ -1,7 +1,7 @@
 /** @file\r
 Header file for boot maintenance module.\r
 \r
 /** @file\r
 Header file for boot maintenance module.\r
 \r

-Copyright (c) 2004 - 2017, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2004 - 2018, Intel Corporation. All rights reserved.<BR>\r

 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r


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

-  \r
+\r

   UINTN                          Signature;\r
 \r
   EFI_HII_HANDLE                 BmmHiiHandle;\r
   UINTN                          Signature;\r
 \r
   EFI_HII_HANDLE                 BmmHiiHandle;\r


@@ -355,7 +355,7 @@ typedef struct {
   //\r
   // BMM main formset callback data.\r
   //\r
   //\r
   // BMM main formset callback data.\r
   //\r

-  \r
+\r

   EFI_FORM_ID                    BmmCurrentPageId;\r
   EFI_FORM_ID                    BmmPreviousPageId;\r
   BOOLEAN                        BmmAskSaveOrNot;\r
   EFI_FORM_ID                    BmmCurrentPageId;\r
   EFI_FORM_ID                    BmmPreviousPageId;\r
   BOOLEAN                        BmmAskSaveOrNot;\r


@@ -403,7 +403,7 @@ BOpt_GetBootOptions (
 \r
   @return EFI_SUCESS The functin completes successfully.\r
   @retval EFI_OUT_OF_RESOURCES Not enough memory to compete the operation.\r
 \r
   @return EFI_SUCESS The functin completes successfully.\r
   @retval EFI_OUT_OF_RESOURCES Not enough memory to compete the operation.\r

-  \r
+\r

 \r
 **/\r
 EFI_STATUS\r
 \r
 **/\r
 EFI_STATUS\r


@@ -505,12 +505,12 @@ BOpt_GetMenuEntry (
   );\r
 \r
 /**\r
   );\r
 \r
 /**\r

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

   The value is saved as #### + 1.\r
 \r
   @param CallbackData    The BMM context data.\r
 **/\r
   The value is saved as #### + 1.\r
 \r
   @param CallbackData    The BMM context data.\r
 **/\r

-VOID  \r
+VOID\r

 GetBootOrder (\r
   IN  BMM_CALLBACK_DATA    *CallbackData\r
   );\r
 GetBootOrder (\r
   IN  BMM_CALLBACK_DATA    *CallbackData\r
   );\r


@@ -519,9 +519,9 @@ GetBootOrder (
   Get driver option order from globalc DriverOptionMenu.\r
 \r
   @param CallbackData    The BMM context data.\r
   Get driver option order from globalc DriverOptionMenu.\r
 \r
   @param CallbackData    The BMM context data.\r

-  \r
+\r

 **/\r
 **/\r

-VOID  \r
+VOID\r

 GetDriverOrder (\r
   IN  BMM_CALLBACK_DATA    *CallbackData\r
   );\r
 GetDriverOrder (\r
   IN  BMM_CALLBACK_DATA    *CallbackData\r
   );\r


@@ -596,11 +596,11 @@ ChangeVariableDevicePath (
 \r
 /**\r
   Update the multi-instance device path of Terminal Device based on\r
 \r
 /**\r
   Update the multi-instance device path of Terminal Device based on\r

-  the global TerminalMenu. If ChangeTernimal is TRUE, the terminal \r
+  the global TerminalMenu. If ChangeTernimal is TRUE, the terminal\r

   device path in the Terminal Device in TerminalMenu is also updated.\r
 \r
   @param DevicePath      The multi-instance device path.\r
   device path in the Terminal Device in TerminalMenu is also updated.\r
 \r
   @param DevicePath      The multi-instance device path.\r

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

                          in TerminalMenu is also updated; FALSE, no update.\r
 \r
   @return EFI_SUCCESS    The function completes successfully.\r
                          in TerminalMenu is also updated; FALSE, no update.\r
 \r
   @return EFI_SUCCESS    The function completes successfully.\r


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

-  This function create a currently loaded Boot Option from \r
-  the BMM. It then appends this Boot Option to the end of \r
+  This function create a currently loaded Boot Option from\r
+  the BMM. It then appends this Boot Option to the end of\r

   the "BootOrder" list. It also append this Boot Opotion to the end\r
   of BootOptionMenu.\r
 \r
   the "BootOrder" list. It also append this Boot Opotion to the end\r
   of BootOptionMenu.\r
 \r


@@ -635,9 +635,9 @@ Var_UpdateBootOption (
 /**\r
   Delete Boot Option that represent a Deleted state in BootOptionMenu.\r
 \r
 /**\r
   Delete Boot Option that represent a Deleted state in BootOptionMenu.\r
 \r

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

                         BM_LOAD_CONTEXT marked for deletion is deleted\r
                         BM_LOAD_CONTEXT marked for deletion is deleted\r

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

 \r
 **/\r
 EFI_STATUS\r
 \r
 **/\r
 EFI_STATUS\r


@@ -646,8 +646,8 @@ Var_DelBootOption (
   );\r
 \r
 /**\r
   );\r
 \r
 /**\r

-  This function create a currently loaded Drive Option from \r
-  the BMM. It then appends this Driver Option to the end of \r
+  This function create a currently loaded Drive Option from\r
+  the BMM. It then appends this Driver Option to the end of\r

   the "DriverOrder" list. It append this Driver Opotion to the end\r
   of DriverOptionMenu.\r
 \r
   the "DriverOrder" list. It append this Driver Opotion to the end\r
   of DriverOptionMenu.\r
 \r


@@ -719,11 +719,11 @@ Var_UpdateErrorOutOption (
 \r
 /**\r
   This function delete and build Out of Band console device.\r
 \r
 /**\r
   This function delete and build Out of Band console device.\r

-  \r
+\r

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

-  \r
+\r

   @retval EFI_SUCCESS    The function complete successfully.\r
   @retval EFI_SUCCESS    The function complete successfully.\r

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

 **/\r
 EFI_STATUS\r
 Var_UpdateOutOfBandOption (\r
 **/\r
 EFI_STATUS\r
 Var_UpdateOutOfBandOption (\r


@@ -731,7 +731,7 @@ Var_UpdateOutOfBandOption (
   );\r
 \r
 /**\r
   );\r
 \r
 /**\r

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

   this EFI Variable is deleted.\r
   It also update the BMM context data specified the "BootNext" value.\r
 \r
   this EFI Variable is deleted.\r
   It also update the BMM context data specified the "BootNext" value.\r
 \r


@@ -747,7 +747,7 @@ Var_UpdateBootNext (
   );\r
 \r
 /**\r
   );\r
 \r
 /**\r

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

   BootOptionMenu with the new "BootOrder" list.\r
 \r
   @param CallbackData           The BMM context data.\r
   BootOptionMenu with the new "BootOrder" list.\r
 \r
   @param CallbackData           The BMM context data.\r


@@ -816,7 +816,7 @@ RefreshUpdateData (
 \r
 /**\r
   Clean up the dynamic opcode at label and form specified by\r
 \r
 /**\r
   Clean up the dynamic opcode at label and form specified by\r

-  both LabelId. \r
+  both LabelId.\r

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


@@ -937,7 +937,7 @@ UpdateOptionPage(
 \r
   @param VarName            A Null-terminated Unicode string that is\r
                             the name of the vendor's variable.\r
 \r
   @param VarName            A Null-terminated Unicode string that is\r
                             the name of the vendor's variable.\r

-                         \r
+\r

   @param VarGuid            A unique identifier for the vendor.\r
 \r
   @retval  EFI_SUCCESS           The variable was found and removed\r
   @param VarGuid            A unique identifier for the vendor.\r
 \r
   @retval  EFI_SUCCESS           The variable was found and removed\r


@@ -969,7 +969,7 @@ EfiDevicePathInstanceCount (
   );\r
 \r
 /**\r
   );\r
 \r
 /**\r

-  Get a string from the Data Hub record based on \r
+  Get a string from the Data Hub record based on\r

   a device path.\r
 \r
   @param DevPath         The device Path.\r
   a device path.\r
 \r
   @param DevPath         The device Path.\r


@@ -1065,8 +1065,8 @@ InitBootMaintenance(
 \r
   @param CallbackData    The BMM context data.\r
 \r
 \r
   @param CallbackData    The BMM context data.\r
 \r

-**/  \r
-VOID  \r
+**/\r
+VOID\r

 GetConsoleInCheck (\r
   IN  BMM_CALLBACK_DATA    *CallbackData\r
   );\r
 GetConsoleInCheck (\r
   IN  BMM_CALLBACK_DATA    *CallbackData\r
   );\r


@@ -1091,7 +1091,7 @@ GetConsoleOutCheck (
 \r
   @param CallbackData    The BMM context data.\r
 \r
 \r
   @param CallbackData    The BMM context data.\r
 \r

-**/        \r
+**/\r

 VOID\r
 GetConsoleErrCheck (\r
   IN  BMM_CALLBACK_DATA    *CallbackData\r
 VOID\r
 GetConsoleErrCheck (\r
   IN  BMM_CALLBACK_DATA    *CallbackData\r


@@ -1112,9 +1112,9 @@ GetTerminalAttribute (
 \r
 /**\r
   This function will change video resolution and text mode\r
 \r
 /**\r
   This function will change video resolution and text mode\r

-  according to defined setup mode or defined boot mode  \r
+  according to defined setup mode or defined boot mode\r

 \r
 \r

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

 \r
   @retval  EFI_SUCCESS  Mode is changed successfully.\r
   @retval  Others             Mode failed to be changed.\r
 \r
   @retval  EFI_SUCCESS  Mode is changed successfully.\r
   @retval  Others             Mode failed to be changed.\r


@@ -1195,7 +1195,7 @@ BootMaintExtractConfig (
 \r
   @param[in]  This                Points to the EFI_HII_CONFIG_ACCESS_PROTOCOL.\r
   @param[in]  Configuration       A null-terminated Unicode string in\r
 \r
   @param[in]  This                Points to the EFI_HII_CONFIG_ACCESS_PROTOCOL.\r
   @param[in]  Configuration       A null-terminated Unicode string in\r

-                                  <ConfigString> format.   \r
+                                  <ConfigString> format.\r

   @param[out] Progress            A pointer to a string filled in with the\r
                                   offset of the most recent '&' before the\r
                                   first failing name / value pair (or the\r
   @param[out] Progress            A pointer to a string filled in with the\r
                                   offset of the most recent '&' before the\r
                                   first failing name / value pair (or the\r


@@ -1205,7 +1205,7 @@ BootMaintExtractConfig (
                                   successful.\r
 \r
   @retval EFI_SUCCESS             The results have been distributed or are\r
                                   successful.\r
 \r
   @retval EFI_SUCCESS             The results have been distributed or are\r

-                                  awaiting distribution.  \r
+                                  awaiting distribution.\r

   @retval EFI_OUT_OF_RESOURCES    Not enough memory to store the\r
                                   parts of the results that must be\r
                                   stored awaiting possible future\r
   @retval EFI_OUT_OF_RESOURCES    Not enough memory to store the\r
                                   parts of the results that must be\r
                                   stored awaiting possible future\r


@@ -1262,7 +1262,7 @@ BootMaintCallback (
   @retval FALSE  Not exit caller function.\r
 \r
 **/\r
   @retval FALSE  Not exit caller function.\r
 \r
 **/\r

-BOOLEAN \r
+BOOLEAN\r

 EFIAPI\r
 CreateBootOptionFromFile (\r
   IN EFI_DEVICE_PATH_PROTOCOL    *FilePath\r
 EFIAPI\r
 CreateBootOptionFromFile (\r
   IN EFI_DEVICE_PATH_PROTOCOL    *FilePath\r


@@ -1276,7 +1276,7 @@ CreateBootOptionFromFile (
   @retval TRUE   Exit caller function.\r
   @retval FALSE  Not exit caller function.\r
 **/\r
   @retval TRUE   Exit caller function.\r
   @retval FALSE  Not exit caller function.\r
 **/\r

-BOOLEAN \r
+BOOLEAN\r

 EFIAPI\r
 CreateDriverOptionFromFile (\r
   IN EFI_DEVICE_PATH_PROTOCOL    *FilePath\r
 EFIAPI\r
 CreateDriverOptionFromFile (\r
   IN EFI_DEVICE_PATH_PROTOCOL    *FilePath\r


@@ -1289,9 +1289,9 @@ CreateDriverOptionFromFile (
 \r
   @retval TRUE   Exit caller function.\r
   @retval FALSE  Not exit caller function.\r
 \r
   @retval TRUE   Exit caller function.\r
   @retval FALSE  Not exit caller function.\r

-  \r
+\r

 **/\r
 **/\r

-BOOLEAN \r
+BOOLEAN\r

 EFIAPI\r
 BootFromFile (\r
   IN EFI_DEVICE_PATH_PROTOCOL    *FilePath\r
 EFIAPI\r
 BootFromFile (\r
   IN EFI_DEVICE_PATH_PROTOCOL    *FilePath\r

diff --git a/MdeModulePkg/Library/BootMaintenanceManagerUiLib/BootMaintenanceManager.vfr b/MdeModulePkg/Library/BootMaintenanceManagerUiLib/BootMaintenanceManager.vfr
index b0a636f56633b7c8a55fe8a8399270d1a043c923..a14074a17a6e7cb32cac24e6bfa4310212946986 100644 (file)
--- a/MdeModulePkg/Library/BootMaintenanceManagerUiLib/BootMaintenanceManager.vfr
+++ b/MdeModulePkg/Library/BootMaintenanceManagerUiLib/BootMaintenanceManager.vfr
@@ -1,15 +1,15 @@
 ///** @file\r
 //  Boot Maintenance Utility Formset\r
 //\r
 ///** @file\r
 //  Boot Maintenance Utility Formset\r
 //\r

-//  Copyright (c) 2004 - 2016, Intel Corporation. All rights reserved.<BR>\r
+//  Copyright (c) 2004 - 2018, Intel Corporation. All rights reserved.<BR>\r

 //  This program and the accompanying materials\r
 //  are licensed and made available under the terms and conditions of the BSD License\r
 //  which accompanies this distribution.  The full text of the license may be found at\r
 //  http://opensource.org/licenses/bsd-license.php\r
 //  This program and the accompanying materials\r
 //  are licensed and made available under the terms and conditions of the BSD License\r
 //  which accompanies this distribution.  The full text of the license may be found at\r
 //  http://opensource.org/licenses/bsd-license.php\r

-//  \r
+//\r

 //  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 //  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 //  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 //  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r

-//  \r
+//\r

 //**/\r
 \r
 #include "FormGuid.h"\r
 //**/\r
 \r
 #include "FormGuid.h"\r


@@ -38,10 +38,10 @@ formset
               flags = INTERACTIVE,\r
               key   = KEY_VALUE_TRIGGER_FORM_OPEN_ACTION;\r
        endif;\r
               flags = INTERACTIVE,\r
               key   = KEY_VALUE_TRIGGER_FORM_OPEN_ACTION;\r
        endif;\r

-         \r
+\r

     label LABEL_FORM_MAIN_START;\r
     //\r
     label LABEL_FORM_MAIN_START;\r
     //\r

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

     // the platform information.\r
     //\r
     label LABEL_FORM_MAIN_END;\r
     // the platform information.\r
     //\r
     label LABEL_FORM_MAIN_END;\r


@@ -144,7 +144,7 @@ formset
          text   = STRING_TOKEN(STR_NO_SAVE_AND_EXIT),\r
          flags  = INTERACTIVE,\r
          key    = KEY_VALUE_NO_SAVE_AND_EXIT_BOOT;\r
          text   = STRING_TOKEN(STR_NO_SAVE_AND_EXIT),\r
          flags  = INTERACTIVE,\r
          key    = KEY_VALUE_NO_SAVE_AND_EXIT_BOOT;\r

-         \r
+\r

   endform;\r
 \r
   form formid = FORM_BOOT_DEL_ID,\r
   endform;\r
 \r
   form formid = FORM_BOOT_DEL_ID,\r


@@ -181,7 +181,7 @@ formset
 \r
   form formid = FORM_DRV_ADD_FILE_ID,\r
        title = STRING_TOKEN(STR_FORM_DRV_ADD_DESC_TITLE);\r
 \r
   form formid = FORM_DRV_ADD_FILE_ID,\r
        title = STRING_TOKEN(STR_FORM_DRV_ADD_DESC_TITLE);\r

-       \r
+\r

        label FORM_DRV_ADD_FILE_ID;\r
        label LABEL_END;\r
 \r
        label FORM_DRV_ADD_FILE_ID;\r
        label LABEL_END;\r
 \r

diff --git a/MdeModulePkg/Library/BootMaintenanceManagerUiLib/BootMaintenanceManagerStrings.uni b/MdeModulePkg/Library/BootMaintenanceManagerUiLib/BootMaintenanceManagerStrings.uni
index 20b2a7744a83e51173c491bcff9141e2e97cd72e..87e31737ae3a5e764077e503aefd4e55470d8e31 100644 (file)
--- a/MdeModulePkg/Library/BootMaintenanceManagerUiLib/BootMaintenanceManagerStrings.uni
+++ b/MdeModulePkg/Library/BootMaintenanceManagerUiLib/BootMaintenanceManagerStrings.uni
@@ -1,15 +1,15 @@
 ///** @file\r
 //  String definitions for Boot Maintenance Utility.\r
 //\r
 ///** @file\r
 //  String definitions for Boot Maintenance Utility.\r
 //\r

-//  Copyright (c) 2004 - 2015, Intel Corporation. All rights reserved.<BR>\r
+//  Copyright (c) 2004 - 2018, Intel Corporation. All rights reserved.<BR>\r

 //  This program and the accompanying materials\r
 //  are licensed and made available under the terms and conditions of the BSD License\r
 //  which accompanies this distribution.  The full text of the license may be found at\r
 //  http://opensource.org/licenses/bsd-license.php\r
 //  This program and the accompanying materials\r
 //  are licensed and made available under the terms and conditions of the BSD License\r
 //  which accompanies this distribution.  The full text of the license may be found at\r
 //  http://opensource.org/licenses/bsd-license.php\r

-//  \r
+//\r

 //  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 //  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 //  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 //  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r

-//  \r
+//\r

 //**/\r
 \r
 /=#\r
 //**/\r
 \r
 /=#\r


@@ -71,9 +71,9 @@
                                            #language fr-FR "UEFI Optimized Boot"\r
 #string STR_FORM_UEFI_OPTIMIZED_BOOT_HELP  #language en-US "Modify the UEFI Optimized Boot setting"\r
                                            #language fr-FR "Modify the UEFI Optimized Boot setting"\r
                                            #language fr-FR "UEFI Optimized Boot"\r
 #string STR_FORM_UEFI_OPTIMIZED_BOOT_HELP  #language en-US "Modify the UEFI Optimized Boot setting"\r
                                            #language fr-FR "Modify the UEFI Optimized Boot setting"\r

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

                                            #language fr-FR "UEFI Optimized Boot"\r
                                            #language fr-FR "UEFI Optimized Boot"\r

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

                                            #language fr-FR "Check to enable UEFI Optimized Boot"\r
 #string STR_FORM_CON_MAIN_TITLE        #language en-US  "Console Options"\r
                                        #language fr-FR  "Console Options"\r
                                            #language fr-FR "Check to enable UEFI Optimized Boot"\r
 #string STR_FORM_CON_MAIN_TITLE        #language en-US  "Console Options"\r
                                        #language fr-FR  "Console Options"\r

diff --git a/MdeModulePkg/Library/BootMaintenanceManagerUiLib/BootMaintenanceManagerUiLib.inf b/MdeModulePkg/Library/BootMaintenanceManagerUiLib/BootMaintenanceManagerUiLib.inf
index def923b977d71003aaa93f9235e56f1b48d440bc..aad9d7678eb0e7252cbf5efd627e86dd7fd1c399 100644 (file)
--- a/MdeModulePkg/Library/BootMaintenanceManagerUiLib/BootMaintenanceManagerUiLib.inf
+++ b/MdeModulePkg/Library/BootMaintenanceManagerUiLib/BootMaintenanceManagerUiLib.inf
@@ -1,15 +1,15 @@
 ## @file\r
 #  Boot Maintenance Manager Library used by UiApp.\r
 #\r
 ## @file\r
 #  Boot Maintenance Manager Library used by UiApp.\r
 #\r

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

 #  This program and the accompanying materials are licensed and made available under\r
 #  the terms and conditions of the BSD License that accompanies this distribution.\r
 #  The full text of the license may be found at\r
 #  http://opensource.org/licenses/bsd-license.php.\r
 #  This program and the accompanying materials are licensed and made available under\r
 #  the terms and conditions of the BSD License that accompanies this distribution.\r
 #  The full text of the license may be found at\r
 #  http://opensource.org/licenses/bsd-license.php.\r

-#  \r
+#\r

 #  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 #  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 #  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 #  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r

-#  \r
+#\r

 ##\r
 [Defines]\r
   INF_VERSION                    = 0x00010005\r
 ##\r
 [Defines]\r
   INF_VERSION                    = 0x00010005\r


@@ -62,7 +62,7 @@
   UefiHiiServicesLib\r
   UefiBootManagerLib\r
   FileExplorerLib\r
   UefiHiiServicesLib\r
   UefiBootManagerLib\r
   FileExplorerLib\r

-  \r
+\r

 [Guids]\r
   gEfiGlobalVariableGuid                        ## SOMETIMES_PRODUCES ## Variable:L"BootNext" (The number of next boot option)\r
                                                 ## SOMETIMES_PRODUCES ## Variable:L"BootXX" (Boot option variable)\r
 [Guids]\r
   gEfiGlobalVariableGuid                        ## SOMETIMES_PRODUCES ## Variable:L"BootNext" (The number of next boot option)\r
                                                 ## SOMETIMES_PRODUCES ## Variable:L"BootXX" (Boot option variable)\r


@@ -82,7 +82,7 @@
   gEfiIfrTianoGuid                              ## SOMETIMES_CONSUMES ## GUID (Extended IFR Guid Opcode)\r
   gEfiIfrFrontPageGuid                          ## CONSUMES ## GUID\r
   gEfiIfrBootMaintenanceGuid                    ## CONSUMES ## GUID\r
   gEfiIfrTianoGuid                              ## SOMETIMES_CONSUMES ## GUID (Extended IFR Guid Opcode)\r
   gEfiIfrFrontPageGuid                          ## CONSUMES ## GUID\r
   gEfiIfrBootMaintenanceGuid                    ## CONSUMES ## GUID\r

- \r
+\r

 [Protocols]\r
   gEfiSimpleFileSystemProtocolGuid              ## CONSUMES\r
   gEfiLoadFileProtocolGuid                      ## CONSUMES\r
 [Protocols]\r
   gEfiSimpleFileSystemProtocolGuid              ## CONSUMES\r
   gEfiLoadFileProtocolGuid                      ## CONSUMES\r

diff --git a/MdeModulePkg/Library/BootMaintenanceManagerUiLib/BootOption.c b/MdeModulePkg/Library/BootMaintenanceManagerUiLib/BootOption.c
index 8680a51d78c75cb4798632d828c733dc5f0b5d42..a1a2e2a4e7b5487a602083fb689ffb75c297be5c 100644 (file)
--- a/MdeModulePkg/Library/BootMaintenanceManagerUiLib/BootOption.c
+++ b/MdeModulePkg/Library/BootMaintenanceManagerUiLib/BootOption.c
@@ -5,7 +5,7 @@
 \r
   Boot option manipulation\r
 \r
 \r
   Boot option manipulation\r
 \r

-Copyright (c) 2004 - 2016, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2004 - 2018, Intel Corporation. All rights reserved.<BR>\r

 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r


@@ -309,8 +309,8 @@ BOpt_GetBootOptions (
   UINTN                         MenuCount;\r
   UINT8                         *Ptr;\r
   EFI_BOOT_MANAGER_LOAD_OPTION  *BootOption;\r
   UINTN                         MenuCount;\r
   UINT8                         *Ptr;\r
   EFI_BOOT_MANAGER_LOAD_OPTION  *BootOption;\r

-  UINTN                         BootOptionCount;  \r
-  \r
+  UINTN                         BootOptionCount;\r
+\r

   MenuCount         = 0;\r
   BootOrderListSize = 0;\r
   BootNextSize      = 0;\r
   MenuCount         = 0;\r
   BootOrderListSize = 0;\r
   BootNextSize      = 0;\r


@@ -327,7 +327,7 @@ BOpt_GetBootOptions (
   if (BootOrderList == NULL) {\r
     return EFI_NOT_FOUND;\r
   }\r
   if (BootOrderList == NULL) {\r
     return EFI_NOT_FOUND;\r
   }\r

-  \r
+\r

   //\r
   // Get the BootNext from the Var\r
   //\r
   //\r
   // Get the BootNext from the Var\r
   //\r


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

-      \r
+\r

     UnicodeSPrint (BootString, sizeof (BootString), L"Boot%04x", BootOrderList[Index]);\r
     //\r
     //  Get all loadoptions from the VAR\r
     UnicodeSPrint (BootString, sizeof (BootString), L"Boot%04x", BootOrderList[Index]);\r
     //\r
     //  Get all loadoptions from the VAR\r


@@ -415,13 +415,13 @@ BOpt_GetBootOptions (
 \r
     NewLoadContext->FilePathListLength = *(UINT16 *) LoadOptionPtr;\r
     LoadOptionPtr += sizeof (UINT16);\r
 \r
     NewLoadContext->FilePathListLength = *(UINT16 *) LoadOptionPtr;\r
     LoadOptionPtr += sizeof (UINT16);\r

-    \r
+\r

     StringSize = StrSize((UINT16*)LoadOptionPtr);\r
 \r
     NewLoadContext->Description = AllocateZeroPool (StrSize((UINT16*)LoadOptionPtr));\r
     ASSERT (NewLoadContext->Description != NULL);\r
     StrCpyS (NewLoadContext->Description, StrSize((UINT16*)LoadOptionPtr) / sizeof (UINT16), (UINT16*)LoadOptionPtr);\r
     StringSize = StrSize((UINT16*)LoadOptionPtr);\r
 \r
     NewLoadContext->Description = AllocateZeroPool (StrSize((UINT16*)LoadOptionPtr));\r
     ASSERT (NewLoadContext->Description != NULL);\r
     StrCpyS (NewLoadContext->Description, StrSize((UINT16*)LoadOptionPtr) / sizeof (UINT16), (UINT16*)LoadOptionPtr);\r

-    \r
+\r

     ASSERT (NewLoadContext->Description != NULL);\r
     NewMenuEntry->DisplayString = NewLoadContext->Description;\r
     NewMenuEntry->DisplayStringToken = HiiSetString (CallbackData->BmmHiiHandle, 0, NewMenuEntry->DisplayString, NULL);\r
     ASSERT (NewLoadContext->Description != NULL);\r
     NewMenuEntry->DisplayString = NewLoadContext->Description;\r
     NewMenuEntry->DisplayStringToken = HiiSetString (CallbackData->BmmHiiHandle, 0, NewMenuEntry->DisplayString, NULL);\r


@@ -437,7 +437,7 @@ BOpt_GetBootOptions (
       );\r
 \r
     NewMenuEntry->HelpString = UiDevicePathToStr (NewLoadContext->FilePathList);\r
       );\r
 \r
     NewMenuEntry->HelpString = UiDevicePathToStr (NewLoadContext->FilePathList);\r

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

 \r
     LoadOptionPtr += NewLoadContext->FilePathListLength;\r
 \r
 \r
     LoadOptionPtr += NewLoadContext->FilePathListLength;\r
 \r


@@ -703,7 +703,7 @@ BOpt_GetDriverOptions (
   if (DriverOrderList == NULL) {\r
     return EFI_NOT_FOUND;\r
   }\r
   if (DriverOrderList == NULL) {\r
     return EFI_NOT_FOUND;\r
   }\r

-  \r
+\r

   for (Index = 0; Index < DriverOrderListSize / sizeof (UINT16); Index++) {\r
     UnicodeSPrint (\r
       DriverString,\r
   for (Index = 0; Index < DriverOrderListSize / sizeof (UINT16); Index++) {\r
     UnicodeSPrint (\r
       DriverString,\r


@@ -767,7 +767,7 @@ BOpt_GetDriverOptions (
       );\r
 \r
     NewMenuEntry->HelpString = UiDevicePathToStr (NewLoadContext->FilePathList);\r
       );\r
 \r
     NewMenuEntry->HelpString = UiDevicePathToStr (NewLoadContext->FilePathList);\r

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

 \r
     LoadOptionPtr += NewLoadContext->FilePathListLength;\r
 \r
 \r
     LoadOptionPtr += NewLoadContext->FilePathListLength;\r
 \r


@@ -803,29 +803,29 @@ BOpt_GetDriverOptions (
 }\r
 \r
 /**\r
 }\r
 \r
 /**\r

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

   The value is saved as #### + 1.\r
 \r
   @param CallbackData    The BMM context data.\r
 **/\r
   The value is saved as #### + 1.\r
 \r
   @param CallbackData    The BMM context data.\r
 **/\r

-VOID  \r
+VOID\r

 GetBootOrder (\r
   IN  BMM_CALLBACK_DATA    *CallbackData\r
   )\r
 {\r
   BMM_FAKE_NV_DATA          *BmmConfig;\r
   UINT16                    Index;\r
 GetBootOrder (\r
   IN  BMM_CALLBACK_DATA    *CallbackData\r
   )\r
 {\r
   BMM_FAKE_NV_DATA          *BmmConfig;\r
   UINT16                    Index;\r

-  UINT16                    OptionOrderIndex; \r
+  UINT16                    OptionOrderIndex;\r

   UINTN                     DeviceType;\r
   BM_MENU_ENTRY             *NewMenuEntry;\r
   UINTN                     DeviceType;\r
   BM_MENU_ENTRY             *NewMenuEntry;\r

-  BM_LOAD_CONTEXT           *NewLoadContext;  \r
+  BM_LOAD_CONTEXT           *NewLoadContext;\r

 \r
   ASSERT (CallbackData != NULL);\r
 \r
   ASSERT (CallbackData != NULL);\r

-  \r
-  DeviceType = (UINTN) -1;   \r
-  BmmConfig  = &CallbackData->BmmFakeNvData;  \r
+\r
+  DeviceType = (UINTN) -1;\r
+  BmmConfig  = &CallbackData->BmmFakeNvData;\r

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

-  \r
+\r

   for (Index = 0, OptionOrderIndex = 0; ((Index < BootOptionMenu.MenuNumber) &&\r
        (OptionOrderIndex < (sizeof (BmmConfig->BootOptionOrder) / sizeof (BmmConfig->BootOptionOrder[0]))));\r
        Index++) {\r
   for (Index = 0, OptionOrderIndex = 0; ((Index < BootOptionMenu.MenuNumber) &&\r
        (OptionOrderIndex < (sizeof (BmmConfig->BootOptionOrder) / sizeof (BmmConfig->BootOptionOrder[0]))));\r
        Index++) {\r


@@ -844,34 +844,34 @@ GetBootOrder (
       }\r
     }\r
     BmmConfig->BootOptionOrder[OptionOrderIndex++] = (UINT32) (NewMenuEntry->OptionNumber + 1);\r
       }\r
     }\r
     BmmConfig->BootOptionOrder[OptionOrderIndex++] = (UINT32) (NewMenuEntry->OptionNumber + 1);\r

-  }  \r
+  }\r

 }\r
 \r
 /**\r
   Get driver option order from globalc DriverOptionMenu.\r
 \r
   @param CallbackData    The BMM context data.\r
 }\r
 \r
 /**\r
   Get driver option order from globalc DriverOptionMenu.\r
 \r
   @param CallbackData    The BMM context data.\r

-  \r
+\r

 **/\r
 **/\r

-VOID  \r
+VOID\r

 GetDriverOrder (\r
   IN  BMM_CALLBACK_DATA    *CallbackData\r
   )\r
 {\r
   BMM_FAKE_NV_DATA          *BmmConfig;\r
   UINT16                    Index;\r
 GetDriverOrder (\r
   IN  BMM_CALLBACK_DATA    *CallbackData\r
   )\r
 {\r
   BMM_FAKE_NV_DATA          *BmmConfig;\r
   UINT16                    Index;\r

-  UINT16                    OptionOrderIndex; \r
+  UINT16                    OptionOrderIndex;\r

   UINTN                     DeviceType;\r
   BM_MENU_ENTRY             *NewMenuEntry;\r
   UINTN                     DeviceType;\r
   BM_MENU_ENTRY             *NewMenuEntry;\r

-  BM_LOAD_CONTEXT           *NewLoadContext;  \r
+  BM_LOAD_CONTEXT           *NewLoadContext;\r

 \r
 \r
   ASSERT (CallbackData != NULL);\r
 \r
 \r
   ASSERT (CallbackData != NULL);\r

-  \r
-  DeviceType = (UINTN) -1;   \r
-  BmmConfig  = &CallbackData->BmmFakeNvData;  \r
+\r
+  DeviceType = (UINTN) -1;\r
+  BmmConfig  = &CallbackData->BmmFakeNvData;\r

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

-  \r
+\r

   for (Index = 0, OptionOrderIndex = 0; ((Index < DriverOptionMenu.MenuNumber) &&\r
        (OptionOrderIndex < (sizeof (BmmConfig->DriverOptionOrder) / sizeof (BmmConfig->DriverOptionOrder[0]))));\r
        Index++) {\r
   for (Index = 0, OptionOrderIndex = 0; ((Index < DriverOptionMenu.MenuNumber) &&\r
        (OptionOrderIndex < (sizeof (BmmConfig->DriverOptionOrder) / sizeof (BmmConfig->DriverOptionOrder[0]))));\r
        Index++) {\r


@@ -890,8 +890,8 @@ GetDriverOrder (
       }\r
     }\r
     BmmConfig->DriverOptionOrder[OptionOrderIndex++] = (UINT32) (NewMenuEntry->OptionNumber + 1);\r
       }\r
     }\r
     BmmConfig->DriverOptionOrder[OptionOrderIndex++] = (UINT32) (NewMenuEntry->OptionNumber + 1);\r

-  }  \r
-}  \r
+  }\r
+}\r

 \r
 /**\r
   Boot the file specified by the input file path info.\r
 \r
 /**\r
   Boot the file specified by the input file path info.\r


@@ -901,7 +901,7 @@ GetDriverOrder (
   @retval TRUE   Exit caller function.\r
   @retval FALSE  Not exit caller function.\r
 **/\r
   @retval TRUE   Exit caller function.\r
   @retval FALSE  Not exit caller function.\r
 **/\r

-BOOLEAN \r
+BOOLEAN\r

 EFIAPI\r
 BootFromFile (\r
   IN EFI_DEVICE_PATH_PROTOCOL    *FilePath\r
 EFIAPI\r
 BootFromFile (\r
   IN EFI_DEVICE_PATH_PROTOCOL    *FilePath\r


@@ -982,7 +982,7 @@ ReSendForm(
   @retval TRUE   Exit caller function.\r
   @retval FALSE  Not exit caller function.\r
 **/\r
   @retval TRUE   Exit caller function.\r
   @retval FALSE  Not exit caller function.\r
 **/\r

-BOOLEAN \r
+BOOLEAN\r

 EFIAPI\r
 CreateBootOptionFromFile (\r
   IN EFI_DEVICE_PATH_PROTOCOL    *FilePath\r
 EFIAPI\r
 CreateBootOptionFromFile (\r
   IN EFI_DEVICE_PATH_PROTOCOL    *FilePath\r


@@ -1000,7 +1000,7 @@ CreateBootOptionFromFile (
   @retval FALSE  Not exit caller function.\r
 \r
 **/\r
   @retval FALSE  Not exit caller function.\r
 \r
 **/\r

-BOOLEAN \r
+BOOLEAN\r

 EFIAPI\r
 CreateDriverOptionFromFile (\r
   IN EFI_DEVICE_PATH_PROTOCOL    *FilePath\r
 EFIAPI\r
 CreateDriverOptionFromFile (\r
   IN EFI_DEVICE_PATH_PROTOCOL    *FilePath\r

diff --git a/MdeModulePkg/Library/BootMaintenanceManagerUiLib/ConsoleOption.c b/MdeModulePkg/Library/BootMaintenanceManagerUiLib/ConsoleOption.c
index b25c7a651bf625b23a6b1e2c4e34bfae65ebbe37..55f079efa965c8880d86d4175f2bdb82b24f4f94 100644 (file)
--- a/MdeModulePkg/Library/BootMaintenanceManagerUiLib/ConsoleOption.c
+++ b/MdeModulePkg/Library/BootMaintenanceManagerUiLib/ConsoleOption.c
@@ -1,7 +1,7 @@
 /** @file\r
 handles console redirection from boot manager\r
 \r
 /** @file\r
 handles console redirection from boot manager\r
 \r

-Copyright (c) 2004 - 2015, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2004 - 2018, Intel Corporation. All rights reserved.<BR>\r

 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r


@@ -100,11 +100,11 @@ UpdateComAttributeFromVariable (
 \r
 /**\r
   Update the multi-instance device path of Terminal Device based on\r
 \r
 /**\r
   Update the multi-instance device path of Terminal Device based on\r

-  the global TerminalMenu. If ChangeTernimal is TRUE, the terminal \r
+  the global TerminalMenu. If ChangeTernimal is TRUE, the terminal\r

   device path in the Terminal Device in TerminalMenu is also updated.\r
 \r
   @param DevicePath      The multi-instance device path.\r
   device path in the Terminal Device in TerminalMenu is also updated.\r
 \r
   @param DevicePath      The multi-instance device path.\r

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

                          in TerminalMenu is also updated; FALSE, no update.\r
 \r
   @return EFI_SUCCESS    The function completes successfully.\r
                          in TerminalMenu is also updated; FALSE, no update.\r
 \r
   @return EFI_SUCCESS    The function completes successfully.\r


@@ -732,7 +732,7 @@ UpdateComAttributeFromVariable (
                          and BM_CONSOLE_ERR_CONTEXT_SELECT.\r
 \r
   @retval EFI_UNSUPPORTED The type passed in is not in the 3 types defined.\r
                          and BM_CONSOLE_ERR_CONTEXT_SELECT.\r
 \r
   @retval EFI_UNSUPPORTED The type passed in is not in the 3 types defined.\r

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

                           "ConInDev" or "ConErrDev" doesn't exists.\r
   @retval EFI_OUT_OF_RESOURCES Not enough resource to complete the operations.\r
   @retval EFI_SUCCESS          Function completes successfully.\r
                           "ConInDev" or "ConErrDev" doesn't exists.\r
   @retval EFI_OUT_OF_RESOURCES Not enough resource to complete the operations.\r
   @retval EFI_SUCCESS          Function completes successfully.\r


@@ -1021,14 +1021,14 @@ GetConsoleOutMode (
 \r
   @param CallbackData    The BMM context data.\r
 \r
 \r
   @param CallbackData    The BMM context data.\r
 \r

-**/  \r
-VOID  \r
+**/\r
+VOID\r

 GetConsoleInCheck (\r
   IN  BMM_CALLBACK_DATA    *CallbackData\r
   )\r
 {\r
   UINT16              Index;\r
 GetConsoleInCheck (\r
   IN  BMM_CALLBACK_DATA    *CallbackData\r
   )\r
 {\r
   UINT16              Index;\r

-  BM_MENU_ENTRY       *NewMenuEntry; \r
+  BM_MENU_ENTRY       *NewMenuEntry;\r

   UINT8               *ConInCheck;\r
   BM_CONSOLE_CONTEXT  *NewConsoleContext;\r
   BM_TERMINAL_CONTEXT *NewTerminalContext;\r
   UINT8               *ConInCheck;\r
   BM_CONSOLE_CONTEXT  *NewConsoleContext;\r
   BM_TERMINAL_CONTEXT *NewTerminalContext;\r


@@ -1037,9 +1037,9 @@ GetConsoleInCheck (
 \r
   ConInCheck = &CallbackData->BmmFakeNvData.ConsoleInCheck[0];\r
   for (Index = 0; ((Index < ConsoleInpMenu.MenuNumber) && \\r
 \r
   ConInCheck = &CallbackData->BmmFakeNvData.ConsoleInCheck[0];\r
   for (Index = 0; ((Index < ConsoleInpMenu.MenuNumber) && \\r

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

     NewMenuEntry      = BOpt_GetMenuEntry (&ConsoleInpMenu, Index);\r
     NewMenuEntry      = BOpt_GetMenuEntry (&ConsoleInpMenu, Index);\r

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

     ConInCheck[Index] = NewConsoleContext->IsActive;\r
   }\r
 \r
     ConInCheck[Index] = NewConsoleContext->IsActive;\r
   }\r
 \r


@@ -1058,14 +1058,14 @@ GetConsoleInCheck (
 \r
   @param CallbackData    The BMM context data.\r
 \r
 \r
   @param CallbackData    The BMM context data.\r
 \r

-**/      \r
-VOID    \r
+**/\r
+VOID\r

 GetConsoleOutCheck (\r
   IN  BMM_CALLBACK_DATA    *CallbackData\r
   )\r
 {\r
   UINT16              Index;\r
 GetConsoleOutCheck (\r
   IN  BMM_CALLBACK_DATA    *CallbackData\r
   )\r
 {\r
   UINT16              Index;\r

-  BM_MENU_ENTRY       *NewMenuEntry; \r
+  BM_MENU_ENTRY       *NewMenuEntry;\r

   UINT8               *ConOutCheck;\r
   BM_CONSOLE_CONTEXT  *NewConsoleContext;\r
   BM_TERMINAL_CONTEXT *NewTerminalContext;\r
   UINT8               *ConOutCheck;\r
   BM_CONSOLE_CONTEXT  *NewConsoleContext;\r
   BM_TERMINAL_CONTEXT *NewTerminalContext;\r


@@ -1073,9 +1073,9 @@ GetConsoleOutCheck (
   ASSERT (CallbackData != NULL);\r
   ConOutCheck = &CallbackData->BmmFakeNvData.ConsoleOutCheck[0];\r
   for (Index = 0; ((Index < ConsoleOutMenu.MenuNumber) && \\r
   ASSERT (CallbackData != NULL);\r
   ConOutCheck = &CallbackData->BmmFakeNvData.ConsoleOutCheck[0];\r
   for (Index = 0; ((Index < ConsoleOutMenu.MenuNumber) && \\r

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

     NewMenuEntry      = BOpt_GetMenuEntry (&ConsoleOutMenu, Index);\r
     NewMenuEntry      = BOpt_GetMenuEntry (&ConsoleOutMenu, Index);\r

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

     ConOutCheck[Index] = NewConsoleContext->IsActive;\r
   }\r
 \r
     ConOutCheck[Index] = NewConsoleContext->IsActive;\r
   }\r
 \r


@@ -1094,14 +1094,14 @@ GetConsoleOutCheck (
 \r
   @param CallbackData    The BMM context data.\r
 \r
 \r
   @param CallbackData    The BMM context data.\r
 \r

-**/        \r
-VOID  \r
+**/\r
+VOID\r

 GetConsoleErrCheck (\r
   IN  BMM_CALLBACK_DATA    *CallbackData\r
   )\r
 {\r
   UINT16              Index;\r
 GetConsoleErrCheck (\r
   IN  BMM_CALLBACK_DATA    *CallbackData\r
   )\r
 {\r
   UINT16              Index;\r

-  BM_MENU_ENTRY       *NewMenuEntry; \r
+  BM_MENU_ENTRY       *NewMenuEntry;\r

   UINT8               *ConErrCheck;\r
   BM_CONSOLE_CONTEXT  *NewConsoleContext;\r
   BM_TERMINAL_CONTEXT *NewTerminalContext;\r
   UINT8               *ConErrCheck;\r
   BM_CONSOLE_CONTEXT  *NewConsoleContext;\r
   BM_TERMINAL_CONTEXT *NewTerminalContext;\r


@@ -1109,9 +1109,9 @@ GetConsoleErrCheck (
   ASSERT (CallbackData != NULL);\r
   ConErrCheck = &CallbackData->BmmFakeNvData.ConsoleErrCheck[0];\r
   for (Index = 0; ((Index < ConsoleErrMenu.MenuNumber) && \\r
   ASSERT (CallbackData != NULL);\r
   ConErrCheck = &CallbackData->BmmFakeNvData.ConsoleErrCheck[0];\r
   for (Index = 0; ((Index < ConsoleErrMenu.MenuNumber) && \\r

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

     NewMenuEntry      = BOpt_GetMenuEntry (&ConsoleErrMenu, Index);\r
     NewMenuEntry      = BOpt_GetMenuEntry (&ConsoleErrMenu, Index);\r

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

     ConErrCheck[Index] = NewConsoleContext->IsActive;\r
   }\r
 \r
     ConErrCheck[Index] = NewConsoleContext->IsActive;\r
   }\r
 \r


@@ -1131,22 +1131,22 @@ GetConsoleErrCheck (
   @param CallbackData    The BMM context data.\r
 \r
 **/\r
   @param CallbackData    The BMM context data.\r
 \r
 **/\r

-VOID  \r
+VOID\r

 GetTerminalAttribute (\r
   IN  BMM_CALLBACK_DATA    *CallbackData\r
   )\r
 {\r
   BMM_FAKE_NV_DATA     *CurrentFakeNVMap;\r
   BM_MENU_ENTRY        *NewMenuEntry;\r
 GetTerminalAttribute (\r
   IN  BMM_CALLBACK_DATA    *CallbackData\r
   )\r
 {\r
   BMM_FAKE_NV_DATA     *CurrentFakeNVMap;\r
   BM_MENU_ENTRY        *NewMenuEntry;\r

-  BM_TERMINAL_CONTEXT  *NewTerminalContext;    \r
-  UINT16               TerminalIndex;  \r
+  BM_TERMINAL_CONTEXT  *NewTerminalContext;\r
+  UINT16               TerminalIndex;\r

   UINT8                AttributeIndex;\r
 \r
   ASSERT (CallbackData != NULL);\r
 \r
   UINT8                AttributeIndex;\r
 \r
   ASSERT (CallbackData != NULL);\r
 \r

-  CurrentFakeNVMap = &CallbackData->BmmFakeNvData;     \r
+  CurrentFakeNVMap = &CallbackData->BmmFakeNvData;\r

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

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

     NewMenuEntry        = BOpt_GetMenuEntry (&TerminalMenu, TerminalIndex);\r
     NewTerminalContext  = (BM_TERMINAL_CONTEXT *) NewMenuEntry->VariableContext;\r
     for (AttributeIndex = 0; AttributeIndex < sizeof (BaudRateList) / sizeof (BaudRateList [0]); AttributeIndex++) {\r
     NewMenuEntry        = BOpt_GetMenuEntry (&TerminalMenu, TerminalIndex);\r
     NewTerminalContext  = (BM_TERMINAL_CONTEXT *) NewMenuEntry->VariableContext;\r
     for (AttributeIndex = 0; AttributeIndex < sizeof (BaudRateList) / sizeof (BaudRateList [0]); AttributeIndex++) {\r


@@ -1160,7 +1160,7 @@ GetTerminalAttribute (
         NewTerminalContext->DataBitsIndex = AttributeIndex;\r
         break;\r
       }\r
         NewTerminalContext->DataBitsIndex = AttributeIndex;\r
         break;\r
       }\r

-    }    \r
+    }\r

 \r
     for (AttributeIndex = 0; AttributeIndex < ARRAY_SIZE (ParityList); AttributeIndex++) {\r
       if (NewTerminalContext->Parity == (UINT64) (ParityList[AttributeIndex].Value)) {\r
 \r
     for (AttributeIndex = 0; AttributeIndex < ARRAY_SIZE (ParityList); AttributeIndex++) {\r
       if (NewTerminalContext->Parity == (UINT64) (ParityList[AttributeIndex].Value)) {\r


@@ -1178,7 +1178,7 @@ GetTerminalAttribute (
     CurrentFakeNVMap->COMBaudRate[TerminalIndex]     = NewTerminalContext->BaudRateIndex;\r
     CurrentFakeNVMap->COMDataRate[TerminalIndex]     = NewTerminalContext->DataBitsIndex;\r
     CurrentFakeNVMap->COMStopBits[TerminalIndex]     = NewTerminalContext->StopBitsIndex;\r
     CurrentFakeNVMap->COMBaudRate[TerminalIndex]     = NewTerminalContext->BaudRateIndex;\r
     CurrentFakeNVMap->COMDataRate[TerminalIndex]     = NewTerminalContext->DataBitsIndex;\r
     CurrentFakeNVMap->COMStopBits[TerminalIndex]     = NewTerminalContext->StopBitsIndex;\r

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

     CurrentFakeNVMap->COMTerminalType[TerminalIndex] = NewTerminalContext->TerminalType;\r
     CurrentFakeNVMap->COMFlowControl[TerminalIndex]  = NewTerminalContext->FlowControl;\r
   }\r
     CurrentFakeNVMap->COMTerminalType[TerminalIndex] = NewTerminalContext->TerminalType;\r
     CurrentFakeNVMap->COMFlowControl[TerminalIndex]  = NewTerminalContext->FlowControl;\r
   }\r

diff --git a/MdeModulePkg/Library/BootMaintenanceManagerUiLib/FormGuid.h b/MdeModulePkg/Library/BootMaintenanceManagerUiLib/FormGuid.h
index 299a149f6011e357f449a76b35819a8a00cddde7..186b2b7e23ca7f4daa5842d8aeb73521ebf2a792 100644 (file)
--- a/MdeModulePkg/Library/BootMaintenanceManagerUiLib/FormGuid.h
+++ b/MdeModulePkg/Library/BootMaintenanceManagerUiLib/FormGuid.h
@@ -1,7 +1,7 @@
 /** @file\r
 Formset guids, form id and VarStore data structure for Boot Maintenance Manager.\r
 \r
 /** @file\r
 Formset guids, form id and VarStore data structure for Boot Maintenance Manager.\r
 \r

-Copyright (c) 2004 - 2016, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2004 - 2018, Intel Corporation. All rights reserved.<BR>\r

 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r


@@ -148,7 +148,7 @@ typedef struct {
   // At most 100 input/output/errorout device for console storage\r
   //\r
   UINT8   ConsoleCheck[MAX_MENU_NUMBER];\r
   // At most 100 input/output/errorout device for console storage\r
   //\r
   UINT8   ConsoleCheck[MAX_MENU_NUMBER];\r

-  \r
+\r

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

diff --git a/MdeModulePkg/Library/BootMaintenanceManagerUiLib/UpdatePage.c b/MdeModulePkg/Library/BootMaintenanceManagerUiLib/UpdatePage.c
index b3cc3c88dd0dae26a19ac6f07219dd7243607344..f598c46a5a8aaa0a43c02f560f86f77082f7860e 100644 (file)
--- a/MdeModulePkg/Library/BootMaintenanceManagerUiLib/UpdatePage.c
+++ b/MdeModulePkg/Library/BootMaintenanceManagerUiLib/UpdatePage.c
@@ -1,7 +1,7 @@
 /** @file\r
 Dynamically update the pages.\r
 \r
 /** @file\r
 Dynamically update the pages.\r
 \r

-Copyright (c) 2004 - 2017, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2004 - 2018, Intel Corporation. All rights reserved.<BR>\r

 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r


@@ -28,16 +28,16 @@ CreateUpdateData (
   //\r
   mStartOpCodeHandle = HiiAllocateOpCodeHandle ();\r
   ASSERT (mStartOpCodeHandle != NULL);\r
   //\r
   mStartOpCodeHandle = HiiAllocateOpCodeHandle ();\r
   ASSERT (mStartOpCodeHandle != NULL);\r

-  \r
+\r

   mEndOpCodeHandle = HiiAllocateOpCodeHandle ();\r
   ASSERT (mEndOpCodeHandle != NULL);\r
   mEndOpCodeHandle = HiiAllocateOpCodeHandle ();\r
   ASSERT (mEndOpCodeHandle != NULL);\r

-  \r
+\r

   //\r
   // Create Hii Extend Label OpCode as the start opcode\r
   //\r
   mStartLabel = (EFI_IFR_GUID_LABEL *) HiiCreateGuidOpCode (mStartOpCodeHandle, &gEfiIfrTianoGuid, NULL, sizeof (EFI_IFR_GUID_LABEL));\r
   mStartLabel->ExtendOpCode = EFI_IFR_EXTEND_OP_LABEL;\r
   //\r
   // Create Hii Extend Label OpCode as the start opcode\r
   //\r
   mStartLabel = (EFI_IFR_GUID_LABEL *) HiiCreateGuidOpCode (mStartOpCodeHandle, &gEfiIfrTianoGuid, NULL, sizeof (EFI_IFR_GUID_LABEL));\r
   mStartLabel->ExtendOpCode = EFI_IFR_EXTEND_OP_LABEL;\r

-  \r
+\r

   //\r
   // Create Hii Extend Label OpCode as the end opcode\r
   //\r
   //\r
   // Create Hii Extend Label OpCode as the end opcode\r
   //\r


@@ -57,7 +57,7 @@ RefreshUpdateData (
 {\r
   //\r
   // Free current updated date\r
 {\r
   //\r
   // Free current updated date\r

-  //  \r
+  //\r

   if (mStartOpCodeHandle != NULL) {\r
     HiiFreeOpCodeHandle (mStartOpCodeHandle);\r
   }\r
   if (mStartOpCodeHandle != NULL) {\r
     HiiFreeOpCodeHandle (mStartOpCodeHandle);\r
   }\r


@@ -78,7 +78,7 @@ RefreshUpdateData (
 /**\r
   Add a "Go back to main page" tag in front of the form when there are no\r
   "Apply changes" and "Discard changes" tags in the end of the form.\r
 /**\r
   Add a "Go back to main page" tag in front of the form when there are no\r
   "Apply changes" and "Discard changes" tags in the end of the form.\r

- \r
+\r

   @param CallbackData    The BMM context data.\r
 \r
 **/\r
   @param CallbackData    The BMM context data.\r
 \r
 **/\r


@@ -162,7 +162,7 @@ UpdatePageEnd (
 }\r
 \r
 /**\r
 }\r
 \r
 /**\r

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

 \r
   @param LabelId         It is both the Form ID and Label ID for opcode deletion.\r
   @param CallbackData    The BMM context data.\r
 \r
   @param LabelId         It is both the Form ID and Label ID for opcode deletion.\r
   @param CallbackData    The BMM context data.\r


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

-    \r
+\r

     HiiCreateCheckBoxOpCode (\r
       mStartOpCodeHandle,\r
       (EFI_QUESTION_ID) (BOOT_OPTION_DEL_QUESTION_ID + Index),\r
     HiiCreateCheckBoxOpCode (\r
       mStartOpCodeHandle,\r
       (EFI_QUESTION_ID) (BOOT_OPTION_DEL_QUESTION_ID + Index),\r


@@ -368,7 +368,7 @@ UpdateDrvDelPage (
 }\r
 \r
 /**\r
 }\r
 \r
 /**\r

-  Prepare the page to allow user to add description for \r
+  Prepare the page to allow user to add description for\r

   a Driver Option.\r
 \r
   @param CallbackData    The BMM context data.\r
   a Driver Option.\r
 \r
   @param CallbackData    The BMM context data.\r


@@ -582,8 +582,8 @@ UpdateOrderPage (
   OptionOrder = NULL;\r
   QuestionId = 0;\r
   VarOffset = 0;\r
   OptionOrder = NULL;\r
   QuestionId = 0;\r
   VarOffset = 0;\r

-  switch (UpdatePageId) { \r
-  \r
+  switch (UpdatePageId) {\r
+\r

   case FORM_BOOT_CHG_ID:\r
     //\r
     // If the BootOptionOrder in the BmmFakeNvData are same with the date in the BmmOldFakeNVData,\r
   case FORM_BOOT_CHG_ID:\r
     //\r
     // If the BootOptionOrder in the BmmFakeNvData are same with the date in the BmmOldFakeNVData,\r


@@ -598,7 +598,7 @@ UpdateOrderPage (
     QuestionId = BOOT_OPTION_ORDER_QUESTION_ID;\r
     VarOffset = BOOT_OPTION_ORDER_VAR_OFFSET;\r
     break;\r
     QuestionId = BOOT_OPTION_ORDER_QUESTION_ID;\r
     VarOffset = BOOT_OPTION_ORDER_VAR_OFFSET;\r
     break;\r

-    \r
+\r

   case FORM_DRV_CHG_ID:\r
     //\r
     // If the DriverOptionOrder in the BmmFakeNvData are same with the date in the BmmOldFakeNVData,\r
   case FORM_DRV_CHG_ID:\r
     //\r
     // If the DriverOptionOrder in the BmmFakeNvData are same with the date in the BmmOldFakeNVData,\r


@@ -613,12 +613,12 @@ UpdateOrderPage (
     QuestionId = DRIVER_OPTION_ORDER_QUESTION_ID;\r
     VarOffset = DRIVER_OPTION_ORDER_VAR_OFFSET;\r
     break;\r
     QuestionId = DRIVER_OPTION_ORDER_QUESTION_ID;\r
     VarOffset = DRIVER_OPTION_ORDER_VAR_OFFSET;\r
     break;\r

-  }  \r
-  ASSERT (OptionOrder != NULL);   \r
-  \r
+  }\r
+  ASSERT (OptionOrder != NULL);\r
+\r

   OptionsOpCodeHandle = HiiAllocateOpCodeHandle ();\r
   ASSERT (OptionsOpCodeHandle != NULL);\r
   OptionsOpCodeHandle = HiiAllocateOpCodeHandle ();\r
   ASSERT (OptionsOpCodeHandle != NULL);\r

-  \r
+\r

   NewMenuEntry = NULL;\r
   for (OptionIndex = 0; (OptionOrder[OptionIndex] != 0 && OptionIndex < MAX_MENU_NUMBER); OptionIndex++) {\r
     BootOptionFound = FALSE;\r
   NewMenuEntry = NULL;\r
   for (OptionIndex = 0; (OptionOrder[OptionIndex] != 0 && OptionIndex < MAX_MENU_NUMBER); OptionIndex++) {\r
     BootOptionFound = FALSE;\r


@@ -639,21 +639,21 @@ UpdateOrderPage (
         );\r
     }\r
   }\r
         );\r
     }\r
   }\r

-  \r
+\r

   if (OptionMenu->MenuNumber > 0) {\r
   if (OptionMenu->MenuNumber > 0) {\r

-    HiiCreateOrderedListOpCode (                   \r
-      mStartOpCodeHandle,                          // Container for dynamic created opcodes     \r
-      QuestionId,                                  // Question ID                               \r
-      VARSTORE_ID_BOOT_MAINT,                      // VarStore ID                               \r
-      VarOffset,                                   // Offset in Buffer Storage                  \r
-      STRING_TOKEN (STR_CHANGE_ORDER),             // Question prompt text                      \r
-      STRING_TOKEN (STR_CHANGE_ORDER),             // Question help text                        \r
-      0,                                           // Question flag                             \r
+    HiiCreateOrderedListOpCode (\r
+      mStartOpCodeHandle,                          // Container for dynamic created opcodes\r
+      QuestionId,                                  // Question ID\r
+      VARSTORE_ID_BOOT_MAINT,                      // VarStore ID\r
+      VarOffset,                                   // Offset in Buffer Storage\r
+      STRING_TOKEN (STR_CHANGE_ORDER),             // Question prompt text\r
+      STRING_TOKEN (STR_CHANGE_ORDER),             // Question help text\r
+      0,                                           // Question flag\r

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

-      EFI_IFR_TYPE_NUM_SIZE_32,                    // Data type of Question value               \r
-      100,                                         // Maximum container                         \r
-      OptionsOpCodeHandle,                         // Option Opcode list                        \r
-      NULL                                         // Default Opcode is NULL                    \r
+      EFI_IFR_TYPE_NUM_SIZE_32,                    // Data type of Question value\r
+      100,                                         // Maximum container\r
+      OptionsOpCodeHandle,                         // Option Opcode list\r
+      NULL                                         // Default Opcode is NULL\r

       );\r
   }\r
 \r
       );\r
   }\r
 \r


@@ -730,7 +730,7 @@ UpdateConModePage (
     if (EFI_ERROR (Status)) {\r
       continue;\r
     }\r
     if (EFI_ERROR (Status)) {\r
       continue;\r
     }\r

-    \r
+\r

     //\r
     // Build mode string Column x Row\r
     //\r
     //\r
     // Build mode string Column x Row\r
     //\r


@@ -848,7 +848,7 @@ UpdateTerminalPage (
     OptionsOpCodeHandle,\r
     NULL\r
     );\r
     OptionsOpCodeHandle,\r
     NULL\r
     );\r

-  \r
+\r

   HiiFreeOpCodeHandle (OptionsOpCodeHandle);\r
   OptionsOpCodeHandle = HiiAllocateOpCodeHandle ();\r
   ASSERT (OptionsOpCodeHandle != NULL);\r
   HiiFreeOpCodeHandle (OptionsOpCodeHandle);\r
   OptionsOpCodeHandle = HiiAllocateOpCodeHandle ();\r
   ASSERT (OptionsOpCodeHandle != NULL);\r


@@ -1013,7 +1013,7 @@ UpdateTerminalPage (
 \r
   UpdatePageEnd (CallbackData);\r
 }\r
 \r
   UpdatePageEnd (CallbackData);\r
 }\r

- \r
+\r

 /**\r
 Update add boot/driver option page.\r
 \r
 /**\r
 Update add boot/driver option page.\r
 \r

diff --git a/MdeModulePkg/Library/BootMaintenanceManagerUiLib/Variable.c b/MdeModulePkg/Library/BootMaintenanceManagerUiLib/Variable.c
index c1c55b0fb23c6b6bc492fb8ffe6a23720c67ffae..f934546829c08e9318febaecd9e3bad91f3c6ab4 100644 (file)
--- a/MdeModulePkg/Library/BootMaintenanceManagerUiLib/Variable.c
+++ b/MdeModulePkg/Library/BootMaintenanceManagerUiLib/Variable.c
@@ -1,7 +1,7 @@
 /** @file\r
 Variable operation that will be used by bootmaint\r
 \r
 /** @file\r
 Variable operation that will be used by bootmaint\r
 \r

-Copyright (c) 2004 - 2017, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2004 - 2018, Intel Corporation. All rights reserved.<BR>\r

 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r


@@ -17,10 +17,10 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 /**\r
   Delete Boot Option that represent a Deleted state in BootOptionMenu.\r
 \r
 /**\r
   Delete Boot Option that represent a Deleted state in BootOptionMenu.\r
 \r

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

                         BM_LOAD_CONTEXT marked for deletion is deleted.\r
   @retval EFI_NOT_FOUND If can not find the boot option want to be deleted.\r
                         BM_LOAD_CONTEXT marked for deletion is deleted.\r
   @retval EFI_NOT_FOUND If can not find the boot option want to be deleted.\r

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

 \r
 **/\r
 EFI_STATUS\r
 \r
 **/\r
 EFI_STATUS\r


@@ -124,7 +124,7 @@ Var_DelDriverOption (
 \r
   This function clear the EFI variable defined by ConsoleName and\r
   gEfiGlobalVariableGuid. It then build the multi-instance device\r
 \r
   This function clear the EFI variable defined by ConsoleName and\r
   gEfiGlobalVariableGuid. It then build the multi-instance device\r

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

   in ConsoleMenu. Then it scan all corresponding console device by\r
   scanning Terminal (built from device supporting Serial I/O instances)\r
   devices in TerminalMenu. At last, it save a EFI variable specifed\r
   in ConsoleMenu. Then it scan all corresponding console device by\r
   scanning Terminal (built from device supporting Serial I/O instances)\r
   devices in TerminalMenu. At last, it save a EFI variable specifed\r


@@ -188,7 +188,7 @@ Var_UpdateConsoleOption (
         ) {\r
       Vendor.Header.Type    = MESSAGING_DEVICE_PATH;\r
       Vendor.Header.SubType = MSG_VENDOR_DP;\r
         ) {\r
       Vendor.Header.Type    = MESSAGING_DEVICE_PATH;\r
       Vendor.Header.SubType = MSG_VENDOR_DP;\r

-      \r
+\r

       ASSERT (NewTerminalContext->TerminalType < (ARRAY_SIZE (TerminalTypeGuid)));\r
       CopyMem (\r
         &Vendor.Guid,\r
       ASSERT (NewTerminalContext->TerminalType < (ARRAY_SIZE (TerminalTypeGuid)));\r
       CopyMem (\r
         &Vendor.Guid,\r


@@ -261,7 +261,7 @@ Var_UpdateConsoleOutOption (
   console device.\r
 \r
   @retval EFI_SUCCESS    The function complete successfully.\r
   console device.\r
 \r
   @retval EFI_SUCCESS    The function complete successfully.\r

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

 **/\r
 EFI_STATUS\r
 Var_UpdateErrorOutOption (\r
 **/\r
 EFI_STATUS\r
 Var_UpdateErrorOutOption (\r


@@ -272,8 +272,8 @@ Var_UpdateErrorOutOption (
 }\r
 \r
 /**\r
 }\r
 \r
 /**\r

-  This function create a currently loaded Drive Option from \r
-  the BMM. It then appends this Driver Option to the end of \r
+  This function create a currently loaded Drive Option from\r
+  the BMM. It then appends this Driver Option to the end of\r

   the "DriverOrder" list. It append this Driver Opotion to the end\r
   of DriverOptionMenu.\r
 \r
   the "DriverOrder" list. It append this Driver Opotion to the end\r
   of DriverOptionMenu.\r
 \r


@@ -401,8 +401,8 @@ Var_UpdateDriverOption (
 }\r
 \r
 /**\r
 }\r
 \r
 /**\r

-  This function create a currently loaded Boot Option from \r
-  the BMM. It then appends this Boot Option to the end of \r
+  This function create a currently loaded Boot Option from\r
+  the BMM. It then appends this Boot Option to the end of\r

   the "BootOrder" list. It also append this Boot Opotion to the end\r
   of BootOptionMenu.\r
 \r
   the "BootOrder" list. It also append this Boot Opotion to the end\r
   of BootOptionMenu.\r
 \r


@@ -521,7 +521,7 @@ Var_UpdateBootOption (
 }\r
 \r
 /**\r
 }\r
 \r
 /**\r

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

   no "BootNext" specified in BMM, this EFI Variable is deleted.\r
   It also update the BMM context data specified the "BootNext"\r
   vaule.\r
   no "BootNext" specified in BMM, this EFI Variable is deleted.\r
   It also update the BMM context data specified the "BootNext"\r
   vaule.\r


@@ -529,7 +529,7 @@ Var_UpdateBootOption (
   @param CallbackData    The BMM context data.\r
 \r
   @retval EFI_SUCCESS    The function complete successfully.\r
   @param CallbackData    The BMM context data.\r
 \r
   @retval EFI_SUCCESS    The function complete successfully.\r

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

                          for detail return information.\r
 \r
 **/\r
                          for detail return information.\r
 \r
 **/\r


@@ -633,7 +633,7 @@ Var_UpdateBootOrder (
                   BootOrder\r
                   );\r
   FreePool (BootOrder);\r
                   BootOrder\r
                   );\r
   FreePool (BootOrder);\r

-  \r
+\r

   BOpt_FreeMenu (&BootOptionMenu);\r
   BOpt_GetBootOptions (CallbackData);\r
 \r
   BOpt_FreeMenu (&BootOptionMenu);\r
   BOpt_GetBootOptions (CallbackData);\r
 \r

diff --git a/MdeModulePkg/Library/BootManagerUiLib/BootManager.c b/MdeModulePkg/Library/BootManagerUiLib/BootManager.c
index 8e776327883a9ae732255eba3bd44809af7a9364..7f3edc3d3dfd0d0bb3b93d55fea7adfa779a586f 100644 (file)
--- a/MdeModulePkg/Library/BootManagerUiLib/BootManager.c
+++ b/MdeModulePkg/Library/BootManagerUiLib/BootManager.c
@@ -1,7 +1,7 @@
 /** @file\r
   The boot manager reference implementation\r
 \r
 /** @file\r
   The boot manager reference implementation\r
 \r

-Copyright (c) 2004 - 2017, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2004 - 2018, Intel Corporation. All rights reserved.<BR>\r

 This program and the accompanying materials are licensed and made available under\r
 the terms and conditions of the BSD License that accompanies this distribution.\r
 The full text of the license may be found at\r
 This program and the accompanying materials are licensed and made available under\r
 the terms and conditions of the BSD License that accompanies this distribution.\r
 The full text of the license may be found at\r


@@ -62,7 +62,7 @@ HII_VENDOR_DEVICE_PATH  mBootManagerHiiVendorDevicePath = {
   {\r
     END_DEVICE_PATH_TYPE,\r
     END_ENTIRE_DEVICE_PATH_SUBTYPE,\r
   {\r
     END_DEVICE_PATH_TYPE,\r
     END_ENTIRE_DEVICE_PATH_SUBTYPE,\r

-    { \r
+    {\r

       (UINT8) (END_DEVICE_PATH_LENGTH),\r
       (UINT8) ((END_DEVICE_PATH_LENGTH) >> 8)\r
     }\r
       (UINT8) (END_DEVICE_PATH_LENGTH),\r
       (UINT8) ((END_DEVICE_PATH_LENGTH) >> 8)\r
     }\r


@@ -82,9 +82,9 @@ BOOT_MANAGER_CALLBACK_DATA  gBootManagerPrivate = {
 \r
 /**\r
   This function will change video resolution and text mode\r
 \r
 /**\r
   This function will change video resolution and text mode\r

-  according to defined setup mode or defined boot mode  \r
+  according to defined setup mode or defined boot mode\r

 \r
 \r

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

 \r
   @retval  EFI_SUCCESS  Mode is changed successfully.\r
   @retval  Others             Mode failed to be changed.\r
 \r
   @retval  EFI_SUCCESS  Mode is changed successfully.\r
   @retval  Others             Mode failed to be changed.\r


@@ -111,13 +111,13 @@ BmSetConsoleMode (
   EFI_STATUS                            Status;\r
   UINTN                                 Index;\r
   UINTN                                 CurrentColumn;\r
   EFI_STATUS                            Status;\r
   UINTN                                 Index;\r
   UINTN                                 CurrentColumn;\r

-  UINTN                                 CurrentRow;  \r
+  UINTN                                 CurrentRow;\r

 \r
   MaxGopMode  = 0;\r
   MaxTextMode = 0;\r
 \r
   //\r
 \r
   MaxGopMode  = 0;\r
   MaxTextMode = 0;\r
 \r
   //\r

-  // Get current video resolution and text mode \r
+  // Get current video resolution and text mode\r

   //\r
   Status = gBS->HandleProtocol (\r
                   gST->ConsoleOutHandle,\r
   //\r
   Status = gBS->HandleProtocol (\r
                   gST->ConsoleOutHandle,\r


@@ -156,7 +156,7 @@ BmSetConsoleMode (
     NewHorizontalResolution = mBmBootHorizontalResolution;\r
     NewVerticalResolution   = mBmBootVerticalResolution;\r
     NewColumns              = mBmBootTextModeColumn;\r
     NewHorizontalResolution = mBmBootHorizontalResolution;\r
     NewVerticalResolution   = mBmBootVerticalResolution;\r
     NewColumns              = mBmBootTextModeColumn;\r

-    NewRows                 = mBmBootTextModeRow;   \r
+    NewRows                 = mBmBootTextModeRow;\r

   }\r
 \r
   if (GraphicsOutput != NULL) {\r
   }\r
 \r
   if (GraphicsOutput != NULL) {\r


@@ -340,7 +340,7 @@ BmSetupResetReminder (
 /**\r
   Group the legacy boot options in the BootOption.\r
 \r
 /**\r
   Group the legacy boot options in the BootOption.\r
 \r

-  The routine assumes the boot options in the beginning that covers all the device \r
+  The routine assumes the boot options in the beginning that covers all the device\r

   types are ordered properly and re-position the following boot options just after\r
   the corresponding boot options with the same device type.\r
   For example:\r
   types are ordered properly and re-position the following boot options just after\r
   the corresponding boot options with the same device type.\r
   For example:\r


@@ -466,7 +466,7 @@ BmDevicePathToStr (
   This function invokes Boot Manager. It then enumerate all boot options. If\r
   a boot option from the Boot Manager page is selected, Boot Manager will boot\r
   from this boot option.\r
   This function invokes Boot Manager. It then enumerate all boot options. If\r
   a boot option from the Boot Manager page is selected, Boot Manager will boot\r
   from this boot option.\r

-  \r
+\r

 **/\r
 VOID\r
 UpdateBootManager (\r
 **/\r
 VOID\r
 UpdateBootManager (\r


@@ -559,7 +559,7 @@ UpdateBootManager (
       NeedEndOp = FALSE;\r
       HiiCreateEndOpCode (StartOpCodeHandle);\r
     }\r
       NeedEndOp = FALSE;\r
       HiiCreateEndOpCode (StartOpCodeHandle);\r
     }\r

-    \r
+\r

     if (IsLegacyOption && DeviceType != ((BBS_BBS_DEVICE_PATH *) BootOption[Index].FilePath)->DeviceType) {\r
       if (NeedEndOp) {\r
         HiiCreateEndOpCode (StartOpCodeHandle);\r
     if (IsLegacyOption && DeviceType != ((BBS_BBS_DEVICE_PATH *) BootOption[Index].FilePath)->DeviceType) {\r
       if (NeedEndOp) {\r
         HiiCreateEndOpCode (StartOpCodeHandle);\r

diff --git a/MdeModulePkg/Library/BootManagerUiLib/BootManagerStrings.uni b/MdeModulePkg/Library/BootManagerUiLib/BootManagerStrings.uni
index 188a3abc8ecff525acf9c5a5f0d9fd8c7c375955..598369e38f76333673fc1d12b6a9a3d40b2adfdf 100644 (file)
--- a/MdeModulePkg/Library/BootManagerUiLib/BootManagerStrings.uni
+++ b/MdeModulePkg/Library/BootManagerUiLib/BootManagerStrings.uni
@@ -1,24 +1,24 @@
 ///** @file\r
 //\r
 ///** @file\r
 //\r

-// Copyright (c) 2007 - 2015, Intel Corporation. All rights reserved.<BR>\r
-// This program and the accompanying materials                          \r
-// are licensed and made available under the terms and conditions of the BSD License         \r
-// which accompanies this distribution.  The full text of the license may be found at        \r
-// http://opensource.org/licenses/bsd-license.php                                            \r
-//                                                                                           \r
-// THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     \r
-// WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             \r
-// \r
+// Copyright (c) 2007 - 2018, Intel Corporation. All rights reserved.<BR>\r
+// This program and the accompanying materials\r
+// are licensed and made available under the terms and conditions of the BSD License\r
+// which accompanies this distribution.  The full text of the license may be found at\r
+// http://opensource.org/licenses/bsd-license.php\r
+//\r
+// THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
+// WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
+//\r

 // Module Name:\r
 //\r
 //   BootManagerStrings.uni\r
 // Module Name:\r
 //\r
 //   BootManagerStrings.uni\r

-// \r
+//\r

 // Abstract:\r
 // Abstract:\r

-// \r
+//\r

 //   String definitions for Boot Manager formset.\r
 //   String definitions for Boot Manager formset.\r

-// \r
+//\r

 // Revision History:\r
 // Revision History:\r

-// \r
+//\r

 // --*/\r
 \r
 /=#\r
 // --*/\r
 \r
 /=#\r

diff --git a/MdeModulePkg/Library/BootManagerUiLib/BootManagerUiLib.inf b/MdeModulePkg/Library/BootManagerUiLib/BootManagerUiLib.inf
index 7983b0794938d4628ec4d20ef86aa4fa8e125414..f6fc074b9d1bc0dcb1328f9a027e3a75b26b5750 100644 (file)
--- a/MdeModulePkg/Library/BootManagerUiLib/BootManagerUiLib.inf
+++ b/MdeModulePkg/Library/BootManagerUiLib/BootManagerUiLib.inf
@@ -1,12 +1,12 @@
 ## @file\r
 #  Boot Manager Library used by UiApp.\r
 #\r
 ## @file\r
 #  Boot Manager Library used by UiApp.\r
 #\r

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

 #  This program and the accompanying materials are licensed and made available under\r
 #  the terms and conditions of the BSD License that accompanies this distribution.\r
 #  The full text of the license may be found at\r
 #  http://opensource.org/licenses/bsd-license.php.\r
 #  This program and the accompanying materials are licensed and made available under\r
 #  the terms and conditions of the BSD License that accompanies this distribution.\r
 #  The full text of the license may be found at\r
 #  http://opensource.org/licenses/bsd-license.php.\r

-#  \r
+#\r

 #  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 #  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 #\r
 #  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 #  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 #\r

diff --git a/MdeModulePkg/Library/CpuExceptionHandlerLibNull/CpuExceptionHandlerLibNull.c b/MdeModulePkg/Library/CpuExceptionHandlerLibNull/CpuExceptionHandlerLibNull.c
index 723e644e38f02a94903bf06b863caebe3b10d0d9..e1ed6df4ca61e56570ca7aca5719b03f025166ce 100644 (file)
--- a/MdeModulePkg/Library/CpuExceptionHandlerLibNull/CpuExceptionHandlerLibNull.c
+++ b/MdeModulePkg/Library/CpuExceptionHandlerLibNull/CpuExceptionHandlerLibNull.c
@@ -1,7 +1,7 @@
 /** @file\r
   CPU Exception Handler library implementition with empty functions.\r
 \r
 /** @file\r
   CPU Exception Handler library implementition with empty functions.\r
 \r

-  Copyright (c) 2012 - 2017, Intel Corporation. All rights reserved.<BR>\r
+  Copyright (c) 2012 - 2018, Intel Corporation. All rights reserved.<BR>\r

   This program and the accompanying materials\r
   are licensed and made available under the terms and conditions of the BSD License\r
   which accompanies this distribution.  The full text of the license may be found at\r
   This program and the accompanying materials\r
   are licensed and made available under the terms and conditions of the BSD License\r
   which accompanies this distribution.  The full text of the license may be found at\r


@@ -16,15 +16,15 @@
 \r
 /**\r
   Initializes all CPU exceptions entries and provides the default exception handlers.\r
 \r
 /**\r
   Initializes all CPU exceptions entries and provides the default exception handlers.\r

-  \r
+\r

   Caller should try to get an array of interrupt and/or exception vectors that are in use and need to\r
   persist by EFI_VECTOR_HANDOFF_INFO defined in PI 1.3 specification.\r
   Caller should try to get an array of interrupt and/or exception vectors that are in use and need to\r
   persist by EFI_VECTOR_HANDOFF_INFO defined in PI 1.3 specification.\r

-  If caller cannot get reserved vector list or it does not exists, set VectorInfo to NULL. \r
+  If caller cannot get reserved vector list or it does not exists, set VectorInfo to NULL.\r

   If VectorInfo is not NULL, the exception vectors will be initialized per vector attribute accordingly.\r
 \r
   @param[in]  VectorInfo    Pointer to reserved vector list.\r
   If VectorInfo is not NULL, the exception vectors will be initialized per vector attribute accordingly.\r
 \r
   @param[in]  VectorInfo    Pointer to reserved vector list.\r

-  \r
-  @retval EFI_SUCCESS           CPU Exception Entries have been successfully initialized \r
+\r
+  @retval EFI_SUCCESS           CPU Exception Entries have been successfully initialized\r

                                 with default exception handlers.\r
   @retval EFI_INVALID_PARAMETER VectorInfo includes the invalid content if VectorInfo is not NULL.\r
   @retval EFI_UNSUPPORTED       This function is not supported.\r
                                 with default exception handlers.\r
   @retval EFI_INVALID_PARAMETER VectorInfo includes the invalid content if VectorInfo is not NULL.\r
   @retval EFI_UNSUPPORTED       This function is not supported.\r


@@ -41,15 +41,15 @@ InitializeCpuExceptionHandlers (
 \r
 /**\r
   Initializes all CPU interrupt/exceptions entries and provides the default interrupt/exception handlers.\r
 \r
 /**\r
   Initializes all CPU interrupt/exceptions entries and provides the default interrupt/exception handlers.\r

-  \r
+\r

   Caller should try to get an array of interrupt and/or exception vectors that are in use and need to\r
   persist by EFI_VECTOR_HANDOFF_INFO defined in PI 1.3 specification.\r
   Caller should try to get an array of interrupt and/or exception vectors that are in use and need to\r
   persist by EFI_VECTOR_HANDOFF_INFO defined in PI 1.3 specification.\r

-  If caller cannot get reserved vector list or it does not exists, set VectorInfo to NULL. \r
+  If caller cannot get reserved vector list or it does not exists, set VectorInfo to NULL.\r

   If VectorInfo is not NULL, the exception vectors will be initialized per vector attribute accordingly.\r
 \r
   @param[in]  VectorInfo    Pointer to reserved vector list.\r
   If VectorInfo is not NULL, the exception vectors will be initialized per vector attribute accordingly.\r
 \r
   @param[in]  VectorInfo    Pointer to reserved vector list.\r

-  \r
-  @retval EFI_SUCCESS           All CPU interrupt/exception entries have been successfully initialized \r
+\r
+  @retval EFI_SUCCESS           All CPU interrupt/exception entries have been successfully initialized\r

                                 with default interrupt/exception handlers.\r
   @retval EFI_INVALID_PARAMETER VectorInfo includes the invalid content if VectorInfo is not NULL.\r
   @retval EFI_UNSUPPORTED       This function is not supported.\r
                                 with default interrupt/exception handlers.\r
   @retval EFI_INVALID_PARAMETER VectorInfo includes the invalid content if VectorInfo is not NULL.\r
   @retval EFI_UNSUPPORTED       This function is not supported.\r


@@ -67,9 +67,9 @@ InitializeCpuInterruptHandlers (
 /**\r
   Registers a function to be called from the processor interrupt handler.\r
 \r
 /**\r
   Registers a function to be called from the processor interrupt handler.\r
 \r

-  This function registers and enables the handler specified by InterruptHandler for a processor \r
-  interrupt or exception type specified by InterruptType. If InterruptHandler is NULL, then the \r
-  handler for the processor interrupt or exception type specified by InterruptType is uninstalled. \r
+  This function registers and enables the handler specified by InterruptHandler for a processor\r
+  interrupt or exception type specified by InterruptType. If InterruptHandler is NULL, then the\r
+  handler for the processor interrupt or exception type specified by InterruptType is uninstalled.\r

   The installed handler is called once for each processor interrupt or exception.\r
   NOTE: This function should be invoked after InitializeCpuExceptionHandlers() or\r
   InitializeCpuInterruptHandlers() invoked, otherwise EFI_UNSUPPORTED returned.\r
   The installed handler is called once for each processor interrupt or exception.\r
   NOTE: This function should be invoked after InitializeCpuExceptionHandlers() or\r
   InitializeCpuInterruptHandlers() invoked, otherwise EFI_UNSUPPORTED returned.\r

diff --git a/MdeModulePkg/Library/CustomizedDisplayLib/CustomizedDisplayLib.c b/MdeModulePkg/Library/CustomizedDisplayLib/CustomizedDisplayLib.c
index e29892ff17f15152c4c68559212ae53e0daf5f4c..485815bbd26305f9059f19f828a8e6d0744d0210 100644 (file)
--- a/MdeModulePkg/Library/CustomizedDisplayLib/CustomizedDisplayLib.c
+++ b/MdeModulePkg/Library/CustomizedDisplayLib/CustomizedDisplayLib.c
@@ -2,13 +2,13 @@
 \r
   This library class defines a set of interfaces to customize Display module\r
 \r
 \r
   This library class defines a set of interfaces to customize Display module\r
 \r

-Copyright (c) 2013 - 2014, Intel Corporation. All rights reserved.<BR>\r
-This program and the accompanying materials are licensed and made available under \r
-the terms and conditions of the BSD License that accompanies this distribution.  \r
+Copyright (c) 2013 - 2018, Intel Corporation. All rights reserved.<BR>\r
+This program and the accompanying materials are licensed and made available under\r
+the terms and conditions of the BSD License that accompanies this distribution.\r

 The full text of the license may be found at\r
 The full text of the license may be found at\r

-http://opensource.org/licenses/bsd-license.php.                                            \r
+http://opensource.org/licenses/bsd-license.php.\r

 \r
 \r

-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     \r
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r

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


@@ -44,14 +44,14 @@ Statement
 **/\r
 \r
 /**\r
 **/\r
 \r
 /**\r

-  This funtion defines Page Frame and Backgroud. \r
-  \r
-  Based on the above layout, it will be responsible for HeaderHeight, FooterHeight, \r
-  StatusBarHeight and Backgroud. And, it will reserve Screen for Statement. \r
+  This funtion defines Page Frame and Backgroud.\r
+\r
+  Based on the above layout, it will be responsible for HeaderHeight, FooterHeight,\r
+  StatusBarHeight and Backgroud. And, it will reserve Screen for Statement.\r

 \r
   @param[in]  FormData             Form Data to be shown in Page.\r
   @param[out] ScreenForStatement   Screen to be used for Statement. (Prompt, Value and Help)\r
 \r
   @param[in]  FormData             Form Data to be shown in Page.\r
   @param[out] ScreenForStatement   Screen to be used for Statement. (Prompt, Value and Help)\r

-  \r
+\r

   @return Status\r
 **/\r
 EFI_STATUS\r
   @return Status\r
 **/\r
 EFI_STATUS\r


@@ -120,8 +120,8 @@ DisplayPageFrame (
   This function updates customized key panel's help information.\r
   The library will prepare those Strings for the basic key, ESC, Enter, Up/Down/Left/Right, +/-.\r
   and arrange them in Footer panel.\r
   This function updates customized key panel's help information.\r
   The library will prepare those Strings for the basic key, ESC, Enter, Up/Down/Left/Right, +/-.\r
   and arrange them in Footer panel.\r

-  \r
-  @param[in]  FormData       Form Data to be shown in Page. FormData has the highlighted statement. \r
+\r
+  @param[in]  FormData       Form Data to be shown in Page. FormData has the highlighted statement.\r

   @param[in]  Statement      The statement current selected.\r
   @param[in]  Selected       Whether or not a tag be selected. TRUE means Enter has hit this question.\r
 **/\r
   @param[in]  Statement      The statement current selected.\r
   @param[in]  Selected       Whether or not a tag be selected. TRUE means Enter has hit this question.\r
 **/\r


@@ -214,7 +214,7 @@ RefreshKeyHelp (
   } else if (Statement->OpCode->OpCode == EFI_IFR_TIME_OP) {\r
     TimeOp  = (EFI_IFR_TIME *) Statement->OpCode;\r
     HexDisplay = (TimeOp->Flags & EFI_IFR_DISPLAY_UINT_HEX) == EFI_IFR_DISPLAY_UINT_HEX;\r
   } else if (Statement->OpCode->OpCode == EFI_IFR_TIME_OP) {\r
     TimeOp  = (EFI_IFR_TIME *) Statement->OpCode;\r
     HexDisplay = (TimeOp->Flags & EFI_IFR_DISPLAY_UINT_HEX) == EFI_IFR_DISPLAY_UINT_HEX;\r

-  }  \r
+  }\r

   switch (Statement->OpCode->OpCode) {\r
   case EFI_IFR_ORDERED_LIST_OP:\r
   case EFI_IFR_ONE_OF_OP:\r
   switch (Statement->OpCode->OpCode) {\r
   case EFI_IFR_ORDERED_LIST_OP:\r
   case EFI_IFR_ONE_OF_OP:\r


@@ -232,7 +232,7 @@ RefreshKeyHelp (
       if ((Statement->OpCode->OpCode == EFI_IFR_DATE_OP) ||\r
           (Statement->OpCode->OpCode == EFI_IFR_TIME_OP)) {\r
         PrintAt (\r
       if ((Statement->OpCode->OpCode == EFI_IFR_DATE_OP) ||\r
           (Statement->OpCode->OpCode == EFI_IFR_TIME_OP)) {\r
         PrintAt (\r

-          ColumnWidth1, \r
+          ColumnWidth1,\r

           StartColumnOfHelp,\r
           BottomRowOfHelp,\r
           L"%c%c%c%c%s",\r
           StartColumnOfHelp,\r
           BottomRowOfHelp,\r
           L"%c%c%c%c%s",\r


@@ -259,7 +259,7 @@ RefreshKeyHelp (
       //\r
       // If it is a selected numeric with manual input, display different message\r
       //\r
       //\r
       // If it is a selected numeric with manual input, display different message\r
       //\r

-      if ((Statement->OpCode->OpCode == EFI_IFR_NUMERIC_OP) || \r
+      if ((Statement->OpCode->OpCode == EFI_IFR_NUMERIC_OP) ||\r

           (Statement->OpCode->OpCode == EFI_IFR_DATE_OP) ||\r
           (Statement->OpCode->OpCode == EFI_IFR_TIME_OP)) {\r
         ColumnStr2 = HexDisplay ? gHexNumericInput : gDecNumericInput;\r
           (Statement->OpCode->OpCode == EFI_IFR_DATE_OP) ||\r
           (Statement->OpCode->OpCode == EFI_IFR_TIME_OP)) {\r
         ColumnStr2 = HexDisplay ? gHexNumericInput : gDecNumericInput;\r


@@ -329,16 +329,16 @@ RefreshKeyHelp (
 \r
   default:\r
     break;\r
 \r
   default:\r
     break;\r

-  }  \r
+  }\r

 }\r
 \r
 /**\r
   Update status bar.\r
 \r
 }\r
 \r
 /**\r
   Update status bar.\r
 \r

-  This function updates the status bar on the bottom of menu screen. It just shows StatusBar. \r
+  This function updates the status bar on the bottom of menu screen. It just shows StatusBar.\r

   Original logic in this function should be splitted out.\r
 \r
   Original logic in this function should be splitted out.\r
 \r

-  @param[in]  MessageType            The type of message to be shown. InputError or Configuration Changed. \r
+  @param[in]  MessageType            The type of message to be shown. InputError or Configuration Changed.\r

   @param[in]  State                  Show or Clear Message.\r
 **/\r
 VOID\r
   @param[in]  State                  Show or Clear Message.\r
 **/\r
 VOID\r


@@ -395,17 +395,17 @@ UpdateStatusBar (
 \r
   default:\r
     break;\r
 \r
   default:\r
     break;\r

-  } \r
+  }\r

 }\r
 \r
 /**\r
 }\r
 \r
 /**\r

-  Create popup window. It will replace CreateDialog(). \r
+  Create popup window. It will replace CreateDialog().\r

 \r
   This function draws OEM/Vendor specific pop up windows.\r
 \r
   @param[out]  Key    User Input Key\r
   @param       ...    String to be shown in Popup. The variable argument list is terminated by a NULL.\r
 \r
   This function draws OEM/Vendor specific pop up windows.\r
 \r
   @param[out]  Key    User Input Key\r
   @param       ...    String to be shown in Popup. The variable argument list is terminated by a NULL.\r

-  \r
+\r

 **/\r
 VOID\r
 EFIAPI\r
 **/\r
 VOID\r
 EFIAPI\r


@@ -453,17 +453,17 @@ CreateDialog (
   VA_START (Marker, Key);\r
   while  ((String = VA_ARG (Marker, CHAR16 *)) != NULL) {\r
     LineNum ++;\r
   VA_START (Marker, Key);\r
   while  ((String = VA_ARG (Marker, CHAR16 *)) != NULL) {\r
     LineNum ++;\r

-    \r
+\r

     if ((LibGetStringWidth (String) / 2) > LargestString) {\r
       LargestString = (LibGetStringWidth (String) / 2);\r
     }\r
     if ((LibGetStringWidth (String) / 2) > LargestString) {\r
       LargestString = (LibGetStringWidth (String) / 2);\r
     }\r

-  } \r
+  }\r

   VA_END (Marker);\r
 \r
   if ((LargestString + 2) > DimensionsWidth) {\r
     LargestString = DimensionsWidth - 2;\r
   }\r
   VA_END (Marker);\r
 \r
   if ((LargestString + 2) > DimensionsWidth) {\r
     LargestString = DimensionsWidth - 2;\r
   }\r

-  \r
+\r

   CurrentAttribute  = gST->ConOut->Mode->Attribute;\r
   CursorVisible     = gST->ConOut->Mode->CursorVisible;\r
   gST->ConOut->EnableCursor (gST->ConOut, FALSE);\r
   CurrentAttribute  = gST->ConOut->Mode->Attribute;\r
   CursorVisible     = gST->ConOut->Mode->CursorVisible;\r
   gST->ConOut->EnableCursor (gST->ConOut, FALSE);\r


@@ -551,8 +551,8 @@ CreateDialog (
 }\r
 \r
 /**\r
 }\r
 \r
 /**\r

-  Confirm how to handle the changed data. \r
-  \r
+  Confirm how to handle the changed data.\r
+\r

   @return Action BROWSER_ACTION_SUBMIT, BROWSER_ACTION_DISCARD or other values.\r
 **/\r
 UINTN\r
   @return Action BROWSER_ACTION_SUBMIT, BROWSER_ACTION_DISCARD or other values.\r
 **/\r
 UINTN\r


@@ -566,10 +566,10 @@ ConfirmDataChange (
   EFI_INPUT_KEY           Key;\r
 \r
   gST->ConIn->ReadKeyStroke (gST->ConIn, &Key);\r
   EFI_INPUT_KEY           Key;\r
 \r
   gST->ConIn->ReadKeyStroke (gST->ConIn, &Key);\r

-  \r
+\r

   YesResponse = gYesResponse[0];\r
   NoResponse  = gNoResponse[0];\r
   YesResponse = gYesResponse[0];\r
   NoResponse  = gNoResponse[0];\r

-  \r
+\r

   //\r
   // If NV flag is up, prompt user\r
   //\r
   //\r
   // If NV flag is up, prompt user\r
   //\r


@@ -581,7 +581,7 @@ ConfirmDataChange (
     ((Key.UnicodeChar | UPPER_LOWER_CASE_OFFSET) != (NoResponse | UPPER_LOWER_CASE_OFFSET)) &&\r
     ((Key.UnicodeChar | UPPER_LOWER_CASE_OFFSET) != (YesResponse | UPPER_LOWER_CASE_OFFSET))\r
   );\r
     ((Key.UnicodeChar | UPPER_LOWER_CASE_OFFSET) != (NoResponse | UPPER_LOWER_CASE_OFFSET)) &&\r
     ((Key.UnicodeChar | UPPER_LOWER_CASE_OFFSET) != (YesResponse | UPPER_LOWER_CASE_OFFSET))\r
   );\r

-  \r
+\r

   if (Key.ScanCode == SCAN_ESC) {\r
     return BROWSER_ACTION_NONE;\r
   } else if ((Key.UnicodeChar | UPPER_LOWER_CASE_OFFSET) == (YesResponse | UPPER_LOWER_CASE_OFFSET)) {\r
   if (Key.ScanCode == SCAN_ESC) {\r
     return BROWSER_ACTION_NONE;\r
   } else if ((Key.UnicodeChar | UPPER_LOWER_CASE_OFFSET) == (YesResponse | UPPER_LOWER_CASE_OFFSET)) {\r


@@ -594,7 +594,7 @@ ConfirmDataChange (
 /**\r
   OEM specifies whether Setup exits Page by ESC key.\r
 \r
 /**\r
   OEM specifies whether Setup exits Page by ESC key.\r
 \r

-  This function customized the behavior that whether Setup exits Page so that \r
+  This function customized the behavior that whether Setup exits Page so that\r

   system able to boot when configuration is not changed.\r
 \r
   @retval  TRUE     Exits FrontPage\r
   system able to boot when configuration is not changed.\r
 \r
   @retval  TRUE     Exits FrontPage\r


@@ -610,14 +610,14 @@ FormExitPolicy (
 }\r
 \r
 /**\r
 }\r
 \r
 /**\r

-  Set Timeout value for a ceratain Form to get user response. \r
-  \r
+  Set Timeout value for a ceratain Form to get user response.\r
+\r

   This function allows to set timeout value on a ceratain form if necessary.\r
   This function allows to set timeout value on a ceratain form if necessary.\r

-  If timeout is not zero, the form will exit if user has no response in timeout. \r
-  \r
+  If timeout is not zero, the form will exit if user has no response in timeout.\r
+\r

   @param[in]  FormData   Form Data to be shown in Page\r
 \r
   @param[in]  FormData   Form Data to be shown in Page\r
 \r

-  @return 0     No timeout for this form. \r
+  @return 0     No timeout for this form.\r

   @return > 0   Timeout value in 100 ns units.\r
 **/\r
 UINT64\r
   @return > 0   Timeout value in 100 ns units.\r
 **/\r
 UINT64\r


@@ -898,7 +898,7 @@ GetSubTitleTextColor (
   Clear Screen to the initial state.\r
 **/\r
 VOID\r
   Clear Screen to the initial state.\r
 **/\r
 VOID\r

-EFIAPI \r
+EFIAPI\r

 ClearDisplayPage (\r
   VOID\r
   )\r
 ClearDisplayPage (\r
   VOID\r
   )\r


@@ -950,7 +950,7 @@ CustomizedDisplayLibDestructor (
   )\r
 {\r
   HiiRemovePackages(mCDLStringPackHandle);\r
   )\r
 {\r
   HiiRemovePackages(mCDLStringPackHandle);\r

-  \r
+\r

   FreeLibStrings ();\r
 \r
   return EFI_SUCCESS;\r
   FreeLibStrings ();\r
 \r
   return EFI_SUCCESS;\r

diff --git a/MdeModulePkg/Library/CustomizedDisplayLib/CustomizedDisplayLib.inf b/MdeModulePkg/Library/CustomizedDisplayLib/CustomizedDisplayLib.inf
index 23528948a3999dfa44b26bb1369b2253371f6d5d..4b1f6b4404508bc3f3268ce5b9be00768bba8e6a 100644 (file)
--- a/MdeModulePkg/Library/CustomizedDisplayLib/CustomizedDisplayLib.inf
+++ b/MdeModulePkg/Library/CustomizedDisplayLib/CustomizedDisplayLib.inf
@@ -1,7 +1,7 @@
 ## @file\r
 # Customize display library used by display engine.\r
 #\r
 ## @file\r
 # Customize display library used by display engine.\r
 #\r

-#  Copyright (c) 2013 - 2015, Intel Corporation. All rights reserved.<BR>\r
+#  Copyright (c) 2013 - 2018, Intel Corporation. All rights reserved.<BR>\r

 #\r
 #  This program and the accompanying materials\r
 #  are licensed and made available under the terms and conditions of the BSD License\r
 #\r
 #  This program and the accompanying materials\r
 #  are licensed and made available under the terms and conditions of the BSD License\r


@@ -34,7 +34,7 @@
   CustomizedDisplayLibInternal.h\r
   CustomizedDisplayLibInternal.c\r
   CustomizedDisplayLib.uni\r
   CustomizedDisplayLibInternal.h\r
   CustomizedDisplayLibInternal.c\r
   CustomizedDisplayLib.uni\r

-  \r
+\r

 [Packages]\r
   MdePkg/MdePkg.dec\r
   MdeModulePkg/MdeModulePkg.dec\r
 [Packages]\r
   MdePkg/MdePkg.dec\r
   MdeModulePkg/MdeModulePkg.dec\r


@@ -54,7 +54,7 @@
 \r
 [Guids]\r
   gEfiIfrTianoGuid  ## SOMETIMES_CONSUMES   ## UNDEFINED\r
 \r
 [Guids]\r
   gEfiIfrTianoGuid  ## SOMETIMES_CONSUMES   ## UNDEFINED\r

-  \r
+\r

 [Protocols]\r
 \r
 [Pcd]\r
 [Protocols]\r
 \r
 [Pcd]\r


@@ -62,4 +62,4 @@
   gEfiMdeModulePkgTokenSpaceGuid.PcdBrowserFieldTextColor                  ## CONSUMES\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdBrowserFieldTextHighlightColor         ## CONSUMES\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdBrowserFieldBackgroundHighlightColor   ## CONSUMES\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdBrowserFieldTextColor                  ## CONSUMES\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdBrowserFieldTextHighlightColor         ## CONSUMES\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdBrowserFieldBackgroundHighlightColor   ## CONSUMES\r

-  gEfiMdeModulePkgTokenSpaceGuid.PcdFrontPageFormSetGuid                   ## CONSUMES
\ No newline at end of file
+  gEfiMdeModulePkgTokenSpaceGuid.PcdFrontPageFormSetGuid                   ## CONSUMES\r

diff --git a/MdeModulePkg/Library/CustomizedDisplayLib/CustomizedDisplayLibInternal.c b/MdeModulePkg/Library/CustomizedDisplayLib/CustomizedDisplayLibInternal.c
index bc14a9dd769c067bc0e05e52bc30032dac263d9b..b1629259f6d6a2499c4c8348195f5968f7c31a88 100644 (file)
--- a/MdeModulePkg/Library/CustomizedDisplayLib/CustomizedDisplayLibInternal.c
+++ b/MdeModulePkg/Library/CustomizedDisplayLib/CustomizedDisplayLibInternal.c
@@ -2,13 +2,13 @@
 \r
   This library class defines a set of interfaces to customize Display module\r
 \r
 \r
   This library class defines a set of interfaces to customize Display module\r
 \r

-Copyright (c) 2013-2015, Intel Corporation. All rights reserved.<BR>\r
-This program and the accompanying materials are licensed and made available under \r
-the terms and conditions of the BSD License that accompanies this distribution.  \r
+Copyright (c) 2013-2018, Intel Corporation. All rights reserved.<BR>\r
+This program and the accompanying materials are licensed and made available under\r
+the terms and conditions of the BSD License that accompanies this distribution.\r

 The full text of the license may be found at\r
 The full text of the license may be found at\r

-http://opensource.org/licenses/bsd-license.php.                                            \r
+http://opensource.org/licenses/bsd-license.php.\r

 \r
 \r

-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     \r
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r

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


@@ -47,10 +47,10 @@ CHAR16            *gInputErrorMessage;
   Print banner info for front page.\r
 \r
   @param[in]  FormData             Form Data to be shown in Page\r
   Print banner info for front page.\r
 \r
   @param[in]  FormData             Form Data to be shown in Page\r

-  \r
+\r

 **/\r
 VOID\r
 **/\r
 VOID\r

-PrintBannerInfo ( \r
+PrintBannerInfo (\r

   IN FORM_DISPLAY_ENGINE_FORM       *FormData\r
   )\r
 {\r
   IN FORM_DISPLAY_ENGINE_FORM       *FormData\r
   )\r
 {\r


@@ -84,15 +84,15 @@ PrintBannerInfo (
         ) {\r
       RowIdx    = (UINT8) (Line - (UINT8) gScreenDimensions.TopRow);\r
       ColumnIdx = (UINT8) (Alignment - (UINT8) gScreenDimensions.LeftColumn);\r
         ) {\r
       RowIdx    = (UINT8) (Line - (UINT8) gScreenDimensions.TopRow);\r
       ColumnIdx = (UINT8) (Alignment - (UINT8) gScreenDimensions.LeftColumn);\r

-  \r
+\r

       ASSERT (RowIdx < BANNER_HEIGHT && ColumnIdx < BANNER_COLUMNS);\r
       ASSERT (RowIdx < BANNER_HEIGHT && ColumnIdx < BANNER_COLUMNS);\r

-  \r
+\r

       if (gBannerData!= NULL && gBannerData->Banner[RowIdx][ColumnIdx] != 0x0000) {\r
         StrFrontPageBanner = LibGetToken (gBannerData->Banner[RowIdx][ColumnIdx], FormData->HiiHandle);\r
       } else {\r
         continue;\r
       }\r
       if (gBannerData!= NULL && gBannerData->Banner[RowIdx][ColumnIdx] != 0x0000) {\r
         StrFrontPageBanner = LibGetToken (gBannerData->Banner[RowIdx][ColumnIdx], FormData->HiiHandle);\r
       } else {\r
         continue;\r
       }\r

-  \r
+\r

       switch (Alignment - gScreenDimensions.LeftColumn) {\r
       case 0:\r
         //\r
       switch (Alignment - gScreenDimensions.LeftColumn) {\r
       case 0:\r
         //\r


@@ -100,7 +100,7 @@ PrintBannerInfo (
         //\r
         PrintStringAt (gScreenDimensions.LeftColumn + BANNER_LEFT_COLUMN_INDENT, Line, StrFrontPageBanner);\r
         break;\r
         //\r
         PrintStringAt (gScreenDimensions.LeftColumn + BANNER_LEFT_COLUMN_INDENT, Line, StrFrontPageBanner);\r
         break;\r

-  \r
+\r

       case 1:\r
         //\r
         // Handle center column\r
       case 1:\r
         //\r
         // Handle center column\r


@@ -111,7 +111,7 @@ PrintBannerInfo (
           StrFrontPageBanner\r
           );\r
         break;\r
           StrFrontPageBanner\r
           );\r
         break;\r

-  \r
+\r

       case 2:\r
         //\r
         // Handle right column\r
       case 2:\r
         //\r
         // Handle right column\r


@@ -123,7 +123,7 @@ PrintBannerInfo (
           );\r
         break;\r
       }\r
           );\r
         break;\r
       }\r

-  \r
+\r

       FreePool (StrFrontPageBanner);\r
     }\r
   }\r
       FreePool (StrFrontPageBanner);\r
     }\r
   }\r


@@ -159,7 +159,7 @@ PrintFramework (
       );\r
     return;\r
   }\r
       );\r
     return;\r
   }\r

-    \r
+\r

   Buffer = AllocateZeroPool (0x10000);\r
   ASSERT (Buffer != NULL);\r
   Character = BOXDRAW_HORIZONTAL;\r
   Buffer = AllocateZeroPool (0x10000);\r
   ASSERT (Buffer != NULL);\r
   Character = BOXDRAW_HORIZONTAL;\r


@@ -187,7 +187,7 @@ PrintFramework (
     PrintCharAt (gScreenDimensions.LeftColumn, Row, Character);\r
     PrintCharAt (gScreenDimensions.RightColumn - 1, Row, Character);\r
   }\r
     PrintCharAt (gScreenDimensions.LeftColumn, Row, Character);\r
     PrintCharAt (gScreenDimensions.RightColumn - 1, Row, Character);\r
   }\r

-  \r
+\r

   //\r
   // Print Form Title\r
   //\r
   //\r
   // Print Form Title\r
   //\r


@@ -239,7 +239,7 @@ PrintFramework (
 \r
   Character = BOXDRAW_UP_LEFT;\r
   PrintCharAt ((UINTN) -1, (UINTN) -1, Character);\r
 \r
   Character = BOXDRAW_UP_LEFT;\r
   PrintCharAt ((UINTN) -1, (UINTN) -1, Character);\r

-  \r
+\r

   FreePool (Buffer);\r
 }\r
 \r
   FreePool (Buffer);\r
 }\r
 \r


@@ -282,7 +282,7 @@ ProcessUserOpcode(
       }\r
       break;\r
 \r
       }\r
       break;\r
 \r

-    case EFI_IFR_GUID_OP:     \r
+    case EFI_IFR_GUID_OP:\r

       if (CompareGuid (&gEfiIfrTianoGuid, (EFI_GUID *)((CHAR8*) OpCodeData + sizeof (EFI_IFR_OP_HEADER)))) {\r
         //\r
         // Tiano specific GUIDed opcodes\r
       if (CompareGuid (&gEfiIfrTianoGuid, (EFI_GUID *)((CHAR8*) OpCodeData + sizeof (EFI_IFR_OP_HEADER)))) {\r
         //\r
         // Tiano specific GUIDed opcodes\r


@@ -306,7 +306,7 @@ ProcessUserOpcode(
               gBannerData = AllocateZeroPool (sizeof (BANNER_DATA));\r
               ASSERT (gBannerData != NULL);\r
             }\r
               gBannerData = AllocateZeroPool (sizeof (BANNER_DATA));\r
               ASSERT (gBannerData != NULL);\r
             }\r

-            \r
+\r

             CopyMem (\r
               &gBannerData->Banner[((EFI_IFR_GUID_BANNER *) OpCodeData)->LineNumber][\r
               ((EFI_IFR_GUID_BANNER *) OpCodeData)->Alignment],\r
             CopyMem (\r
               &gBannerData->Banner[((EFI_IFR_GUID_BANNER *) OpCodeData)->LineNumber][\r
               ((EFI_IFR_GUID_BANNER *) OpCodeData)->Alignment],\r


@@ -335,7 +335,7 @@ ProcessUserOpcode(
 \r
 /**\r
   Process some op codes which is out side of current form.\r
 \r
 /**\r
   Process some op codes which is out side of current form.\r

-  \r
+\r

   @param FormData                Pointer to the form data.\r
 \r
   @return EFI_SUCCESS            Pass the statement success.\r
   @param FormData                Pointer to the form data.\r
 \r
   @return EFI_SUCCESS            Pass the statement success.\r


@@ -386,7 +386,7 @@ ProcessExternedOpcode (
   @return EFI_INVALID_PARAMETER  The input screen info is not acceptable.\r
 \r
 **/\r
   @return EFI_INVALID_PARAMETER  The input screen info is not acceptable.\r
 \r
 **/\r

-EFI_STATUS \r
+EFI_STATUS\r

 ScreenDiemensionInfoValidate (\r
   IN FORM_DISPLAY_ENGINE_FORM       *FormData\r
   )\r
 ScreenDiemensionInfoValidate (\r
   IN FORM_DISPLAY_ENGINE_FORM       *FormData\r
   )\r


@@ -395,7 +395,7 @@ ScreenDiemensionInfoValidate (
   UINTN                Index;\r
 \r
   //\r
   UINTN                Index;\r
 \r
   //\r

-  // Calculate total number of Register HotKeys. \r
+  // Calculate total number of Register HotKeys.\r

   //\r
   Index = 0;\r
   if (!IsListEmpty (&FormData->HotKeyListHead)){\r
   //\r
   Index = 0;\r
   if (!IsListEmpty (&FormData->HotKeyListHead)){\r


@@ -584,7 +584,7 @@ PrintHotKeyHelpString (
   ColumnStr              = gLibEmptyString;\r
 \r
   //\r
   ColumnStr              = gLibEmptyString;\r
 \r
   //\r

-  // Calculate total number of Register HotKeys. \r
+  // Calculate total number of Register HotKeys.\r

   //\r
   Index = 0;\r
   Link  = GetFirstNode (&FormData->HotKeyListHead);\r
   //\r
   Index = 0;\r
   Link  = GetFirstNode (&FormData->HotKeyListHead);\r


@@ -607,7 +607,7 @@ PrintHotKeyHelpString (
     CurrentRow = BottomRowOfHotKeyHelp - Index / 3;\r
 \r
     //\r
     CurrentRow = BottomRowOfHotKeyHelp - Index / 3;\r
 \r
     //\r

-    // Help string can't exceed ColumnWidth. One Row will show three Help information. \r
+    // Help string can't exceed ColumnWidth. One Row will show three Help information.\r

     //\r
     BakChar = L'\0';\r
     if (StrLen (HotKey->HelpString) > ColumnIndexWidth) {\r
     //\r
     BakChar = L'\0';\r
     if (StrLen (HotKey->HelpString) > ColumnIndexWidth) {\r


@@ -632,7 +632,7 @@ PrintHotKeyHelpString (
     Link = GetNextNode (&FormData->HotKeyListHead, Link);\r
     Index ++;\r
   }\r
     Link = GetNextNode (&FormData->HotKeyListHead, Link);\r
     Index ++;\r
   }\r

-  \r
+\r

   if (SetState) {\r
     //\r
     // Clear KeyHelp\r
   if (SetState) {\r
     //\r
     // Clear KeyHelp\r


@@ -651,13 +651,13 @@ PrintHotKeyHelpString (
       PrintStringAtWithWidth (CurrentCol, CurrentRow, gLibEmptyString, ColumnIndexWidth);\r
     }\r
   }\r
       PrintStringAtWithWidth (CurrentCol, CurrentRow, gLibEmptyString, ColumnIndexWidth);\r
     }\r
   }\r

-  \r
+\r

   return;\r
 }\r
 \r
 /**\r
   Get step info from numeric opcode.\r
   return;\r
 }\r
 \r
 /**\r
   Get step info from numeric opcode.\r

-  \r
+\r

   @param[in] OpCode     The input numeric op code.\r
 \r
   @return step info for this opcode.\r
   @param[in] OpCode     The input numeric op code.\r
 \r
   @return step info for this opcode.\r


@@ -671,24 +671,24 @@ LibGetFieldFromNum (
   UINT64                Step;\r
 \r
   NumericOp = (EFI_IFR_NUMERIC *) OpCode;\r
   UINT64                Step;\r
 \r
   NumericOp = (EFI_IFR_NUMERIC *) OpCode;\r

-  \r
+\r

   switch (NumericOp->Flags & EFI_IFR_NUMERIC_SIZE) {\r
   case EFI_IFR_NUMERIC_SIZE_1:\r
     Step    = NumericOp->data.u8.Step;\r
     break;\r
   switch (NumericOp->Flags & EFI_IFR_NUMERIC_SIZE) {\r
   case EFI_IFR_NUMERIC_SIZE_1:\r
     Step    = NumericOp->data.u8.Step;\r
     break;\r

-  \r
+\r

   case EFI_IFR_NUMERIC_SIZE_2:\r
     Step    = NumericOp->data.u16.Step;\r
     break;\r
   case EFI_IFR_NUMERIC_SIZE_2:\r
     Step    = NumericOp->data.u16.Step;\r
     break;\r

-  \r
+\r

   case EFI_IFR_NUMERIC_SIZE_4:\r
     Step    = NumericOp->data.u32.Step;\r
     break;\r
   case EFI_IFR_NUMERIC_SIZE_4:\r
     Step    = NumericOp->data.u32.Step;\r
     break;\r

-  \r
+\r

   case EFI_IFR_NUMERIC_SIZE_8:\r
     Step    = NumericOp->data.u64.Step;\r
     break;\r
   case EFI_IFR_NUMERIC_SIZE_8:\r
     Step    = NumericOp->data.u64.Step;\r
     break;\r

-  \r
+\r

   default:\r
     Step = 0;\r
     break;\r
   default:\r
     Step = 0;\r
     break;\r


@@ -729,7 +729,7 @@ InitializeLibStrings (
 \r
   gNvUpdateMessage      = LibGetToken (STRING_TOKEN (NV_UPDATE_MESSAGE), mCDLStringPackHandle);\r
   gInputErrorMessage    = LibGetToken (STRING_TOKEN (INPUT_ERROR_MESSAGE), mCDLStringPackHandle);\r
 \r
   gNvUpdateMessage      = LibGetToken (STRING_TOKEN (NV_UPDATE_MESSAGE), mCDLStringPackHandle);\r
   gInputErrorMessage    = LibGetToken (STRING_TOKEN (INPUT_ERROR_MESSAGE), mCDLStringPackHandle);\r

-  \r
+\r

   //\r
   // SpaceBuffer;\r
   //\r
   //\r
   // SpaceBuffer;\r
   //\r


@@ -770,7 +770,7 @@ FreeLibStrings (
 \r
   FreePool (gNvUpdateMessage);\r
   FreePool (gInputErrorMessage);\r
 \r
   FreePool (gNvUpdateMessage);\r
   FreePool (gInputErrorMessage);\r

-  \r
+\r

   FreePool (mSpaceBuffer);\r
 }\r
 \r
   FreePool (mSpaceBuffer);\r
 }\r
 \r


@@ -799,7 +799,7 @@ WaitForKeyStroke (
     if (Status != EFI_NOT_READY) {\r
       continue;\r
     }\r
     if (Status != EFI_NOT_READY) {\r
       continue;\r
     }\r

-    \r
+\r

     gBS->WaitForEvent (1, &gST->ConIn->WaitForKey, &Index);\r
   }\r
   return Status;\r
     gBS->WaitForEvent (1, &gST->ConIn->WaitForKey, &Index);\r
   }\r
   return Status;\r


@@ -845,7 +845,7 @@ LibSetUnicodeMem (
 **/\r
 UINTN\r
 PrintInternal (\r
 **/\r
 UINTN\r
 PrintInternal (\r

-  IN UINTN                            Width, \r
+  IN UINTN                            Width,\r

   IN UINTN                            Column,\r
   IN UINTN                            Row,\r
   IN EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL  *Out,\r
   IN UINTN                            Column,\r
   IN UINTN                            Row,\r
   IN EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL  *Out,\r

diff --git a/MdeModulePkg/Library/CustomizedDisplayLib/CustomizedDisplayLibInternal.h b/MdeModulePkg/Library/CustomizedDisplayLib/CustomizedDisplayLibInternal.h
index 7342b508b06e39b6c2598b5cc37944ce494dfc8c..09a78854e596c8104543f8be0ff23df7df279fab 100644 (file)
--- a/MdeModulePkg/Library/CustomizedDisplayLib/CustomizedDisplayLibInternal.h
+++ b/MdeModulePkg/Library/CustomizedDisplayLib/CustomizedDisplayLibInternal.h
@@ -2,13 +2,13 @@
 \r
   This library class defines a set of interfaces to customize Display module\r
 \r
 \r
   This library class defines a set of interfaces to customize Display module\r
 \r

-Copyright (c) 2013, Intel Corporation. All rights reserved.<BR>\r
-This program and the accompanying materials are licensed and made available under \r
-the terms and conditions of the BSD License that accompanies this distribution.  \r
+Copyright (c) 2013 - 2018, Intel Corporation. All rights reserved.<BR>\r
+This program and the accompanying materials are licensed and made available under\r
+the terms and conditions of the BSD License that accompanies this distribution.\r

 The full text of the license may be found at\r
 The full text of the license may be found at\r

-http://opensource.org/licenses/bsd-license.php.                                            \r
+http://opensource.org/licenses/bsd-license.php.\r

 \r
 \r

-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     \r
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r

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


@@ -121,10 +121,10 @@ extern CHAR16            *gInputErrorMessage;
   Print banner info for front page.\r
 \r
   @param[in]  FormData             Form Data to be shown in Page\r
   Print banner info for front page.\r
 \r
   @param[in]  FormData             Form Data to be shown in Page\r

-  \r
+\r

 **/\r
 VOID\r
 **/\r
 VOID\r

-PrintBannerInfo ( \r
+PrintBannerInfo (\r

   IN FORM_DISPLAY_ENGINE_FORM       *FormData\r
   );\r
 \r
   IN FORM_DISPLAY_ENGINE_FORM       *FormData\r
   );\r
 \r


@@ -147,7 +147,7 @@ PrintFramework (
   @return EFI_INVALID_PARAMETER  The input screen info is not acceptable.\r
 \r
 **/\r
   @return EFI_INVALID_PARAMETER  The input screen info is not acceptable.\r
 \r
 **/\r

-EFI_STATUS \r
+EFI_STATUS\r

 ScreenDiemensionInfoValidate (\r
   IN FORM_DISPLAY_ENGINE_FORM       *FormData\r
   );\r
 ScreenDiemensionInfoValidate (\r
   IN FORM_DISPLAY_ENGINE_FORM       *FormData\r
   );\r


@@ -201,10 +201,10 @@ PrintHotKeyHelpString (
   IN FORM_DISPLAY_ENGINE_FORM      *FormData,\r
   IN BOOLEAN                       SetState\r
   );\r
   IN FORM_DISPLAY_ENGINE_FORM      *FormData,\r
   IN BOOLEAN                       SetState\r
   );\r

-  \r
+\r

 /**\r
   Get step info from numeric opcode.\r
 /**\r
   Get step info from numeric opcode.\r

-  \r
+\r

   @param[in] OpCode     The input numeric op code.\r
 \r
   @return step info for this opcode.\r
   @param[in] OpCode     The input numeric op code.\r
 \r
   @return step info for this opcode.\r


@@ -285,7 +285,7 @@ PrintAt (
 \r
 /**\r
   Process some op codes which is out side of current form.\r
 \r
 /**\r
   Process some op codes which is out side of current form.\r

-  \r
+\r

   @param FormData                Pointer to the form data.\r
 \r
 **/\r
   @param FormData                Pointer to the form data.\r
 \r
 **/\r

diff --git a/MdeModulePkg/Library/CustomizedDisplayLib/CustomizedDisplayLibModStrs.uni b/MdeModulePkg/Library/CustomizedDisplayLib/CustomizedDisplayLibModStrs.uni
index 4a58241571f98612db2987383bc95b891885958d..33db2eb92309084b7dd08d764fa8d42c99da7166 100644 (file)
--- a/MdeModulePkg/Library/CustomizedDisplayLib/CustomizedDisplayLibModStrs.uni
+++ b/MdeModulePkg/Library/CustomizedDisplayLib/CustomizedDisplayLibModStrs.uni
@@ -1,7 +1,7 @@
 // /** @file\r
 // CustomizedDisplayLib Module Localized Abstract and Description Content\r
 //\r
 // /** @file\r
 // CustomizedDisplayLib Module Localized Abstract and Description Content\r
 //\r

-// Copyright (c) 2014, Intel Corporation. All rights reserved.<BR>\r
+// Copyright (c) 2014 - 2018, Intel Corporation. All rights reserved.<BR>\r

 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r
 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r


@@ -13,11 +13,11 @@
 // **/\r
 \r
 \r
 // **/\r
 \r
 \r

-#string STR_MODULE_ABSTRACT             \r
-#language en-US \r
+#string STR_MODULE_ABSTRACT\r
+#language en-US\r

 "Customize display library used by display engine."\r
 \r
 "Customize display library used by display engine."\r
 \r

-#string STR_MODULE_DESCRIPTION          \r
-#language en-US \r
+#string STR_MODULE_DESCRIPTION\r
+#language en-US\r

 "Customize display library used by display engine."\r
 \r
 "Customize display library used by display engine."\r
 \r

diff --git a/MdeModulePkg/Library/DeviceManagerUiLib/DeviceManager.c b/MdeModulePkg/Library/DeviceManagerUiLib/DeviceManager.c
index ac8a975bf6f1ed6612075c077dbb15a252cdccab..d39736764c5e7aba1a5dbc365b0e4040d354c266 100644 (file)
--- a/MdeModulePkg/Library/DeviceManagerUiLib/DeviceManager.c
+++ b/MdeModulePkg/Library/DeviceManagerUiLib/DeviceManager.c
@@ -1,7 +1,7 @@
 /** @file\r
 The device manager reference implementation\r
 \r
 /** @file\r
 The device manager reference implementation\r
 \r

-Copyright (c) 2004 - 2017, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2004 - 2018, Intel Corporation. All rights reserved.<BR>\r

 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r


@@ -58,7 +58,7 @@ HII_VENDOR_DEVICE_PATH  mDeviceManagerHiiVendorDevicePath = {
   {\r
     END_DEVICE_PATH_TYPE,\r
     END_ENTIRE_DEVICE_PATH_SUBTYPE,\r
   {\r
     END_DEVICE_PATH_TYPE,\r
     END_ENTIRE_DEVICE_PATH_SUBTYPE,\r

-    { \r
+    {\r

       (UINT8) (END_DEVICE_PATH_LENGTH),\r
       (UINT8) ((END_DEVICE_PATH_LENGTH) >> 8)\r
     }\r
       (UINT8) (END_DEVICE_PATH_LENGTH),\r
       (UINT8) ((END_DEVICE_PATH_LENGTH) >> 8)\r
     }\r


@@ -101,12 +101,12 @@ DmExtractDevicePathFromHiiHandle (
 /**\r
   Get the mac address string from the device path.\r
   if the device path has the vlan, get the vanid also.\r
 /**\r
   Get the mac address string from the device path.\r
   if the device path has the vlan, get the vanid also.\r

-  \r
-  @param MacAddressNode              Device path begin with mac address \r
+\r
+  @param MacAddressNode              Device path begin with mac address\r

   @param PBuffer                     Output string buffer contain mac address.\r
 \r
 **/\r
   @param PBuffer                     Output string buffer contain mac address.\r
 \r
 **/\r

-BOOLEAN \r
+BOOLEAN\r

 GetMacAddressString(\r
   IN  MAC_ADDR_DEVICE_PATH   *MacAddressNode,\r
   OUT CHAR16                 **PBuffer\r
 GetMacAddressString(\r
   IN  MAC_ADDR_DEVICE_PATH   *MacAddressNode,\r
   OUT CHAR16                 **PBuffer\r


@@ -142,7 +142,7 @@ GetMacAddressString(
   *PBuffer = String;\r
   StrCpyS(String, BufferLen / sizeof (CHAR16), L"MAC:");\r
   String += 4;\r
   *PBuffer = String;\r
   StrCpyS(String, BufferLen / sizeof (CHAR16), L"MAC:");\r
   String += 4;\r

-  \r
+\r

   //\r
   // Convert the MAC address into a unicode string.\r
   //\r
   //\r
   // Convert the MAC address into a unicode string.\r
   //\r


@@ -202,7 +202,7 @@ GetMacAddressString(
   @retval  EFI_SUCCESS               Add the item is successful.\r
   @return  Other values if failed to Add the item.\r
 **/\r
   @retval  EFI_SUCCESS               Add the item is successful.\r
   @return  Other values if failed to Add the item.\r
 **/\r

-BOOLEAN \r
+BOOLEAN\r

 AddIdToMacDeviceList (\r
   IN  EFI_STRING        MacAddrString\r
   )\r
 AddIdToMacDeviceList (\r
   IN  EFI_STRING        MacAddrString\r
   )\r


@@ -252,7 +252,7 @@ AddIdToMacDeviceList (
     if (TempDeviceList == NULL) {\r
       return FALSE;\r
     }\r
     if (TempDeviceList == NULL) {\r
       return FALSE;\r
     }\r

-    TempDeviceList[mMacDeviceList.CurListLen].PromptId = PromptId;  \r
+    TempDeviceList[mMacDeviceList.CurListLen].PromptId = PromptId;\r

     TempDeviceList[mMacDeviceList.CurListLen].QuestionId = (EFI_QUESTION_ID) (mMacDeviceList.CurListLen + NETWORK_DEVICE_LIST_KEY_OFFSET);\r
 \r
     mMacDeviceList.NodeList = TempDeviceList;\r
     TempDeviceList[mMacDeviceList.CurListLen].QuestionId = (EFI_QUESTION_ID) (mMacDeviceList.CurListLen + NETWORK_DEVICE_LIST_KEY_OFFSET);\r
 \r
     mMacDeviceList.NodeList = TempDeviceList;\r


@@ -306,8 +306,8 @@ IsMacAddressDevicePath (
       if (DEVICE_MANAGER_FORM_ID == NextShowFormId) {\r
         *NeedAddItem = TRUE;\r
         break;\r
       if (DEVICE_MANAGER_FORM_ID == NextShowFormId) {\r
         *NeedAddItem = TRUE;\r
         break;\r

-      } \r
-      \r
+      }\r
+\r

       if (!GetMacAddressString((MAC_ADDR_DEVICE_PATH*)DevicePath, &Buffer)) {\r
         break;\r
       }\r
       if (!GetMacAddressString((MAC_ADDR_DEVICE_PATH*)DevicePath, &Buffer)) {\r
         break;\r
       }\r


@@ -321,7 +321,7 @@ IsMacAddressDevicePath (
 \r
       if (NETWORK_DEVICE_LIST_FORM_ID == NextShowFormId) {\r
         //\r
 \r
       if (NETWORK_DEVICE_LIST_FORM_ID == NextShowFormId) {\r
         //\r

-        // Same handle may has two network child handle, so the questionid \r
+        // Same handle may has two network child handle, so the questionid\r

         // has the offset of SAME_HANDLE_KEY_OFFSET.\r
         //\r
         if (AddIdToMacDeviceList (Buffer)) {\r
         // has the offset of SAME_HANDLE_KEY_OFFSET.\r
         //\r
         if (AddIdToMacDeviceList (Buffer)) {\r


@@ -351,7 +351,7 @@ IsMacAddressDevicePath (
   @return  FALSE         Do not need to add the menu about the network.\r
 \r
 **/\r
   @return  FALSE         Do not need to add the menu about the network.\r
 \r
 **/\r

-BOOLEAN \r
+BOOLEAN\r

 IsNeedAddNetworkMenu (\r
   IN      EFI_HII_HANDLE      Handle,\r
   IN      EFI_FORM_ID         NextShowFormId,\r
 IsNeedAddNetworkMenu (\r
   IN      EFI_HII_HANDLE      Handle,\r
   IN      EFI_FORM_ID         NextShowFormId,\r


@@ -360,7 +360,7 @@ IsNeedAddNetworkMenu (
 {\r
   EFI_STATUS     Status;\r
   UINTN          EntryCount;\r
 {\r
   EFI_STATUS     Status;\r
   UINTN          EntryCount;\r

-  UINTN          Index;  \r
+  UINTN          Index;\r

   EFI_HANDLE     DriverHandle;\r
   EFI_HANDLE     ControllerHandle;\r
   EFI_DEVICE_PATH_PROTOCOL   *DevicePath;\r
   EFI_HANDLE     DriverHandle;\r
   EFI_HANDLE     ControllerHandle;\r
   EFI_DEVICE_PATH_PROTOCOL   *DevicePath;\r


@@ -389,9 +389,9 @@ IsNeedAddNetworkMenu (
   }\r
   TmpDevicePath = DevicePath;\r
 \r
   }\r
   TmpDevicePath = DevicePath;\r
 \r

-  // \r
+  //\r

   // Check whether this device path include mac address device path.\r
   // Check whether this device path include mac address device path.\r

-  // If this path has mac address path, get the value whether need \r
+  // If this path has mac address path, get the value whether need\r

   // add this info to the menu and return.\r
   // Else check more about the child handle devcie path.\r
   //\r
   // add this info to the menu and return.\r
   // Else check more about the child handle devcie path.\r
   //\r


@@ -413,7 +413,7 @@ IsNeedAddNetworkMenu (
   }\r
 \r
   if (!IsDevicePathEnd (TmpDevicePath)) {\r
   }\r
 \r
   if (!IsDevicePathEnd (TmpDevicePath)) {\r

-    return FALSE;    \r
+    return FALSE;\r

   }\r
 \r
   //\r
   }\r
 \r
   //\r


@@ -452,7 +452,7 @@ IsNeedAddNetworkMenu (
         continue;\r
       }\r
 \r
         continue;\r
       }\r
 \r

-      // \r
+      //\r

       // Check whether this device path include mac address device path.\r
       //\r
       if (!IsMacAddressDevicePath(ChildDevicePath, NextShowFormId,&IsNeedAdd)) {\r
       // Check whether this device path include mac address device path.\r
       //\r
       if (!IsMacAddressDevicePath(ChildDevicePath, NextShowFormId,&IsNeedAdd)) {\r


@@ -472,7 +472,7 @@ IsNeedAddNetworkMenu (
         } else {\r
           //\r
           // If need to update other form, return whether need to add to the menu.\r
         } else {\r
           //\r
           // If need to update other form, return whether need to add to the menu.\r

-          //          \r
+          //\r

           goto Done;\r
         }\r
       }\r
           goto Done;\r
         }\r
       }\r


@@ -481,9 +481,9 @@ IsNeedAddNetworkMenu (
 \r
 Done:\r
   if (OpenInfoBuffer != NULL) {\r
 \r
 Done:\r
   if (OpenInfoBuffer != NULL) {\r

-    FreePool (OpenInfoBuffer);  \r
+    FreePool (OpenInfoBuffer);\r

   }\r
   }\r

-  return IsNeedAdd; \r
+  return IsNeedAdd;\r

 }\r
 \r
 /**\r
 }\r
 \r
 /**\r


@@ -514,10 +514,10 @@ CreateDeviceManagerForm(
   EFI_STRING                  NewStringTitle;\r
   CHAR16                      *DevicePathStr;\r
   EFI_STRING_ID               DevicePathId;\r
   EFI_STRING                  NewStringTitle;\r
   CHAR16                      *DevicePathStr;\r
   EFI_STRING_ID               DevicePathId;\r

-  EFI_IFR_FORM_SET            *Buffer;      \r
-  UINTN                       BufferSize;   \r
-  UINT8                       ClassGuidNum; \r
-  EFI_GUID                    *ClassGuid;   \r
+  EFI_IFR_FORM_SET            *Buffer;\r
+  UINTN                       BufferSize;\r
+  UINT8                       ClassGuidNum;\r
+  EFI_GUID                    *ClassGuid;\r

   UINTN                       TempSize;\r
   UINT8                       *Ptr;\r
   EFI_STATUS                  Status;\r
   UINTN                       TempSize;\r
   UINT8                       *Ptr;\r
   EFI_STATUS                  Status;\r


@@ -599,7 +599,7 @@ CreateDeviceManagerForm(
       if (((EFI_IFR_OP_HEADER *) Ptr)->Length <= OFFSET_OF (EFI_IFR_FORM_SET, Flags)){\r
         Ptr += ((EFI_IFR_OP_HEADER *) Ptr)->Length;\r
         continue;\r
       if (((EFI_IFR_OP_HEADER *) Ptr)->Length <= OFFSET_OF (EFI_IFR_FORM_SET, Flags)){\r
         Ptr += ((EFI_IFR_OP_HEADER *) Ptr)->Length;\r
         continue;\r

-      } \r
+      }\r

 \r
       ClassGuidNum = (UINT8) (((EFI_IFR_FORM_SET *)Ptr)->Flags & 0x3);\r
       ClassGuid = (EFI_GUID *) (VOID *)(Ptr + sizeof (EFI_IFR_FORM_SET));\r
 \r
       ClassGuidNum = (UINT8) (((EFI_IFR_FORM_SET *)Ptr)->Flags & 0x3);\r
       ClassGuid = (EFI_GUID *) (VOID *)(Ptr + sizeof (EFI_IFR_FORM_SET));\r


@@ -629,7 +629,7 @@ CreateDeviceManagerForm(
 \r
         //\r
         // Network device process\r
 \r
         //\r
         // Network device process\r

-        // \r
+        //\r

         if (IsNeedAddNetworkMenu (HiiHandles[Index], NextShowFormId,&AddItemCount)) {\r
           if (NextShowFormId == DEVICE_MANAGER_FORM_ID) {\r
             //\r
         if (IsNeedAddNetworkMenu (HiiHandles[Index], NextShowFormId,&AddItemCount)) {\r
           if (NextShowFormId == DEVICE_MANAGER_FORM_ID) {\r
             //\r


@@ -679,7 +679,7 @@ CreateDeviceManagerForm(
               0,\r
               (EFI_QUESTION_ID) (Index + DEVICE_KEY_OFFSET),\r
               0,\r
               0,\r
               (EFI_QUESTION_ID) (Index + DEVICE_KEY_OFFSET),\r
               0,\r

-              &FormSetGuid,    \r
+              &FormSetGuid,\r

               DevicePathId\r
             );\r
           }\r
               DevicePathId\r
             );\r
           }\r


@@ -899,7 +899,7 @@ DeviceManagerUiLibConstructor (
   ASSERT (gDeviceManagerPrivate.HiiHandle != NULL);\r
 \r
   //\r
   ASSERT (gDeviceManagerPrivate.HiiHandle != NULL);\r
 \r
   //\r

-  // Update boot manager page \r
+  // Update boot manager page\r

   //\r
   CreateDeviceManagerForm (DEVICE_MANAGER_FORM_ID);\r
 \r
   //\r
   CreateDeviceManagerForm (DEVICE_MANAGER_FORM_ID);\r
 \r

diff --git a/MdeModulePkg/Library/DeviceManagerUiLib/DeviceManagerStrings.uni b/MdeModulePkg/Library/DeviceManagerUiLib/DeviceManagerStrings.uni
index 55d03d623962a5cbbf7f1bbc07b4a511c6914fc3..f896cd8190c695d894609bd6f4c79d6fb19df46a 100644 (file)
--- a/MdeModulePkg/Library/DeviceManagerUiLib/DeviceManagerStrings.uni
+++ b/MdeModulePkg/Library/DeviceManagerUiLib/DeviceManagerStrings.uni
@@ -2,15 +2,15 @@
 //\r
 //  String definitions for the Device Manager.\r
 //\r
 //\r
 //  String definitions for the Device Manager.\r
 //\r

-//  Copyright (c) 2004 - 2017, Intel Corporation. All rights reserved.<BR>\r
+//  Copyright (c) 2004 - 2018, Intel Corporation. All rights reserved.<BR>\r

 //  This program and the accompanying materials\r
 //  are licensed and made available under the terms and conditions of the BSD License\r
 //  which accompanies this distribution.  The full text of the license may be found at\r
 //  http://opensource.org/licenses/bsd-license.php\r
 //  This program and the accompanying materials\r
 //  are licensed and made available under the terms and conditions of the BSD License\r
 //  which accompanies this distribution.  The full text of the license may be found at\r
 //  http://opensource.org/licenses/bsd-license.php\r

-//  \r
+//\r

 //  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 //  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 //  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 //  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r

-//  \r
+//\r

 //**/\r
 \r
 /=#\r
 //**/\r
 \r
 /=#\r

diff --git a/MdeModulePkg/Library/DeviceManagerUiLib/DeviceManagerUiLib.inf b/MdeModulePkg/Library/DeviceManagerUiLib/DeviceManagerUiLib.inf
index 1dc665b94056b5ef10402666f40ede962bcf08b3..d493b37baa9cc96b70d7a027c1f031f08e07cf67 100644 (file)
--- a/MdeModulePkg/Library/DeviceManagerUiLib/DeviceManagerUiLib.inf
+++ b/MdeModulePkg/Library/DeviceManagerUiLib/DeviceManagerUiLib.inf
@@ -1,15 +1,15 @@
 ## @file\r
 #  Device Manager Library used by UiApp\r
 ## @file\r
 #  Device Manager Library used by UiApp\r

-#  \r
-#  Copyright (c) 2011 - 2015, Intel Corporation. All rights reserved.<BR>\r
+#\r
+#  Copyright (c) 2011 - 2018, Intel Corporation. All rights reserved.<BR>\r

 #  This program and the accompanying materials are licensed and made available under\r
 #  the terms and conditions of the BSD License that accompanies this distribution.\r
 #  The full text of the license may be found at\r
 #  http://opensource.org/licenses/bsd-license.php.\r
 #  This program and the accompanying materials are licensed and made available under\r
 #  the terms and conditions of the BSD License that accompanies this distribution.\r
 #  The full text of the license may be found at\r
 #  http://opensource.org/licenses/bsd-license.php.\r

-#  \r
+#\r

 #  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 #  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 #  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 #  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r

-#  \r
+#\r

 ##\r
 [Defines]\r
   INF_VERSION                    = 0x00010005\r
 ##\r
 [Defines]\r
   INF_VERSION                    = 0x00010005\r

diff --git a/MdeModulePkg/Library/DxeCapsuleLibNull/DxeCapsuleLibNull.c b/MdeModulePkg/Library/DxeCapsuleLibNull/DxeCapsuleLibNull.c
index b064240ccbd15925ac15aa1905ca1fee2ed4908b..5b45c19981f004a6a5d6a1bb0af5210c37dcbc2d 100644 (file)
--- a/MdeModulePkg/Library/DxeCapsuleLibNull/DxeCapsuleLibNull.c
+++ b/MdeModulePkg/Library/DxeCapsuleLibNull/DxeCapsuleLibNull.c
@@ -1,7 +1,7 @@
 /** @file\r
   Null Dxe Capsule Library instance does nothing and returns unsupport status.\r
 \r
 /** @file\r
   Null Dxe Capsule Library instance does nothing and returns unsupport status.\r
 \r

-Copyright (c) 2007 - 2016, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2007 - 2018, Intel Corporation. All rights reserved.<BR>\r

 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r


@@ -15,13 +15,13 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #include <Library/CapsuleLib.h>\r
 \r
 /**\r
 #include <Library/CapsuleLib.h>\r
 \r
 /**\r

-  The firmware checks whether the capsule image is supported \r
+  The firmware checks whether the capsule image is supported\r

   by the CapsuleGuid in CapsuleHeader or other specific information in capsule image.\r
 \r
   Caution: This function may receive untrusted input.\r
 \r
   @param  CapsuleHeader    Point to the UEFI capsule image to be checked.\r
   by the CapsuleGuid in CapsuleHeader or other specific information in capsule image.\r
 \r
   Caution: This function may receive untrusted input.\r
 \r
   @param  CapsuleHeader    Point to the UEFI capsule image to be checked.\r

-  \r
+\r

   @retval EFI_UNSUPPORTED  Input capsule is not supported by the firmware.\r
 **/\r
 EFI_STATUS\r
   @retval EFI_UNSUPPORTED  Input capsule is not supported by the firmware.\r
 **/\r
 EFI_STATUS\r


@@ -39,8 +39,8 @@ SupportCapsuleImage (
 \r
   Caution: This function may receive untrusted input.\r
 \r
 \r
   Caution: This function may receive untrusted input.\r
 \r

-  @param  CapsuleHeader    Point to the UEFI capsule image to be processed. \r
-   \r
+  @param  CapsuleHeader    Point to the UEFI capsule image to be processed.\r
+\r

   @retval EFI_UNSUPPORTED  Capsule image is not supported by the firmware.\r
 **/\r
 EFI_STATUS\r
   @retval EFI_UNSUPPORTED  Capsule image is not supported by the firmware.\r
 **/\r
 EFI_STATUS\r

diff --git a/MdeModulePkg/Library/DxeCoreMemoryAllocationLib/DxeCoreMemoryAllocationServices.h b/MdeModulePkg/Library/DxeCoreMemoryAllocationLib/DxeCoreMemoryAllocationServices.h
index 04ad3d6da39b1e7396e987260856c5f2e4058273..6e8520bb0858f978eaf3da25d44ca336583108ed 100644 (file)
--- a/MdeModulePkg/Library/DxeCoreMemoryAllocationLib/DxeCoreMemoryAllocationServices.h
+++ b/MdeModulePkg/Library/DxeCoreMemoryAllocationLib/DxeCoreMemoryAllocationServices.h
@@ -2,16 +2,16 @@
   Contains function prototypes for Memory Services in DxeCore.\r
 \r
   This header file borrows the DxeCore Memory Allocation services as the primitive\r
   Contains function prototypes for Memory Services in DxeCore.\r
 \r
   This header file borrows the DxeCore Memory Allocation services as the primitive\r

-  for memory allocation. \r
+  for memory allocation.\r

 \r
 \r

-  Copyright (c) 2008, Intel Corporation. All rights reserved.<BR>\r
-  This program and the accompanying materials                          \r
-  are licensed and made available under the terms and conditions of the BSD License         \r
-  which accompanies this distribution.  The full text of the license may be found at        \r
-  http://opensource.org/licenses/bsd-license.php                                            \r
+  Copyright (c) 2008 - 2018, Intel Corporation. All rights reserved.<BR>\r
+  This program and the accompanying materials\r
+  are licensed and made available under the terms and conditions of the BSD License\r
+  which accompanies this distribution.  The full text of the license may be found at\r
+  http://opensource.org/licenses/bsd-license.php\r

 \r
 \r

-  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     \r
-  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             \r
+  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
+  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r

 \r
 **/\r
 \r
 \r
 **/\r
 \r

diff --git a/MdeModulePkg/Library/DxeCoreMemoryAllocationLib/DxeCoreMemoryProfileLib.c b/MdeModulePkg/Library/DxeCoreMemoryAllocationLib/DxeCoreMemoryProfileLib.c
index 8f28b988f5e0c68ae086b44758130094a9597ed3..9fbe1222a7c482f098d97e95ba18c01ae9acbab7 100644 (file)
--- a/MdeModulePkg/Library/DxeCoreMemoryAllocationLib/DxeCoreMemoryProfileLib.c
+++ b/MdeModulePkg/Library/DxeCoreMemoryAllocationLib/DxeCoreMemoryProfileLib.c
@@ -1,14 +1,14 @@
 /** @file\r
   Support routines for memory profile for DxeCore.\r
 \r
 /** @file\r
   Support routines for memory profile for DxeCore.\r
 \r

-  Copyright (c) 2016, Intel Corporation. All rights reserved.<BR>\r
-  This program and the accompanying materials                          \r
-  are licensed and made available under the terms and conditions of the BSD License         \r
-  which accompanies this distribution.  The full text of the license may be found at        \r
-  http://opensource.org/licenses/bsd-license.php.                                            \r
-\r
-  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     \r
-  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             \r
+  Copyright (c) 2016 - 2018, Intel Corporation. All rights reserved.<BR>\r
+  This program and the accompanying materials\r
+  are licensed and made available under the terms and conditions of the BSD License\r
+  which accompanies this distribution.  The full text of the license may be found at\r
+  http://opensource.org/licenses/bsd-license.php.\r
+\r
+  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
+  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r

 \r
 **/\r
 \r
 \r
 **/\r
 \r

diff --git a/MdeModulePkg/Library/DxeCoreMemoryAllocationLib/DxeCoreMemoryProfileLibNull.c b/MdeModulePkg/Library/DxeCoreMemoryAllocationLib/DxeCoreMemoryProfileLibNull.c
index 9ae0db82732e424ad455965e74ad14e976bc0d52..cc2403bd85440bc8f3be89f473c1f83ccb000044 100644 (file)
--- a/MdeModulePkg/Library/DxeCoreMemoryAllocationLib/DxeCoreMemoryProfileLibNull.c
+++ b/MdeModulePkg/Library/DxeCoreMemoryAllocationLib/DxeCoreMemoryProfileLibNull.c
@@ -1,14 +1,14 @@
 /** @file\r
   Null routines for memory profile for DxeCore.\r
 \r
 /** @file\r
   Null routines for memory profile for DxeCore.\r
 \r

-  Copyright (c) 2016, Intel Corporation. All rights reserved.<BR>\r
-  This program and the accompanying materials                          \r
-  are licensed and made available under the terms and conditions of the BSD License         \r
-  which accompanies this distribution.  The full text of the license may be found at        \r
-  http://opensource.org/licenses/bsd-license.php.                                            \r
-\r
-  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     \r
-  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             \r
+  Copyright (c) 2016 - 2018, Intel Corporation. All rights reserved.<BR>\r
+  This program and the accompanying materials\r
+  are licensed and made available under the terms and conditions of the BSD License\r
+  which accompanies this distribution.  The full text of the license may be found at\r
+  http://opensource.org/licenses/bsd-license.php.\r
+\r
+  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
+  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r

 \r
 **/\r
 \r
 \r
 **/\r
 \r

diff --git a/MdeModulePkg/Library/DxeCoreMemoryAllocationLib/DxeCoreMemoryProfileServices.h b/MdeModulePkg/Library/DxeCoreMemoryAllocationLib/DxeCoreMemoryProfileServices.h
index 619d7add9a6dd569f0ecd5e5ca2462229994e24d..b713bfe718cd7e4b86061ed09cb95c01d3e4467a 100644 (file)
--- a/MdeModulePkg/Library/DxeCoreMemoryAllocationLib/DxeCoreMemoryProfileServices.h
+++ b/MdeModulePkg/Library/DxeCoreMemoryAllocationLib/DxeCoreMemoryProfileServices.h
@@ -4,14 +4,14 @@
   This header file borrows the DxeCore Memory Profile services as the primitive\r
   for memory profile.\r
 \r
   This header file borrows the DxeCore Memory Profile services as the primitive\r
   for memory profile.\r
 \r

-  Copyright (c) 2016, Intel Corporation. All rights reserved.<BR>\r
-  This program and the accompanying materials                          \r
-  are licensed and made available under the terms and conditions of the BSD License         \r
-  which accompanies this distribution.  The full text of the license may be found at        \r
-  http://opensource.org/licenses/bsd-license.php                                            \r
-\r
-  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     \r
-  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             \r
+  Copyright (c) 2016 - 2018, Intel Corporation. All rights reserved.<BR>\r
+  This program and the accompanying materials\r
+  are licensed and made available under the terms and conditions of the BSD License\r
+  which accompanies this distribution.  The full text of the license may be found at\r
+  http://opensource.org/licenses/bsd-license.php\r
+\r
+  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
+  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r

 \r
 **/\r
 \r
 \r
 **/\r
 \r

diff --git a/MdeModulePkg/Library/DxeCoreMemoryAllocationLib/MemoryAllocationLib.c b/MdeModulePkg/Library/DxeCoreMemoryAllocationLib/MemoryAllocationLib.c
index 95725c866f13a67033460b556554a9dde9b44bf8..3d01c27987bb44cf1e66816a63ce877c41472247 100644 (file)
--- a/MdeModulePkg/Library/DxeCoreMemoryAllocationLib/MemoryAllocationLib.c
+++ b/MdeModulePkg/Library/DxeCoreMemoryAllocationLib/MemoryAllocationLib.c
@@ -1,16 +1,16 @@
 /** @file\r
 /** @file\r

-  Support routines for memory allocation routines based \r
+  Support routines for memory allocation routines based\r

   on DxeCore Memory Allocation services for DxeCore,\r
   with memory profile support.\r
 \r
   on DxeCore Memory Allocation services for DxeCore,\r
   with memory profile support.\r
 \r

-  Copyright (c) 2006 - 2017, Intel Corporation. All rights reserved.<BR>\r
-  This program and the accompanying materials                          \r
-  are licensed and made available under the terms and conditions of the BSD License         \r
-  which accompanies this distribution.  The full text of the license may be found at        \r
-  http://opensource.org/licenses/bsd-license.php                                            \r
+  Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r
+  This program and the accompanying materials\r
+  are licensed and made available under the terms and conditions of the BSD License\r
+  which accompanies this distribution.  The full text of the license may be found at\r
+  http://opensource.org/licenses/bsd-license.php\r

 \r
 \r

-  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     \r
-  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             \r
+  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
+  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r

 \r
 **/\r
 \r
 \r
 **/\r
 \r


@@ -40,12 +40,12 @@
 **/\r
 VOID *\r
 InternalAllocatePages (\r
 **/\r
 VOID *\r
 InternalAllocatePages (\r

-  IN EFI_MEMORY_TYPE  MemoryType,  \r
+  IN EFI_MEMORY_TYPE  MemoryType,\r

   IN UINTN            Pages\r
   )\r
 {\r
   EFI_STATUS            Status;\r
   IN UINTN            Pages\r
   )\r
 {\r
   EFI_STATUS            Status;\r

-  EFI_PHYSICAL_ADDRESS  Memory; \r
+  EFI_PHYSICAL_ADDRESS  Memory;\r

 \r
   if (Pages == 0) {\r
     return NULL;\r
 \r
   if (Pages == 0) {\r
     return NULL;\r


@@ -171,11 +171,11 @@ AllocateReservedPages (
   must have been allocated on a previous call to the page allocation services of the Memory\r
   Allocation Library.  If it is not possible to free allocated pages, then this function will\r
   perform no actions.\r
   must have been allocated on a previous call to the page allocation services of the Memory\r
   Allocation Library.  If it is not possible to free allocated pages, then this function will\r
   perform no actions.\r

-  \r
+\r

   If Buffer was not allocated with a page allocation function in the Memory Allocation Library,\r
   then ASSERT().\r
   If Pages is zero, then ASSERT().\r
   If Buffer was not allocated with a page allocation function in the Memory Allocation Library,\r
   then ASSERT().\r
   If Pages is zero, then ASSERT().\r

- \r
+\r

   @param  Buffer                Pointer to the buffer of pages to free.\r
   @param  Pages                 The number of 4 KB pages to free.\r
 \r
   @param  Buffer                Pointer to the buffer of pages to free.\r
   @param  Pages                 The number of 4 KB pages to free.\r
 \r


@@ -214,7 +214,7 @@ FreePages (
 **/\r
 VOID *\r
 InternalAllocateAlignedPages (\r
 **/\r
 VOID *\r
 InternalAllocateAlignedPages (\r

-  IN EFI_MEMORY_TYPE  MemoryType,  \r
+  IN EFI_MEMORY_TYPE  MemoryType,\r

   IN UINTN            Pages,\r
   IN UINTN            Alignment\r
   )\r
   IN UINTN            Pages,\r
   IN UINTN            Alignment\r
   )\r


@@ -230,7 +230,7 @@ InternalAllocateAlignedPages (
   // Alignment must be a power of two or zero.\r
   //\r
   ASSERT ((Alignment & (Alignment - 1)) == 0);\r
   // Alignment must be a power of two or zero.\r
   //\r
   ASSERT ((Alignment & (Alignment - 1)) == 0);\r

- \r
+\r

   if (Pages == 0) {\r
     return NULL;\r
   }\r
   if (Pages == 0) {\r
     return NULL;\r
   }\r


@@ -244,7 +244,7 @@ InternalAllocateAlignedPages (
     // Make sure that Pages plus EFI_SIZE_TO_PAGES (Alignment) does not overflow.\r
     //\r
     ASSERT (RealPages > Pages);\r
     // Make sure that Pages plus EFI_SIZE_TO_PAGES (Alignment) does not overflow.\r
     //\r
     ASSERT (RealPages > Pages);\r

- \r
+\r

     Status         = CoreAllocatePages (AllocateAnyPages, MemoryType, RealPages, &Memory);\r
     if (EFI_ERROR (Status)) {\r
       return NULL;\r
     Status         = CoreAllocatePages (AllocateAnyPages, MemoryType, RealPages, &Memory);\r
     if (EFI_ERROR (Status)) {\r
       return NULL;\r


@@ -287,7 +287,7 @@ InternalAllocateAlignedPages (
   alignment specified by Alignment.  The allocated buffer is returned.  If Pages is 0, then NULL is\r
   returned.  If there is not enough memory at the specified alignment remaining to satisfy the\r
   request, then NULL is returned.\r
   alignment specified by Alignment.  The allocated buffer is returned.  If Pages is 0, then NULL is\r
   returned.  If there is not enough memory at the specified alignment remaining to satisfy the\r
   request, then NULL is returned.\r

-  \r
+\r

   If Alignment is not a power of two and Alignment is not zero, then ASSERT().\r
   If Pages plus EFI_SIZE_TO_PAGES (Alignment) overflows, then ASSERT().\r
 \r
   If Alignment is not a power of two and Alignment is not zero, then ASSERT().\r
   If Pages plus EFI_SIZE_TO_PAGES (Alignment) overflows, then ASSERT().\r
 \r


@@ -328,7 +328,7 @@ AllocateAlignedPages (
   alignment specified by Alignment.  The allocated buffer is returned.  If Pages is 0, then NULL is\r
   returned.  If there is not enough memory at the specified alignment remaining to satisfy the\r
   request, then NULL is returned.\r
   alignment specified by Alignment.  The allocated buffer is returned.  If Pages is 0, then NULL is\r
   returned.  If there is not enough memory at the specified alignment remaining to satisfy the\r
   request, then NULL is returned.\r

-  \r
+\r

   If Alignment is not a power of two and Alignment is not zero, then ASSERT().\r
   If Pages plus EFI_SIZE_TO_PAGES (Alignment) overflows, then ASSERT().\r
 \r
   If Alignment is not a power of two and Alignment is not zero, then ASSERT().\r
   If Pages plus EFI_SIZE_TO_PAGES (Alignment) overflows, then ASSERT().\r
 \r


@@ -369,7 +369,7 @@ AllocateAlignedRuntimePages (
   alignment specified by Alignment.  The allocated buffer is returned.  If Pages is 0, then NULL is\r
   returned.  If there is not enough memory at the specified alignment remaining to satisfy the\r
   request, then NULL is returned.\r
   alignment specified by Alignment.  The allocated buffer is returned.  If Pages is 0, then NULL is\r
   returned.  If there is not enough memory at the specified alignment remaining to satisfy the\r
   request, then NULL is returned.\r

-  \r
+\r

   If Alignment is not a power of two and Alignment is not zero, then ASSERT().\r
   If Pages plus EFI_SIZE_TO_PAGES (Alignment) overflows, then ASSERT().\r
 \r
   If Alignment is not a power of two and Alignment is not zero, then ASSERT().\r
   If Pages plus EFI_SIZE_TO_PAGES (Alignment) overflows, then ASSERT().\r
 \r


@@ -409,13 +409,13 @@ AllocateAlignedReservedPages (
 \r
   Frees the number of 4KB pages specified by Pages from the buffer specified by Buffer.  Buffer\r
   must have been allocated on a previous call to the aligned page allocation services of the Memory\r
 \r
   Frees the number of 4KB pages specified by Pages from the buffer specified by Buffer.  Buffer\r
   must have been allocated on a previous call to the aligned page allocation services of the Memory\r

-  Allocation Library.  If it is not possible to free allocated pages, then this function will \r
+  Allocation Library.  If it is not possible to free allocated pages, then this function will\r

   perform no actions.\r
   perform no actions.\r

-  \r
+\r

   If Buffer was not allocated with an aligned page allocation function in the Memory Allocation\r
   Library, then ASSERT().\r
   If Pages is zero, then ASSERT().\r
   If Buffer was not allocated with an aligned page allocation function in the Memory Allocation\r
   Library, then ASSERT().\r
   If Pages is zero, then ASSERT().\r

-  \r
+\r

   @param  Buffer                Pointer to the buffer of pages to free.\r
   @param  Pages                 The number of 4 KB pages to free.\r
 \r
   @param  Buffer                Pointer to the buffer of pages to free.\r
   @param  Pages                 The number of 4 KB pages to free.\r
 \r


@@ -449,7 +449,7 @@ FreeAlignedPages (
 **/\r
 VOID *\r
 InternalAllocatePool (\r
 **/\r
 VOID *\r
 InternalAllocatePool (\r

-  IN EFI_MEMORY_TYPE  MemoryType,  \r
+  IN EFI_MEMORY_TYPE  MemoryType,\r

   IN UINTN            AllocationSize\r
   )\r
 {\r
   IN UINTN            AllocationSize\r
   )\r
 {\r


@@ -583,9 +583,9 @@ AllocateReservedPool (
 **/\r
 VOID *\r
 InternalAllocateZeroPool (\r
 **/\r
 VOID *\r
 InternalAllocateZeroPool (\r

-  IN EFI_MEMORY_TYPE  PoolType,  \r
+  IN EFI_MEMORY_TYPE  PoolType,\r

   IN UINTN            AllocationSize\r
   IN UINTN            AllocationSize\r

-  ) \r
+  )\r

 {\r
   VOID  *Memory;\r
 \r
 {\r
   VOID  *Memory;\r
 \r


@@ -709,7 +709,7 @@ AllocateReservedZeroPool (
   allocated buffer.  If AllocationSize is 0, then a valid buffer of 0 size is returned.  If there\r
   is not enough memory remaining to satisfy the request, then NULL is returned.\r
   If Buffer is NULL, then ASSERT().\r
   allocated buffer.  If AllocationSize is 0, then a valid buffer of 0 size is returned.  If there\r
   is not enough memory remaining to satisfy the request, then NULL is returned.\r
   If Buffer is NULL, then ASSERT().\r

-  If AllocationSize is greater than (MAX_ADDRESS - Buffer + 1), then ASSERT(). \r
+  If AllocationSize is greater than (MAX_ADDRESS - Buffer + 1), then ASSERT().\r

 \r
   @param  PoolType              The type of pool to allocate.\r
   @param  AllocationSize        The number of bytes to allocate and zero.\r
 \r
   @param  PoolType              The type of pool to allocate.\r
   @param  AllocationSize        The number of bytes to allocate and zero.\r


@@ -720,10 +720,10 @@ AllocateReservedZeroPool (
 **/\r
 VOID *\r
 InternalAllocateCopyPool (\r
 **/\r
 VOID *\r
 InternalAllocateCopyPool (\r

-  IN EFI_MEMORY_TYPE  PoolType,  \r
+  IN EFI_MEMORY_TYPE  PoolType,\r

   IN UINTN            AllocationSize,\r
   IN CONST VOID       *Buffer\r
   IN UINTN            AllocationSize,\r
   IN CONST VOID       *Buffer\r

-  ) \r
+  )\r

 {\r
   VOID  *Memory;\r
 \r
 {\r
   VOID  *Memory;\r
 \r


@@ -735,7 +735,7 @@ InternalAllocateCopyPool (
      Memory = CopyMem (Memory, Buffer, AllocationSize);\r
   }\r
   return Memory;\r
      Memory = CopyMem (Memory, Buffer, AllocationSize);\r
   }\r
   return Memory;\r

-} \r
+}\r

 \r
 /**\r
   Copies a buffer to an allocated buffer of type EfiBootServicesData.\r
 \r
 /**\r
   Copies a buffer to an allocated buffer of type EfiBootServicesData.\r


@@ -744,9 +744,9 @@ InternalAllocateCopyPool (
   AllocationSize bytes from Buffer to the newly allocated buffer, and returns a pointer to the\r
   allocated buffer.  If AllocationSize is 0, then a valid buffer of 0 size is returned.  If there\r
   is not enough memory remaining to satisfy the request, then NULL is returned.\r
   AllocationSize bytes from Buffer to the newly allocated buffer, and returns a pointer to the\r
   allocated buffer.  If AllocationSize is 0, then a valid buffer of 0 size is returned.  If there\r
   is not enough memory remaining to satisfy the request, then NULL is returned.\r

-  \r
+\r

   If Buffer is NULL, then ASSERT().\r
   If Buffer is NULL, then ASSERT().\r

-  If AllocationSize is greater than (MAX_ADDRESS - Buffer + 1), then ASSERT(). \r
+  If AllocationSize is greater than (MAX_ADDRESS - Buffer + 1), then ASSERT().\r

 \r
   @param  AllocationSize        The number of bytes to allocate and zero.\r
   @param  Buffer                The buffer to copy to the allocated buffer.\r
 \r
   @param  AllocationSize        The number of bytes to allocate and zero.\r
   @param  Buffer                The buffer to copy to the allocated buffer.\r


@@ -784,9 +784,9 @@ AllocateCopyPool (
   AllocationSize bytes from Buffer to the newly allocated buffer, and returns a pointer to the\r
   allocated buffer.  If AllocationSize is 0, then a valid buffer of 0 size is returned.  If there\r
   is not enough memory remaining to satisfy the request, then NULL is returned.\r
   AllocationSize bytes from Buffer to the newly allocated buffer, and returns a pointer to the\r
   allocated buffer.  If AllocationSize is 0, then a valid buffer of 0 size is returned.  If there\r
   is not enough memory remaining to satisfy the request, then NULL is returned.\r

-  \r
+\r

   If Buffer is NULL, then ASSERT().\r
   If Buffer is NULL, then ASSERT().\r

-  If AllocationSize is greater than (MAX_ADDRESS - Buffer + 1), then ASSERT(). \r
+  If AllocationSize is greater than (MAX_ADDRESS - Buffer + 1), then ASSERT().\r

 \r
   @param  AllocationSize        The number of bytes to allocate and zero.\r
   @param  Buffer                The buffer to copy to the allocated buffer.\r
 \r
   @param  AllocationSize        The number of bytes to allocate and zero.\r
   @param  Buffer                The buffer to copy to the allocated buffer.\r


@@ -824,9 +824,9 @@ AllocateRuntimeCopyPool (
   AllocationSize bytes from Buffer to the newly allocated buffer, and returns a pointer to the\r
   allocated buffer.  If AllocationSize is 0, then a valid buffer of 0 size is returned.  If there\r
   is not enough memory remaining to satisfy the request, then NULL is returned.\r
   AllocationSize bytes from Buffer to the newly allocated buffer, and returns a pointer to the\r
   allocated buffer.  If AllocationSize is 0, then a valid buffer of 0 size is returned.  If there\r
   is not enough memory remaining to satisfy the request, then NULL is returned.\r

-  \r
+\r

   If Buffer is NULL, then ASSERT().\r
   If Buffer is NULL, then ASSERT().\r

-  If AllocationSize is greater than (MAX_ADDRESS - Buffer + 1), then ASSERT(). \r
+  If AllocationSize is greater than (MAX_ADDRESS - Buffer + 1), then ASSERT().\r

 \r
   @param  AllocationSize        The number of bytes to allocate and zero.\r
   @param  Buffer                The buffer to copy to the allocated buffer.\r
 \r
   @param  AllocationSize        The number of bytes to allocate and zero.\r
   @param  Buffer                The buffer to copy to the allocated buffer.\r


@@ -861,19 +861,19 @@ AllocateReservedCopyPool (
   Reallocates a buffer of a specified memory type.\r
 \r
   Allocates and zeros the number bytes specified by NewSize from memory of the type\r
   Reallocates a buffer of a specified memory type.\r
 \r
   Allocates and zeros the number bytes specified by NewSize from memory of the type\r

-  specified by PoolType.  If OldBuffer is not NULL, then the smaller of OldSize and \r
-  NewSize bytes are copied from OldBuffer to the newly allocated buffer, and \r
-  OldBuffer is freed.  A pointer to the newly allocated buffer is returned.  \r
-  If NewSize is 0, then a valid buffer of 0 size is  returned.  If there is not \r
+  specified by PoolType.  If OldBuffer is not NULL, then the smaller of OldSize and\r
+  NewSize bytes are copied from OldBuffer to the newly allocated buffer, and\r
+  OldBuffer is freed.  A pointer to the newly allocated buffer is returned.\r
+  If NewSize is 0, then a valid buffer of 0 size is  returned.  If there is not\r

   enough memory remaining to satisfy the request, then NULL is returned.\r
   enough memory remaining to satisfy the request, then NULL is returned.\r

-  \r
+\r

   If the allocation of the new buffer is successful and the smaller of NewSize and OldSize\r
   is greater than (MAX_ADDRESS - OldBuffer + 1), then ASSERT().\r
 \r
   @param  PoolType       The type of pool to allocate.\r
   @param  OldSize        The size, in bytes, of OldBuffer.\r
   @param  NewSize        The size, in bytes, of the buffer to reallocate.\r
   If the allocation of the new buffer is successful and the smaller of NewSize and OldSize\r
   is greater than (MAX_ADDRESS - OldBuffer + 1), then ASSERT().\r
 \r
   @param  PoolType       The type of pool to allocate.\r
   @param  OldSize        The size, in bytes, of OldBuffer.\r
   @param  NewSize        The size, in bytes, of the buffer to reallocate.\r

-  @param  OldBuffer      The buffer to copy to the allocated buffer.  This is an optional \r
+  @param  OldBuffer      The buffer to copy to the allocated buffer.  This is an optional\r

                          parameter that may be NULL.\r
 \r
   @return A pointer to the allocated buffer or NULL if allocation fails.\r
                          parameter that may be NULL.\r
 \r
   @return A pointer to the allocated buffer or NULL if allocation fails.\r


@@ -881,7 +881,7 @@ AllocateReservedCopyPool (
 **/\r
 VOID *\r
 InternalReallocatePool (\r
 **/\r
 VOID *\r
 InternalReallocatePool (\r

-  IN EFI_MEMORY_TYPE  PoolType,  \r
+  IN EFI_MEMORY_TYPE  PoolType,\r

   IN UINTN            OldSize,\r
   IN UINTN            NewSize,\r
   IN VOID             *OldBuffer  OPTIONAL\r
   IN UINTN            OldSize,\r
   IN UINTN            NewSize,\r
   IN VOID             *OldBuffer  OPTIONAL\r


@@ -901,18 +901,18 @@ InternalReallocatePool (
   Reallocates a buffer of type EfiBootServicesData.\r
 \r
   Allocates and zeros the number bytes specified by NewSize from memory of type\r
   Reallocates a buffer of type EfiBootServicesData.\r
 \r
   Allocates and zeros the number bytes specified by NewSize from memory of type\r

-  EfiBootServicesData.  If OldBuffer is not NULL, then the smaller of OldSize and \r
-  NewSize bytes are copied from OldBuffer to the newly allocated buffer, and \r
-  OldBuffer is freed.  A pointer to the newly allocated buffer is returned.  \r
-  If NewSize is 0, then a valid buffer of 0 size is  returned.  If there is not \r
+  EfiBootServicesData.  If OldBuffer is not NULL, then the smaller of OldSize and\r
+  NewSize bytes are copied from OldBuffer to the newly allocated buffer, and\r
+  OldBuffer is freed.  A pointer to the newly allocated buffer is returned.\r
+  If NewSize is 0, then a valid buffer of 0 size is  returned.  If there is not\r

   enough memory remaining to satisfy the request, then NULL is returned.\r
   enough memory remaining to satisfy the request, then NULL is returned.\r

-  \r
+\r

   If the allocation of the new buffer is successful and the smaller of NewSize and OldSize\r
   is greater than (MAX_ADDRESS - OldBuffer + 1), then ASSERT().\r
 \r
   @param  OldSize        The size, in bytes, of OldBuffer.\r
   @param  NewSize        The size, in bytes, of the buffer to reallocate.\r
   If the allocation of the new buffer is successful and the smaller of NewSize and OldSize\r
   is greater than (MAX_ADDRESS - OldBuffer + 1), then ASSERT().\r
 \r
   @param  OldSize        The size, in bytes, of OldBuffer.\r
   @param  NewSize        The size, in bytes, of the buffer to reallocate.\r

-  @param  OldBuffer      The buffer to copy to the allocated buffer.  This is an optional \r
+  @param  OldBuffer      The buffer to copy to the allocated buffer.  This is an optional\r

                          parameter that may be NULL.\r
 \r
   @return A pointer to the allocated buffer or NULL if allocation fails.\r
                          parameter that may be NULL.\r
 \r
   @return A pointer to the allocated buffer or NULL if allocation fails.\r


@@ -946,10 +946,10 @@ ReallocatePool (
   Reallocates a buffer of type EfiRuntimeServicesData.\r
 \r
   Allocates and zeros the number bytes specified by NewSize from memory of type\r
   Reallocates a buffer of type EfiRuntimeServicesData.\r
 \r
   Allocates and zeros the number bytes specified by NewSize from memory of type\r

-  EfiRuntimeServicesData.  If OldBuffer is not NULL, then the smaller of OldSize and \r
-  NewSize bytes are copied from OldBuffer to the newly allocated buffer, and \r
-  OldBuffer is freed.  A pointer to the newly allocated buffer is returned.  \r
-  If NewSize is 0, then a valid buffer of 0 size is  returned.  If there is not \r
+  EfiRuntimeServicesData.  If OldBuffer is not NULL, then the smaller of OldSize and\r
+  NewSize bytes are copied from OldBuffer to the newly allocated buffer, and\r
+  OldBuffer is freed.  A pointer to the newly allocated buffer is returned.\r
+  If NewSize is 0, then a valid buffer of 0 size is  returned.  If there is not\r

   enough memory remaining to satisfy the request, then NULL is returned.\r
 \r
   If the allocation of the new buffer is successful and the smaller of NewSize and OldSize\r
   enough memory remaining to satisfy the request, then NULL is returned.\r
 \r
   If the allocation of the new buffer is successful and the smaller of NewSize and OldSize\r


@@ -957,7 +957,7 @@ ReallocatePool (
 \r
   @param  OldSize        The size, in bytes, of OldBuffer.\r
   @param  NewSize        The size, in bytes, of the buffer to reallocate.\r
 \r
   @param  OldSize        The size, in bytes, of OldBuffer.\r
   @param  NewSize        The size, in bytes, of the buffer to reallocate.\r

-  @param  OldBuffer      The buffer to copy to the allocated buffer.  This is an optional \r
+  @param  OldBuffer      The buffer to copy to the allocated buffer.  This is an optional\r

                          parameter that may be NULL.\r
 \r
   @return A pointer to the allocated buffer or NULL if allocation fails.\r
                          parameter that may be NULL.\r
 \r
   @return A pointer to the allocated buffer or NULL if allocation fails.\r


@@ -991,10 +991,10 @@ ReallocateRuntimePool (
   Reallocates a buffer of type EfiReservedMemoryType.\r
 \r
   Allocates and zeros the number bytes specified by NewSize from memory of type\r
   Reallocates a buffer of type EfiReservedMemoryType.\r
 \r
   Allocates and zeros the number bytes specified by NewSize from memory of type\r

-  EfiReservedMemoryType.  If OldBuffer is not NULL, then the smaller of OldSize and \r
-  NewSize bytes are copied from OldBuffer to the newly allocated buffer, and \r
-  OldBuffer is freed.  A pointer to the newly allocated buffer is returned.  \r
-  If NewSize is 0, then a valid buffer of 0 size is  returned.  If there is not \r
+  EfiReservedMemoryType.  If OldBuffer is not NULL, then the smaller of OldSize and\r
+  NewSize bytes are copied from OldBuffer to the newly allocated buffer, and\r
+  OldBuffer is freed.  A pointer to the newly allocated buffer is returned.\r
+  If NewSize is 0, then a valid buffer of 0 size is  returned.  If there is not\r

   enough memory remaining to satisfy the request, then NULL is returned.\r
 \r
   If the allocation of the new buffer is successful and the smaller of NewSize and OldSize\r
   enough memory remaining to satisfy the request, then NULL is returned.\r
 \r
   If the allocation of the new buffer is successful and the smaller of NewSize and OldSize\r


@@ -1002,7 +1002,7 @@ ReallocateRuntimePool (
 \r
   @param  OldSize        The size, in bytes, of OldBuffer.\r
   @param  NewSize        The size, in bytes, of the buffer to reallocate.\r
 \r
   @param  OldSize        The size, in bytes, of OldBuffer.\r
   @param  NewSize        The size, in bytes, of the buffer to reallocate.\r

-  @param  OldBuffer      The buffer to copy to the allocated buffer.  This is an optional \r
+  @param  OldBuffer      The buffer to copy to the allocated buffer.  This is an optional\r

                          parameter that may be NULL.\r
 \r
   @return A pointer to the allocated buffer or NULL if allocation fails.\r
                          parameter that may be NULL.\r
 \r
   @return A pointer to the allocated buffer or NULL if allocation fails.\r


@@ -1039,7 +1039,7 @@ ReallocateReservedPool (
   Frees the buffer specified by Buffer.  Buffer must have been allocated on a previous call to the\r
   pool allocation services of the Memory Allocation Library.  If it is not possible to free pool\r
   resources, then this function will perform no actions.\r
   Frees the buffer specified by Buffer.  Buffer must have been allocated on a previous call to the\r
   pool allocation services of the Memory Allocation Library.  If it is not possible to free pool\r
   resources, then this function will perform no actions.\r

-  \r
+\r

   If Buffer was not allocated with a pool allocation function in the Memory Allocation Library,\r
   then ASSERT().\r
 \r
   If Buffer was not allocated with a pool allocation function in the Memory Allocation Library,\r
   then ASSERT().\r
 \r

diff --git a/MdeModulePkg/Library/DxeCorePerformanceLib/DxeCorePerformanceLib.c b/MdeModulePkg/Library/DxeCorePerformanceLib/DxeCorePerformanceLib.c
index efff5134c7be99bcc3aee866191011b0667aa8a9..57a14e8796f67e92474879ea70f66ced388edc48 100644 (file)
--- a/MdeModulePkg/Library/DxeCorePerformanceLib/DxeCorePerformanceLib.c
+++ b/MdeModulePkg/Library/DxeCorePerformanceLib/DxeCorePerformanceLib.c
@@ -3,7 +3,7 @@
 \r
   This library provides the performance measurement interfaces and initializes performance\r
   logging for DXE phase. It first initializes its private global data structure for\r
 \r
   This library provides the performance measurement interfaces and initializes performance\r
   logging for DXE phase. It first initializes its private global data structure for\r

-  performance logging and saves the performance GUIDed HOB passed from PEI phase. \r
+  performance logging and saves the performance GUIDed HOB passed from PEI phase.\r

   It initializes DXE phase performance logging by publishing the Performance and PerformanceEx Protocol,\r
   which are consumed by DxePerformanceLib to logging performance data in DXE phase.\r
 \r
   It initializes DXE phase performance logging by publishing the Performance and PerformanceEx Protocol,\r
   which are consumed by DxePerformanceLib to logging performance data in DXE phase.\r
 \r

diff --git a/MdeModulePkg/Library/DxeCorePerformanceLib/DxeCorePerformanceLib.inf b/MdeModulePkg/Library/DxeCorePerformanceLib/DxeCorePerformanceLib.inf
index 3e77f9cd57ae588704570c4999cb19f654f0e2a0..8fab47ff02daf3c29bf6b252f0090396f6d3b317 100644 (file)
--- a/MdeModulePkg/Library/DxeCorePerformanceLib/DxeCorePerformanceLib.inf
+++ b/MdeModulePkg/Library/DxeCorePerformanceLib/DxeCorePerformanceLib.inf
@@ -1,24 +1,24 @@
 ## @file\r
 #  Performance library instance mainly for DxeCore usage.\r
 ## @file\r
 #  Performance library instance mainly for DxeCore usage.\r

-#  \r
+#\r

 #  This library provides the performance measurement interfaces and initializes performance\r
 #  logging for DXE phase. It first initializes its private global data structure for\r
 #  This library provides the performance measurement interfaces and initializes performance\r
 #  logging for DXE phase. It first initializes its private global data structure for\r

-#  performance logging and saves the performance GUIDed HOB passed from PEI phase. \r
+#  performance logging and saves the performance GUIDed HOB passed from PEI phase.\r

 #  It initializes DXE phase performance logging by publishing the Performance and PerformanceEx Protocol,\r
 #  which is consumed by DxePerformanceLib to logging performance data in DXE phase.\r
 #  This library is mainly used by DxeCore to start performance logging to ensure that\r
 #  Performance and PerformanceEx Protocol are installed at the very beginning of DXE phase.\r
 #  It initializes DXE phase performance logging by publishing the Performance and PerformanceEx Protocol,\r
 #  which is consumed by DxePerformanceLib to logging performance data in DXE phase.\r
 #  This library is mainly used by DxeCore to start performance logging to ensure that\r
 #  Performance and PerformanceEx Protocol are installed at the very beginning of DXE phase.\r

-#  \r
+#\r

 #  Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r
 # (C) Copyright 2016 Hewlett Packard Enterprise Development LP<BR>\r
 #  This program and the accompanying materials\r
 #  are licensed and made available under the terms and conditions of the BSD License\r
 #  which accompanies this distribution.  The full text of the license may be found at\r
 #  http://opensource.org/licenses/bsd-license.php\r
 #  Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r
 # (C) Copyright 2016 Hewlett Packard Enterprise Development LP<BR>\r
 #  This program and the accompanying materials\r
 #  are licensed and made available under the terms and conditions of the BSD License\r
 #  which accompanies this distribution.  The full text of the license may be found at\r
 #  http://opensource.org/licenses/bsd-license.php\r

-#  \r
+#\r

 #  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 #  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 #  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 #  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r

-#  \r
+#\r

 ##\r
 \r
 [Defines]\r
 ##\r
 \r
 [Defines]\r

diff --git a/MdeModulePkg/Library/DxeCorePerformanceLib/DxeCorePerformanceLib.uni b/MdeModulePkg/Library/DxeCorePerformanceLib/DxeCorePerformanceLib.uni
index dcdb8ae5c4ab2e8981c0e10cb32b97d31bf3580b..f9f2853d69c33ab1f61a0a44c11180f781acb351 100644 (file)
--- a/MdeModulePkg/Library/DxeCorePerformanceLib/DxeCorePerformanceLib.uni
+++ b/MdeModulePkg/Library/DxeCorePerformanceLib/DxeCorePerformanceLib.uni
@@ -9,13 +9,13 @@
 // This library is mainly used by DxeCore to start performance logging to ensure that\r
 // Performance and PerformanceEx Protocol are installed at the very beginning of DXE phase.\r
 //\r
 // This library is mainly used by DxeCore to start performance logging to ensure that\r
 // Performance and PerformanceEx Protocol are installed at the very beginning of DXE phase.\r
 //\r

-// Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.<BR>\r
+// Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r

 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r
 // which accompanies this distribution.  The full text of the license may be found at\r
 // http://opensource.org/licenses/bsd-license.php\r
 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r
 // which accompanies this distribution.  The full text of the license may be found at\r
 // http://opensource.org/licenses/bsd-license.php\r

-// \r
+//\r

 // THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 // WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 //\r
 // THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 // WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 //\r

diff --git a/MdeModulePkg/Library/DxeCorePerformanceLib/DxeCorePerformanceLibInternal.h b/MdeModulePkg/Library/DxeCorePerformanceLib/DxeCorePerformanceLibInternal.h
index a96f408150390bf53b1434ac339389fe2f527145..2b214e2e57097785f855434a50945d8798be9935 100644 (file)
--- a/MdeModulePkg/Library/DxeCorePerformanceLib/DxeCorePerformanceLibInternal.h
+++ b/MdeModulePkg/Library/DxeCorePerformanceLib/DxeCorePerformanceLibInternal.h
@@ -14,7 +14,7 @@ THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
 WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 \r
 **/\r
 WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 \r
 **/\r

-  \r
+\r

 #ifndef _DXE_CORE_PERFORMANCE_LIB_INTERNAL_H_\r
 #define _DXE_CORE_PERFORMANCE_LIB_INTERNAL_H_\r
 \r
 #ifndef _DXE_CORE_PERFORMANCE_LIB_INTERNAL_H_\r
 #define _DXE_CORE_PERFORMANCE_LIB_INTERNAL_H_\r
 \r

diff --git a/MdeModulePkg/Library/DxeCrc32GuidedSectionExtractLib/DxeCrc32GuidedSectionExtractLib.c b/MdeModulePkg/Library/DxeCrc32GuidedSectionExtractLib/DxeCrc32GuidedSectionExtractLib.c
index 5f2892823b5017a52fa7d98da7eacfe82320083e..13aaaacecdaed28c6b335660c04d87a85694667e 100644 (file)
--- a/MdeModulePkg/Library/DxeCrc32GuidedSectionExtractLib/DxeCrc32GuidedSectionExtractLib.c
+++ b/MdeModulePkg/Library/DxeCrc32GuidedSectionExtractLib/DxeCrc32GuidedSectionExtractLib.c
@@ -1,17 +1,17 @@
 /** @file\r
 \r
 /** @file\r
 \r

-  This library registers CRC32 guided section handler \r
+  This library registers CRC32 guided section handler\r

   to parse CRC32 encapsulation section and extract raw data.\r
   It uses UEFI boot service CalculateCrc32 to authenticate 32 bit CRC value.\r
 \r
   to parse CRC32 encapsulation section and extract raw data.\r
   It uses UEFI boot service CalculateCrc32 to authenticate 32 bit CRC value.\r
 \r

-Copyright (c) 2007 - 2011, Intel Corporation. All rights reserved.<BR>\r
-This program and the accompanying materials                          \r
-are licensed and made available under the terms and conditions of the BSD License         \r
-which accompanies this distribution.  The full text of the license may be found at        \r
-http://opensource.org/licenses/bsd-license.php                                            \r
-                                                                                          \r
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     \r
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             \r
+Copyright (c) 2007 - 2018, Intel Corporation. All rights reserved.<BR>\r
+This program and the accompanying materials\r
+are licensed and made available under the terms and conditions of the BSD License\r
+which accompanies this distribution.  The full text of the license may be found at\r
+http://opensource.org/licenses/bsd-license.php\r
+\r
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r

 \r
 **/\r
 \r
 \r
 **/\r
 \r


@@ -39,7 +39,7 @@ typedef struct {
 /**\r
 \r
   GetInfo gets raw data size and attribute of the input guided section.\r
 /**\r
 \r
   GetInfo gets raw data size and attribute of the input guided section.\r

-  It first checks whether the input guid section is supported. \r
+  It first checks whether the input guid section is supported.\r

   If not, EFI_INVALID_PARAMETER will return.\r
 \r
   @param InputSection       Buffer containing the input GUIDed section to be processed.\r
   If not, EFI_INVALID_PARAMETER will return.\r
 \r
   @param InputSection       Buffer containing the input GUIDed section to be processed.\r


@@ -47,7 +47,7 @@ typedef struct {
   @param ScratchBufferSize  The size of ScratchBuffer.\r
   @param SectionAttribute   The attribute of the input guided section.\r
 \r
   @param ScratchBufferSize  The size of ScratchBuffer.\r
   @param SectionAttribute   The attribute of the input guided section.\r
 \r

-  @retval EFI_SUCCESS            The size of destination buffer, the size of scratch buffer and \r
+  @retval EFI_SUCCESS            The size of destination buffer, the size of scratch buffer and\r

                                  the attribute of the input section are successfully retrieved.\r
   @retval EFI_INVALID_PARAMETER  The GUID in InputSection does not match this instance guid.\r
 \r
                                  the attribute of the input section are successfully retrieved.\r
   @retval EFI_INVALID_PARAMETER  The GUID in InputSection does not match this instance guid.\r
 \r


@@ -100,7 +100,7 @@ Crc32GuidedSectionGetInfo (
 \r
   Extraction handler tries to extract raw data from the input guided section.\r
   It also does authentication check for 32bit CRC value in the input guided section.\r
 \r
   Extraction handler tries to extract raw data from the input guided section.\r
   It also does authentication check for 32bit CRC value in the input guided section.\r

-  It first checks whether the input guid section is supported. \r
+  It first checks whether the input guid section is supported.\r

   If not, EFI_INVALID_PARAMETER will return.\r
 \r
   @param InputSection    Buffer containing the input GUIDed section to be processed.\r
   If not, EFI_INVALID_PARAMETER will return.\r
 \r
   @param InputSection    Buffer containing the input GUIDed section to be processed.\r


@@ -137,7 +137,7 @@ Crc32GuidedSectionHandler (
         &(((EFI_GUID_DEFINED_SECTION2 *) InputSection)->SectionDefinitionGuid))) {\r
       return EFI_INVALID_PARAMETER;\r
     }\r
         &(((EFI_GUID_DEFINED_SECTION2 *) InputSection)->SectionDefinitionGuid))) {\r
       return EFI_INVALID_PARAMETER;\r
     }\r

-  \r
+\r

     //\r
     // Get section Crc32 checksum.\r
     //\r
     //\r
     // Get section Crc32 checksum.\r
     //\r


@@ -159,7 +159,7 @@ Crc32GuidedSectionHandler (
         &(((EFI_GUID_DEFINED_SECTION *) InputSection)->SectionDefinitionGuid))) {\r
       return EFI_INVALID_PARAMETER;\r
     }\r
         &(((EFI_GUID_DEFINED_SECTION *) InputSection)->SectionDefinitionGuid))) {\r
       return EFI_INVALID_PARAMETER;\r
     }\r

-  \r
+\r

     //\r
     // Get section Crc32 checksum.\r
     //\r
     //\r
     // Get section Crc32 checksum.\r
     //\r

diff --git a/MdeModulePkg/Library/DxeCrc32GuidedSectionExtractLib/DxeCrc32GuidedSectionExtractLib.inf b/MdeModulePkg/Library/DxeCrc32GuidedSectionExtractLib/DxeCrc32GuidedSectionExtractLib.inf
index d244897ab625b58c54f6fcf585435b9305408734..7a8efbf8cfef790fc6ced16fa594252d7e3162bc 100644 (file)
--- a/MdeModulePkg/Library/DxeCrc32GuidedSectionExtractLib/DxeCrc32GuidedSectionExtractLib.inf
+++ b/MdeModulePkg/Library/DxeCrc32GuidedSectionExtractLib/DxeCrc32GuidedSectionExtractLib.inf
@@ -1,13 +1,13 @@
 ## @file\r
 #  Dxe Crc32 Guided Section Extract library.\r
 #\r
 ## @file\r
 #  Dxe Crc32 Guided Section Extract library.\r
 #\r

-#  This library doesn't produce any library class. The constructor function uses \r
+#  This library doesn't produce any library class. The constructor function uses\r

 #  ExtractGuidedSectionLib service to register CRC32 guided section handler\r
 #  that parses CRC32 encapsulation section and extracts raw data.\r
 #\r
 #  It uses UEFI boot service CalculateCrc32 to authenticate 32 bit CRC value.\r
 #\r
 #  ExtractGuidedSectionLib service to register CRC32 guided section handler\r
 #  that parses CRC32 encapsulation section and extracts raw data.\r
 #\r
 #  It uses UEFI boot service CalculateCrc32 to authenticate 32 bit CRC value.\r
 #\r

-# Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.<BR>\r
+# Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r

 #\r
 #  This program and the accompanying materials\r
 #  are licensed and made available under the terms and conditions of the BSD License\r
 #\r
 #  This program and the accompanying materials\r
 #  are licensed and made available under the terms and conditions of the BSD License\r

diff --git a/MdeModulePkg/Library/DxeCrc32GuidedSectionExtractLib/DxeCrc32GuidedSectionExtractLib.uni b/MdeModulePkg/Library/DxeCrc32GuidedSectionExtractLib/DxeCrc32GuidedSectionExtractLib.uni
index d28cdf0fba16c1577a2c3c740cc00fa677d8b5e4..2e91ca529f9eaeaa8a9c3810efb0aa05f3f2c33d 100644 (file)
--- a/MdeModulePkg/Library/DxeCrc32GuidedSectionExtractLib/DxeCrc32GuidedSectionExtractLib.uni
+++ b/MdeModulePkg/Library/DxeCrc32GuidedSectionExtractLib/DxeCrc32GuidedSectionExtractLib.uni
@@ -4,10 +4,10 @@
 // This library doesn't produce any library class. The constructor function uses\r
 // ExtractGuidedSectionLib service to register CRC32 guided section handler\r
 // that parses CRC32 encapsulation section and extracts raw data.\r
 // This library doesn't produce any library class. The constructor function uses\r
 // ExtractGuidedSectionLib service to register CRC32 guided section handler\r
 // that parses CRC32 encapsulation section and extracts raw data.\r

-// \r
+//\r

 // It uses UEFI boot service CalculateCrc32 to authenticate 32 bit CRC value.\r
 //\r
 // It uses UEFI boot service CalculateCrc32 to authenticate 32 bit CRC value.\r
 //\r

-// Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.<BR>\r
+// Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r

 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r
 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r

diff --git a/MdeModulePkg/Library/DxeDebugPrintErrorLevelLib/DxeDebugPrintErrorLevelLib.c b/MdeModulePkg/Library/DxeDebugPrintErrorLevelLib/DxeDebugPrintErrorLevelLib.c
index 0ba88d8eeb683324a87ad00801dcb294c8a140a3..613850f5e918342d1c2a76632dddca8b4b3a6d54 100644 (file)
--- a/MdeModulePkg/Library/DxeDebugPrintErrorLevelLib/DxeDebugPrintErrorLevelLib.c
+++ b/MdeModulePkg/Library/DxeDebugPrintErrorLevelLib/DxeDebugPrintErrorLevelLib.c
@@ -1,10 +1,10 @@
 /** @file\r
 /** @file\r

-  Debug Print Error Level library instance that provide compatibility with the \r
+  Debug Print Error Level library instance that provide compatibility with the\r

   "err" shell command.  This includes support for the Debug Mask Protocol\r
   supports for global debug print error level mask stored in an EFI Variable.\r
   This library instance only support DXE Phase modules.\r
 \r
   "err" shell command.  This includes support for the Debug Mask Protocol\r
   supports for global debug print error level mask stored in an EFI Variable.\r
   This library instance only support DXE Phase modules.\r
 \r

-  Copyright (c) 2011, Intel Corporation. All rights reserved.<BR>\r
+  Copyright (c) 2011 - 2018, Intel Corporation. All rights reserved.<BR>\r

   This program and the accompanying materials\r
   are licensed and made available under the terms and conditions of the BSD License\r
   which accompanies this distribution.  The full text of the license may be found at\r
   This program and the accompanying materials\r
   are licensed and made available under the terms and conditions of the BSD License\r
   which accompanies this distribution.  The full text of the license may be found at\r


@@ -32,7 +32,7 @@
   it in CurrentDebugMask.\r
 \r
   @param  This              The protocol instance pointer.\r
   it in CurrentDebugMask.\r
 \r
   @param  This              The protocol instance pointer.\r

-  @param  CurrentDebugMask  Pointer to the debug print error level mask that \r
+  @param  CurrentDebugMask  Pointer to the debug print error level mask that\r

                             is returned.\r
 \r
   @retval EFI_SUCCESS            The current debug print error level mask was\r
                             is returned.\r
 \r
   @retval EFI_SUCCESS            The current debug print error level mask was\r


@@ -45,8 +45,8 @@
 EFI_STATUS\r
 EFIAPI\r
 GetDebugMask (\r
 EFI_STATUS\r
 EFIAPI\r
 GetDebugMask (\r

-  IN EFI_DEBUG_MASK_PROTOCOL  *This,             \r
-  IN OUT UINTN                *CurrentDebugMask  \r
+  IN EFI_DEBUG_MASK_PROTOCOL  *This,\r
+  IN OUT UINTN                *CurrentDebugMask\r

   );\r
 \r
 /**\r
   );\r
 \r
 /**\r


@@ -79,7 +79,7 @@ EFI_DEBUG_MASK_PROTOCOL  mDebugMaskProtocol = {
 };\r
 \r
 ///\r
 };\r
 \r
 ///\r

-/// Global variable that is set to TRUE after the first attempt is made to \r
+/// Global variable that is set to TRUE after the first attempt is made to\r

 /// retrieve the global error level mask through the EFI Varibale Services.\r
 /// This variable prevents the EFI Variable Services from being called fort\r
 /// every DEBUG() macro.\r
 /// retrieve the global error level mask through the EFI Varibale Services.\r
 /// This variable prevents the EFI Variable Services from being called fort\r
 /// every DEBUG() macro.\r


@@ -91,9 +91,9 @@ BOOLEAN           mGlobalErrorLevelInitialized = FALSE;
 /// module that is using this library instance.  This variable is initially\r
 /// set to the PcdDebugPrintErrorLevel value.  If the EFI Variable exists that\r
 /// contains the global debug print error level mask, then that overrides the\r
 /// module that is using this library instance.  This variable is initially\r
 /// set to the PcdDebugPrintErrorLevel value.  If the EFI Variable exists that\r
 /// contains the global debug print error level mask, then that overrides the\r

-/// PcdDebugPrintErrorLevel value. The EFI Variable can optionally be \r
+/// PcdDebugPrintErrorLevel value. The EFI Variable can optionally be\r

 /// discovered via a HOB so early DXE drivers can access the variable. If the\r
 /// discovered via a HOB so early DXE drivers can access the variable. If the\r

-/// Debug Mask Protocol SetDebugMask() service is called, then that overrides \r
+/// Debug Mask Protocol SetDebugMask() service is called, then that overrides\r

 /// the PcdDebugPrintErrorLevel and the EFI Variable setting.\r
 ///\r
 UINT32            mDebugPrintErrorLevel        = 0;\r
 /// the PcdDebugPrintErrorLevel and the EFI Variable setting.\r
 ///\r
 UINT32            mDebugPrintErrorLevel        = 0;\r


@@ -107,12 +107,12 @@ UINT32            mDebugPrintErrorLevel        = 0;
 EFI_SYSTEM_TABLE  *mSystemTable                         = NULL;\r
 \r
 /**\r
 EFI_SYSTEM_TABLE  *mSystemTable                         = NULL;\r
 \r
 /**\r

-  The constructor function caches the PCI Express Base Address and creates a \r
+  The constructor function caches the PCI Express Base Address and creates a\r

   Set Virtual Address Map event to convert physical address to virtual addresses.\r
   Set Virtual Address Map event to convert physical address to virtual addresses.\r

-  \r
+\r

   @param  ImageHandle   The firmware allocated handle for the EFI image.\r
   @param  SystemTable   A pointer to the EFI System Table.\r
   @param  ImageHandle   The firmware allocated handle for the EFI image.\r
   @param  SystemTable   A pointer to the EFI System Table.\r

-  \r
+\r

   @retval EFI_SUCCESS   The constructor completed successfully.\r
   @retval Other value   The constructor did not complete successfully.\r
 \r
   @retval EFI_SUCCESS   The constructor completed successfully.\r
   @retval Other value   The constructor did not complete successfully.\r
 \r


@@ -125,15 +125,15 @@ DxeDebugPrintErrorLevelLibConstructor (
   )\r
 {\r
   EFI_STATUS                  Status;\r
   )\r
 {\r
   EFI_STATUS                  Status;\r

-  \r
+\r

   //\r
   // Initialize the error level mask from PCD setting.\r
   //\r
   mDebugPrintErrorLevel = PcdGet32 (PcdDebugPrintErrorLevel);\r
   //\r
   // Initialize the error level mask from PCD setting.\r
   //\r
   mDebugPrintErrorLevel = PcdGet32 (PcdDebugPrintErrorLevel);\r

-    \r
+\r

   //\r
   // Install Debug Mask Protocol onto ImageHandle\r
   //\r
   // Install Debug Mask Protocol onto ImageHandle\r

-  //  \r
+  //\r

   mSystemTable = SystemTable;\r
   Status = SystemTable->BootServices->InstallMultipleProtocolInterfaces (\r
                                         &ImageHandle,\r
   mSystemTable = SystemTable;\r
   Status = SystemTable->BootServices->InstallMultipleProtocolInterfaces (\r
                                         &ImageHandle,\r


@@ -144,22 +144,22 @@ DxeDebugPrintErrorLevelLibConstructor (
   //\r
   // Attempt to retrieve the global debug print error level mask from the EFI Variable\r
   // If the EFI Variable can not be accessed when this module's library constructors are\r
   //\r
   // Attempt to retrieve the global debug print error level mask from the EFI Variable\r
   // If the EFI Variable can not be accessed when this module's library constructors are\r

-  // executed a HOB can be used to set the global debug print error level. If no value \r
+  // executed a HOB can be used to set the global debug print error level. If no value\r

   // was found then the EFI Variable access will be reattempted on every DEBUG() print\r
   // from this module until the EFI Variable services are available.\r
   //\r
   GetDebugPrintErrorLevel ();\r
   // was found then the EFI Variable access will be reattempted on every DEBUG() print\r
   // from this module until the EFI Variable services are available.\r
   //\r
   GetDebugPrintErrorLevel ();\r

-  \r
+\r

   return Status;\r
 }\r
 \r
 /**\r
   return Status;\r
 }\r
 \r
 /**\r

-  The destructor function frees any allocated buffers and closes the Set Virtual \r
+  The destructor function frees any allocated buffers and closes the Set Virtual\r

   Address Map event.\r
   Address Map event.\r

-  \r
+\r

   @param  ImageHandle   The firmware allocated handle for the EFI image.\r
   @param  SystemTable   A pointer to the EFI System Table.\r
   @param  ImageHandle   The firmware allocated handle for the EFI image.\r
   @param  SystemTable   A pointer to the EFI System Table.\r

-  \r
+\r

   @retval EFI_SUCCESS   The destructor completed successfully.\r
   @retval Other value   The destructor did not complete successfully.\r
 \r
   @retval EFI_SUCCESS   The destructor completed successfully.\r
   @retval Other value   The destructor did not complete successfully.\r
 \r


@@ -173,7 +173,7 @@ DxeDebugPrintErrorLevelLibDestructor (
 {\r
   //\r
   // Uninstall the Debug Mask Protocol from ImageHandle\r
 {\r
   //\r
   // Uninstall the Debug Mask Protocol from ImageHandle\r

-  //  \r
+  //\r

   return SystemTable->BootServices->UninstallMultipleProtocolInterfaces (\r
                                       ImageHandle,\r
                                       &gEfiDebugMaskProtocolGuid, &mDebugMaskProtocol,\r
   return SystemTable->BootServices->UninstallMultipleProtocolInterfaces (\r
                                       ImageHandle,\r
                                       &gEfiDebugMaskProtocolGuid, &mDebugMaskProtocol,\r


@@ -207,13 +207,13 @@ GetDebugPrintErrorLevel (
   if (mSystemTable == NULL) {\r
     return PcdGet32 (PcdDebugPrintErrorLevel);\r
   }\r
   if (mSystemTable == NULL) {\r
     return PcdGet32 (PcdDebugPrintErrorLevel);\r
   }\r

-  \r
+\r

   //\r
   //\r

-  // Check to see if an attempt has been made to retrieve the global debug print \r
+  // Check to see if an attempt has been made to retrieve the global debug print\r

   // error level mask.  Since this library instance stores the global debug print\r
   // error level mask in an EFI Variable, the EFI Variable should only be accessed\r
   // once to reduce the overhead of reading the EFI Variable on every debug print\r
   // error level mask.  Since this library instance stores the global debug print\r
   // error level mask in an EFI Variable, the EFI Variable should only be accessed\r
   // once to reduce the overhead of reading the EFI Variable on every debug print\r

-  //  \r
+  //\r

   if (!mGlobalErrorLevelInitialized) {\r
     //\r
     // Make sure the TPL Level is low enough for EFI Variable Services to be called\r
   if (!mGlobalErrorLevelInitialized) {\r
     //\r
     // Make sure the TPL Level is low enough for EFI Variable Services to be called\r


@@ -222,15 +222,15 @@ GetDebugPrintErrorLevel (
     mSystemTable->BootServices->RestoreTPL (CurrentTpl);\r
     if (CurrentTpl <= TPL_CALLBACK) {\r
       //\r
     mSystemTable->BootServices->RestoreTPL (CurrentTpl);\r
     if (CurrentTpl <= TPL_CALLBACK) {\r
       //\r

-      // Attempt to retrieve the global debug print error level mask from the \r
+      // Attempt to retrieve the global debug print error level mask from the\r

       // EFI Variable\r
       //\r
       Size = sizeof (GlobalErrorLevel);\r
       Status = mSystemTable->RuntimeServices->GetVariable (\r
       // EFI Variable\r
       //\r
       Size = sizeof (GlobalErrorLevel);\r
       Status = mSystemTable->RuntimeServices->GetVariable (\r

-                                       DEBUG_MASK_VARIABLE_NAME, \r
-                                       &gEfiGenericVariableGuid, \r
-                                       NULL, \r
-                                       &Size, \r
+                                       DEBUG_MASK_VARIABLE_NAME,\r
+                                       &gEfiGenericVariableGuid,\r
+                                       NULL,\r
+                                       &Size,\r

                                        &GlobalErrorLevel\r
                                        );\r
       if (Status != EFI_NOT_AVAILABLE_YET) {\r
                                        &GlobalErrorLevel\r
                                        );\r
       if (Status != EFI_NOT_AVAILABLE_YET) {\r


@@ -270,9 +270,9 @@ GetDebugPrintErrorLevel (
 \r
 /**\r
   Sets the global debug print error level mask fpr the entire platform.\r
 \r
 /**\r
   Sets the global debug print error level mask fpr the entire platform.\r

-  \r
+\r

   @param   ErrorLevel     Global debug print error level\r
   @param   ErrorLevel     Global debug print error level\r

-  \r
+\r

   @retval  TRUE           The debug print error level mask was sucessfully set.\r
   @retval  FALSE          The debug print error level mask could not be set.\r
 \r
   @retval  TRUE           The debug print error level mask was sucessfully set.\r
   @retval  FALSE          The debug print error level mask could not be set.\r
 \r


@@ -304,18 +304,18 @@ SetDebugPrintErrorLevel (
       GlobalErrorLevel = (UINTN)ErrorLevel;\r
       Size = sizeof (GlobalErrorLevel);\r
       Status = mSystemTable->RuntimeServices->SetVariable (\r
       GlobalErrorLevel = (UINTN)ErrorLevel;\r
       Size = sizeof (GlobalErrorLevel);\r
       Status = mSystemTable->RuntimeServices->SetVariable (\r

-                                       DEBUG_MASK_VARIABLE_NAME, \r
-                                       &gEfiGenericVariableGuid, \r
+                                       DEBUG_MASK_VARIABLE_NAME,\r
+                                       &gEfiGenericVariableGuid,\r

                                        (EFI_VARIABLE_NON_VOLATILE | EFI_VARIABLE_BOOTSERVICE_ACCESS),\r
                                        Size,\r
                                        &GlobalErrorLevel\r
                                        );\r
       if (!EFI_ERROR (Status)) {\r
         //\r
                                        (EFI_VARIABLE_NON_VOLATILE | EFI_VARIABLE_BOOTSERVICE_ACCESS),\r
                                        Size,\r
                                        &GlobalErrorLevel\r
                                        );\r
       if (!EFI_ERROR (Status)) {\r
         //\r

-        // If the EFI Variable was updated, then update the mask value for this \r
+        // If the EFI Variable was updated, then update the mask value for this\r

         // module and return TRUE.\r
         //\r
         // module and return TRUE.\r
         //\r

-        mGlobalErrorLevelInitialized = TRUE;    \r
+        mGlobalErrorLevelInitialized = TRUE;\r

         mDebugPrintErrorLevel = ErrorLevel;\r
         return TRUE;\r
       }\r
         mDebugPrintErrorLevel = ErrorLevel;\r
         return TRUE;\r
       }\r


@@ -332,7 +332,7 @@ SetDebugPrintErrorLevel (
   it in CurrentDebugMask.\r
 \r
   @param  This              The protocol instance pointer.\r
   it in CurrentDebugMask.\r
 \r
   @param  This              The protocol instance pointer.\r

-  @param  CurrentDebugMask  Pointer to the debug print error level mask that \r
+  @param  CurrentDebugMask  Pointer to the debug print error level mask that\r

                             is returned.\r
 \r
   @retval EFI_SUCCESS            The current debug print error level mask was\r
                             is returned.\r
 \r
   @retval EFI_SUCCESS            The current debug print error level mask was\r


@@ -345,14 +345,14 @@ SetDebugPrintErrorLevel (
 EFI_STATUS\r
 EFIAPI\r
 GetDebugMask (\r
 EFI_STATUS\r
 EFIAPI\r
 GetDebugMask (\r

-  IN EFI_DEBUG_MASK_PROTOCOL  *This,             \r
-  IN OUT UINTN                *CurrentDebugMask  \r
+  IN EFI_DEBUG_MASK_PROTOCOL  *This,\r
+  IN OUT UINTN                *CurrentDebugMask\r

   )\r
 {\r
   if (CurrentDebugMask == NULL) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
   )\r
 {\r
   if (CurrentDebugMask == NULL) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r

-  \r
+\r

   //\r
   // Retrieve the current debug mask from mDebugPrintErrorLevel\r
   //\r
   //\r
   // Retrieve the current debug mask from mDebugPrintErrorLevel\r
   //\r

diff --git a/MdeModulePkg/Library/DxeDebugPrintErrorLevelLib/DxeDebugPrintErrorLevelLib.inf b/MdeModulePkg/Library/DxeDebugPrintErrorLevelLib/DxeDebugPrintErrorLevelLib.inf
index b471af7a88e908cd3cb1b52d7e5e46094000ae90..69a41f40c75bba79615832c85e885958525fd3d0 100644 (file)
--- a/MdeModulePkg/Library/DxeDebugPrintErrorLevelLib/DxeDebugPrintErrorLevelLib.inf
+++ b/MdeModulePkg/Library/DxeDebugPrintErrorLevelLib/DxeDebugPrintErrorLevelLib.inf
@@ -3,7 +3,7 @@
 #  This includes support for the Debug Mask Protocol supports for global debug print error level mask\r
 #  stored in an EFI Variable. This library instance only support DXE Phase modules.\r
 #\r
 #  This includes support for the Debug Mask Protocol supports for global debug print error level mask\r
 #  stored in an EFI Variable. This library instance only support DXE Phase modules.\r
 #\r

-#  Copyright (c) 2011 - 2014, Intel Corporation. All rights reserved.<BR>\r
+#  Copyright (c) 2011 - 2018, Intel Corporation. All rights reserved.<BR>\r

 #\r
 #  This program and the accompanying materials\r
 #  are licensed and made available under the terms and conditions of the BSD License\r
 #\r
 #  This program and the accompanying materials\r
 #  are licensed and made available under the terms and conditions of the BSD License\r


@@ -22,7 +22,7 @@
   FILE_GUID                      = 1D564EC9-9373-49a4-9E3F-E4D7B9974C84\r
   MODULE_TYPE                    = DXE_DRIVER\r
   VERSION_STRING                 = 1.0\r
   FILE_GUID                      = 1D564EC9-9373-49a4-9E3F-E4D7B9974C84\r
   MODULE_TYPE                    = DXE_DRIVER\r
   VERSION_STRING                 = 1.0\r

-  LIBRARY_CLASS                  = DebugPrintErrorLevelLib|DXE_CORE DXE_DRIVER DXE_RUNTIME_DRIVER DXE_SAL_DRIVER UEFI_APPLICATION UEFI_DRIVER \r
+  LIBRARY_CLASS                  = DebugPrintErrorLevelLib|DXE_CORE DXE_DRIVER DXE_RUNTIME_DRIVER DXE_SAL_DRIVER UEFI_APPLICATION UEFI_DRIVER\r

   CONSTRUCTOR                    = DxeDebugPrintErrorLevelLibConstructor\r
   DESTRUCTOR                     = DxeDebugPrintErrorLevelLibDestructor\r
 \r
   CONSTRUCTOR                    = DxeDebugPrintErrorLevelLibConstructor\r
   DESTRUCTOR                     = DxeDebugPrintErrorLevelLibDestructor\r
 \r


@@ -40,10 +40,10 @@
 [LibraryClasses]\r
   PcdLib\r
   HobLib\r
 [LibraryClasses]\r
   PcdLib\r
   HobLib\r

-  \r
+\r

 [Protocols]\r
   gEfiDebugMaskProtocolGuid     ## PRODUCES\r
 [Protocols]\r
   gEfiDebugMaskProtocolGuid     ## PRODUCES\r

-  \r
+\r

 [Guids]\r
   ## SOMETIMES_PRODUCES   ## Variable:L"EFIDebug"\r
   ## SOMETIMES_CONSUMES   ## Variable:L"EFIDebug"\r
 [Guids]\r
   ## SOMETIMES_PRODUCES   ## Variable:L"EFIDebug"\r
   ## SOMETIMES_CONSUMES   ## Variable:L"EFIDebug"\r

diff --git a/MdeModulePkg/Library/DxeDpcLib/DpcLib.c b/MdeModulePkg/Library/DxeDpcLib/DpcLib.c
index ddc3e0adda76493b08f43a306e30378f3cdcab14..03149bcfc7733248ddc7b054cfedd566372820f9 100644 (file)
--- a/MdeModulePkg/Library/DxeDpcLib/DpcLib.c
+++ b/MdeModulePkg/Library/DxeDpcLib/DpcLib.c
@@ -1,7 +1,7 @@
 /** @file\r
   Help functions to access UDP service.\r
 /** @file\r
   Help functions to access UDP service.\r

-  \r
-Copyright (c) 2005 - 2007, Intel Corporation. All rights reserved.<BR>\r
+\r
+Copyright (c) 2005 - 2018, Intel Corporation. All rights reserved.<BR>\r

 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r

diff --git a/MdeModulePkg/Library/DxeDpcLib/DxeDpcLib.uni b/MdeModulePkg/Library/DxeDpcLib/DxeDpcLib.uni
index 84e72e1c4646c80b4865df4ea6e561af2beddb6e..e2a9c21c6345fda4a37c7d61303a6be2c1c46ac8 100644 (file)
--- a/MdeModulePkg/Library/DxeDpcLib/DxeDpcLib.uni
+++ b/MdeModulePkg/Library/DxeDpcLib/DxeDpcLib.uni
@@ -3,13 +3,13 @@
 //\r
 // This library instance provides the DPC service by consuming EFI DPC Protocol.\r
 //\r
 //\r
 // This library instance provides the DPC service by consuming EFI DPC Protocol.\r
 //\r

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

 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r
 // which accompanies this distribution.  The full text of the license may be found at\r
 // http://opensource.org/licenses/bsd-license.php\r
 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r
 // which accompanies this distribution.  The full text of the license may be found at\r
 // http://opensource.org/licenses/bsd-license.php\r

-// \r
+//\r

 // THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 // WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 //\r
 // THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 // WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 //\r

diff --git a/MdeModulePkg/Library/DxeFileExplorerProtocol/DxeFileExplorerProtocol.c b/MdeModulePkg/Library/DxeFileExplorerProtocol/DxeFileExplorerProtocol.c
index e1fca76f5b0a720c21bb4d85307e85f838b07731..8c22a3fe54878241d62ce83aa27a573612de5bcc 100644 (file)
--- a/MdeModulePkg/Library/DxeFileExplorerProtocol/DxeFileExplorerProtocol.c
+++ b/MdeModulePkg/Library/DxeFileExplorerProtocol/DxeFileExplorerProtocol.c
@@ -1,12 +1,12 @@
 /** @file\r
   Instance of file explorer Library based on gEfiFileExplorerProtocolGuid.\r
 \r
 /** @file\r
   Instance of file explorer Library based on gEfiFileExplorerProtocolGuid.\r
 \r

-  Implement the file explorer library instance by wrap the interface \r
+  Implement the file explorer library instance by wrap the interface\r

   provided in the file explorer protocol. This protocol is defined as the internal\r
   provided in the file explorer protocol. This protocol is defined as the internal\r

-  protocol related to this implementation, not in the public spec. So, this \r
+  protocol related to this implementation, not in the public spec. So, this\r

   library instance is only for this code base.\r
 \r
   library instance is only for this code base.\r
 \r

-Copyright (c) 2009 - 2015, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2009 - 2018, Intel Corporation. All rights reserved.<BR>\r

 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r


@@ -30,13 +30,13 @@ EFI_FILE_EXPLORER_PROTOCOL *mProtocol = NULL;
 \r
 /**\r
   The constructor function caches the pointer to file explorer protocol.\r
 \r
 /**\r
   The constructor function caches the pointer to file explorer protocol.\r

-  \r
+\r

   The constructor function locates Print2 protocol from protocol database.\r
   The constructor function locates Print2 protocol from protocol database.\r

-  It will ASSERT() if that operation fails and it will always return EFI_SUCCESS. \r
+  It will ASSERT() if that operation fails and it will always return EFI_SUCCESS.\r

 \r
   @param  ImageHandle   The firmware allocated handle for the EFI image.\r
   @param  SystemTable   A pointer to the EFI System Table.\r
 \r
   @param  ImageHandle   The firmware allocated handle for the EFI image.\r
   @param  SystemTable   A pointer to the EFI System Table.\r

-  \r
+\r

   @retval EFI_SUCCESS   The constructor always returns EFI_SUCCESS.\r
 \r
 **/\r
   @retval EFI_SUCCESS   The constructor always returns EFI_SUCCESS.\r
 \r
 **/\r


@@ -61,7 +61,7 @@ FileExplorerConstructor (
 }\r
 \r
 /**\r
 }\r
 \r
 /**\r

-  Choose a file in the specified directory. \r
+  Choose a file in the specified directory.\r

 \r
   If user input NULL for the RootDirectory, will choose file in the system.\r
 \r
 \r
   If user input NULL for the RootDirectory, will choose file in the system.\r
 \r

diff --git a/MdeModulePkg/Library/DxeFileExplorerProtocol/DxeFileExplorerProtocol.inf b/MdeModulePkg/Library/DxeFileExplorerProtocol/DxeFileExplorerProtocol.inf
index 5725a9b4ab84aabf3d13b18e7c7d4616687aecb7..9db58cb8f67eb18cf49cb1a6a476e8e5bb117328 100644 (file)
--- a/MdeModulePkg/Library/DxeFileExplorerProtocol/DxeFileExplorerProtocol.inf
+++ b/MdeModulePkg/Library/DxeFileExplorerProtocol/DxeFileExplorerProtocol.inf
@@ -1,7 +1,7 @@
 ## @file\r
 #  Library instance that implements File explorer Library class based on protocol gEfiFileExplorerProtocolGuid.\r
 #\r
 ## @file\r
 #  Library instance that implements File explorer Library class based on protocol gEfiFileExplorerProtocolGuid.\r
 #\r

-#  Copyright (c) 2009 - 2015, Intel Corporation. All rights reserved.<BR>\r
+#  Copyright (c) 2009 - 2018, Intel Corporation. All rights reserved.<BR>\r

 #\r
 #  This program and the accompanying materials\r
 #  are licensed and made available under the terms and conditions of the BSD License\r
 #\r
 #  This program and the accompanying materials\r
 #  are licensed and made available under the terms and conditions of the BSD License\r


@@ -38,4 +38,4 @@
   gEfiFileExplorerProtocolGuid                         ## CONSUMES\r
 \r
 [Depex.common.DXE_DRIVER, Depex.common.DXE_RUNTIME_DRIVER, Depex.common.DXE_SAL_DRIVER, Depex.common.DXE_SMM_DRIVER]\r
   gEfiFileExplorerProtocolGuid                         ## CONSUMES\r
 \r
 [Depex.common.DXE_DRIVER, Depex.common.DXE_RUNTIME_DRIVER, Depex.common.DXE_SAL_DRIVER, Depex.common.DXE_SMM_DRIVER]\r

-  gEfiFileExplorerProtocolGuid
\ No newline at end of file
+  gEfiFileExplorerProtocolGuid\r

diff --git a/MdeModulePkg/Library/DxeHttpLib/DxeHttpLib.c b/MdeModulePkg/Library/DxeHttpLib/DxeHttpLib.c
index 9774670d7c8f2632646586ca2eaf77fc04caa2f9..5fbb50d03ab61f60a05986bdc2b91c9c5bdda099 100644 (file)
--- a/MdeModulePkg/Library/DxeHttpLib/DxeHttpLib.c
+++ b/MdeModulePkg/Library/DxeHttpLib/DxeHttpLib.c
@@ -2,7 +2,7 @@
   This library is used to share code between UEFI network stack modules.\r
   It provides the helper routines to parse the HTTP message byte stream.\r
 \r
   This library is used to share code between UEFI network stack modules.\r
   It provides the helper routines to parse the HTTP message byte stream.\r
 \r

-Copyright (c) 2015 - 2017, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2015 - 2018, Intel Corporation. All rights reserved.<BR>\r

 (C) Copyright 2016 Hewlett Packard Enterprise Development LP<BR>\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 (C) Copyright 2016 Hewlett Packard Enterprise Development LP<BR>\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r


@@ -20,10 +20,10 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 \r
 /**\r
   Decode a percent-encoded URI component to the ASCII character.\r
 \r
 /**\r
   Decode a percent-encoded URI component to the ASCII character.\r

-  \r
-  Decode the input component in Buffer according to RFC 3986. The caller is responsible to make \r
+\r
+  Decode the input component in Buffer according to RFC 3986. The caller is responsible to make\r

   sure ResultBuffer points to a buffer with size equal or greater than ((AsciiStrSize (Buffer))\r
   sure ResultBuffer points to a buffer with size equal or greater than ((AsciiStrSize (Buffer))\r

-  in bytes. \r
+  in bytes.\r

 \r
   @param[in]    Buffer           The pointer to a percent-encoded URI component.\r
   @param[in]    BufferLength     Length of Buffer in bytes.\r
 \r
   @param[in]    Buffer           The pointer to a percent-encoded URI component.\r
   @param[in]    BufferLength     Length of Buffer in bytes.\r


@@ -32,7 +32,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 \r
   @retval EFI_SUCCESS            Successfully decoded the URI.\r
   @retval EFI_INVALID_PARAMETER  Buffer is not a valid percent-encoded string.\r
 \r
   @retval EFI_SUCCESS            Successfully decoded the URI.\r
   @retval EFI_INVALID_PARAMETER  Buffer is not a valid percent-encoded string.\r

-  \r
+\r

 **/\r
 EFI_STATUS\r
 EFIAPI\r
 **/\r
 EFI_STATUS\r
 EFIAPI\r


@@ -50,13 +50,13 @@ UriPercentDecode (
   if (Buffer == NULL || BufferLength == 0 || ResultBuffer == NULL) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
   if (Buffer == NULL || BufferLength == 0 || ResultBuffer == NULL) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r

-  \r
+\r

   Index = 0;\r
   Offset = 0;\r
   HexStr[2] = '\0';\r
   while (Index < BufferLength) {\r
     if (Buffer[Index] == '%') {\r
   Index = 0;\r
   Offset = 0;\r
   HexStr[2] = '\0';\r
   while (Index < BufferLength) {\r
     if (Buffer[Index] == '%') {\r

-      if (Index + 1 >= BufferLength || Index + 2 >= BufferLength || \r
+      if (Index + 1 >= BufferLength || Index + 2 >= BufferLength ||\r

           !NET_IS_HEX_CHAR (Buffer[Index+1]) || !NET_IS_HEX_CHAR (Buffer[Index+2])) {\r
         return EFI_INVALID_PARAMETER;\r
       }\r
           !NET_IS_HEX_CHAR (Buffer[Index+1]) || !NET_IS_HEX_CHAR (Buffer[Index+2])) {\r
         return EFI_INVALID_PARAMETER;\r
       }\r


@@ -72,7 +72,7 @@ UriPercentDecode (
   }\r
 \r
   *ResultLength = (UINT32) Offset;\r
   }\r
 \r
   *ResultLength = (UINT32) Offset;\r

-    \r
+\r

   return EFI_SUCCESS;\r
 }\r
 \r
   return EFI_SUCCESS;\r
 }\r
 \r


@@ -82,8 +82,8 @@ UriPercentDecode (
 \r
   @param[in]       Char           Next character.\r
   @param[in]       State          Current value of the parser state machine.\r
 \r
   @param[in]       Char           Next character.\r
   @param[in]       State          Current value of the parser state machine.\r

-  @param[in]       IsRightBracket TRUE if there is an sign ']' in the authority component and \r
-                                  indicates the next part is ':' before Port.                                \r
+  @param[in]       IsRightBracket TRUE if there is an sign ']' in the authority component and\r
+                                  indicates the next part is ':' before Port.\r

 \r
   @return          Updated state value.\r
 **/\r
 \r
   @return          Updated state value.\r
 **/\r


@@ -116,27 +116,27 @@ NetHttpParseAuthorityChar (
     break;\r
 \r
   case UrlParserHost:\r
     break;\r
 \r
   case UrlParserHost:\r

-  case UrlParserHostStart:  \r
+  case UrlParserHostStart:\r

     if (Char == '[') {\r
       return UrlParserHostIpv6;\r
     }\r
     if (Char == '[') {\r
       return UrlParserHostIpv6;\r
     }\r

-    \r
+\r

     if (Char == ':') {\r
       return UrlParserPortStart;\r
     }\r
     if (Char == ':') {\r
       return UrlParserPortStart;\r
     }\r

-    \r
+\r

     return UrlParserHost;\r
     return UrlParserHost;\r

-    \r
-  case UrlParserHostIpv6:  \r
+\r
+  case UrlParserHostIpv6:\r

     if (Char == ']') {\r
       *IsRightBracket = TRUE;\r
     }\r
     if (Char == ']') {\r
       *IsRightBracket = TRUE;\r
     }\r

-    \r
+\r

     if (Char == ':' && *IsRightBracket) {\r
       return UrlParserPortStart;\r
     }\r
     return UrlParserHostIpv6;\r
     if (Char == ':' && *IsRightBracket) {\r
       return UrlParserPortStart;\r
     }\r
     return UrlParserHostIpv6;\r

-    \r
+\r

   case UrlParserPort:\r
   case UrlParserPortStart:\r
     return UrlParserPort;\r
   case UrlParserPort:\r
   case UrlParserPortStart:\r
     return UrlParserPort;\r


@@ -173,7 +173,7 @@ NetHttpParseAuthority (
   UINT32                Field;\r
   UINT32                OldField;\r
   BOOLEAN               IsrightBracket;\r
   UINT32                Field;\r
   UINT32                OldField;\r
   BOOLEAN               IsrightBracket;\r

-  \r
+\r

   ASSERT ((UrlParser->FieldBitMap & BIT (HTTP_URI_FIELD_AUTHORITY)) != 0);\r
 \r
   //\r
   ASSERT ((UrlParser->FieldBitMap & BIT (HTTP_URI_FIELD_AUTHORITY)) != 0);\r
 \r
   //\r


@@ -203,7 +203,7 @@ NetHttpParseAuthority (
     case UrlParserUserInfo:\r
       Field = HTTP_URI_FIELD_USERINFO;\r
       break;\r
     case UrlParserUserInfo:\r
       Field = HTTP_URI_FIELD_USERINFO;\r
       break;\r

-      \r
+\r

     case UrlParserHost:\r
       Field = HTTP_URI_FIELD_HOST;\r
       break;\r
     case UrlParserHost:\r
       Field = HTTP_URI_FIELD_HOST;\r
       break;\r


@@ -211,7 +211,7 @@ NetHttpParseAuthority (
     case UrlParserHostIpv6:\r
       Field = HTTP_URI_FIELD_HOST;\r
       break;\r
     case UrlParserHostIpv6:\r
       Field = HTTP_URI_FIELD_HOST;\r
       break;\r

-      \r
+\r

     case UrlParserPort:\r
       Field = HTTP_URI_FIELD_PORT;\r
       break;\r
     case UrlParserPort:\r
       Field = HTTP_URI_FIELD_PORT;\r
       break;\r


@@ -259,12 +259,12 @@ NetHttpParseUrlChar (
   if (Char == ' ' || Char == '\r' || Char == '\n') {\r
     return UrlParserStateMax;\r
   }\r
   if (Char == ' ' || Char == '\r' || Char == '\n') {\r
     return UrlParserStateMax;\r
   }\r

-  \r
+\r

   //\r
   // http_URL = "http:" "//" host [ ":" port ] [ abs_path [ "?" query ]]\r
   //\r
   // http_URL = "http:" "//" host [ ":" port ] [ abs_path [ "?" query ]]\r

-  // \r
+  //\r

   // Request-URI    = "*" | absolute-URI | path-absolute | authority\r
   // Request-URI    = "*" | absolute-URI | path-absolute | authority\r

-  // \r
+  //\r

   // absolute-URI  = scheme ":" hier-part [ "?" query ]\r
   // path-absolute = "/" [ segment-nz *( "/" segment ) ]\r
   // authority   = [ userinfo "@" ] host [ ":" port ]\r
   // absolute-URI  = scheme ":" hier-part [ "?" query ]\r
   // path-absolute = "/" [ segment-nz *( "/" segment ) ]\r
   // authority   = [ userinfo "@" ] host [ ":" port ]\r


@@ -333,7 +333,7 @@ NetHttpParseUrlChar (
 \r
   case UrlParserFragmentStart:\r
     return UrlParserFragment;\r
 \r
   case UrlParserFragmentStart:\r
     return UrlParserFragment;\r

-    \r
+\r

   default:\r
     break;\r
   }\r
   default:\r
     break;\r
   }\r


@@ -375,7 +375,7 @@ HttpParseUrl (
   HTTP_URL_PARSER       *Parser;\r
 \r
   Parser = NULL;\r
   HTTP_URL_PARSER       *Parser;\r
 \r
   Parser = NULL;\r

-  \r
+\r

   if (Url == NULL || Length == 0 || UrlParser == NULL) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
   if (Url == NULL || Length == 0 || UrlParser == NULL) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r


@@ -384,7 +384,7 @@ HttpParseUrl (
   if (Parser == NULL) {\r
     return EFI_OUT_OF_RESOURCES;\r
   }\r
   if (Parser == NULL) {\r
     return EFI_OUT_OF_RESOURCES;\r
   }\r

-  \r
+\r

   if (IsConnectMethod) {\r
     //\r
     // According to RFC 2616, the authority form is only used by the CONNECT method.\r
   if (IsConnectMethod) {\r
     //\r
     // According to RFC 2616, the authority form is only used by the CONNECT method.\r


@@ -407,7 +407,7 @@ HttpParseUrl (
     case UrlParserStateMax:\r
       FreePool (Parser);\r
       return EFI_INVALID_PARAMETER;\r
     case UrlParserStateMax:\r
       FreePool (Parser);\r
       return EFI_INVALID_PARAMETER;\r

-      \r
+\r

     case UrlParserSchemeColon:\r
     case UrlParserSchemeColonSlash:\r
     case UrlParserSchemeColonSlashSlash:\r
     case UrlParserSchemeColon:\r
     case UrlParserSchemeColonSlash:\r
     case UrlParserSchemeColonSlashSlash:\r


@@ -417,7 +417,7 @@ HttpParseUrl (
       // Skip all the delimiting char: "://" "?" "@"\r
       //\r
       continue;\r
       // Skip all the delimiting char: "://" "?" "@"\r
       //\r
       continue;\r

-    \r
+\r

     case UrlParserScheme:\r
       Field = HTTP_URI_FIELD_SCHEME;\r
       break;\r
     case UrlParserScheme:\r
       Field = HTTP_URI_FIELD_SCHEME;\r
       break;\r


@@ -474,7 +474,7 @@ HttpParseUrl (
   }\r
 \r
   *UrlParser = Parser;\r
   }\r
 \r
   *UrlParser = Parser;\r

-  return EFI_SUCCESS;  \r
+  return EFI_SUCCESS;\r

 }\r
 \r
 /**\r
 }\r
 \r
 /**\r


@@ -491,7 +491,7 @@ HttpParseUrl (
   @retval EFI_INVALID_PARAMETER    Uri is NULL or HostName is NULL or UrlParser is invalid.\r
   @retval EFI_NOT_FOUND            No hostName component in the URL.\r
   @retval EFI_OUT_OF_RESOURCES     Could not allocate needed resources.\r
   @retval EFI_INVALID_PARAMETER    Uri is NULL or HostName is NULL or UrlParser is invalid.\r
   @retval EFI_NOT_FOUND            No hostName component in the URL.\r
   @retval EFI_OUT_OF_RESOURCES     Could not allocate needed resources.\r

-  \r
+\r

 **/\r
 EFI_STATUS\r
 EFIAPI\r
 **/\r
 EFI_STATUS\r
 EFIAPI\r


@@ -520,7 +520,7 @@ HttpUrlGetHostName (
   if (Name == NULL) {\r
     return EFI_OUT_OF_RESOURCES;\r
   }\r
   if (Name == NULL) {\r
     return EFI_OUT_OF_RESOURCES;\r
   }\r

-  \r
+\r

   Status = UriPercentDecode (\r
              Url + Parser->FieldData[HTTP_URI_FIELD_HOST].Offset,\r
              Parser->FieldData[HTTP_URI_FIELD_HOST].Length,\r
   Status = UriPercentDecode (\r
              Url + Parser->FieldData[HTTP_URI_FIELD_HOST].Offset,\r
              Parser->FieldData[HTTP_URI_FIELD_HOST].Length,\r


@@ -551,7 +551,7 @@ HttpUrlGetHostName (
   @retval EFI_INVALID_PARAMETER    Uri is NULL or Ip4Address is NULL or UrlParser is invalid.\r
   @retval EFI_NOT_FOUND            No IPv4 address component in the URL.\r
   @retval EFI_OUT_OF_RESOURCES     Could not allocate needed resources.\r
   @retval EFI_INVALID_PARAMETER    Uri is NULL or Ip4Address is NULL or UrlParser is invalid.\r
   @retval EFI_NOT_FOUND            No IPv4 address component in the URL.\r
   @retval EFI_OUT_OF_RESOURCES     Could not allocate needed resources.\r

-  \r
+\r

 **/\r
 EFI_STATUS\r
 EFIAPI\r
 **/\r
 EFI_STATUS\r
 EFIAPI\r


@@ -565,7 +565,7 @@ HttpUrlGetIp4 (
   EFI_STATUS           Status;\r
   UINT32               ResultLength;\r
   HTTP_URL_PARSER      *Parser;\r
   EFI_STATUS           Status;\r
   UINT32               ResultLength;\r
   HTTP_URL_PARSER      *Parser;\r

-  \r
+\r

   if (Url == NULL || UrlParser == NULL || Ip4Address == NULL) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
   if (Url == NULL || UrlParser == NULL || Ip4Address == NULL) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r


@@ -580,7 +580,7 @@ HttpUrlGetIp4 (
   if (Ip4String == NULL) {\r
     return EFI_OUT_OF_RESOURCES;\r
   }\r
   if (Ip4String == NULL) {\r
     return EFI_OUT_OF_RESOURCES;\r
   }\r

-  \r
+\r

   Status = UriPercentDecode (\r
              Url + Parser->FieldData[HTTP_URI_FIELD_HOST].Offset,\r
              Parser->FieldData[HTTP_URI_FIELD_HOST].Length,\r
   Status = UriPercentDecode (\r
              Url + Parser->FieldData[HTTP_URI_FIELD_HOST].Offset,\r
              Parser->FieldData[HTTP_URI_FIELD_HOST].Length,\r


@@ -612,7 +612,7 @@ HttpUrlGetIp4 (
   @retval EFI_INVALID_PARAMETER    Uri is NULL or Ip6Address is NULL or UrlParser is invalid.\r
   @retval EFI_NOT_FOUND            No IPv6 address component in the URL.\r
   @retval EFI_OUT_OF_RESOURCES     Could not allocate needed resources.\r
   @retval EFI_INVALID_PARAMETER    Uri is NULL or Ip6Address is NULL or UrlParser is invalid.\r
   @retval EFI_NOT_FOUND            No IPv6 address component in the URL.\r
   @retval EFI_OUT_OF_RESOURCES     Could not allocate needed resources.\r

-  \r
+\r

 **/\r
 EFI_STATUS\r
 EFIAPI\r
 **/\r
 EFI_STATUS\r
 EFIAPI\r


@@ -628,7 +628,7 @@ HttpUrlGetIp6 (
   EFI_STATUS           Status;\r
   UINT32               ResultLength;\r
   HTTP_URL_PARSER      *Parser;\r
   EFI_STATUS           Status;\r
   UINT32               ResultLength;\r
   HTTP_URL_PARSER      *Parser;\r

-  \r
+\r

   if (Url == NULL || UrlParser == NULL || Ip6Address == NULL) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
   if (Url == NULL || UrlParser == NULL || Ip6Address == NULL) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r


@@ -656,7 +656,7 @@ HttpUrlGetIp6 (
   if (Ip6String == NULL) {\r
     return EFI_OUT_OF_RESOURCES;\r
   }\r
   if (Ip6String == NULL) {\r
     return EFI_OUT_OF_RESOURCES;\r
   }\r

-  \r
+\r

   Status = UriPercentDecode (\r
              Ptr + 1,\r
              Length - 2,\r
   Status = UriPercentDecode (\r
              Ptr + 1,\r
              Length - 2,\r


@@ -667,7 +667,7 @@ HttpUrlGetIp6 (
     FreePool (Ip6String);\r
     return Status;\r
   }\r
     FreePool (Ip6String);\r
     return Status;\r
   }\r

-  \r
+\r

   Ip6String[ResultLength] = '\0';\r
   Status = NetLibAsciiStrToIp6 (Ip6String, Ip6Address);\r
   FreePool (Ip6String);\r
   Ip6String[ResultLength] = '\0';\r
   Status = NetLibAsciiStrToIp6 (Ip6String, Ip6Address);\r
   FreePool (Ip6String);\r


@@ -688,7 +688,7 @@ HttpUrlGetIp6 (
   @retval EFI_INVALID_PARAMETER    Uri is NULL or Port is NULL or UrlParser is invalid.\r
   @retval EFI_NOT_FOUND            No port number in the URL.\r
   @retval EFI_OUT_OF_RESOURCES     Could not allocate needed resources.\r
   @retval EFI_INVALID_PARAMETER    Uri is NULL or Port is NULL or UrlParser is invalid.\r
   @retval EFI_NOT_FOUND            No port number in the URL.\r
   @retval EFI_OUT_OF_RESOURCES     Could not allocate needed resources.\r

-  \r
+\r

 **/\r
 EFI_STATUS\r
 EFIAPI\r
 **/\r
 EFI_STATUS\r
 EFIAPI\r


@@ -771,7 +771,7 @@ ON_EXIT:
   @retval EFI_INVALID_PARAMETER    Uri is NULL or HostName is NULL or UrlParser is invalid.\r
   @retval EFI_NOT_FOUND            No hostName component in the URL.\r
   @retval EFI_OUT_OF_RESOURCES     Could not allocate needed resources.\r
   @retval EFI_INVALID_PARAMETER    Uri is NULL or HostName is NULL or UrlParser is invalid.\r
   @retval EFI_NOT_FOUND            No hostName component in the URL.\r
   @retval EFI_OUT_OF_RESOURCES     Could not allocate needed resources.\r

-  \r
+\r

 **/\r
 EFI_STATUS\r
 EFIAPI\r
 **/\r
 EFI_STATUS\r
 EFIAPI\r


@@ -800,7 +800,7 @@ HttpUrlGetPath (
   if (PathStr == NULL) {\r
     return EFI_OUT_OF_RESOURCES;\r
   }\r
   if (PathStr == NULL) {\r
     return EFI_OUT_OF_RESOURCES;\r
   }\r

-  \r
+\r

   Status = UriPercentDecode (\r
              Url + Parser->FieldData[HTTP_URI_FIELD_PATH].Offset,\r
              Parser->FieldData[HTTP_URI_FIELD_PATH].Length,\r
   Status = UriPercentDecode (\r
              Url + Parser->FieldData[HTTP_URI_FIELD_PATH].Offset,\r
              Parser->FieldData[HTTP_URI_FIELD_PATH].Length,\r


@@ -821,7 +821,7 @@ HttpUrlGetPath (
   Release the resource of the URL parser.\r
 \r
   @param[in]    UrlParser            Pointer to the parser.\r
   Release the resource of the URL parser.\r
 \r
   @param[in]    UrlParser            Pointer to the parser.\r

-  \r
+\r

 **/\r
 VOID\r
 EFIAPI\r
 **/\r
 VOID\r
 EFIAPI\r


@@ -835,9 +835,9 @@ HttpUrlFreeParser (
 /**\r
   Find a specified header field according to the field name.\r
 \r
 /**\r
   Find a specified header field according to the field name.\r
 \r

-  @param[in]   HeaderCount      Number of HTTP header structures in Headers list. \r
+  @param[in]   HeaderCount      Number of HTTP header structures in Headers list.\r

   @param[in]   Headers          Array containing list of HTTP headers.\r
   @param[in]   Headers          Array containing list of HTTP headers.\r

-  @param[in]   FieldName        Null terminated string which describes a field name. \r
+  @param[in]   FieldName        Null terminated string which describes a field name.\r

 \r
   @return    Pointer to the found header or NULL.\r
 \r
 \r
   @return    Pointer to the found header or NULL.\r
 \r


@@ -975,7 +975,7 @@ HttpIoParseContentLengthHeader (
   @param[in]    Headers            Array containing list of HTTP headers.\r
 \r
   @return       The message is "chunked" transfer-coding (TRUE) or not (FALSE).\r
   @param[in]    Headers            Array containing list of HTTP headers.\r
 \r
   @return       The message is "chunked" transfer-coding (TRUE) or not (FALSE).\r

- \r
+\r

 **/\r
 BOOLEAN\r
 HttpIoIsChunked (\r
 **/\r
 BOOLEAN\r
 HttpIoIsChunked (\r


@@ -1072,7 +1072,7 @@ HttpInitMsgParser (
 {\r
   EFI_STATUS            Status;\r
   HTTP_BODY_PARSER      *Parser;\r
 {\r
   EFI_STATUS            Status;\r
   HTTP_BODY_PARSER      *Parser;\r

-  \r
+\r

   if (HeaderCount != 0 && Headers == NULL) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
   if (HeaderCount != 0 && Headers == NULL) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r


@@ -1087,7 +1087,7 @@ HttpInitMsgParser (
   }\r
 \r
   Parser->State = BodyParserBodyStart;\r
   }\r
 \r
   Parser->State = BodyParserBodyStart;\r

-  \r
+\r

   //\r
   // Determine the message length according to RFC 2616.\r
   // 1. Check whether the message "MUST NOT" have a message-body.\r
   //\r
   // Determine the message length according to RFC 2616.\r
   // 1. Check whether the message "MUST NOT" have a message-body.\r


@@ -1108,7 +1108,7 @@ HttpInitMsgParser (
   // 4. Range header is not supported now, so we won't meet media type "multipart/byteranges".\r
   // 5. By server closing the connection\r
   //\r
   // 4. Range header is not supported now, so we won't meet media type "multipart/byteranges".\r
   // 5. By server closing the connection\r
   //\r

-  \r
+\r

   //\r
   // Set state to skip body parser if the message shouldn't have a message body.\r
   //\r
   //\r
   // Set state to skip body parser if the message shouldn't have a message body.\r
   //\r


@@ -1151,7 +1151,7 @@ HttpParseMessageBody (
   UINTN                 LengthForCallback;\r
   EFI_STATUS            Status;\r
   HTTP_BODY_PARSER      *Parser;\r
   UINTN                 LengthForCallback;\r
   EFI_STATUS            Status;\r
   HTTP_BODY_PARSER      *Parser;\r

-  \r
+\r

   if (BodyLength == 0 || Body == NULL) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
   if (BodyLength == 0 || Body == NULL) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r


@@ -1195,7 +1195,7 @@ HttpParseMessageBody (
     switch (Parser->State) {\r
     case BodyParserStateMax:\r
       return EFI_ABORTED;\r
     switch (Parser->State) {\r
     case BodyParserStateMax:\r
       return EFI_ABORTED;\r

- \r
+\r

     case BodyParserBodyIdentity:\r
       //\r
       // Identity transfer-coding, just notify user to save the body data.\r
     case BodyParserBodyIdentity:\r
       //\r
       // Identity transfer-coding, just notify user to save the body data.\r


@@ -1265,7 +1265,7 @@ HttpParseMessageBody (
        }\r
       Char++;\r
       break;\r
        }\r
       Char++;\r
       break;\r

-      \r
+\r

     case BodyParserChunkSizeEndCR:\r
       if (*Char != '\n') {\r
         Parser->State = BodyParserStateMax;\r
     case BodyParserChunkSizeEndCR:\r
       if (*Char != '\n') {\r
         Parser->State = BodyParserStateMax;\r


@@ -1274,7 +1274,7 @@ HttpParseMessageBody (
       Char++;\r
       if (Parser->CurrentChunkSize == 0) {\r
         //\r
       Char++;\r
       if (Parser->CurrentChunkSize == 0) {\r
         //\r

-        // The last chunk has been parsed and now assumed the state \r
+        // The last chunk has been parsed and now assumed the state\r

         // of HttpBodyParse is ParserLastCRLF. So it need to decide\r
         // whether the rest message is trailer or last CRLF in the next round.\r
         //\r
         // of HttpBodyParse is ParserLastCRLF. So it need to decide\r
         // whether the rest message is trailer or last CRLF in the next round.\r
         //\r


@@ -1285,10 +1285,10 @@ HttpParseMessageBody (
       Parser->State = BodyParserChunkDataStart;\r
       Parser->CurrentChunkParsedSize = 0;\r
       break;\r
       Parser->State = BodyParserChunkDataStart;\r
       Parser->CurrentChunkParsedSize = 0;\r
       break;\r

-      \r
+\r

     case BodyParserLastCRLF:\r
       //\r
     case BodyParserLastCRLF:\r
       //\r

-      // Judge the byte is belong to the Last CRLF or trailer, and then \r
+      // Judge the byte is belong to the Last CRLF or trailer, and then\r

       // configure the state of HttpBodyParse to corresponding state.\r
       //\r
       if (*Char == '\r') {\r
       // configure the state of HttpBodyParse to corresponding state.\r
       //\r
       if (*Char == '\r') {\r


@@ -1299,7 +1299,7 @@ HttpParseMessageBody (
         Parser->State = BodyParserTrailer;\r
         break;\r
       }\r
         Parser->State = BodyParserTrailer;\r
         break;\r
       }\r

-      \r
+\r

     case BodyParserLastCRLFEnd:\r
       if (*Char == '\n') {\r
         Parser->State = BodyParserComplete;\r
     case BodyParserLastCRLFEnd:\r
       if (*Char == '\n') {\r
         Parser->State = BodyParserComplete;\r


@@ -1320,13 +1320,13 @@ HttpParseMessageBody (
         Parser->State = BodyParserStateMax;\r
         break;\r
       }\r
         Parser->State = BodyParserStateMax;\r
         break;\r
       }\r

-      \r
+\r

     case BodyParserTrailer:\r
       if (*Char == '\r') {\r
         Parser->State = BodyParserChunkSizeEndCR;\r
       }\r
       Char++;\r
     case BodyParserTrailer:\r
       if (*Char == '\r') {\r
         Parser->State = BodyParserChunkSizeEndCR;\r
       }\r
       Char++;\r

-      break;      \r
+      break;\r

 \r
     case BodyParserChunkDataStart:\r
       //\r
 \r
     case BodyParserChunkDataStart:\r
       //\r


@@ -1350,7 +1350,7 @@ HttpParseMessageBody (
       Parser->CurrentChunkParsedSize += LengthForCallback;\r
       if (Parser->CurrentChunkParsedSize == Parser->CurrentChunkSize) {\r
         Parser->State = BodyParserChunkDataEnd;\r
       Parser->CurrentChunkParsedSize += LengthForCallback;\r
       if (Parser->CurrentChunkParsedSize == Parser->CurrentChunkSize) {\r
         Parser->State = BodyParserChunkDataEnd;\r

-      }           \r
+      }\r

       break;\r
 \r
     case BodyParserChunkDataEnd:\r
       break;\r
 \r
     case BodyParserChunkDataEnd:\r


@@ -1369,7 +1369,7 @@ HttpParseMessageBody (
       }\r
       Char++;\r
       Parser->State = BodyParserChunkSizeStart;\r
       }\r
       Char++;\r
       Parser->State = BodyParserChunkSizeStart;\r

-      break;     \r
+      break;\r

 \r
     default:\r
       break;\r
 \r
     default:\r
       break;\r


@@ -1424,7 +1424,7 @@ HttpIsMessageComplete (
   @retval EFI_SUCCESS                Successfully to get the entity length.\r
   @retval EFI_NOT_READY              Entity length is not valid yet.\r
   @retval EFI_INVALID_PARAMETER      MsgParser is NULL or ContentLength is NULL.\r
   @retval EFI_SUCCESS                Successfully to get the entity length.\r
   @retval EFI_NOT_READY              Entity length is not valid yet.\r
   @retval EFI_INVALID_PARAMETER      MsgParser is NULL or ContentLength is NULL.\r

-  \r
+\r

 **/\r
 EFI_STATUS\r
 EFIAPI\r
 **/\r
 EFI_STATUS\r
 EFIAPI\r


@@ -1453,7 +1453,7 @@ HttpGetEntityLength (
   Release the resource of the message parser.\r
 \r
   @param[in]    MsgParser            Pointer to the message parser.\r
   Release the resource of the message parser.\r
 \r
   @param[in]    MsgParser            Pointer to the message parser.\r

-  \r
+\r

 **/\r
 VOID\r
 EFIAPI\r
 **/\r
 VOID\r
 EFIAPI\r


@@ -1619,19 +1619,19 @@ HttpGetFieldNameAndValue (
   while (TRUE) {\r
     if (*FieldValueStr == ' ' || *FieldValueStr == '\t') {\r
       //\r
   while (TRUE) {\r
     if (*FieldValueStr == ' ' || *FieldValueStr == '\t') {\r
       //\r

-      // Boundary condition check. \r
+      // Boundary condition check.\r

       //\r
       if ((UINTN) EndofHeader - (UINTN) FieldValueStr < 1) {\r
       //\r
       if ((UINTN) EndofHeader - (UINTN) FieldValueStr < 1) {\r

-        return NULL;  \r
+        return NULL;\r

       }\r
       }\r

-      \r
+\r

       FieldValueStr ++;\r
     } else if (*FieldValueStr == '\r') {\r
       //\r
       FieldValueStr ++;\r
     } else if (*FieldValueStr == '\r') {\r
       //\r

-      // Boundary condition check. \r
+      // Boundary condition check.\r

       //\r
       if ((UINTN) EndofHeader - (UINTN) FieldValueStr < 3) {\r
       //\r
       if ((UINTN) EndofHeader - (UINTN) FieldValueStr < 3) {\r

-        return NULL;  \r
+        return NULL;\r

       }\r
 \r
       if (*(FieldValueStr + 1) == '\n' && (*(FieldValueStr + 2) == ' ' || *(FieldValueStr + 2) == '\t')) {\r
       }\r
 \r
       if (*(FieldValueStr + 1) == '\n' && (*(FieldValueStr + 2) == ' ' || *(FieldValueStr + 2) == '\t')) {\r


@@ -1755,7 +1755,7 @@ HttpGenRequestMessage (
   // 3. If we do not have a Request, HeaderCount should be zero\r
   // 4. If we do not have Request and Headers, we need at least a message-body\r
   //\r
   // 3. If we do not have a Request, HeaderCount should be zero\r
   // 4. If we do not have Request and Headers, we need at least a message-body\r
   //\r

-  if ((Message == NULL || RequestMsg == NULL || RequestMsgSize == NULL) || \r
+  if ((Message == NULL || RequestMsg == NULL || RequestMsgSize == NULL) ||\r

       (Message->Data.Request != NULL && Url == NULL) ||\r
       (Message->Data.Request != NULL && Message->HeaderCount == 0) ||\r
       (Message->Data.Request == NULL && Message->HeaderCount != 0) ||\r
       (Message->Data.Request != NULL && Url == NULL) ||\r
       (Message->Data.Request != NULL && Message->HeaderCount == 0) ||\r
       (Message->Data.Request == NULL && Message->HeaderCount != 0) ||\r


@@ -2069,7 +2069,7 @@ HttpIsValidHttpHeader (
     if (DeleteList[Index] == NULL) {\r
       continue;\r
     }\r
     if (DeleteList[Index] == NULL) {\r
       continue;\r
     }\r

-    \r
+\r

     if (AsciiStrCmp (FieldName, DeleteList[Index]) == 0) {\r
       return FALSE;\r
     }\r
     if (AsciiStrCmp (FieldName, DeleteList[Index]) == 0) {\r
       return FALSE;\r
     }\r

diff --git a/MdeModulePkg/Library/DxeHttpLib/DxeHttpLib.inf b/MdeModulePkg/Library/DxeHttpLib/DxeHttpLib.inf
index 92b9b91239cffbefca5a78a8b1325a37c7f89dca..d6d5391b3ad882cd46c1d9e7c9d48a352ea33c4f 100644 (file)
--- a/MdeModulePkg/Library/DxeHttpLib/DxeHttpLib.inf
+++ b/MdeModulePkg/Library/DxeHttpLib/DxeHttpLib.inf
@@ -1,7 +1,7 @@
 ## @file\r
 #  It provides the helper routines to parse the HTTP message byte stream.\r
 #\r
 ## @file\r
 #  It provides the helper routines to parse the HTTP message byte stream.\r
 #\r

-#  Copyright (c) 2015 - 2016, Intel Corporation. All rights reserved.<BR>\r
+#  Copyright (c) 2015 - 2018, Intel Corporation. All rights reserved.<BR>\r

 #  (C) Copyright 2016 Hewlett Packard Enterprise Development LP<BR>\r
 #  This program and the accompanying materials\r
 #  are licensed and made available under the terms and conditions of the BSD License\r
 #  (C) Copyright 2016 Hewlett Packard Enterprise Development LP<BR>\r
 #  This program and the accompanying materials\r
 #  are licensed and made available under the terms and conditions of the BSD License\r


@@ -45,4 +45,4 @@
   NetLib\r
 \r
 [Protocols]\r
   NetLib\r
 \r
 [Protocols]\r

-  gEfiHttpUtilitiesProtocolGuid                 ## SOMETIMES_CONSUMES
\ No newline at end of file
+  gEfiHttpUtilitiesProtocolGuid                 ## SOMETIMES_CONSUMES\r

diff --git a/MdeModulePkg/Library/DxeHttpLib/DxeHttpLib.uni b/MdeModulePkg/Library/DxeHttpLib/DxeHttpLib.uni
index bde5004b56ccbff1fcaede57c0a0c9879091dbac..452f125d95969154a96b16199c8c6f017969c06b 100644 (file)
--- a/MdeModulePkg/Library/DxeHttpLib/DxeHttpLib.uni
+++ b/MdeModulePkg/Library/DxeHttpLib/DxeHttpLib.uni
@@ -3,13 +3,13 @@
 //\r
 // This library instance provides the helper routines to parse the HTTP message byte stream.\r
 //\r
 //\r
 // This library instance provides the helper routines to parse the HTTP message byte stream.\r
 //\r

-// Copyright (c) 2015, Intel Corporation. All rights reserved.<BR>\r
+// Copyright (c) 2015 - 2018, Intel Corporation. All rights reserved.<BR>\r

 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r
 // which accompanies this distribution.  The full text of the license may be found at\r
 // http://opensource.org/licenses/bsd-license.php\r
 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r
 // which accompanies this distribution.  The full text of the license may be found at\r
 // http://opensource.org/licenses/bsd-license.php\r

-// \r
+//\r

 // THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 // WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 //\r
 // THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 // WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 //\r

diff --git a/MdeModulePkg/Library/DxeIpIoLib/DxeIpIoLib.c b/MdeModulePkg/Library/DxeIpIoLib/DxeIpIoLib.c
index 66c7fec6c54820b455603a8cb0b01648c78e9055..fafc26894dba2184f25d8776468ac700625ebbe5 100644 (file)
--- a/MdeModulePkg/Library/DxeIpIoLib/DxeIpIoLib.c
+++ b/MdeModulePkg/Library/DxeIpIoLib/DxeIpIoLib.c
@@ -78,11 +78,11 @@ GLOBAL_REMOVE_IF_UNREFERENCED ICMP_ERROR_INFO  mIcmp6ErrMap[10] = {
   {FALSE, TRUE}, // ICMP6_ERR_UNREACH_NET\r
   {FALSE, TRUE}, // ICMP6_ERR_UNREACH_HOST\r
   {TRUE,  TRUE}, // ICMP6_ERR_UNREACH_PROTOCOL\r
   {FALSE, TRUE}, // ICMP6_ERR_UNREACH_NET\r
   {FALSE, TRUE}, // ICMP6_ERR_UNREACH_HOST\r
   {TRUE,  TRUE}, // ICMP6_ERR_UNREACH_PROTOCOL\r

-  {TRUE,  TRUE}, // ICMP6_ERR_UNREACH_PORT    \r
+  {TRUE,  TRUE}, // ICMP6_ERR_UNREACH_PORT\r

   {TRUE,  TRUE}, // ICMP6_ERR_PACKAGE_TOOBIG\r
   {FALSE, TRUE}, // ICMP6_ERR_TIMXCEED_HOPLIMIT\r
   {FALSE, TRUE}, // ICMP6_ERR_TIMXCEED_REASS\r
   {TRUE,  TRUE}, // ICMP6_ERR_PACKAGE_TOOBIG\r
   {FALSE, TRUE}, // ICMP6_ERR_TIMXCEED_HOPLIMIT\r
   {FALSE, TRUE}, // ICMP6_ERR_TIMXCEED_REASS\r

-  {FALSE, TRUE}, // ICMP6_ERR_PARAMPROB_HEADER    \r
+  {FALSE, TRUE}, // ICMP6_ERR_PARAMPROB_HEADER\r

   {FALSE, TRUE}, // ICMP6_ERR_PARAMPROB_NEXHEADER\r
   {FALSE, TRUE}  // ICMP6_ERR_PARAMPROB_IPV6OPTION\r
 };\r
   {FALSE, TRUE}, // ICMP6_ERR_PARAMPROB_NEXHEADER\r
   {FALSE, TRUE}  // ICMP6_ERR_PARAMPROB_IPV6OPTION\r
 };\r


@@ -258,7 +258,7 @@ IpIoCloseProtocolDestroyIpChild (
 }\r
 \r
 /**\r
 }\r
 \r
 /**\r

-  This function handles ICMPv4 packets. It is the worker function of \r
+  This function handles ICMPv4 packets. It is the worker function of\r

   IpIoIcmpHandler.\r
 \r
   @param[in]       IpIo            Pointer to the IP_IO instance.\r
   IpIoIcmpHandler.\r
 \r
   @param[in]       IpIo            Pointer to the IP_IO instance.\r


@@ -283,19 +283,19 @@ IpIoIcmpv4Handler (
   UINT8                Type;\r
   UINT8                Code;\r
   UINT32               TrimBytes;\r
   UINT8                Type;\r
   UINT8                Code;\r
   UINT32               TrimBytes;\r

-  \r
+\r

   ASSERT (IpIo != NULL);\r
   ASSERT (Pkt != NULL);\r
   ASSERT (Session != NULL);\r
   ASSERT (IpIo->IpVersion == IP_VERSION_4);\r
   ASSERT (IpIo != NULL);\r
   ASSERT (Pkt != NULL);\r
   ASSERT (Session != NULL);\r
   ASSERT (IpIo->IpVersion == IP_VERSION_4);\r

-  \r
+\r

   //\r
   // Check the ICMP packet length.\r
   //\r
   if (Pkt->TotalSize < sizeof (IP4_ICMP_ERROR_HEAD)) {\r
     return EFI_ABORTED;\r
   }\r
   //\r
   // Check the ICMP packet length.\r
   //\r
   if (Pkt->TotalSize < sizeof (IP4_ICMP_ERROR_HEAD)) {\r
     return EFI_ABORTED;\r
   }\r

-  \r
+\r

   IcmpHdr = NET_PROTO_HDR (Pkt, IP4_ICMP_ERROR_HEAD);\r
   IpHdr   = (EFI_IP4_HEADER *) (&IcmpHdr->IpHead);\r
 \r
   IcmpHdr = NET_PROTO_HDR (Pkt, IP4_ICMP_ERROR_HEAD);\r
   IpHdr   = (EFI_IP4_HEADER *) (&IcmpHdr->IpHead);\r
 \r


@@ -387,20 +387,20 @@ IpIoIcmpv4Handler (
   TrimBytes  = (UINT32) (PayLoadHdr - (UINT8 *) IcmpHdr);\r
 \r
   NetbufTrim (Pkt, TrimBytes, TRUE);\r
   TrimBytes  = (UINT32) (PayLoadHdr - (UINT8 *) IcmpHdr);\r
 \r
   NetbufTrim (Pkt, TrimBytes, TRUE);\r

-  \r
+\r

   //\r
   //\r

-  // If the input packet has invalid format, and TrimBytes is larger than \r
+  // If the input packet has invalid format, and TrimBytes is larger than\r

   // the packet size, the NetbufTrim might trim the packet to zero.\r
   //\r
   if (Pkt->TotalSize != 0) {\r
     IpIo->PktRcvdNotify (EFI_ICMP_ERROR, IcmpErr, Session, Pkt, IpIo->RcvdContext);\r
   }\r
 \r
   // the packet size, the NetbufTrim might trim the packet to zero.\r
   //\r
   if (Pkt->TotalSize != 0) {\r
     IpIo->PktRcvdNotify (EFI_ICMP_ERROR, IcmpErr, Session, Pkt, IpIo->RcvdContext);\r
   }\r
 \r

-  return EFI_SUCCESS;  \r
+  return EFI_SUCCESS;\r

 }\r
 \r
 /**\r
 }\r
 \r
 /**\r

-  This function handles ICMPv6 packets. It is the worker function of \r
+  This function handles ICMPv6 packets. It is the worker function of\r

   IpIoIcmpHandler.\r
 \r
   @param[in]       IpIo            Pointer to the IP_IO instance.\r
   IpIoIcmpHandler.\r
 \r
   @param[in]       IpIo            Pointer to the IP_IO instance.\r


@@ -447,7 +447,7 @@ IpIoIcmpv6Handler (
 \r
   //\r
   // Analyze the ICMPv6 Error in this ICMPv6 packet\r
 \r
   //\r
   // Analyze the ICMPv6 Error in this ICMPv6 packet\r

-  // \r
+  //\r

   switch (Type) {\r
   case ICMP_V6_DEST_UNREACHABLE:\r
     switch (Code) {\r
   switch (Type) {\r
   case ICMP_V6_DEST_UNREACHABLE:\r
     switch (Code) {\r


@@ -506,7 +506,7 @@ IpIoIcmpv6Handler (
    default:\r
 \r
      return EFI_ABORTED;\r
    default:\r
 \r
      return EFI_ABORTED;\r

-   } \r
+   }\r

 \r
   //\r
   // Notify user the ICMPv6 packet only containing payload except\r
 \r
   //\r
   // Notify user the ICMPv6 packet only containing payload except\r


@@ -517,7 +517,7 @@ IpIoIcmpv6Handler (
   NextHeader = IpHdr->NextHeader;\r
   PayLoadHdr = (UINT8 *) ((UINT8 *) IcmpHdr + sizeof (IP6_ICMP_ERROR_HEAD));\r
   Flag       = TRUE;\r
   NextHeader = IpHdr->NextHeader;\r
   PayLoadHdr = (UINT8 *) ((UINT8 *) IcmpHdr + sizeof (IP6_ICMP_ERROR_HEAD));\r
   Flag       = TRUE;\r

-  \r
+\r

   do {\r
     switch (NextHeader) {\r
     case EFI_IP_PROTO_UDP:\r
   do {\r
     switch (NextHeader) {\r
     case EFI_IP_PROTO_UDP:\r


@@ -555,11 +555,11 @@ IpIoIcmpv6Handler (
   } while (Flag);\r
 \r
   TrimBytes = (UINT32) (PayLoadHdr - (UINT8 *) IcmpHdr);\r
   } while (Flag);\r
 \r
   TrimBytes = (UINT32) (PayLoadHdr - (UINT8 *) IcmpHdr);\r

-  \r
+\r

   NetbufTrim (Pkt, TrimBytes, TRUE);\r
 \r
   //\r
   NetbufTrim (Pkt, TrimBytes, TRUE);\r
 \r
   //\r

-  // If the input packet has invalid format, and TrimBytes is larger than \r
+  // If the input packet has invalid format, and TrimBytes is larger than\r

   // the packet size, the NetbufTrim might trim the packet to zero.\r
   //\r
   if (Pkt->TotalSize != 0) {\r
   // the packet size, the NetbufTrim might trim the packet to zero.\r
   //\r
   if (Pkt->TotalSize != 0) {\r


@@ -634,7 +634,7 @@ IpIoExtFree (
   @param[in]       Dest                 Pointer to the destination IP address.\r
   @param[in]       Override             Pointer to the overriden IP_IO data.\r
 \r
   @param[in]       Dest                 Pointer to the destination IP address.\r
   @param[in]       Override             Pointer to the overriden IP_IO data.\r
 \r

-  @return Pointer to the data structure created to wrap the packet. If any error occurs, \r
+  @return Pointer to the data structure created to wrap the packet. If any error occurs,\r

           then return NULL.\r
 \r
 **/\r
           then return NULL.\r
 \r
 **/\r


@@ -650,7 +650,7 @@ IpIoCreateSndEntry (
   )\r
 {\r
   IP_IO_SEND_ENTRY          *SndEntry;\r
   )\r
 {\r
   IP_IO_SEND_ENTRY          *SndEntry;\r

-  EFI_EVENT                 Event;  \r
+  EFI_EVENT                 Event;\r

   EFI_STATUS                Status;\r
   NET_FRAGMENT              *ExtFragment;\r
   UINT32                    FragmentCount;\r
   EFI_STATUS                Status;\r
   NET_FRAGMENT              *ExtFragment;\r
   UINT32                    FragmentCount;\r


@@ -700,7 +700,7 @@ IpIoCreateSndEntry (
   }\r
 \r
   //\r
   }\r
 \r
   //\r

-  // Build a fragment table to contain the fragments in the packet. \r
+  // Build a fragment table to contain the fragments in the packet.\r

   //\r
   if (IpIo->IpVersion == IP_VERSION_4) {\r
     ExtFragment = (NET_FRAGMENT *) TxData->Ip4TxData.FragmentTable;\r
   //\r
   if (IpIo->IpVersion == IP_VERSION_4) {\r
     ExtFragment = (NET_FRAGMENT *) TxData->Ip4TxData.FragmentTable;\r


@@ -757,7 +757,7 @@ IpIoCreateSndEntry (
     Ip6TxData->FragmentCount = FragmentCount;\r
     Ip6TxData->ExtHdrsLength = 0;\r
     Ip6TxData->ExtHdrs       = NULL;\r
     Ip6TxData->FragmentCount = FragmentCount;\r
     Ip6TxData->ExtHdrsLength = 0;\r
     Ip6TxData->ExtHdrs       = NULL;\r

-    \r
+\r

     //\r
     // Set the fields of SndToken\r
     //\r
     //\r
     // Set the fields of SndToken\r
     //\r


@@ -804,7 +804,7 @@ ON_ERROR:
 \r
 /**\r
   Destroy the SndEntry.\r
 \r
 /**\r
   Destroy the SndEntry.\r

-  \r
+\r

   This function pairs with IpIoCreateSndEntry().\r
 \r
   @param[in]  SndEntry              Pointer to the send entry to be destroyed.\r
   This function pairs with IpIoCreateSndEntry().\r
 \r
   @param[in]  SndEntry              Pointer to the send entry to be destroyed.\r


@@ -1120,19 +1120,19 @@ IpIoListenHandlerDpc (
     if (!NetIp6IsValidUnicast(&RxData->Ip6RxData.Header->SourceAddress)) {\r
       goto CleanUp;\r
     }\r
     if (!NetIp6IsValidUnicast(&RxData->Ip6RxData.Header->SourceAddress)) {\r
       goto CleanUp;\r
     }\r

-    \r
+\r

     if (RxData->Ip6RxData.DataLength == 0) {\r
       //\r
       // Discard zero length data payload packet.\r
       //\r
       goto CleanUp;\r
     }\r
     if (RxData->Ip6RxData.DataLength == 0) {\r
       //\r
       // Discard zero length data payload packet.\r
       //\r
       goto CleanUp;\r
     }\r

-    \r
+\r

     //\r
     // The fragment should always be valid for non-zero length packet.\r
     //\r
     ASSERT (RxData->Ip6RxData.FragmentCount != 0);\r
     //\r
     // The fragment should always be valid for non-zero length packet.\r
     //\r
     ASSERT (RxData->Ip6RxData.FragmentCount != 0);\r

-    \r
+\r

     //\r
     // Create a netbuffer representing IPv6 packet\r
     //\r
     //\r
     // Create a netbuffer representing IPv6 packet\r
     //\r


@@ -1152,19 +1152,19 @@ IpIoListenHandlerDpc (
     // Create a net session\r
     //\r
     CopyMem (\r
     // Create a net session\r
     //\r
     CopyMem (\r

-      &Session.Source, \r
+      &Session.Source,\r

       &RxData->Ip6RxData.Header->SourceAddress,\r
       sizeof(EFI_IPv6_ADDRESS)\r
       );\r
     CopyMem (\r
       &RxData->Ip6RxData.Header->SourceAddress,\r
       sizeof(EFI_IPv6_ADDRESS)\r
       );\r
     CopyMem (\r

-      &Session.Dest, \r
-      &RxData->Ip6RxData.Header->DestinationAddress, \r
+      &Session.Dest,\r
+      &RxData->Ip6RxData.Header->DestinationAddress,\r

       sizeof(EFI_IPv6_ADDRESS)\r
       );\r
     Session.IpHdr.Ip6Hdr = RxData->Ip6RxData.Header;\r
     Session.IpHdrLen     = RxData->Ip6RxData.HeaderLength;\r
     Session.IpVersion    = IP_VERSION_6;\r
       sizeof(EFI_IPv6_ADDRESS)\r
       );\r
     Session.IpHdr.Ip6Hdr = RxData->Ip6RxData.Header;\r
     Session.IpHdrLen     = RxData->Ip6RxData.HeaderLength;\r
     Session.IpVersion    = IP_VERSION_6;\r

-  } \r
+  }\r

 \r
   if (EFI_SUCCESS == Status) {\r
 \r
 \r
   if (EFI_SUCCESS == Status) {\r
 \r


@@ -1186,7 +1186,7 @@ CleanUp:
   if (IpIo->IpVersion == IP_VERSION_4){\r
     gBS->SignalEvent (RxData->Ip4RxData.RecycleSignal);\r
   } else {\r
   if (IpIo->IpVersion == IP_VERSION_4){\r
     gBS->SignalEvent (RxData->Ip4RxData.RecycleSignal);\r
   } else {\r

-    gBS->SignalEvent (RxData->Ip6RxData.RecycleSignal); \r
+    gBS->SignalEvent (RxData->Ip6RxData.RecycleSignal);\r

   }\r
 \r
 Resume:\r
   }\r
 \r
 Resume:\r


@@ -1223,7 +1223,7 @@ IpIoListenHandler (
   Create a new IP_IO instance.\r
 \r
   If IpVersion is not IP_VERSION_4 or IP_VERSION_6, then ASSERT().\r
   Create a new IP_IO instance.\r
 \r
   If IpVersion is not IP_VERSION_4 or IP_VERSION_6, then ASSERT().\r

-  \r
+\r

   This function uses IP4/IP6 service binding protocol in Controller to create\r
   an IP4/IP6 child (aka IP4/IP6 instance).\r
 \r
   This function uses IP4/IP6 service binding protocol in Controller to create\r
   an IP4/IP6 child (aka IP4/IP6 instance).\r
 \r


@@ -1232,7 +1232,7 @@ IpIoListenHandler (
   @param[in]  Controller        The controller handle that has IP4 or IP6 service\r
                                 binding protocol installed.\r
   @param[in]  IpVersion         The version of the IP protocol to use, either\r
   @param[in]  Controller        The controller handle that has IP4 or IP6 service\r
                                 binding protocol installed.\r
   @param[in]  IpVersion         The version of the IP protocol to use, either\r

-                                IPv4 or IPv6.                            \r
+                                IPv4 or IPv6.\r

 \r
   @return Pointer to a newly created IP_IO instance, or NULL if failed.\r
 \r
 \r
   @return Pointer to a newly created IP_IO instance, or NULL if failed.\r
 \r


@@ -1287,7 +1287,7 @@ IpIoCreate (
              Controller,\r
              Image,\r
              &IpIo->ChildHandle,\r
              Controller,\r
              Image,\r
              &IpIo->ChildHandle,\r

-             IpVersion,             \r
+             IpVersion,\r

              (VOID **) & (IpIo->Ip)\r
              );\r
   if (EFI_ERROR (Status)) {\r
              (VOID **) & (IpIo->Ip)\r
              );\r
   if (EFI_ERROR (Status)) {\r


@@ -1324,7 +1324,7 @@ ReleaseIpIo:
 \r
   @retval          EFI_SUCCESS            The IP_IO instance opened with OpenData\r
                                           successfully.\r
 \r
   @retval          EFI_SUCCESS            The IP_IO instance opened with OpenData\r
                                           successfully.\r

-  @retval          EFI_ACCESS_DENIED      The IP_IO instance is configured, avoid to \r
+  @retval          EFI_ACCESS_DENIED      The IP_IO instance is configured, avoid to\r

                                           reopen it.\r
   @retval          EFI_UNSUPPORTED        IPv4 RawData mode is no supported.\r
   @retval          EFI_INVALID_PARAMETER  Invalid input parameter.\r
                                           reopen it.\r
   @retval          EFI_UNSUPPORTED        IPv4 RawData mode is no supported.\r
   @retval          EFI_INVALID_PARAMETER  Invalid input parameter.\r


@@ -1369,7 +1369,7 @@ IpIoOpen (
       IpIo->StationIp = EFI_NTOHL (OpenData->IpConfigData.Ip4CfgData.StationAddress);\r
       IpIo->SubnetMask = EFI_NTOHL (OpenData->IpConfigData.Ip4CfgData.SubnetMask);\r
     }\r
       IpIo->StationIp = EFI_NTOHL (OpenData->IpConfigData.Ip4CfgData.StationAddress);\r
       IpIo->SubnetMask = EFI_NTOHL (OpenData->IpConfigData.Ip4CfgData.SubnetMask);\r
     }\r

-    \r
+\r

     Status = IpIo->Ip.Ip4->Configure (\r
                              IpIo->Ip.Ip4,\r
                              &OpenData->IpConfigData.Ip4CfgData\r
     Status = IpIo->Ip.Ip4->Configure (\r
                              IpIo->Ip.Ip4,\r
                              &OpenData->IpConfigData.Ip4CfgData\r


@@ -1377,7 +1377,7 @@ IpIoOpen (
   } else {\r
 \r
     Status = IpIo->Ip.Ip6->Configure (\r
   } else {\r
 \r
     Status = IpIo->Ip.Ip6->Configure (\r

-                             IpIo->Ip.Ip6, \r
+                             IpIo->Ip.Ip6,\r

                              &OpenData->IpConfigData.Ip6CfgData\r
                              );\r
   }\r
                              &OpenData->IpConfigData.Ip6CfgData\r
                              );\r
   }\r


@@ -1450,7 +1450,7 @@ IpIoOpen (
   Stop an IP_IO instance.\r
 \r
   If Ip version is not IP_VERSION_4 or IP_VERSION_6, then ASSERT().\r
   Stop an IP_IO instance.\r
 \r
   If Ip version is not IP_VERSION_4 or IP_VERSION_6, then ASSERT().\r

-  \r
+\r

   This function is paired with IpIoOpen(). The IP_IO will be unconfigured and all\r
   the pending send/receive tokens will be canceled.\r
 \r
   This function is paired with IpIoOpen(). The IP_IO will be unconfigured and all\r
   the pending send/receive tokens will be canceled.\r
 \r


@@ -1532,7 +1532,7 @@ IpIoStop (
 \r
 /**\r
   Destroy an IP_IO instance.\r
 \r
 /**\r
   Destroy an IP_IO instance.\r

-  \r
+\r

   This function is paired with IpIoCreate(). The IP_IO will be closed first.\r
   Resource will be freed afterwards. See IpIoCloseProtocolDestroyIpChild().\r
 \r
   This function is paired with IpIoCreate(). The IP_IO will be closed first.\r
   Resource will be freed afterwards. See IpIoCloseProtocolDestroyIpChild().\r
 \r


@@ -1550,7 +1550,7 @@ IpIoDestroy (
   )\r
 {\r
   EFI_STATUS    Status;\r
   )\r
 {\r
   EFI_STATUS    Status;\r

-  \r
+\r

   //\r
   // Stop the IpIo.\r
   //\r
   //\r
   // Stop the IpIo.\r
   //\r


@@ -1580,7 +1580,7 @@ IpIoDestroy (
 \r
 /**\r
   Send out an IP packet.\r
 \r
 /**\r
   Send out an IP packet.\r

-  \r
+\r

   This function is called after IpIoOpen(). The data to be sent is wrapped in\r
   Pkt. The IP instance wrapped in IpIo is used for sending by default but can be\r
   overriden by Sender. Other sending configs, like source address and gateway\r
   This function is called after IpIoOpen(). The data to be sent is wrapped in\r
   Pkt. The IP instance wrapped in IpIo is used for sending by default but can be\r
   overriden by Sender. Other sending configs, like source address and gateway\r


@@ -1720,7 +1720,7 @@ IpIoCancelTxToken (
 \r
   If IpIo is NULL, then ASSERT().\r
   If Ip version is not IP_VERSION_4 or IP_VERSION_6, then ASSERT().\r
 \r
   If IpIo is NULL, then ASSERT().\r
   If Ip version is not IP_VERSION_4 or IP_VERSION_6, then ASSERT().\r

-  \r
+\r

   The function is used to add the IP_IO to the IP_IO sending list. The caller\r
   can later use IpIoFindSender() to get the IP_IO and call IpIoSend() to send\r
   data.\r
   The function is used to add the IP_IO to the IP_IO sending list. The caller\r
   can later use IpIoFindSender() to get the IP_IO and call IpIoSend() to send\r
   data.\r


@@ -1883,9 +1883,9 @@ IpIoConfigIp (
 \r
       if (((EFI_IP4_CONFIG_DATA *) IpConfigData)->UseDefaultAddress) {\r
         Status = Ip.Ip4->GetModeData (\r
 \r
       if (((EFI_IP4_CONFIG_DATA *) IpConfigData)->UseDefaultAddress) {\r
         Status = Ip.Ip4->GetModeData (\r

-                           Ip.Ip4, \r
-                           &Ip4ModeData, \r
-                           NULL, \r
+                           Ip.Ip4,\r
+                           &Ip4ModeData,\r
+                           NULL,\r

                            NULL\r
                            );\r
         if (EFI_ERROR (Status)) {\r
                            NULL\r
                            );\r
         if (EFI_ERROR (Status)) {\r


@@ -1898,12 +1898,12 @@ IpIoConfigIp (
       }\r
 \r
       CopyMem (\r
       }\r
 \r
       CopyMem (\r

-        &IpInfo->Addr.Addr, \r
-        &((EFI_IP4_CONFIG_DATA *) IpConfigData)->StationAddress, \r
+        &IpInfo->Addr.Addr,\r
+        &((EFI_IP4_CONFIG_DATA *) IpConfigData)->StationAddress,\r

         sizeof (IP4_ADDR)\r
         );\r
       CopyMem (\r
         sizeof (IP4_ADDR)\r
         );\r
       CopyMem (\r

-        &IpInfo->PreMask.SubnetMask, \r
+        &IpInfo->PreMask.SubnetMask,\r

         &((EFI_IP4_CONFIG_DATA *) IpConfigData)->SubnetMask,\r
         sizeof (IP4_ADDR)\r
         );\r
         &((EFI_IP4_CONFIG_DATA *) IpConfigData)->SubnetMask,\r
         sizeof (IP4_ADDR)\r
         );\r


@@ -1961,11 +1961,11 @@ IpIoConfigIp (
       } else {\r
         Status = EFI_NO_MAPPING;\r
         return Status;\r
       } else {\r
         Status = EFI_NO_MAPPING;\r
         return Status;\r

-      } \r
+      }\r

 \r
       CopyMem (\r
 \r
       CopyMem (\r

-        &IpInfo->Addr, \r
-        &Ip6ModeData.ConfigData.StationAddress, \r
+        &IpInfo->Addr,\r
+        &Ip6ModeData.ConfigData.StationAddress,\r

         sizeof (EFI_IPv6_ADDRESS)\r
         );\r
 \r
         sizeof (EFI_IPv6_ADDRESS)\r
         );\r
 \r


@@ -1976,7 +1976,7 @@ IpIoConfigIp (
       if (EFI_ERROR (Status)) {\r
         Ip.Ip6->Configure (Ip.Ip6, NULL);\r
       }\r
       if (EFI_ERROR (Status)) {\r
         Ip.Ip6->Configure (Ip.Ip6, NULL);\r
       }\r

-    }  \r
+    }\r

   } else {\r
     //\r
     // The IP instance is reset, set the stored Addr and SubnetMask to zero.\r
   } else {\r
     //\r
     // The IP instance is reset, set the stored Addr and SubnetMask to zero.\r


@@ -1994,7 +1994,7 @@ IpIoConfigIp (
   sending purpose.\r
 \r
   If Ip version is not IP_VERSION_4 or IP_VERSION_6, then ASSERT().\r
   sending purpose.\r
 \r
   If Ip version is not IP_VERSION_4 or IP_VERSION_6, then ASSERT().\r

-  \r
+\r

   This function pairs with IpIoAddIp(). The IpInfo is previously created by\r
   IpIoAddIp(). The IP_IO_IP_INFO::RefCnt is decremented and the IP instance\r
   will be dstroyed if the RefCnt is zero.\r
   This function pairs with IpIoAddIp(). The IpInfo is previously created by\r
   IpIoAddIp(). The IP_IO_IP_INFO::RefCnt is decremented and the IP instance\r
   will be dstroyed if the RefCnt is zero.\r


@@ -2012,7 +2012,7 @@ IpIoRemoveIp (
 {\r
 \r
   UINT8               IpVersion;\r
 {\r
 \r
   UINT8               IpVersion;\r

-  \r
+\r

   if (IpIo == NULL || IpInfo == NULL) {\r
     return;\r
   }\r
   if (IpIo == NULL || IpInfo == NULL) {\r
     return;\r
   }\r


@@ -2070,7 +2070,7 @@ IpIoRemoveIp (
 /**\r
   Find the first IP protocol maintained in IpIo whose local\r
   address is the same as Src.\r
 /**\r
   Find the first IP protocol maintained in IpIo whose local\r
   address is the same as Src.\r

-  \r
+\r

   This function is called when the caller needs the IpIo to send data to the\r
   specified Src. The IpIo was added previously by IpIoAddIp().\r
 \r
   This function is called when the caller needs the IpIo to send data to the\r
   specified Src. The IpIo was added previously by IpIoAddIp().\r
 \r


@@ -2124,7 +2124,7 @@ IpIoFindSender (
 \r
         if (EFI_IP6_EQUAL (&IpInfo->Addr.v6, &Src->v6)) {\r
           *IpIo = IpIoPtr;\r
 \r
         if (EFI_IP6_EQUAL (&IpInfo->Addr.v6, &Src->v6)) {\r
           *IpIo = IpIoPtr;\r

-          return IpInfo;       \r
+          return IpInfo;\r

         }\r
       }\r
     }\r
         }\r
       }\r
     }\r


@@ -2139,13 +2139,13 @@ IpIoFindSender (
 \r
 /**\r
   Get the ICMP error map information.\r
 \r
 /**\r
   Get the ICMP error map information.\r

-  \r
+\r

   The ErrorStatus will be returned. The IsHard and Notify are optional. If they\r
   are not NULL, this routine will fill them.\r
 \r
   @param[in]   IcmpError             IcmpError Type.\r
   @param[in]   IpVersion             The version of the IP protocol to use,\r
   The ErrorStatus will be returned. The IsHard and Notify are optional. If they\r
   are not NULL, this routine will fill them.\r
 \r
   @param[in]   IcmpError             IcmpError Type.\r
   @param[in]   IpVersion             The version of the IP protocol to use,\r

-                                     either IPv4 or IPv6. \r
+                                     either IPv4 or IPv6.\r

   @param[out]  IsHard                If TRUE, indicates that it is a hard error.\r
   @param[out]  Notify                If TRUE, SockError needs to be notified.\r
 \r
   @param[out]  IsHard                If TRUE, indicates that it is a hard error.\r
   @param[out]  Notify                If TRUE, SockError needs to be notified.\r
 \r


@@ -2217,12 +2217,12 @@ IpIoGetIcmpErrStatus (
 \r
     case ICMP6_ERR_UNREACH_HOST:\r
     case ICMP6_ERR_TIMXCEED_HOPLIMIT:\r
 \r
     case ICMP6_ERR_UNREACH_HOST:\r
     case ICMP6_ERR_TIMXCEED_HOPLIMIT:\r

-    case ICMP6_ERR_TIMXCEED_REASS:       \r
+    case ICMP6_ERR_TIMXCEED_REASS:\r

       return EFI_HOST_UNREACHABLE;\r
 \r
     case ICMP6_ERR_UNREACH_PROTOCOL:\r
       return EFI_PROTOCOL_UNREACHABLE;\r
       return EFI_HOST_UNREACHABLE;\r
 \r
     case ICMP6_ERR_UNREACH_PROTOCOL:\r
       return EFI_PROTOCOL_UNREACHABLE;\r

-      \r
+\r

     case ICMP6_ERR_UNREACH_PORT:\r
       return EFI_PORT_UNREACHABLE;\r
 \r
     case ICMP6_ERR_UNREACH_PORT:\r
       return EFI_PORT_UNREACHABLE;\r
 \r


@@ -2251,23 +2251,23 @@ IpIoGetIcmpErrStatus (
   Refresh the remote peer's Neighbor Cache entries.\r
 \r
   This function is called when the caller needs the IpIo to refresh the existing\r
   Refresh the remote peer's Neighbor Cache entries.\r
 \r
   This function is called when the caller needs the IpIo to refresh the existing\r

-  IPv6 neighbor cache entries since the neighbor is considered reachable by the \r
-  node has recently received a confirmation that packets sent recently to the \r
-  neighbor were received by its IP layer. \r
+  IPv6 neighbor cache entries since the neighbor is considered reachable by the\r
+  node has recently received a confirmation that packets sent recently to the\r
+  neighbor were received by its IP layer.\r

 \r
   @param[in]   IpIo                  Pointer to an IP_IO instance\r
   @param[in]   Neighbor              The IP address of the neighbor\r
   @param[in]   Timeout               Time in 100-ns units that this entry will\r
 \r
   @param[in]   IpIo                  Pointer to an IP_IO instance\r
   @param[in]   Neighbor              The IP address of the neighbor\r
   @param[in]   Timeout               Time in 100-ns units that this entry will\r

-                                     remain in the neighbor cache. A value of \r
-                                     zero means that the entry is permanent. \r
-                                     A value of non-zero means that the entry is \r
+                                     remain in the neighbor cache. A value of\r
+                                     zero means that the entry is permanent.\r
+                                     A value of non-zero means that the entry is\r

                                      dynamic and will be deleted after Timeout.\r
 \r
   @retval      EFI_SUCCESS           The operation is completed successfully.\r
   @retval      EFI_NOT_STARTED       The IpIo is not configured.\r
   @retval      EFI_INVALID_PARAMETER Neighbor Address is invalid.\r
                                      dynamic and will be deleted after Timeout.\r
 \r
   @retval      EFI_SUCCESS           The operation is completed successfully.\r
   @retval      EFI_NOT_STARTED       The IpIo is not configured.\r
   @retval      EFI_INVALID_PARAMETER Neighbor Address is invalid.\r

-  @retval      EFI_NOT_FOUND         The neighbor cache entry is not in the \r
-                                     neighbor table.  \r
+  @retval      EFI_NOT_FOUND         The neighbor cache entry is not in the\r
+                                     neighbor table.\r

   @retval      EFI_UNSUPPORTED       IP version is IPv4, which doesn't support neighbor cache refresh.\r
   @retval      EFI_OUT_OF_RESOURCES  Failed due to resource limit.\r
 \r
   @retval      EFI_UNSUPPORTED       IP version is IPv4, which doesn't support neighbor cache refresh.\r
   @retval      EFI_OUT_OF_RESOURCES  Failed due to resource limit.\r
 \r


@@ -2277,7 +2277,7 @@ EFIAPI
 IpIoRefreshNeighbor (\r
   IN IP_IO           *IpIo,\r
   IN EFI_IP_ADDRESS  *Neighbor,\r
 IpIoRefreshNeighbor (\r
   IN IP_IO           *IpIo,\r
   IN EFI_IP_ADDRESS  *Neighbor,\r

-  IN UINT32          Timeout  \r
+  IN UINT32          Timeout\r

   )\r
 {\r
   EFI_IP6_PROTOCOL  *Ip;\r
   )\r
 {\r
   EFI_IP6_PROTOCOL  *Ip;\r

diff --git a/MdeModulePkg/Library/DxeIpIoLib/DxeIpIoLib.uni b/MdeModulePkg/Library/DxeIpIoLib/DxeIpIoLib.uni
index 755d29911b23bc8d6cd39a75937afcf4d76b9a02..2a82881b6af638fa1830d7e63245ce222b205f0a 100644 (file)
--- a/MdeModulePkg/Library/DxeIpIoLib/DxeIpIoLib.uni
+++ b/MdeModulePkg/Library/DxeIpIoLib/DxeIpIoLib.uni
@@ -3,13 +3,13 @@
 //\r
 // This library instance provides IP services upon EFI IPv4/IPv6 Protocols.\r
 //\r
 //\r
 // This library instance provides IP services upon EFI IPv4/IPv6 Protocols.\r
 //\r

-// Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.<BR>\r
+// Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r

 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r
 // which accompanies this distribution.  The full text of the license may be found at\r
 // http://opensource.org/licenses/bsd-license.php\r
 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r
 // which accompanies this distribution.  The full text of the license may be found at\r
 // http://opensource.org/licenses/bsd-license.php\r

-// \r
+//\r

 // THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 // WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 //\r
 // THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 // WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 //\r

diff --git a/MdeModulePkg/Library/DxeNetLib/DxeNetLib.c b/MdeModulePkg/Library/DxeNetLib/DxeNetLib.c
index 90d2e3e64d86d1608e3050ecb933d90dfa34ddb1..bf8f5523e60d00af6ec029907b400e8a9aeea130 100644 (file)
--- a/MdeModulePkg/Library/DxeNetLib/DxeNetLib.c
+++ b/MdeModulePkg/Library/DxeNetLib/DxeNetLib.c
@@ -648,10 +648,10 @@ NetGetIpClass (
 \r
 /**\r
   Check whether the IP is a valid unicast address according to\r
 \r
 /**\r
   Check whether the IP is a valid unicast address according to\r

-  the netmask. \r
+  the netmask.\r

 \r
   ASSERT if NetMask is zero.\r
 \r
   ASSERT if NetMask is zero.\r

-  \r
+\r

   If all bits of the host address of IP are 0 or 1, IP is also not a valid unicast address,\r
   except when the originator is one of the endpoints of a point-to-point link with a 31-bit\r
   mask (RFC3021).\r
   If all bits of the host address of IP are 0 or 1, IP is also not a valid unicast address,\r
   except when the originator is one of the endpoints of a point-to-point link with a 31-bit\r
   mask (RFC3021).\r


@@ -670,7 +670,7 @@ NetIp4IsUnicast (
   )\r
 {\r
   ASSERT (NetMask != 0);\r
   )\r
 {\r
   ASSERT (NetMask != 0);\r

-  \r
+\r

   if (Ip == 0 || IP4_IS_LOCAL_BROADCAST (Ip)) {\r
     return FALSE;\r
   }\r
   if (Ip == 0 || IP4_IS_LOCAL_BROADCAST (Ip)) {\r
     return FALSE;\r
   }\r


@@ -895,7 +895,7 @@ Ip6Swap128 (
 /**\r
   Initialize a random seed using current time and monotonic count.\r
 \r
 /**\r
   Initialize a random seed using current time and monotonic count.\r
 \r

-  Get current time and monotonic count first. Then initialize a random seed \r
+  Get current time and monotonic count first. Then initialize a random seed\r

   based on some basic mathematics operation on the hour, day, minute, second,\r
   nanosecond and year of the current time and the monotonic count value.\r
 \r
   based on some basic mathematics operation on the hour, day, minute, second,\r
   nanosecond and year of the current time and the monotonic count value.\r
 \r


@@ -1132,7 +1132,7 @@ NetListInsertBefore (
   If it has been removed, then restart the traversal from the head.\r
   If it hasn't been removed, then continue with the next node directly.\r
   This function will end the iterate and return the CallBack's last return value if error happens,\r
   If it has been removed, then restart the traversal from the head.\r
   If it hasn't been removed, then continue with the next node directly.\r
   This function will end the iterate and return the CallBack's last return value if error happens,\r

-  or retrun EFI_SUCCESS if 2 complete passes are made with no changes in the number of children in the list.  \r
+  or retrun EFI_SUCCESS if 2 complete passes are made with no changes in the number of children in the list.\r

 \r
   @param[in]    List             The head of the list.\r
   @param[in]    CallBack         Pointer to the callback function to destroy one node in the list.\r
 \r
   @param[in]    List             The head of the list.\r
   @param[in]    CallBack         Pointer to the callback function to destroy one node in the list.\r


@@ -1219,7 +1219,7 @@ NetIsInHandleBuffer (
   )\r
 {\r
   UINTN     Index;\r
   )\r
 {\r
   UINTN     Index;\r

-  \r
+\r

   if (NumberOfChildren == 0 || ChildHandleBuffer == NULL) {\r
     return FALSE;\r
   }\r
   if (NumberOfChildren == 0 || ChildHandleBuffer == NULL) {\r
     return FALSE;\r
   }\r


@@ -1810,7 +1810,7 @@ NetLibDefaultUnload (
     if (DriverBinding->ImageHandle != ImageHandle) {\r
       continue;\r
     }\r
     if (DriverBinding->ImageHandle != ImageHandle) {\r
       continue;\r
     }\r

-    \r
+\r

     //\r
     // Disconnect the driver specified by ImageHandle from all\r
     // the devices in the handle database.\r
     //\r
     // Disconnect the driver specified by ImageHandle from all\r
     // the devices in the handle database.\r


@@ -1822,16 +1822,16 @@ NetLibDefaultUnload (
                       NULL\r
                       );\r
     }\r
                       NULL\r
                       );\r
     }\r

-    \r
+\r

     //\r
     // Uninstall all the protocols installed in the driver entry point\r
     //\r
     // Uninstall all the protocols installed in the driver entry point\r

-    //    \r
+    //\r

     gBS->UninstallProtocolInterface (\r
           DriverBinding->DriverBindingHandle,\r
           &gEfiDriverBindingProtocolGuid,\r
           DriverBinding\r
           );\r
     gBS->UninstallProtocolInterface (\r
           DriverBinding->DriverBindingHandle,\r
           &gEfiDriverBindingProtocolGuid,\r
           DriverBinding\r
           );\r

-    \r
+\r

     Status = gBS->HandleProtocol (\r
                     DeviceHandleBuffer[Index],\r
                     &gEfiComponentNameProtocolGuid,\r
     Status = gBS->HandleProtocol (\r
                     DeviceHandleBuffer[Index],\r
                     &gEfiComponentNameProtocolGuid,\r


@@ -2576,13 +2576,13 @@ Exit:
 \r
 /**\r
 \r
 \r
 /**\r
 \r

-  Detect media state for a network device. This routine will wait for a period of time at \r
-  a specified checking interval when a certain network is under connecting until connection \r
+  Detect media state for a network device. This routine will wait for a period of time at\r
+  a specified checking interval when a certain network is under connecting until connection\r

   process finishs or timeout. If Aip protocol is supported by low layer drivers, three kinds\r
   of media states can be detected: EFI_SUCCESS, EFI_NOT_READY and EFI_NO_MEDIA, represents\r
   process finishs or timeout. If Aip protocol is supported by low layer drivers, three kinds\r
   of media states can be detected: EFI_SUCCESS, EFI_NOT_READY and EFI_NO_MEDIA, represents\r

-  connected state, connecting state and no media state respectively. When function detects \r
-  the current state is EFI_NOT_READY, it will loop to wait for next time's check until state \r
-  turns to be EFI_SUCCESS or EFI_NO_MEDIA. If Aip protocol is not supported, function will \r
+  connected state, connecting state and no media state respectively. When function detects\r
+  the current state is EFI_NOT_READY, it will loop to wait for next time's check until state\r
+  turns to be EFI_SUCCESS or EFI_NO_MEDIA. If Aip protocol is not supported, function will\r

   call NetLibDetectMedia() and return state directly.\r
 \r
   @param[in]   ServiceHandle    The handle where network service binding protocols are\r
   call NetLibDetectMedia() and return state directly.\r
 \r
   @param[in]   ServiceHandle    The handle where network service binding protocols are\r


@@ -2593,7 +2593,7 @@ Exit:
   @param[out]  MediaState       The pointer to the detected media state.\r
 \r
   @retval EFI_SUCCESS           Media detection success.\r
   @param[out]  MediaState       The pointer to the detected media state.\r
 \r
   @retval EFI_SUCCESS           Media detection success.\r

-  @retval EFI_INVALID_PARAMETER ServiceHandle is not a valid network device handle or \r
+  @retval EFI_INVALID_PARAMETER ServiceHandle is not a valid network device handle or\r

                                 MediaState pointer is NULL.\r
   @retval EFI_DEVICE_ERROR      A device error occurred.\r
   @retval EFI_TIMEOUT           Network is connecting but timeout.\r
                                 MediaState pointer is NULL.\r
   @retval EFI_DEVICE_ERROR      A device error occurred.\r
   @retval EFI_TIMEOUT           Network is connecting but timeout.\r


@@ -2697,7 +2697,7 @@ NetLibDetectMediaWaitTimeout (
   }\r
 \r
   //\r
   }\r
 \r
   //\r

-  // Loop to check media state \r
+  // Loop to check media state\r

   //\r
 \r
   Timer        = NULL;\r
   //\r
 \r
   Timer        = NULL;\r


@@ -2758,10 +2758,10 @@ NetLibDetectMediaWaitTimeout (
   from DHCP).\r
 \r
   If the controller handle does not have the EFI_IP4_CONFIG2_PROTOCOL installed, the\r
   from DHCP).\r
 \r
   If the controller handle does not have the EFI_IP4_CONFIG2_PROTOCOL installed, the\r

-  default address is static. If failed to get the policy from Ip4 Config2 Protocol, \r
+  default address is static. If failed to get the policy from Ip4 Config2 Protocol,\r

   the default address is static. Otherwise, get the result from Ip4 Config2 Protocol.\r
 \r
   the default address is static. Otherwise, get the result from Ip4 Config2 Protocol.\r
 \r

-  @param[in]   Controller     The controller handle which has the EFI_IP4_CONFIG2_PROTOCOL \r
+  @param[in]   Controller     The controller handle which has the EFI_IP4_CONFIG2_PROTOCOL\r

                               relative with the default address to judge.\r
 \r
   @retval TRUE           If the default address is static.\r
                               relative with the default address to judge.\r
 \r
   @retval TRUE           If the default address is static.\r


@@ -2775,12 +2775,12 @@ NetLibDefaultAddressIsStatic (
 {\r
   EFI_STATUS                       Status;\r
   EFI_IP4_CONFIG2_PROTOCOL         *Ip4Config2;\r
 {\r
   EFI_STATUS                       Status;\r
   EFI_IP4_CONFIG2_PROTOCOL         *Ip4Config2;\r

-  UINTN                            DataSize;  \r
+  UINTN                            DataSize;\r

   EFI_IP4_CONFIG2_POLICY           Policy;\r
   BOOLEAN                          IsStatic;\r
 \r
   Ip4Config2 = NULL;\r
   EFI_IP4_CONFIG2_POLICY           Policy;\r
   BOOLEAN                          IsStatic;\r
 \r
   Ip4Config2 = NULL;\r

-  \r
+\r

   DataSize = sizeof (EFI_IP4_CONFIG2_POLICY);\r
 \r
   IsStatic   = TRUE;\r
   DataSize = sizeof (EFI_IP4_CONFIG2_POLICY);\r
 \r
   IsStatic   = TRUE;\r


@@ -2797,11 +2797,11 @@ NetLibDefaultAddressIsStatic (
   if (EFI_ERROR (Status)) {\r
     goto ON_EXIT;\r
   }\r
   if (EFI_ERROR (Status)) {\r
     goto ON_EXIT;\r
   }\r

-  \r
+\r

   IsStatic = (BOOLEAN) (Policy == Ip4Config2PolicyStatic);\r
 \r
 ON_EXIT:\r
   IsStatic = (BOOLEAN) (Policy == Ip4Config2PolicyStatic);\r
 \r
 ON_EXIT:\r

-  \r
+\r

   return IsStatic;\r
 }\r
 \r
   return IsStatic;\r
 }\r
 \r


@@ -3132,14 +3132,14 @@ NetLibStrToIp6andPrefix (
 \r
   Convert one EFI_IPv6_ADDRESS to Null-terminated Unicode string.\r
   The text representation of address is defined in RFC 4291.\r
 \r
   Convert one EFI_IPv6_ADDRESS to Null-terminated Unicode string.\r
   The text representation of address is defined in RFC 4291.\r

-  \r
+\r

   @param[in]       Ip6Address     The pointer to the IPv6 address.\r
   @param[out]      String         The buffer to return the converted string.\r
   @param[in]       StringSize     The length in bytes of the input String.\r
   @param[in]       Ip6Address     The pointer to the IPv6 address.\r
   @param[out]      String         The buffer to return the converted string.\r
   @param[in]       StringSize     The length in bytes of the input String.\r

-                                  \r
+\r

   @retval EFI_SUCCESS             Convert to string successfully.\r
   @retval EFI_INVALID_PARAMETER   The input parameter is invalid.\r
   @retval EFI_SUCCESS             Convert to string successfully.\r
   @retval EFI_INVALID_PARAMETER   The input parameter is invalid.\r

-  @retval EFI_BUFFER_TOO_SMALL    The BufferSize is too small for the result. BufferSize has been \r
+  @retval EFI_BUFFER_TOO_SMALL    The BufferSize is too small for the result. BufferSize has been\r

                                   updated with the size needed to complete the request.\r
 **/\r
 EFI_STATUS\r
                                   updated with the size needed to complete the request.\r
 **/\r
 EFI_STATUS\r


@@ -3165,7 +3165,7 @@ NetLibIp6ToStr (
 \r
   //\r
   // Convert the UINT8 array to an UINT16 array for easy handling.\r
 \r
   //\r
   // Convert the UINT8 array to an UINT16 array for easy handling.\r

-  // \r
+  //\r

   ZeroMem (Ip6Addr, sizeof (Ip6Addr));\r
   for (Index = 0; Index < 16; Index++) {\r
     Ip6Addr[Index / 2] |= (Ip6Address->Addr[Index] << ((1 - (Index % 2)) << 3));\r
   ZeroMem (Ip6Addr, sizeof (Ip6Addr));\r
   for (Index = 0; Index < 16; Index++) {\r
     Ip6Addr[Index / 2] |= (Ip6Address->Addr[Index] << ((1 - (Index % 2)) << 3));\r


@@ -3197,7 +3197,7 @@ NetLibIp6ToStr (
       }\r
     }\r
   }\r
       }\r
     }\r
   }\r

-  \r
+\r

   if (CurrentZerosStart != DEFAULT_ZERO_START && CurrentZerosLength > 2) {\r
     if (LongestZerosStart == DEFAULT_ZERO_START || LongestZerosLength < CurrentZerosLength) {\r
       LongestZerosStart  = CurrentZerosStart;\r
   if (CurrentZerosStart != DEFAULT_ZERO_START && CurrentZerosLength > 2) {\r
     if (LongestZerosStart == DEFAULT_ZERO_START || LongestZerosLength < CurrentZerosLength) {\r
       LongestZerosStart  = CurrentZerosStart;\r


@@ -3218,7 +3218,7 @@ NetLibIp6ToStr (
     }\r
     Ptr += UnicodeSPrint(Ptr, 10, L"%x", Ip6Addr[Index]);\r
   }\r
     }\r
     Ptr += UnicodeSPrint(Ptr, 10, L"%x", Ip6Addr[Index]);\r
   }\r

-  \r
+\r

   if (LongestZerosStart != DEFAULT_ZERO_START && LongestZerosStart + LongestZerosLength == 8) {\r
     *Ptr++ = L':';\r
   }\r
   if (LongestZerosStart != DEFAULT_ZERO_START && LongestZerosStart + LongestZerosLength == 8) {\r
     *Ptr++ = L':';\r
   }\r


@@ -3281,7 +3281,7 @@ NetLibGetSystemGuid (
         //\r
         return EFI_NOT_FOUND;\r
       }\r
         //\r
         return EFI_NOT_FOUND;\r
       }\r

-      \r
+\r

       //\r
       // SMBIOS tables are byte packed so we need to do a byte copy to\r
       // prevend alignment faults on Itanium-based platform.\r
       //\r
       // SMBIOS tables are byte packed so we need to do a byte copy to\r
       // prevend alignment faults on Itanium-based platform.\r


@@ -3295,12 +3295,12 @@ NetLibGetSystemGuid (
     // 1. Formatted section; 2. Unformatted string section. So, 2 steps are needed\r
     // to skip one SMBIOS structure.\r
     //\r
     // 1. Formatted section; 2. Unformatted string section. So, 2 steps are needed\r
     // to skip one SMBIOS structure.\r
     //\r

-    \r
+\r

     //\r
     // Step 1: Skip over formatted section.\r
     //\r
     String = (CHAR8 *) (Smbios.Raw + Smbios.Hdr->Length);\r
     //\r
     // Step 1: Skip over formatted section.\r
     //\r
     String = (CHAR8 *) (Smbios.Raw + Smbios.Hdr->Length);\r

-  \r
+\r

     //\r
     // Step 2: Skip over unformated string section.\r
     //\r
     //\r
     // Step 2: Skip over unformated string section.\r
     //\r


@@ -3318,7 +3318,7 @@ NetLibGetSystemGuid (
         //\r
         Smbios.Raw = (UINT8 *)++String;\r
         break;\r
         //\r
         Smbios.Raw = (UINT8 *)++String;\r
         break;\r

-      }    \r
+      }\r

     } while (TRUE);\r
   } while (Smbios.Raw < SmbiosEnd.Raw);\r
   return EFI_NOT_FOUND;\r
     } while (TRUE);\r
   } while (Smbios.Raw < SmbiosEnd.Raw);\r
   return EFI_NOT_FOUND;\r


@@ -3328,19 +3328,19 @@ NetLibGetSystemGuid (
   Create Dns QName according the queried domain name.\r
 \r
   If DomainName is NULL, then ASSERT().\r
   Create Dns QName according the queried domain name.\r
 \r
   If DomainName is NULL, then ASSERT().\r

-  \r
-  QName is a domain name represented as a sequence of labels, \r
-  where each label consists of a length octet followed by that \r
-  number of octets. The QName terminates with the zero \r
-  length octet for the null label of the root. Caller should \r
+\r
+  QName is a domain name represented as a sequence of labels,\r
+  where each label consists of a length octet followed by that\r
+  number of octets. The QName terminates with the zero\r
+  length octet for the null label of the root. Caller should\r

   take responsibility to free the buffer in returned pointer.\r
 \r
   take responsibility to free the buffer in returned pointer.\r
 \r

-  @param  DomainName    The pointer to the queried domain name string.  \r
+  @param  DomainName    The pointer to the queried domain name string.\r

 \r
   @retval NULL          Failed to fill QName.\r
   @return               QName filled successfully.\r
 \r
   @retval NULL          Failed to fill QName.\r
   @return               QName filled successfully.\r

-  \r
-**/ \r
+\r
+**/\r

 CHAR8 *\r
 EFIAPI\r
 NetLibCreateDnsQName (\r
 CHAR8 *\r
 EFIAPI\r
 NetLibCreateDnsQName (\r


@@ -3362,10 +3362,10 @@ NetLibCreateDnsQName (
   Tail          = NULL;\r
 \r
   //\r
   Tail          = NULL;\r
 \r
   //\r

-  // One byte for first label length, one byte for terminated length zero. \r
+  // One byte for first label length, one byte for terminated length zero.\r

   //\r
   QueryNameSize = StrLen (DomainName) + 2;\r
   //\r
   QueryNameSize = StrLen (DomainName) + 2;\r

-  \r
+\r

   if (QueryNameSize > DNS_MAX_NAME_SIZE) {\r
     return NULL;\r
   }\r
   if (QueryNameSize > DNS_MAX_NAME_SIZE) {\r
     return NULL;\r
   }\r


@@ -3374,7 +3374,7 @@ NetLibCreateDnsQName (
   if (QueryName == NULL) {\r
     return NULL;\r
   }\r
   if (QueryName == NULL) {\r
     return NULL;\r
   }\r

-  \r
+\r

   Header = QueryName;\r
   Tail = Header + 1;\r
   Len = 0;\r
   Header = QueryName;\r
   Tail = Header + 1;\r
   Len = 0;\r

diff --git a/MdeModulePkg/Library/DxeNetLib/DxeNetLib.inf b/MdeModulePkg/Library/DxeNetLib/DxeNetLib.inf
index ad0727c42f5b01a9df2bb7aa44e813a8bd88bb7e..c31a04bb720ca366bc3d9a67e9ad807274c87f74 100644 (file)
--- a/MdeModulePkg/Library/DxeNetLib/DxeNetLib.inf
+++ b/MdeModulePkg/Library/DxeNetLib/DxeNetLib.inf
@@ -1,7 +1,7 @@
 ## @file\r
 #  This library instance provides the basic network services.\r
 #\r
 ## @file\r
 #  This library instance provides the basic network services.\r
 #\r

-#  Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.<BR>\r
+#  Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r

 #  (C) Copyright 2015 Hewlett Packard Enterprise Development LP<BR>\r
 #  This program and the accompanying materials\r
 #  are licensed and made available under the terms and conditions of the BSD License\r
 #  (C) Copyright 2015 Hewlett Packard Enterprise Development LP<BR>\r
 #  This program and the accompanying materials\r
 #  are licensed and made available under the terms and conditions of the BSD License\r


@@ -64,4 +64,4 @@
   gEfiIp4Config2ProtocolGuid                    ## SOMETIMES_CONSUMES\r
   gEfiComponentNameProtocolGuid                 ## SOMETIMES_CONSUMES\r
   gEfiComponentName2ProtocolGuid                ## SOMETIMES_CONSUMES\r
   gEfiIp4Config2ProtocolGuid                    ## SOMETIMES_CONSUMES\r
   gEfiComponentNameProtocolGuid                 ## SOMETIMES_CONSUMES\r
   gEfiComponentName2ProtocolGuid                ## SOMETIMES_CONSUMES\r

-  gEfiAdapterInformationProtocolGuid            ## SOMETIMES_CONSUMES
\ No newline at end of file
+  gEfiAdapterInformationProtocolGuid            ## SOMETIMES_CONSUMES\r

diff --git a/MdeModulePkg/Library/DxeNetLib/DxeNetLib.uni b/MdeModulePkg/Library/DxeNetLib/DxeNetLib.uni
index c324a50a61de406e60c6daa086368ee8b7b957c4..2d6039a4fe61f3718c02eb2f10a4f0eca57d906c 100644 (file)
--- a/MdeModulePkg/Library/DxeNetLib/DxeNetLib.uni
+++ b/MdeModulePkg/Library/DxeNetLib/DxeNetLib.uni
@@ -3,13 +3,13 @@
 //\r
 // This library instance provides the basic network services.\r
 //\r
 //\r
 // This library instance provides the basic network services.\r
 //\r

-// Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.<BR>\r
+// Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r

 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r
 // which accompanies this distribution.  The full text of the license may be found at\r
 // http://opensource.org/licenses/bsd-license.php\r
 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r
 // which accompanies this distribution.  The full text of the license may be found at\r
 // http://opensource.org/licenses/bsd-license.php\r

-// \r
+//\r

 // THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 // WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 //\r
 // THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 // WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 //\r

diff --git a/MdeModulePkg/Library/DxeNetLib/NetBuffer.c b/MdeModulePkg/Library/DxeNetLib/NetBuffer.c
index d0e2b9f2a886043c5332816615ede4258b880efb..9d333659d6d4a27be2581767d66130ef44a2288e 100644 (file)
--- a/MdeModulePkg/Library/DxeNetLib/NetBuffer.c
+++ b/MdeModulePkg/Library/DxeNetLib/NetBuffer.c
@@ -1,7 +1,7 @@
 /** @file\r
   Network library functions providing net buffer operation support.\r
 \r
 /** @file\r
   Network library functions providing net buffer operation support.\r
 \r

-Copyright (c) 2005 - 2017, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2005 - 2018, Intel Corporation. All rights reserved.<BR>\r

 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r


@@ -1847,11 +1847,11 @@ NetIp6PseudoHeadChecksum (
 }\r
 \r
 /**\r
 }\r
 \r
 /**\r

-  The function frees the net buffer which allocated by the IP protocol. It releases \r
-  only the net buffer and doesn't call the external free function. \r
+  The function frees the net buffer which allocated by the IP protocol. It releases\r
+  only the net buffer and doesn't call the external free function.\r

 \r
 \r

-  This function should be called after finishing the process of mIpSec->ProcessExt() \r
-  for outbound traffic. The (EFI_IPSEC2_PROTOCOL)->ProcessExt() allocates a new \r
+  This function should be called after finishing the process of mIpSec->ProcessExt()\r
+  for outbound traffic. The (EFI_IPSEC2_PROTOCOL)->ProcessExt() allocates a new\r

   buffer for the ESP, so there needs a function to free the old net buffer.\r
 \r
   @param[in]  Nbuf       The network buffer to be freed.\r
   buffer for the ESP, so there needs a function to free the old net buffer.\r
 \r
   @param[in]  Nbuf       The network buffer to be freed.\r


@@ -1868,7 +1868,7 @@ NetIpSecNetbufFree (
   Nbuf->RefCnt--;\r
 \r
   if (Nbuf->RefCnt == 0) {\r
   Nbuf->RefCnt--;\r
 \r
   if (Nbuf->RefCnt == 0) {\r

-    \r
+\r

     //\r
     // Update Vector only when NBuf is to be released. That is,\r
     // all the sharing of Nbuf increse Vector's RefCnt by one\r
     //\r
     // Update Vector only when NBuf is to be released. That is,\r
     // all the sharing of Nbuf increse Vector's RefCnt by one\r


@@ -1883,14 +1883,14 @@ NetIpSecNetbufFree (
     }\r
 \r
     //\r
     }\r
 \r
     //\r

-    // If NET_VECTOR_OWN_FIRST is set, release the first block since it is \r
+    // If NET_VECTOR_OWN_FIRST is set, release the first block since it is\r

     // allocated by us\r
     //\r
     if ((Nbuf->Vector->Flag & NET_VECTOR_OWN_FIRST) != 0) {\r
       FreePool (Nbuf->Vector->Block[0].Bulk);\r
     }\r
     FreePool (Nbuf->Vector);\r
     // allocated by us\r
     //\r
     if ((Nbuf->Vector->Flag & NET_VECTOR_OWN_FIRST) != 0) {\r
       FreePool (Nbuf->Vector->Block[0].Bulk);\r
     }\r
     FreePool (Nbuf->Vector);\r

-    FreePool (Nbuf); \r
-  } \r
+    FreePool (Nbuf);\r
+  }\r

 }\r
 \r
 }\r
 \r

diff --git a/MdeModulePkg/Library/DxePerformanceLib/DxePerformanceLib.c b/MdeModulePkg/Library/DxePerformanceLib/DxePerformanceLib.c
index 664e8261af999f7c5004f1ca51544ad2c653ad02..befef0f2e5c667f0011a348925780083ee315022 100644 (file)
--- a/MdeModulePkg/Library/DxePerformanceLib/DxePerformanceLib.c
+++ b/MdeModulePkg/Library/DxePerformanceLib/DxePerformanceLib.c
@@ -6,7 +6,7 @@
   to log performance data. If both PerformanceEx and Performance Protocol is not available, it does not log any\r
   performance information.\r
 \r
   to log performance data. If both PerformanceEx and Performance Protocol is not available, it does not log any\r
   performance information.\r
 \r

-  Copyright (c) 2006 - 2016, Intel Corporation. All rights reserved.<BR>\r
+  Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r

 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r


@@ -226,7 +226,7 @@ EndPerformanceMeasurementEx (
 UINTN\r
 EFIAPI\r
 GetPerformanceMeasurementEx (\r
 UINTN\r
 EFIAPI\r
 GetPerformanceMeasurementEx (\r

-  IN  UINTN       LogEntryKey, \r
+  IN  UINTN       LogEntryKey,\r

   OUT CONST VOID  **Handle,\r
   OUT CONST CHAR8 **Token,\r
   OUT CONST CHAR8 **Module,\r
   OUT CONST VOID  **Handle,\r
   OUT CONST CHAR8 **Token,\r
   OUT CONST CHAR8 **Module,\r

diff --git a/MdeModulePkg/Library/DxePerformanceLib/DxePerformanceLib.inf b/MdeModulePkg/Library/DxePerformanceLib/DxePerformanceLib.inf
index c7d06a3a1b184cba6047713e002ce3d075f1e0b4..d9c7e833b503350a692e5b4b442c1ceb5bd0a0b1 100644 (file)
--- a/MdeModulePkg/Library/DxePerformanceLib/DxePerformanceLib.inf
+++ b/MdeModulePkg/Library/DxePerformanceLib/DxePerformanceLib.inf
@@ -1,20 +1,20 @@
 ## @file\r
 #  Performance library instance used in DXE phase.\r
 ## @file\r
 #  Performance library instance used in DXE phase.\r

-#  \r
+#\r

 #  This library instance provides infrastructure for DXE phase drivers to log performance\r
 #  data. It consumes PerformanceEx or Performance Protocol published by DxeCorePerformanceLib\r
 #  to log performance data. If both PerformanceEx and Performance Protocol are not available,\r
 #  it does not log any performance information.\r
 #  This library instance provides infrastructure for DXE phase drivers to log performance\r
 #  data. It consumes PerformanceEx or Performance Protocol published by DxeCorePerformanceLib\r
 #  to log performance data. If both PerformanceEx and Performance Protocol are not available,\r
 #  it does not log any performance information.\r

-#  \r
+#\r

 #  Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r
 #  This program and the accompanying materials\r
 #  are licensed and made available under the terms and conditions of the BSD License\r
 #  which accompanies this distribution.  The full text of the license may be found at\r
 #  http://opensource.org/licenses/bsd-license.php\r
 #  Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r
 #  This program and the accompanying materials\r
 #  are licensed and made available under the terms and conditions of the BSD License\r
 #  which accompanies this distribution.  The full text of the license may be found at\r
 #  http://opensource.org/licenses/bsd-license.php\r

-#  \r
+#\r

 #  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 #  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 #  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 #  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r

-#  \r
+#\r

 ##\r
 \r
 [Defines]\r
 ##\r
 \r
 [Defines]\r

diff --git a/MdeModulePkg/Library/DxePerformanceLib/DxePerformanceLib.uni b/MdeModulePkg/Library/DxePerformanceLib/DxePerformanceLib.uni
index 0c04cb052916ad60cc7edcbd26dd4221e7bc09c3..317e405df665c0b75d2de552ff363cd48c7988bb 100644 (file)
--- a/MdeModulePkg/Library/DxePerformanceLib/DxePerformanceLib.uni
+++ b/MdeModulePkg/Library/DxePerformanceLib/DxePerformanceLib.uni
@@ -6,13 +6,13 @@
 // to log performance data. If both PerformanceEx and Performance Protocol are not available,\r
 // it does not log any performance information.\r
 //\r
 // to log performance data. If both PerformanceEx and Performance Protocol are not available,\r
 // it does not log any performance information.\r
 //\r

-// Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.<BR>\r
+// Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r

 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r
 // which accompanies this distribution.  The full text of the license may be found at\r
 // http://opensource.org/licenses/bsd-license.php\r
 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r
 // which accompanies this distribution.  The full text of the license may be found at\r
 // http://opensource.org/licenses/bsd-license.php\r

-// \r
+//\r

 // THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 // WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 //\r
 // THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 // WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 //\r

diff --git a/MdeModulePkg/Library/DxePrintLibPrint2Protocol/PrintLib.c b/MdeModulePkg/Library/DxePrintLibPrint2Protocol/PrintLib.c
index e09520c81b248e4f8e325a81cb6533074c649a8a..4f69673767c51bc1c14981b2af50f7069d56b00d 100644 (file)
--- a/MdeModulePkg/Library/DxePrintLibPrint2Protocol/PrintLib.c
+++ b/MdeModulePkg/Library/DxePrintLibPrint2Protocol/PrintLib.c
@@ -1,12 +1,12 @@
 /** @file\r
   Instance of Print Library based on gEfiPrint2SProtocolGuid.\r
 \r
 /** @file\r
   Instance of Print Library based on gEfiPrint2SProtocolGuid.\r
 \r

-  Implement the print library instance by wrap the interface \r
+  Implement the print library instance by wrap the interface\r

   provided in the Print2S protocol. This protocol is defined as the internal\r
   provided in the Print2S protocol. This protocol is defined as the internal\r

-  protocol related to this implementation, not in the public spec. So, this \r
+  protocol related to this implementation, not in the public spec. So, this\r

   library instance is only for this code base.\r
 \r
   library instance is only for this code base.\r
 \r

-Copyright (c) 2009 - 2017, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2009 - 2018, Intel Corporation. All rights reserved.<BR>\r

 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r


@@ -47,13 +47,13 @@ EFI_PRINT2S_PROTOCOL  *mPrint2SProtocol = NULL;
 \r
 /**\r
   The constructor function caches the pointer to Print2S protocol.\r
 \r
 /**\r
   The constructor function caches the pointer to Print2S protocol.\r

-  \r
+\r

   The constructor function locates Print2S protocol from protocol database.\r
   The constructor function locates Print2S protocol from protocol database.\r

-  It will ASSERT() if that operation fails and it will always return EFI_SUCCESS. \r
+  It will ASSERT() if that operation fails and it will always return EFI_SUCCESS.\r

 \r
   @param  ImageHandle   The firmware allocated handle for the EFI image.\r
   @param  SystemTable   A pointer to the EFI System Table.\r
 \r
   @param  ImageHandle   The firmware allocated handle for the EFI image.\r
   @param  SystemTable   A pointer to the EFI System Table.\r

-  \r
+\r

   @retval EFI_SUCCESS   The constructor always returns EFI_SUCCESS.\r
 \r
 **/\r
   @retval EFI_SUCCESS   The constructor always returns EFI_SUCCESS.\r
 \r
 **/\r


@@ -79,7 +79,7 @@ PrintLibConstructor (
 \r
 \r
 /**\r
 \r
 \r
 /**\r

-  Worker function that converts a VA_LIST to a BASE_LIST based on a Null-terminated \r
+  Worker function that converts a VA_LIST to a BASE_LIST based on a Null-terminated\r

   format string.\r
 \r
   @param  AsciiFormat     TRUE if Format is an ASCII string.  FALSE if Format is a Unicode string.\r
   format string.\r
 \r
   @param  AsciiFormat     TRUE if Format is an ASCII string.  FALSE if Format is a Unicode string.\r


@@ -151,11 +151,11 @@ DxePrintLibPrint2ProtocolVaListToBaseList (
         FormatCharacter = ((*Format & 0xff) | ((BytesPerFormatCharacter == 1) ? 0 : (*(Format + 1) << 8))) & FormatMask;\r
 \r
         switch (FormatCharacter) {\r
         FormatCharacter = ((*Format & 0xff) | ((BytesPerFormatCharacter == 1) ? 0 : (*(Format + 1) << 8))) & FormatMask;\r
 \r
         switch (FormatCharacter) {\r

-        case '.': \r
-        case '-': \r
-        case '+': \r
-        case ' ': \r
-        case ',': \r
+        case '.':\r
+        case '-':\r
+        case '+':\r
+        case ' ':\r
+        case ',':\r

         case '0':\r
         case '1':\r
         case '2':\r
         case '0':\r
         case '1':\r
         case '2':\r


@@ -168,7 +168,7 @@ DxePrintLibPrint2ProtocolVaListToBaseList (
         case '9':\r
           break;\r
         case 'L':\r
         case '9':\r
           break;\r
         case 'L':\r

-        case 'l': \r
+        case 'l':\r

           Long = TRUE;\r
           break;\r
         case '*':\r
           Long = TRUE;\r
           break;\r
         case '*':\r


@@ -177,7 +177,7 @@ DxePrintLibPrint2ProtocolVaListToBaseList (
         case '\0':\r
           //\r
           // Make no output if Format string terminates unexpectedly when\r
         case '\0':\r
           //\r
           // Make no output if Format string terminates unexpectedly when\r

-          // looking up for flag, width, precision and type. \r
+          // looking up for flag, width, precision and type.\r

           //\r
           Format -= BytesPerFormatCharacter;\r
           //\r
           //\r
           Format -= BytesPerFormatCharacter;\r
           //\r


@@ -187,8 +187,8 @@ DxePrintLibPrint2ProtocolVaListToBaseList (
           Done = TRUE;\r
           break;\r
         }\r
           Done = TRUE;\r
           break;\r
         }\r

-      } \r
-        \r
+      }\r
+\r

       //\r
       // Handle each argument type\r
       //\r
       //\r
       // Handle each argument type\r
       //\r


@@ -604,26 +604,26 @@ UnicodeSPrintAsciiFormat (
   [ATTENTION] This function is deprecated for security reason.\r
 \r
   Converts a decimal value to a Null-terminated Unicode string.\r
   [ATTENTION] This function is deprecated for security reason.\r
 \r
   Converts a decimal value to a Null-terminated Unicode string.\r

-  \r
-  Converts the decimal number specified by Value to a Null-terminated Unicode \r
-  string specified by Buffer containing at most Width characters. No padding of spaces \r
+\r
+  Converts the decimal number specified by Value to a Null-terminated Unicode\r
+  string specified by Buffer containing at most Width characters. No padding of spaces\r

   is ever performed. If Width is 0 then a width of MAXIMUM_VALUE_CHARACTERS is assumed.\r
   The number of Unicode characters in Buffer is returned not including the Null-terminator.\r
   If the conversion contains more than Width characters, then only the first\r
   is ever performed. If Width is 0 then a width of MAXIMUM_VALUE_CHARACTERS is assumed.\r
   The number of Unicode characters in Buffer is returned not including the Null-terminator.\r
   If the conversion contains more than Width characters, then only the first\r

-  Width characters are returned, and the total number of characters \r
+  Width characters are returned, and the total number of characters\r

   required to perform the conversion is returned.\r
   required to perform the conversion is returned.\r

-  Additional conversion parameters are specified in Flags.  \r
-  \r
+  Additional conversion parameters are specified in Flags.\r
+\r

   The Flags bit LEFT_JUSTIFY is always ignored.\r
   All conversions are left justified in Buffer.\r
   If Width is 0, PREFIX_ZERO is ignored in Flags.\r
   If COMMA_TYPE is set in Flags, then PREFIX_ZERO is ignored in Flags, and commas\r
   are inserted every 3rd digit starting from the right.\r
   The Flags bit LEFT_JUSTIFY is always ignored.\r
   All conversions are left justified in Buffer.\r
   If Width is 0, PREFIX_ZERO is ignored in Flags.\r
   If COMMA_TYPE is set in Flags, then PREFIX_ZERO is ignored in Flags, and commas\r
   are inserted every 3rd digit starting from the right.\r

-  If RADIX_HEX is set in Flags, then the output buffer will be \r
+  If RADIX_HEX is set in Flags, then the output buffer will be\r

   formatted in hexadecimal format.\r
   If Value is < 0 and RADIX_HEX is not set in Flags, then the fist character in Buffer is a '-'.\r
   formatted in hexadecimal format.\r
   If Value is < 0 and RADIX_HEX is not set in Flags, then the fist character in Buffer is a '-'.\r

-  If PREFIX_ZERO is set in Flags and PREFIX_ZERO is not being ignored, \r
-  then Buffer is padded with '0' characters so the combination of the optional '-' \r
+  If PREFIX_ZERO is set in Flags and PREFIX_ZERO is not being ignored,\r
+  then Buffer is padded with '0' characters so the combination of the optional '-'\r

   sign character, '0' characters, digit characters for Value, and the Null-terminator\r
   add up to Width characters.\r
   If both COMMA_TYPE and RADIX_HEX are set in Flags, then ASSERT().\r
   sign character, '0' characters, digit characters for Value, and the Null-terminator\r
   add up to Width characters.\r
   If both COMMA_TYPE and RADIX_HEX are set in Flags, then ASSERT().\r


@@ -639,7 +639,7 @@ UnicodeSPrintAsciiFormat (
   @param  Value   The 64-bit signed value to convert to a string.\r
   @param  Width   The maximum number of Unicode characters to place in Buffer, not including\r
                   the Null-terminator.\r
   @param  Value   The 64-bit signed value to convert to a string.\r
   @param  Width   The maximum number of Unicode characters to place in Buffer, not including\r
                   the Null-terminator.\r

-  \r
+\r

   @return The number of Unicode characters in Buffer not including the Null-terminator.\r
 \r
 **/\r
   @return The number of Unicode characters in Buffer not including the Null-terminator.\r
 \r
 **/\r


@@ -1083,29 +1083,29 @@ AsciiSPrintUnicodeFormat (
   [ATTENTION] This function is deprecated for security reason.\r
 \r
   Converts a decimal value to a Null-terminated ASCII string.\r
   [ATTENTION] This function is deprecated for security reason.\r
 \r
   Converts a decimal value to a Null-terminated ASCII string.\r

-  \r
-  Converts the decimal number specified by Value to a Null-terminated ASCII string \r
-  specified by Buffer containing at most Width characters. No padding of spaces \r
+\r
+  Converts the decimal number specified by Value to a Null-terminated ASCII string\r
+  specified by Buffer containing at most Width characters. No padding of spaces\r

   is ever performed.\r
   If Width is 0 then a width of  MAXIMUM_VALUE_CHARACTERS is assumed.\r
   The number of ASCII characters in Buffer is returned not including the Null-terminator.\r
   If the conversion contains more than Width characters, then only the first Width\r
   characters are returned, and the total number of characters required to perform\r
   the conversion is returned.\r
   is ever performed.\r
   If Width is 0 then a width of  MAXIMUM_VALUE_CHARACTERS is assumed.\r
   The number of ASCII characters in Buffer is returned not including the Null-terminator.\r
   If the conversion contains more than Width characters, then only the first Width\r
   characters are returned, and the total number of characters required to perform\r
   the conversion is returned.\r

-  Additional conversion parameters are specified in Flags.  \r
+  Additional conversion parameters are specified in Flags.\r

   The Flags bit LEFT_JUSTIFY is always ignored.\r
   All conversions are left justified in Buffer.\r
   If Width is 0, PREFIX_ZERO is ignored in Flags.\r
   If COMMA_TYPE is set in Flags, then PREFIX_ZERO is ignored in Flags, and commas\r
   are inserted every 3rd digit starting from the right.\r
   The Flags bit LEFT_JUSTIFY is always ignored.\r
   All conversions are left justified in Buffer.\r
   If Width is 0, PREFIX_ZERO is ignored in Flags.\r
   If COMMA_TYPE is set in Flags, then PREFIX_ZERO is ignored in Flags, and commas\r
   are inserted every 3rd digit starting from the right.\r

-  If RADIX_HEX is set in Flags, then the output buffer will be \r
+  If RADIX_HEX is set in Flags, then the output buffer will be\r

   formatted in hexadecimal format.\r
   If Value is < 0 and RADIX_HEX is not set in Flags, then the fist character in Buffer is a '-'.\r
   formatted in hexadecimal format.\r
   If Value is < 0 and RADIX_HEX is not set in Flags, then the fist character in Buffer is a '-'.\r

-  If PREFIX_ZERO is set in Flags and PREFIX_ZERO is not being ignored, \r
-  then Buffer is padded with '0' characters so the combination of the optional '-' \r
+  If PREFIX_ZERO is set in Flags and PREFIX_ZERO is not being ignored,\r
+  then Buffer is padded with '0' characters so the combination of the optional '-'\r

   sign character, '0' characters, digit characters for Value, and the Null-terminator\r
   add up to Width characters.\r
   sign character, '0' characters, digit characters for Value, and the Null-terminator\r
   add up to Width characters.\r

-  \r
+\r

   If Buffer is NULL, then ASSERT().\r
   If unsupported bits are set in Flags, then ASSERT().\r
   If both COMMA_TYPE and RADIX_HEX are set in Flags, then ASSERT().\r
   If Buffer is NULL, then ASSERT().\r
   If unsupported bits are set in Flags, then ASSERT().\r
   If both COMMA_TYPE and RADIX_HEX are set in Flags, then ASSERT().\r


@@ -1117,7 +1117,7 @@ AsciiSPrintUnicodeFormat (
   @param  Value   The 64-bit signed value to convert to a string.\r
   @param  Width   The maximum number of ASCII characters to place in Buffer, not including\r
                   the Null-terminator.\r
   @param  Value   The 64-bit signed value to convert to a string.\r
   @param  Width   The maximum number of ASCII characters to place in Buffer, not including\r
                   the Null-terminator.\r

-  \r
+\r

   @return The number of ASCII characters in Buffer not including the Null-terminator.\r
 \r
 **/\r
   @return The number of ASCII characters in Buffer not including the Null-terminator.\r
 \r
 **/\r


@@ -1256,8 +1256,8 @@ GLOBAL_REMOVE_IF_UNREFERENCED CONST CHAR8 mHexStr[] = {'0','1','2','3','4','5','
 **/\r
 CHAR8 *\r
 InternalPrintLibValueToString (\r
 **/\r
 CHAR8 *\r
 InternalPrintLibValueToString (\r

-  IN OUT CHAR8  *Buffer, \r
-  IN INT64      Value, \r
+  IN OUT CHAR8  *Buffer,\r
+  IN INT64      Value,\r

   IN UINTN      Radix\r
   )\r
 {\r
   IN UINTN      Radix\r
   )\r
 {\r


@@ -1279,21 +1279,21 @@ InternalPrintLibValueToString (
 }\r
 \r
 /**\r
 }\r
 \r
 /**\r

-  Worker function that produces a Null-terminated string in an output buffer \r
+  Worker function that produces a Null-terminated string in an output buffer\r

   based on a Null-terminated format string and a VA_LIST argument list.\r
 \r
   based on a Null-terminated format string and a VA_LIST argument list.\r
 \r

-  VSPrint function to process format and place the results in Buffer. Since a \r
-  VA_LIST is used this routine allows the nesting of Vararg routines. Thus \r
+  VSPrint function to process format and place the results in Buffer. Since a\r
+  VA_LIST is used this routine allows the nesting of Vararg routines. Thus\r

   this is the main print working routine.\r
 \r
   If COUNT_ONLY_NO_PRINT is set in Flags, Buffer will not be modified at all.\r
 \r
   this is the main print working routine.\r
 \r
   If COUNT_ONLY_NO_PRINT is set in Flags, Buffer will not be modified at all.\r
 \r

-  @param[out] Buffer          The character buffer to print the results of the \r
+  @param[out] Buffer          The character buffer to print the results of the\r

                               parsing of Format into.\r
                               parsing of Format into.\r

-  @param[in]  BufferSize      The maximum number of characters to put into \r
+  @param[in]  BufferSize      The maximum number of characters to put into\r

                               buffer.\r
   @param[in]  Flags           Initial flags value.\r
                               buffer.\r
   @param[in]  Flags           Initial flags value.\r

-                              Can only have FORMAT_UNICODE, OUTPUT_UNICODE, \r
+                              Can only have FORMAT_UNICODE, OUTPUT_UNICODE,\r

                               and COUNT_ONLY_NO_PRINT set.\r
   @param[in]  Format          A Null-terminated format string.\r
   @param[in]  VaListMarker    VA_LIST style variable argument list consumed by\r
                               and COUNT_ONLY_NO_PRINT set.\r
   @param[in]  Format          A Null-terminated format string.\r
   @param[in]  VaListMarker    VA_LIST style variable argument list consumed by\r


@@ -1317,11 +1317,11 @@ InternalPrintLibSPrintMarker (
   );\r
 \r
 /**\r
   );\r
 \r
 /**\r

-  Worker function that produces a Null-terminated string in an output buffer \r
+  Worker function that produces a Null-terminated string in an output buffer\r

   based on a Null-terminated format string and variable argument list.\r
 \r
   based on a Null-terminated format string and variable argument list.\r
 \r

-  VSPrint function to process format and place the results in Buffer. Since a \r
-  VA_LIST is used this routine allows the nesting of Vararg routines. Thus \r
+  VSPrint function to process format and place the results in Buffer. Since a\r
+  VA_LIST is used this routine allows the nesting of Vararg routines. Thus\r

   this is the main print working routine\r
 \r
   @param  StartOfBuffer The character buffer to print the results of the parsing\r
   this is the main print working routine\r
 \r
   @param  StartOfBuffer The character buffer to print the results of the parsing\r


@@ -1407,7 +1407,7 @@ GLOBAL_REMOVE_IF_UNREFERENCED CONST CHAR8 * CONST mStatusString[] = {
 \r
   @param  Buffer      The buffer to place the Unicode or ASCII string.\r
   @param  EndBuffer   The end of the input Buffer. No characters will be\r
 \r
   @param  Buffer      The buffer to place the Unicode or ASCII string.\r
   @param  EndBuffer   The end of the input Buffer. No characters will be\r

-                      placed after that. \r
+                      placed after that.\r

   @param  Length      The count of character to be placed into Buffer.\r
                       (Negative value indicates no buffer fill.)\r
   @param  Character   The character to be placed into Buffer.\r
   @param  Length      The count of character to be placed into Buffer.\r
                       (Negative value indicates no buffer fill.)\r
   @param  Character   The character to be placed into Buffer.\r


@@ -1426,7 +1426,7 @@ InternalPrintLibFillBuffer (
   )\r
 {\r
   INTN  Index;\r
   )\r
 {\r
   INTN  Index;\r

-  \r
+\r

   for (Index = 0; Index < Length && Buffer < EndBuffer; Index++) {\r
     *Buffer = (CHAR8) Character;\r
     if (Increment != 1) {\r
   for (Index = 0; Index < Length && Buffer < EndBuffer; Index++) {\r
     *Buffer = (CHAR8) Character;\r
     if (Increment != 1) {\r


@@ -1439,21 +1439,21 @@ InternalPrintLibFillBuffer (
 }\r
 \r
 /**\r
 }\r
 \r
 /**\r

-  Worker function that produces a Null-terminated string in an output buffer \r
+  Worker function that produces a Null-terminated string in an output buffer\r

   based on a Null-terminated format string and a VA_LIST argument list.\r
 \r
   based on a Null-terminated format string and a VA_LIST argument list.\r
 \r

-  VSPrint function to process format and place the results in Buffer. Since a \r
-  VA_LIST is used this routine allows the nesting of Vararg routines. Thus \r
+  VSPrint function to process format and place the results in Buffer. Since a\r
+  VA_LIST is used this routine allows the nesting of Vararg routines. Thus\r

   this is the main print working routine.\r
 \r
   If COUNT_ONLY_NO_PRINT is set in Flags, Buffer will not be modified at all.\r
 \r
   this is the main print working routine.\r
 \r
   If COUNT_ONLY_NO_PRINT is set in Flags, Buffer will not be modified at all.\r
 \r

-  @param[out] Buffer          The character buffer to print the results of the \r
+  @param[out] Buffer          The character buffer to print the results of the\r

                               parsing of Format into.\r
                               parsing of Format into.\r

-  @param[in]  BufferSize      The maximum number of characters to put into \r
+  @param[in]  BufferSize      The maximum number of characters to put into\r

                               buffer.\r
   @param[in]  Flags           Initial flags value.\r
                               buffer.\r
   @param[in]  Flags           Initial flags value.\r

-                              Can only have FORMAT_UNICODE, OUTPUT_UNICODE, \r
+                              Can only have FORMAT_UNICODE, OUTPUT_UNICODE,\r

                               and COUNT_ONLY_NO_PRINT set.\r
   @param[in]  Format          A Null-terminated format string.\r
   @param[in]  VaListMarker    VA_LIST style variable argument list consumed by\r
                               and COUNT_ONLY_NO_PRINT set.\r
   @param[in]  Format          A Null-terminated format string.\r
   @param[in]  VaListMarker    VA_LIST style variable argument list consumed by\r


@@ -1509,7 +1509,7 @@ InternalPrintLibSPrintMarker (
 \r
   //\r
   // If you change this code be sure to match the 2 versions of this function.\r
 \r
   //\r
   // If you change this code be sure to match the 2 versions of this function.\r

-  // Nearly identical logic is found in the BasePrintLib and \r
+  // Nearly identical logic is found in the BasePrintLib and\r

   // DxePrintLibPrint2Protocol (both PrintLib instances).\r
   //\r
 \r
   // DxePrintLibPrint2Protocol (both PrintLib instances).\r
   //\r
 \r


@@ -1630,24 +1630,24 @@ InternalPrintLibSPrintMarker (
         Format += BytesPerFormatCharacter;\r
         FormatCharacter = ((*Format & 0xff) | ((BytesPerFormatCharacter == 1) ? 0 : (*(Format + 1) << 8))) & FormatMask;\r
         switch (FormatCharacter) {\r
         Format += BytesPerFormatCharacter;\r
         FormatCharacter = ((*Format & 0xff) | ((BytesPerFormatCharacter == 1) ? 0 : (*(Format + 1) << 8))) & FormatMask;\r
         switch (FormatCharacter) {\r

-        case '.': \r
-          Flags |= PRECISION; \r
+        case '.':\r
+          Flags |= PRECISION;\r

           break;\r
           break;\r

-        case '-': \r
-          Flags |= LEFT_JUSTIFY; \r
+        case '-':\r
+          Flags |= LEFT_JUSTIFY;\r

           break;\r
           break;\r

-        case '+': \r
-          Flags |= PREFIX_SIGN;  \r
+        case '+':\r
+          Flags |= PREFIX_SIGN;\r

           break;\r
           break;\r

-        case ' ': \r
-          Flags |= PREFIX_BLANK; \r
+        case ' ':\r
+          Flags |= PREFIX_BLANK;\r

           break;\r
           break;\r

-        case ',': \r
-          Flags |= COMMA_TYPE; \r
+        case ',':\r
+          Flags |= COMMA_TYPE;\r

           break;\r
         case 'L':\r
           break;\r
         case 'L':\r

-        case 'l': \r
-          Flags |= LONG_TYPE;    \r
+        case 'l':\r
+          Flags |= LONG_TYPE;\r

           break;\r
         case '*':\r
           if ((Flags & PRECISION) == 0) {\r
           break;\r
         case '*':\r
           if ((Flags & PRECISION) == 0) {\r


@@ -1691,11 +1691,11 @@ InternalPrintLibSPrintMarker (
             Precision = Count;\r
           }\r
           break;\r
             Precision = Count;\r
           }\r
           break;\r

-       \r
+\r

         case '\0':\r
           //\r
           // Make no output if Format string terminates unexpectedly when\r
         case '\0':\r
           //\r
           // Make no output if Format string terminates unexpectedly when\r

-          // looking up for flag, width, precision and type. \r
+          // looking up for flag, width, precision and type.\r

           //\r
           Format   -= BytesPerFormatCharacter;\r
           Precision = 0;\r
           //\r
           Format   -= BytesPerFormatCharacter;\r
           Precision = 0;\r


@@ -1706,7 +1706,7 @@ InternalPrintLibSPrintMarker (
           Done = TRUE;\r
           break;\r
         }\r
           Done = TRUE;\r
           break;\r
         }\r

-      } \r
+      }\r

 \r
       //\r
       // Handle each argument type\r
 \r
       //\r
       // Handle each argument type\r


@@ -1746,9 +1746,9 @@ InternalPrintLibSPrintMarker (
           //\r
           // 'd', 'u', 'x', and 'X' that are not preceded by 'l' or 'L' are assumed to be type "int".\r
           // This assumption is made so the format string definition is compatible with the ANSI C\r
           //\r
           // 'd', 'u', 'x', and 'X' that are not preceded by 'l' or 'L' are assumed to be type "int".\r
           // This assumption is made so the format string definition is compatible with the ANSI C\r

-          // Specification for formatted strings.  It is recommended that the Base Types be used \r
-          // everywhere, but in this one case, compliance with ANSI C is more important, and \r
-          // provides an implementation that is compatible with that largest possible set of CPU \r
+          // Specification for formatted strings.  It is recommended that the Base Types be used\r
+          // everywhere, but in this one case, compliance with ANSI C is more important, and\r
+          // provides an implementation that is compatible with that largest possible set of CPU\r

           // architectures.  This is why the type "int" is used in this one case.\r
           //\r
           if (BaseListMarker == NULL) {\r
           // architectures.  This is why the type "int" is used in this one case.\r
           //\r
           if (BaseListMarker == NULL) {\r


@@ -1786,9 +1786,9 @@ InternalPrintLibSPrintMarker (
             //\r
             // 'd', 'u', 'x', and 'X' that are not preceded by 'l' or 'L' are assumed to be type "int".\r
             // This assumption is made so the format string definition is compatible with the ANSI C\r
             //\r
             // 'd', 'u', 'x', and 'X' that are not preceded by 'l' or 'L' are assumed to be type "int".\r
             // This assumption is made so the format string definition is compatible with the ANSI C\r

-            // Specification for formatted strings.  It is recommended that the Base Types be used \r
-            // everywhere, but in this one case, compliance with ANSI C is more important, and \r
-            // provides an implementation that is compatible with that largest possible set of CPU \r
+            // Specification for formatted strings.  It is recommended that the Base Types be used\r
+            // everywhere, but in this one case, compliance with ANSI C is more important, and\r
+            // provides an implementation that is compatible with that largest possible set of CPU\r

             // architectures.  This is why the type "unsigned int" is used in this one case.\r
             //\r
             Value = (unsigned int)Value;\r
             // architectures.  This is why the type "unsigned int" is used in this one case.\r
             //\r
             Value = (unsigned int)Value;\r


@@ -1800,9 +1800,9 @@ InternalPrintLibSPrintMarker (
             //\r
             // 'd', 'u', 'x', and 'X' that are not preceded by 'l' or 'L' are assumed to be type "int".\r
             // This assumption is made so the format string definition is compatible with the ANSI C\r
             //\r
             // 'd', 'u', 'x', and 'X' that are not preceded by 'l' or 'L' are assumed to be type "int".\r
             // This assumption is made so the format string definition is compatible with the ANSI C\r

-            // Specification for formatted strings.  It is recommended that the Base Types be used \r
-            // everywhere, but in this one case, compliance with ANSI C is more important, and \r
-            // provides an implementation that is compatible with that largest possible set of CPU \r
+            // Specification for formatted strings.  It is recommended that the Base Types be used\r
+            // everywhere, but in this one case, compliance with ANSI C is more important, and\r
+            // provides an implementation that is compatible with that largest possible set of CPU\r

             // architectures.  This is why the type "unsigned int" is used in this one case.\r
             //\r
             Value = (unsigned int)Value;\r
             // architectures.  This is why the type "unsigned int" is used in this one case.\r
             //\r
             Value = (unsigned int)Value;\r


@@ -1816,7 +1816,7 @@ InternalPrintLibSPrintMarker (
           Count = 0;\r
         }\r
         ArgumentString = (CHAR8 *)ValueBuffer + Count;\r
           Count = 0;\r
         }\r
         ArgumentString = (CHAR8 *)ValueBuffer + Count;\r

-        \r
+\r

         Digits = Count % 3;\r
         if (Digits != 0) {\r
           Digits = 3 - Digits;\r
         Digits = Count % 3;\r
         if (Digits != 0) {\r
           Digits = 3 - Digits;\r


@@ -1889,7 +1889,7 @@ InternalPrintLibSPrintMarker (
           GuidData3 = ReadUnaligned16 (&(TmpGuid->Data3));\r
           InternalPrintLibSPrint (\r
             ValueBuffer,\r
           GuidData3 = ReadUnaligned16 (&(TmpGuid->Data3));\r
           InternalPrintLibSPrint (\r
             ValueBuffer,\r

-            MAXIMUM_VALUE_CHARACTERS, \r
+            MAXIMUM_VALUE_CHARACTERS,\r

             0,\r
             "%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x",\r
             GuidData1,\r
             0,\r
             "%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x",\r
             GuidData1,\r


@@ -1910,9 +1910,9 @@ InternalPrintLibSPrintMarker (
 \r
       case 't':\r
         if (BaseListMarker == NULL) {\r
 \r
       case 't':\r
         if (BaseListMarker == NULL) {\r

-          TmpTime = VA_ARG (VaListMarker, TIME *); \r
+          TmpTime = VA_ARG (VaListMarker, TIME *);\r

         } else {\r
         } else {\r

-          TmpTime = BASE_ARG (BaseListMarker, TIME *); \r
+          TmpTime = BASE_ARG (BaseListMarker, TIME *);\r

         }\r
         if (TmpTime == NULL) {\r
           ArgumentString = "<null time>";\r
         }\r
         if (TmpTime == NULL) {\r
           ArgumentString = "<null time>";\r


@@ -1997,7 +1997,7 @@ InternalPrintLibSPrintMarker (
         break;\r
       }\r
       break;\r
         break;\r
       }\r
       break;\r

- \r
+\r

     case '\r':\r
       Format += BytesPerFormatCharacter;\r
       FormatCharacter = ((*Format & 0xff) | ((BytesPerFormatCharacter == 1) ? 0 : (*(Format + 1) << 8))) & FormatMask;\r
     case '\r':\r
       Format += BytesPerFormatCharacter;\r
       FormatCharacter = ((*Format & 0xff) | ((BytesPerFormatCharacter == 1) ? 0 : (*(Format + 1) << 8))) & FormatMask;\r


@@ -2173,7 +2173,7 @@ InternalPrintLibSPrintMarker (
 }\r
 \r
 /**\r
 }\r
 \r
 /**\r

-  Returns the number of characters that would be produced by if the formatted \r
+  Returns the number of characters that would be produced by if the formatted\r

   output were produced not including the Null-terminator.\r
 \r
   If FormatString is not aligned on a 16-bit boundary, then ASSERT().\r
   output were produced not including the Null-terminator.\r
 \r
   If FormatString is not aligned on a 16-bit boundary, then ASSERT().\r


@@ -2186,7 +2186,7 @@ InternalPrintLibSPrintMarker (
   @param[in]  FormatString    A Null-terminated Unicode format string.\r
   @param[in]  Marker          VA_LIST marker for the variable argument list.\r
 \r
   @param[in]  FormatString    A Null-terminated Unicode format string.\r
   @param[in]  Marker          VA_LIST marker for the variable argument list.\r
 \r

-  @return The number of characters that would be produced, not including the \r
+  @return The number of characters that would be produced, not including the\r

           Null-terminator.\r
 **/\r
 UINTN\r
           Null-terminator.\r
 **/\r
 UINTN\r


@@ -2201,7 +2201,7 @@ SPrintLength (
 }\r
 \r
 /**\r
 }\r
 \r
 /**\r

-  Returns the number of characters that would be produced by if the formatted \r
+  Returns the number of characters that would be produced by if the formatted\r

   output were produced not including the Null-terminator.\r
 \r
   If FormatString is NULL, then ASSERT() and 0 is returned.\r
   output were produced not including the Null-terminator.\r
 \r
   If FormatString is NULL, then ASSERT() and 0 is returned.\r


@@ -2212,7 +2212,7 @@ SPrintLength (
   @param[in]  FormatString    A Null-terminated ASCII format string.\r
   @param[in]  Marker          VA_LIST marker for the variable argument list.\r
 \r
   @param[in]  FormatString    A Null-terminated ASCII format string.\r
   @param[in]  Marker          VA_LIST marker for the variable argument list.\r
 \r

-  @return The number of characters that would be produced, not including the \r
+  @return The number of characters that would be produced, not including the\r

           Null-terminator.\r
 **/\r
 UINTN\r
           Null-terminator.\r
 **/\r
 UINTN\r

diff --git a/MdeModulePkg/Library/DxeReportStatusCodeLib/ReportStatusCodeLib.c b/MdeModulePkg/Library/DxeReportStatusCodeLib/ReportStatusCodeLib.c
index ce843cc47f46129d2d897577db8810dd5309ea75..b28dc5c3bbd2e3ebc9ba26622f46ad6ed000cbea 100644 (file)
--- a/MdeModulePkg/Library/DxeReportStatusCodeLib/ReportStatusCodeLib.c
+++ b/MdeModulePkg/Library/DxeReportStatusCodeLib/ReportStatusCodeLib.c
@@ -1,7 +1,7 @@
 /** @file\r
   Report Status Code Library for DXE Phase.\r
 \r
 /** @file\r
   Report Status Code Library for DXE Phase.\r
 \r

-  Copyright (c) 2006 - 2010, Intel Corporation. All rights reserved.<BR>\r
+  Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r

   This program and the accompanying materials\r
   are licensed and made available under the terms and conditions of the BSD License\r
   which accompanies this distribution.  The full text of the license may be found at\r
   This program and the accompanying materials\r
   are licensed and made available under the terms and conditions of the BSD License\r
   which accompanies this distribution.  The full text of the license may be found at\r


@@ -109,7 +109,7 @@ InternalReportStatusCode (
     //\r
     return mReportStatusCodeLibStatusCodeProtocol->ReportStatusCode (Type, Value, Instance, (EFI_GUID *)CallerId, Data);\r
   }\r
     //\r
     return mReportStatusCodeLibStatusCodeProtocol->ReportStatusCode (Type, Value, Instance, (EFI_GUID *)CallerId, Data);\r
   }\r

-  \r
+\r

   return EFI_UNSUPPORTED;\r
 }\r
 \r
   return EFI_UNSUPPORTED;\r
 }\r
 \r


@@ -505,7 +505,7 @@ ReportStatusCodeEx (
   //\r
   Tpl = gBS->RaiseTPL (TPL_HIGH_LEVEL);\r
   gBS->RestoreTPL (Tpl);\r
   //\r
   Tpl = gBS->RaiseTPL (TPL_HIGH_LEVEL);\r
   gBS->RestoreTPL (Tpl);\r

-  \r
+\r

   StatusCodeData = NULL;\r
   if (Tpl <= TPL_NOTIFY) {\r
     //\r
   StatusCodeData = NULL;\r
   if (Tpl <= TPL_NOTIFY) {\r
     //\r

diff --git a/MdeModulePkg/Library/DxeResetSystemLib/DxeResetSystemLib.c b/MdeModulePkg/Library/DxeResetSystemLib/DxeResetSystemLib.c
index 76bca223ae04cf3d1f731f130e11f5ffa158c612..ea4878cab1b44b882b421ff2bed40fcfd0d071bc 100644 (file)
--- a/MdeModulePkg/Library/DxeResetSystemLib/DxeResetSystemLib.c
+++ b/MdeModulePkg/Library/DxeResetSystemLib/DxeResetSystemLib.c
@@ -18,11 +18,11 @@
 \r
 /**\r
   This function causes a system-wide reset (cold reset), in which\r
 \r
 /**\r
   This function causes a system-wide reset (cold reset), in which\r

-  all circuitry within the system returns to its initial state. This type of reset \r
+  all circuitry within the system returns to its initial state. This type of reset\r

   is asynchronous to system operation and operates without regard to\r
   cycle boundaries.\r
 \r
   is asynchronous to system operation and operates without regard to\r
   cycle boundaries.\r
 \r

-  If this function returns, it means that the system does not support cold reset. \r
+  If this function returns, it means that the system does not support cold reset.\r

 **/\r
 VOID\r
 EFIAPI\r
 **/\r
 VOID\r
 EFIAPI\r


@@ -34,7 +34,7 @@ ResetCold (
 }\r
 \r
 /**\r
 }\r
 \r
 /**\r

-  This function causes a system-wide initialization (warm reset), in which all processors \r
+  This function causes a system-wide initialization (warm reset), in which all processors\r

   are set to their initial state. Pending cycles are not corrupted.\r
 \r
   If this function returns, it means that the system does not support warm reset.\r
   are set to their initial state. Pending cycles are not corrupted.\r
 \r
   If this function returns, it means that the system does not support warm reset.\r


@@ -49,7 +49,7 @@ ResetWarm (
 }\r
 \r
 /**\r
 }\r
 \r
 /**\r

-  This function causes the system to enter a power state equivalent \r
+  This function causes the system to enter a power state equivalent\r

   to the ACPI G2/S5 or G3 states.\r
 \r
   If this function returns, it means that the system does not support shut down reset.\r
   to the ACPI G2/S5 or G3 states.\r
 \r
   If this function returns, it means that the system does not support shut down reset.\r

diff --git a/MdeModulePkg/Library/DxeSecurityManagementLib/DxeSecurityManagementLib.c b/MdeModulePkg/Library/DxeSecurityManagementLib/DxeSecurityManagementLib.c
index aa4d93b6f3a2c1ebf24401a3db613f2d7afd4b67..65d788bc6863b3c1aa3dae6e49d608a91ed4c049 100644 (file)
--- a/MdeModulePkg/Library/DxeSecurityManagementLib/DxeSecurityManagementLib.c
+++ b/MdeModulePkg/Library/DxeSecurityManagementLib/DxeSecurityManagementLib.c
@@ -1,7 +1,7 @@
 /** @file\r
   Provides generic security measurement functions for DXE module.\r
 \r
 /** @file\r
   Provides generic security measurement functions for DXE module.\r
 \r

-Copyright (c) 2009 - 2015, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2009 - 2018, Intel Corporation. All rights reserved.<BR>\r

 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r


@@ -68,8 +68,8 @@ ReallocateSecurityHandlerTable (
   // Reallocate memory for security info structure.\r
   //\r
   mSecurityTable = ReallocatePool (\r
   // Reallocate memory for security info structure.\r
   //\r
   mSecurityTable = ReallocatePool (\r

-                     mMaxNumberOfSecurityHandler * sizeof (SECURITY_INFO), \r
-                     (mMaxNumberOfSecurityHandler + SECURITY_HANDLER_TABLE_SIZE) * sizeof (SECURITY_INFO), \r
+                     mMaxNumberOfSecurityHandler * sizeof (SECURITY_INFO),\r
+                     (mMaxNumberOfSecurityHandler + SECURITY_HANDLER_TABLE_SIZE) * sizeof (SECURITY_INFO),\r

                      mSecurityTable\r
                      );\r
 \r
                      mSecurityTable\r
                      );\r
 \r


@@ -88,7 +88,7 @@ ReallocateSecurityHandlerTable (
 }\r
 \r
 /**\r
 }\r
 \r
 /**\r

- Check whether an operation is valid according to the requirement of current operation, \r
+ Check whether an operation is valid according to the requirement of current operation,\r

  which must make sure that the measure image operation is the last one.\r
 \r
  @param CurrentAuthOperation  Current operation.\r
  which must make sure that the measure image operation is the last one.\r
 \r
  @param CurrentAuthOperation  Current operation.\r


@@ -102,14 +102,14 @@ CheckAuthenticationOperation (
   IN  UINT32    CurrentAuthOperation,\r
   IN  UINT32    CheckAuthOperation\r
   )\r
   IN  UINT32    CurrentAuthOperation,\r
   IN  UINT32    CheckAuthOperation\r
   )\r

-{ \r
+{\r

   //\r
   // Make sure new auth operation can be recognized.\r
   //\r
   ASSERT ((CheckAuthOperation & ~(EFI_AUTH_IMAGE_OPERATION_MASK | EFI_AUTH_OPERATION_AUTHENTICATION_STATE | EFI_AUTH_OPERATION_IMAGE_REQUIRED)) == 0);\r
   //\r
   // Make sure new auth operation can be recognized.\r
   //\r
   ASSERT ((CheckAuthOperation & ~(EFI_AUTH_IMAGE_OPERATION_MASK | EFI_AUTH_OPERATION_AUTHENTICATION_STATE | EFI_AUTH_OPERATION_IMAGE_REQUIRED)) == 0);\r

-  \r
+\r

   //\r
   //\r

-  // When current operation includes measure image operation, \r
+  // When current operation includes measure image operation,\r

   // only another measure image operation or none operation will be allowed.\r
   //\r
   if ((CurrentAuthOperation & EFI_AUTH_OPERATION_MEASURE_IMAGE) == EFI_AUTH_OPERATION_MEASURE_IMAGE) {\r
   // only another measure image operation or none operation will be allowed.\r
   //\r
   if ((CurrentAuthOperation & EFI_AUTH_OPERATION_MEASURE_IMAGE) == EFI_AUTH_OPERATION_MEASURE_IMAGE) {\r


@@ -120,9 +120,9 @@ CheckAuthenticationOperation (
       return FALSE;\r
     }\r
   }\r
       return FALSE;\r
     }\r
   }\r

-  \r
+\r

   //\r
   //\r

-  // When current operation doesn't include measure image operation, \r
+  // When current operation doesn't include measure image operation,\r

   // any new operation will be allowed.\r
   //\r
   return TRUE;\r
   // any new operation will be allowed.\r
   //\r
   return TRUE;\r


@@ -184,12 +184,12 @@ RegisterSecurityHandler (
   Execute registered handlers until one returns an error and that error is returned.\r
   If none of the handlers return an error, then EFI_SUCCESS is returned.\r
 \r
   Execute registered handlers until one returns an error and that error is returned.\r
   If none of the handlers return an error, then EFI_SUCCESS is returned.\r
 \r

-  Before exectue handler, get the image buffer by file device path if a handler \r
+  Before exectue handler, get the image buffer by file device path if a handler\r

   requires the image file. And return the image buffer to each handler when exectue handler.\r
 \r
   The handlers are executed in same order to their registered order.\r
 \r
   requires the image file. And return the image buffer to each handler when exectue handler.\r
 \r
   The handlers are executed in same order to their registered order.\r
 \r

-  @param[in]  AuthenticationStatus \r
+  @param[in]  AuthenticationStatus\r

                            This is the authentication type returned from the Section\r
                            Extraction protocol. See the Section Extraction Protocol\r
                            Specification for details on this type.\r
                            This is the authentication type returned from the Section\r
                            Extraction protocol. See the Section Extraction Protocol\r
                            Specification for details on this type.\r


@@ -197,9 +197,9 @@ RegisterSecurityHandler (
                            being dispatched. This will optionally be used for logging.\r
 \r
   @retval EFI_SUCCESS            The file specified by File did authenticate when more\r
                            being dispatched. This will optionally be used for logging.\r
 \r
   @retval EFI_SUCCESS            The file specified by File did authenticate when more\r

-                                 than one security handler services were registered, \r
-                                 or the file did not authenticate when no security \r
-                                 handler service was registered. And the platform policy \r
+                                 than one security handler services were registered,\r
+                                 or the file did not authenticate when no security\r
+                                 handler service was registered. And the platform policy\r

                                  dictates that the DXE Core may use File.\r
   @retval EFI_INVALID_PARAMETER  File is NULL.\r
   @retval EFI_SECURITY_VIOLATION The file specified by File did not authenticate, and\r
                                  dictates that the DXE Core may use File.\r
   @retval EFI_INVALID_PARAMETER  File is NULL.\r
   @retval EFI_SECURITY_VIOLATION The file specified by File did not authenticate, and\r


@@ -226,7 +226,7 @@ ExecuteSecurityHandlers (
   EFI_HANDLE    Handle;\r
   EFI_DEVICE_PATH_PROTOCOL        *Node;\r
   EFI_DEVICE_PATH_PROTOCOL        *FilePathToVerfiy;\r
   EFI_HANDLE    Handle;\r
   EFI_DEVICE_PATH_PROTOCOL        *Node;\r
   EFI_DEVICE_PATH_PROTOCOL        *FilePathToVerfiy;\r

-  \r
+\r

   if (FilePath == NULL) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
   if (FilePath == NULL) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r


@@ -237,7 +237,7 @@ ExecuteSecurityHandlers (
   if (mNumberOfSecurityHandler == 0) {\r
     return EFI_SUCCESS;\r
   }\r
   if (mNumberOfSecurityHandler == 0) {\r
     return EFI_SUCCESS;\r
   }\r

-  \r
+\r

   Status                      = EFI_SUCCESS;\r
   FileBuffer                  = NULL;\r
   FileSize                    = 0;\r
   Status                      = EFI_SUCCESS;\r
   FileBuffer                  = NULL;\r
   FileSize                    = 0;\r


@@ -309,8 +309,8 @@ ReallocateSecurity2HandlerTable (
   // Reallocate memory for security info structure.\r
   //\r
   mSecurity2Table = ReallocatePool (\r
   // Reallocate memory for security info structure.\r
   //\r
   mSecurity2Table = ReallocatePool (\r

-                     mMaxNumberOfSecurity2Handler * sizeof (SECURITY2_INFO), \r
-                     (mMaxNumberOfSecurity2Handler + SECURITY_HANDLER_TABLE_SIZE) * sizeof (SECURITY2_INFO), \r
+                     mMaxNumberOfSecurity2Handler * sizeof (SECURITY2_INFO),\r
+                     (mMaxNumberOfSecurity2Handler + SECURITY_HANDLER_TABLE_SIZE) * sizeof (SECURITY2_INFO),\r

                      mSecurity2Table\r
                      );\r
 \r
                      mSecurity2Table\r
                      );\r
 \r


@@ -329,17 +329,17 @@ ReallocateSecurity2HandlerTable (
 }\r
 \r
 /**\r
 }\r
 \r
 /**\r

-  Check whether an operation is valid according to the requirement of current operation, \r
+  Check whether an operation is valid according to the requirement of current operation,\r

   which must make sure that the measure image operation is the last one.\r
   which must make sure that the measure image operation is the last one.\r

-  \r
+\r

   If AuthenticationOperation is not recongnized, return FALSE.\r
   If AuthenticationOperation is EFI_AUTH_OPERATION_NONE, return FALSE.\r
   If AuthenticationOperation includes security operation and authentication operation, return FALSE.\r
   If the previous register handler can't be executed before the later register handler, return FALSE.\r
   If AuthenticationOperation is not recongnized, return FALSE.\r
   If AuthenticationOperation is EFI_AUTH_OPERATION_NONE, return FALSE.\r
   If AuthenticationOperation includes security operation and authentication operation, return FALSE.\r
   If the previous register handler can't be executed before the later register handler, return FALSE.\r

-  \r
+\r

   @param CurrentAuthOperation  Current operation.\r
   @param CheckAuthOperation    Operation to be checked.\r
   @param CurrentAuthOperation  Current operation.\r
   @param CheckAuthOperation    Operation to be checked.\r

-  \r
+\r

   @retval  TRUE   Operation is valid for current operation.\r
   @retval  FALSE  Operation is invalid for current operation.\r
 **/\r
   @retval  TRUE   Operation is valid for current operation.\r
   @retval  FALSE  Operation is invalid for current operation.\r
 **/\r


@@ -348,21 +348,21 @@ CheckAuthentication2Operation (
   IN  UINT32    CurrentAuthOperation,\r
   IN  UINT32    CheckAuthOperation\r
   )\r
   IN  UINT32    CurrentAuthOperation,\r
   IN  UINT32    CheckAuthOperation\r
   )\r

-{ \r
+{\r

   //\r
   // Make sure new auth operation can be recognized.\r
   //\r
   if (CheckAuthOperation == EFI_AUTH_OPERATION_NONE) {\r
     return FALSE;\r
   }\r
   //\r
   // Make sure new auth operation can be recognized.\r
   //\r
   if (CheckAuthOperation == EFI_AUTH_OPERATION_NONE) {\r
     return FALSE;\r
   }\r

-  if ((CheckAuthOperation & ~(EFI_AUTH_IMAGE_OPERATION_MASK | \r
-                              EFI_AUTH_NONE_IMAGE_OPERATION_MASK | \r
+  if ((CheckAuthOperation & ~(EFI_AUTH_IMAGE_OPERATION_MASK |\r
+                              EFI_AUTH_NONE_IMAGE_OPERATION_MASK |\r

                               EFI_AUTH_OPERATION_IMAGE_REQUIRED)) != 0) {\r
     return FALSE;\r
   }\r
 \r
   //\r
                               EFI_AUTH_OPERATION_IMAGE_REQUIRED)) != 0) {\r
     return FALSE;\r
   }\r
 \r
   //\r

-  // When current operation includes measure image operation, \r
+  // When current operation includes measure image operation,\r

   // only another measure image or none image operation will be allowed.\r
   //\r
   if ((CurrentAuthOperation & EFI_AUTH_OPERATION_MEASURE_IMAGE) == EFI_AUTH_OPERATION_MEASURE_IMAGE) {\r
   // only another measure image or none image operation will be allowed.\r
   //\r
   if ((CurrentAuthOperation & EFI_AUTH_OPERATION_MEASURE_IMAGE) == EFI_AUTH_OPERATION_MEASURE_IMAGE) {\r


@@ -373,7 +373,7 @@ CheckAuthentication2Operation (
       return FALSE;\r
     }\r
   }\r
       return FALSE;\r
     }\r
   }\r

-  \r
+\r

   //\r
   // Any other operation will be allowed.\r
   //\r
   //\r
   // Any other operation will be allowed.\r
   //\r


@@ -434,16 +434,16 @@ RegisterSecurity2Handler (
 }\r
 \r
 /**\r
 }\r
 \r
 /**\r

-  Execute registered handlers based on input AuthenticationOperation until \r
-  one returns an error and that error is returned. \r
-  \r
+  Execute registered handlers based on input AuthenticationOperation until\r
+  one returns an error and that error is returned.\r
+\r

   If none of the handlers return an error, then EFI_SUCCESS is returned.\r
   The handlers those satisfy AuthenticationOperation will only be executed.\r
   The handlers are executed in same order to their registered order.\r
 \r
   If none of the handlers return an error, then EFI_SUCCESS is returned.\r
   The handlers those satisfy AuthenticationOperation will only be executed.\r
   The handlers are executed in same order to their registered order.\r
 \r

-  @param[in]  AuthenticationOperation   \r
+  @param[in]  AuthenticationOperation\r

                            The operation type specifies which handlers will be executed.\r
                            The operation type specifies which handlers will be executed.\r

-  @param[in]  AuthenticationStatus \r
+  @param[in]  AuthenticationStatus\r

                            The authentication status for the input file.\r
   @param[in]  File         This is a pointer to the device path of the file that is\r
                            being dispatched. This will optionally be used for logging.\r
                            The authentication status for the input file.\r
   @param[in]  File         This is a pointer to the device path of the file that is\r
                            being dispatched. This will optionally be used for logging.\r


@@ -461,7 +461,7 @@ RegisterSecurity2Handler (
   @retval EFI_SUCCESS             FileBuffer is NULL and current user has permission to start\r
                                   UEFI device drivers on the device path specified by DevicePath.\r
   @retval EFI_SECURITY_VIOLATION  The file specified by File or FileBuffer did not\r
   @retval EFI_SUCCESS             FileBuffer is NULL and current user has permission to start\r
                                   UEFI device drivers on the device path specified by DevicePath.\r
   @retval EFI_SECURITY_VIOLATION  The file specified by File or FileBuffer did not\r

-                                  authenticate, and the platform policy dictates that \r
+                                  authenticate, and the platform policy dictates that\r

                                   the file should be placed in the untrusted state.\r
   @retval EFI_SECURITY_VIOLATION  FileBuffer FileBuffer is NULL and the user has no\r
                                   permission to start UEFI device drivers on the device path specified\r
                                   the file should be placed in the untrusted state.\r
   @retval EFI_SECURITY_VIOLATION  FileBuffer FileBuffer is NULL and the user has no\r
                                   permission to start UEFI device drivers on the device path specified\r


@@ -472,7 +472,7 @@ RegisterSecurity2Handler (
   @retval EFI_ACCESS_DENIED       The file specified by File did not authenticate, and\r
                                   the platform policy dictates that the DXE\r
                                   Foundation may not use File.\r
   @retval EFI_ACCESS_DENIED       The file specified by File did not authenticate, and\r
                                   the platform policy dictates that the DXE\r
                                   Foundation may not use File.\r

-  @retval EFI_INVALID_PARAMETER   File and FileBuffer are both NULL. \r
+  @retval EFI_INVALID_PARAMETER   File and FileBuffer are both NULL.\r

 **/\r
 EFI_STATUS\r
 EFIAPI\r
 **/\r
 EFI_STATUS\r
 EFIAPI\r

diff --git a/MdeModulePkg/Library/DxeSecurityManagementLib/DxeSecurityManagementLib.inf b/MdeModulePkg/Library/DxeSecurityManagementLib/DxeSecurityManagementLib.inf
index 0f8a13b99db690092bcc9f17e77a14557b0df7a6..41d8ff8fd132d320d67b1ca3665f68a6fa7b75a0 100644 (file)
--- a/MdeModulePkg/Library/DxeSecurityManagementLib/DxeSecurityManagementLib.inf
+++ b/MdeModulePkg/Library/DxeSecurityManagementLib/DxeSecurityManagementLib.inf
@@ -3,7 +3,7 @@
 #\r
 # This library provides generic security measurement functions for DXE module.\r
 #\r
 #\r
 # This library provides generic security measurement functions for DXE module.\r
 #\r

-#  Copyright (c) 2009 - 2015, Intel Corporation. All rights reserved.<BR>\r
+#  Copyright (c) 2009 - 2018, Intel Corporation. All rights reserved.<BR>\r

 #\r
 #  This program and the accompanying materials\r
 #  are licensed and made available under the terms and conditions of the BSD License\r
 #\r
 #  This program and the accompanying materials\r
 #  are licensed and made available under the terms and conditions of the BSD License\r


@@ -22,7 +22,7 @@
   FILE_GUID                      = 7F61122C-19DF-47c3-BA0D-6C1149E30FA1\r
   MODULE_TYPE                    = DXE_DRIVER\r
   VERSION_STRING                 = 1.0\r
   FILE_GUID                      = 7F61122C-19DF-47c3-BA0D-6C1149E30FA1\r
   MODULE_TYPE                    = DXE_DRIVER\r
   VERSION_STRING                 = 1.0\r

-  LIBRARY_CLASS                  = SecurityManagementLib|DXE_CORE DXE_DRIVER DXE_RUNTIME_DRIVER DXE_SAL_DRIVER DXE_SMM_DRIVER UEFI_APPLICATION UEFI_DRIVER \r
+  LIBRARY_CLASS                  = SecurityManagementLib|DXE_CORE DXE_DRIVER DXE_RUNTIME_DRIVER DXE_SAL_DRIVER DXE_SMM_DRIVER UEFI_APPLICATION UEFI_DRIVER\r

 \r
 #\r
 # The following information is for reference only and not required by the build tools.\r
 \r
 #\r
 # The following information is for reference only and not required by the build tools.\r

diff --git a/MdeModulePkg/Library/DxeSmmPerformanceLib/DxeSmmPerformanceLib.c b/MdeModulePkg/Library/DxeSmmPerformanceLib/DxeSmmPerformanceLib.c
index d8d06842734570df03bc933c386c2972c248b456..353174724e4b65479658d24d03a862c0f9662cdc 100644 (file)
--- a/MdeModulePkg/Library/DxeSmmPerformanceLib/DxeSmmPerformanceLib.c
+++ b/MdeModulePkg/Library/DxeSmmPerformanceLib/DxeSmmPerformanceLib.c
@@ -5,7 +5,7 @@
   StartPerformanceMeasurement(), EndPerformanceMeasurement(), StartPerformanceMeasurementEx()\r
   and EndPerformanceMeasurementEx() are not implemented.\r
 \r
   StartPerformanceMeasurement(), EndPerformanceMeasurement(), StartPerformanceMeasurementEx()\r
   and EndPerformanceMeasurementEx() are not implemented.\r
 \r

-  Copyright (c) 2011 - 2016, Intel Corporation. All rights reserved.<BR>\r
+  Copyright (c) 2011 - 2018, Intel Corporation. All rights reserved.<BR>\r

 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r


@@ -313,7 +313,7 @@ EndPerformanceMeasurement (
 UINTN\r
 EFIAPI\r
 GetByPerformanceProtocol (\r
 UINTN\r
 EFIAPI\r
 GetByPerformanceProtocol (\r

-  IN  UINTN       LogEntryKey, \r
+  IN  UINTN       LogEntryKey,\r

   OUT CONST VOID  **Handle,\r
   OUT CONST CHAR8 **Token,\r
   OUT CONST CHAR8 **Module,\r
   OUT CONST VOID  **Handle,\r
   OUT CONST CHAR8 **Token,\r
   OUT CONST CHAR8 **Module,\r


@@ -450,12 +450,12 @@ GetAllSmmGaugeData (
   mSmmPerformanceBuffer = (UINT8 *) (UINTN) Entry->PhysicalStart;\r
 \r
   //\r
   mSmmPerformanceBuffer = (UINT8 *) (UINTN) Entry->PhysicalStart;\r
 \r
   //\r

-  // Initialize communicate buffer \r
+  // Initialize communicate buffer\r

   //\r
   SmmCommBufferHeader = (EFI_SMM_COMMUNICATE_HEADER *)mSmmPerformanceBuffer;\r
   SmmPerfCommData = (SMM_PERF_COMMUNICATE *)SmmCommBufferHeader->Data;\r
   ZeroMem((UINT8*)SmmPerfCommData, sizeof(SMM_PERF_COMMUNICATE));\r
   //\r
   SmmCommBufferHeader = (EFI_SMM_COMMUNICATE_HEADER *)mSmmPerformanceBuffer;\r
   SmmPerfCommData = (SMM_PERF_COMMUNICATE *)SmmCommBufferHeader->Data;\r
   ZeroMem((UINT8*)SmmPerfCommData, sizeof(SMM_PERF_COMMUNICATE));\r

-    \r
+\r

   CopyGuid (&SmmCommBufferHeader->HeaderGuid, &gSmmPerformanceProtocolGuid);\r
   SmmCommBufferHeader->MessageLength = sizeof(SMM_PERF_COMMUNICATE);\r
   CommSize = SMM_PERFORMANCE_COMMUNICATION_BUFFER_SIZE;\r
   CopyGuid (&SmmCommBufferHeader->HeaderGuid, &gSmmPerformanceProtocolGuid);\r
   SmmCommBufferHeader->MessageLength = sizeof(SMM_PERF_COMMUNICATE);\r
   CommSize = SMM_PERFORMANCE_COMMUNICATION_BUFFER_SIZE;\r


@@ -482,7 +482,7 @@ GetAllSmmGaugeData (
 \r
   //\r
   // Get all SMM gauge data\r
 \r
   //\r
   // Get all SMM gauge data\r

-  //  \r
+  //\r

   SmmPerfCommData->Function = SMM_PERF_FUNCTION_GET_GAUGE_DATA;\r
   SmmPerfCommData->GaugeData = (GAUGE_DATA_ENTRY *) Buffer;\r
   EntriesGot = 0;\r
   SmmPerfCommData->Function = SMM_PERF_FUNCTION_GET_GAUGE_DATA;\r
   SmmPerfCommData->GaugeData = (GAUGE_DATA_ENTRY *) Buffer;\r
   EntriesGot = 0;\r


@@ -589,12 +589,12 @@ GetAllSmmGaugeDataEx (
   ASSERT (Index < PiSmmCommunicationRegionTable->NumberOfEntries);\r
   mSmmPerformanceBuffer = (UINT8 *) (UINTN) Entry->PhysicalStart;\r
   //\r
   ASSERT (Index < PiSmmCommunicationRegionTable->NumberOfEntries);\r
   mSmmPerformanceBuffer = (UINT8 *) (UINTN) Entry->PhysicalStart;\r
   //\r

-  // Initialize communicate buffer \r
+  // Initialize communicate buffer\r

   //\r
   SmmCommBufferHeader = (EFI_SMM_COMMUNICATE_HEADER *)mSmmPerformanceBuffer;\r
   SmmPerfCommData = (SMM_PERF_COMMUNICATE_EX *)SmmCommBufferHeader->Data;\r
   ZeroMem((UINT8*)SmmPerfCommData, sizeof(SMM_PERF_COMMUNICATE_EX));\r
   //\r
   SmmCommBufferHeader = (EFI_SMM_COMMUNICATE_HEADER *)mSmmPerformanceBuffer;\r
   SmmPerfCommData = (SMM_PERF_COMMUNICATE_EX *)SmmCommBufferHeader->Data;\r
   ZeroMem((UINT8*)SmmPerfCommData, sizeof(SMM_PERF_COMMUNICATE_EX));\r

-    \r
+\r

   CopyGuid (&SmmCommBufferHeader->HeaderGuid, &gSmmPerformanceExProtocolGuid);\r
   SmmCommBufferHeader->MessageLength = sizeof(SMM_PERF_COMMUNICATE_EX);\r
   CommSize = SMM_PERFORMANCE_COMMUNICATION_BUFFER_SIZE;\r
   CopyGuid (&SmmCommBufferHeader->HeaderGuid, &gSmmPerformanceExProtocolGuid);\r
   SmmCommBufferHeader->MessageLength = sizeof(SMM_PERF_COMMUNICATE_EX);\r
   CommSize = SMM_PERFORMANCE_COMMUNICATION_BUFFER_SIZE;\r


@@ -621,7 +621,7 @@ GetAllSmmGaugeDataEx (
 \r
   //\r
   // Get all SMM gauge data\r
 \r
   //\r
   // Get all SMM gauge data\r

-  //  \r
+  //\r

   SmmPerfCommData->Function = SMM_PERF_FUNCTION_GET_GAUGE_DATA;\r
   SmmPerfCommData->GaugeDataEx = (GAUGE_DATA_ENTRY_EX *) Buffer;\r
   EntriesGot = 0;\r
   SmmPerfCommData->Function = SMM_PERF_FUNCTION_GET_GAUGE_DATA;\r
   SmmPerfCommData->GaugeDataEx = (GAUGE_DATA_ENTRY_EX *) Buffer;\r
   EntriesGot = 0;\r


@@ -691,7 +691,7 @@ GetAllSmmGaugeDataEx (
 UINTN\r
 EFIAPI\r
 GetPerformanceMeasurementEx (\r
 UINTN\r
 EFIAPI\r
 GetPerformanceMeasurementEx (\r

-  IN  UINTN       LogEntryKey, \r
+  IN  UINTN       LogEntryKey,\r

   OUT CONST VOID  **Handle,\r
   OUT CONST CHAR8 **Token,\r
   OUT CONST CHAR8 **Module,\r
   OUT CONST VOID  **Handle,\r
   OUT CONST CHAR8 **Token,\r
   OUT CONST CHAR8 **Module,\r

diff --git a/MdeModulePkg/Library/DxeSmmPerformanceLib/DxeSmmPerformanceLib.inf b/MdeModulePkg/Library/DxeSmmPerformanceLib/DxeSmmPerformanceLib.inf
index 2b057704f878957f80d92273314d536fd6e421a5..f4d94c23e84cd8e5466f99497619dd7885d487fe 100644 (file)
--- a/MdeModulePkg/Library/DxeSmmPerformanceLib/DxeSmmPerformanceLib.inf
+++ b/MdeModulePkg/Library/DxeSmmPerformanceLib/DxeSmmPerformanceLib.inf
@@ -1,19 +1,19 @@
 ## @file\r
 #  Performance library instance used in DXE phase to dump SMM performance data.\r
 ## @file\r
 #  Performance library instance used in DXE phase to dump SMM performance data.\r

-#  \r
+#\r

 #  This library instance allows a DXE driver or UEFI application to dump both PEI/DXE and SMM performance data.\r
 #  StartPerformanceMeasurement(), EndPerformanceMeasurement(), StartPerformanceMeasurementEx()\r
 #  and EndPerformanceMeasurementEx() are not implemented.\r
 #  This library instance allows a DXE driver or UEFI application to dump both PEI/DXE and SMM performance data.\r
 #  StartPerformanceMeasurement(), EndPerformanceMeasurement(), StartPerformanceMeasurementEx()\r
 #  and EndPerformanceMeasurementEx() are not implemented.\r

-#  \r
-#  Copyright (c) 2011 - 2016, Intel Corporation. All rights reserved.<BR>\r
+#\r
+#  Copyright (c) 2011 - 2018, Intel Corporation. All rights reserved.<BR>\r

 #  This program and the accompanying materials\r
 #  are licensed and made available under the terms and conditions of the BSD License\r
 #  which accompanies this distribution.  The full text of the license may be found at\r
 #  http://opensource.org/licenses/bsd-license.php\r
 #  This program and the accompanying materials\r
 #  are licensed and made available under the terms and conditions of the BSD License\r
 #  which accompanies this distribution.  The full text of the license may be found at\r
 #  http://opensource.org/licenses/bsd-license.php\r

-#  \r
+#\r

 #  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 #  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 #  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 #  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r

-#  \r
+#\r

 ##\r
 \r
 [Defines]\r
 ##\r
 \r
 [Defines]\r

diff --git a/MdeModulePkg/Library/DxeSmmPerformanceLib/DxeSmmPerformanceLib.uni b/MdeModulePkg/Library/DxeSmmPerformanceLib/DxeSmmPerformanceLib.uni
index 96c5762256ae8b445c4167ee3ff0d3e63d3609b3..6db8cff7a48c82e53d5cfff99d678870f6a8f965 100644 (file)
--- a/MdeModulePkg/Library/DxeSmmPerformanceLib/DxeSmmPerformanceLib.uni
+++ b/MdeModulePkg/Library/DxeSmmPerformanceLib/DxeSmmPerformanceLib.uni
@@ -5,13 +5,13 @@
 // StartPerformanceMeasurement(), EndPerformanceMeasurement(), StartPerformanceMeasurementEx()\r
 // and EndPerformanceMeasurementEx() are not implemented.\r
 //\r
 // StartPerformanceMeasurement(), EndPerformanceMeasurement(), StartPerformanceMeasurementEx()\r
 // and EndPerformanceMeasurementEx() are not implemented.\r
 //\r

-// Copyright (c) 2011 - 2014, Intel Corporation. All rights reserved.<BR>\r
+// Copyright (c) 2011 - 2018, Intel Corporation. All rights reserved.<BR>\r

 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r
 // which accompanies this distribution.  The full text of the license may be found at\r
 // http://opensource.org/licenses/bsd-license.php\r
 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r
 // which accompanies this distribution.  The full text of the license may be found at\r
 // http://opensource.org/licenses/bsd-license.php\r

-// \r
+//\r

 // THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 // WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 //\r
 // THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 // WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 //\r

diff --git a/MdeModulePkg/Library/DxeTcpIoLib/DxeTcpIoLib.c b/MdeModulePkg/Library/DxeTcpIoLib/DxeTcpIoLib.c
index fd85d0e78778698f794a7f0fc14d27c13ce70e64..bf15a78fd365f7b328c88488de47f8dcb796456f 100644 (file)
--- a/MdeModulePkg/Library/DxeTcpIoLib/DxeTcpIoLib.c
+++ b/MdeModulePkg/Library/DxeTcpIoLib/DxeTcpIoLib.c
@@ -2,7 +2,7 @@
   This library is used to share code between UEFI network stack modules.\r
   It provides the helper routines to access TCP service.\r
 \r
   This library is used to share code between UEFI network stack modules.\r
   It provides the helper routines to access TCP service.\r
 \r

-Copyright (c) 2010 - 2017, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2010 - 2018, Intel Corporation. All rights reserved.<BR>\r

 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at<BR>\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at<BR>\r


@@ -23,7 +23,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #include <Library/BaseMemoryLib.h>\r
 \r
 /**\r
 #include <Library/BaseMemoryLib.h>\r
 \r
 /**\r

-  The common notify function associated with various TcpIo events. \r
+  The common notify function associated with various TcpIo events.\r

 \r
   @param[in]  Event   The event signaled.\r
   @param[in]  Context The context.\r
 \r
   @param[in]  Event   The event signaled.\r
   @param[in]  Context The context.\r


@@ -111,14 +111,14 @@ ON_EXIT:
 }\r
 \r
 /**\r
 }\r
 \r
 /**\r

-  Create a TCP socket with the specified configuration data. \r
+  Create a TCP socket with the specified configuration data.\r

 \r
   @param[in]  Image      The handle of the driver image.\r
   @param[in]  Controller The handle of the controller.\r
   @param[in]  TcpVersion The version of Tcp, TCP_VERSION_4 or TCP_VERSION_6.\r
   @param[in]  ConfigData The Tcp configuration data.\r
   @param[out] TcpIo      The TcpIo.\r
 \r
   @param[in]  Image      The handle of the driver image.\r
   @param[in]  Controller The handle of the controller.\r
   @param[in]  TcpVersion The version of Tcp, TCP_VERSION_4 or TCP_VERSION_6.\r
   @param[in]  ConfigData The Tcp configuration data.\r
   @param[out] TcpIo      The TcpIo.\r

-  \r
+\r

   @retval EFI_SUCCESS            The TCP socket is created and configured.\r
   @retval EFI_INVALID_PARAMETER  One or more parameters are invalid.\r
   @retval EFI_UNSUPPORTED        One or more of the control options are not\r
   @retval EFI_SUCCESS            The TCP socket is created and configured.\r
   @retval EFI_INVALID_PARAMETER  One or more parameters are invalid.\r
   @retval EFI_UNSUPPORTED        One or more of the control options are not\r


@@ -176,7 +176,7 @@ TcpIoCreateSocket (
 \r
   //\r
   // Create the TCP child instance and get the TCP protocol.\r
 \r
   //\r
   // Create the TCP child instance and get the TCP protocol.\r

-  //  \r
+  //\r

   Status = NetLibCreateServiceChild (\r
              Controller,\r
              Image,\r
   Status = NetLibCreateServiceChild (\r
              Controller,\r
              Image,\r


@@ -395,9 +395,9 @@ ON_ERROR:
 \r
   return Status;\r
 }\r
 \r
   return Status;\r
 }\r

-  \r
+\r

 /**\r
 /**\r

-  Destroy the socket. \r
+  Destroy the socket.\r

 \r
   @param[in]  TcpIo The TcpIo which wraps the socket to be destroyed.\r
 \r
 \r
   @param[in]  TcpIo The TcpIo which wraps the socket to be destroyed.\r
 \r


@@ -531,7 +531,7 @@ TcpIoDestroySocket (
 \r
   @param[in, out]  TcpIo     The TcpIo wrapping the TCP socket.\r
   @param[in]       Timeout   The time to wait for connection done. Set to NULL for infinite wait.\r
 \r
   @param[in, out]  TcpIo     The TcpIo wrapping the TCP socket.\r
   @param[in]       Timeout   The time to wait for connection done. Set to NULL for infinite wait.\r

-  \r
+\r

   @retval EFI_SUCCESS            Connect to the other endpoint of the TCP socket\r
                                  successfully.\r
   @retval EFI_TIMEOUT            Failed to connect to the other endpoint of the\r
   @retval EFI_SUCCESS            Connect to the other endpoint of the TCP socket\r
                                  successfully.\r
   @retval EFI_TIMEOUT            Failed to connect to the other endpoint of the\r


@@ -604,7 +604,7 @@ TcpIoConnect (
   @param[in, out]  TcpIo     The TcpIo wrapping the TCP socket.\r
   @param[in]       Timeout   The time to wait for connection done. Set to NULL for infinite wait.\r
 \r
   @param[in, out]  TcpIo     The TcpIo wrapping the TCP socket.\r
   @param[in]       Timeout   The time to wait for connection done. Set to NULL for infinite wait.\r
 \r

-  \r
+\r

   @retval EFI_SUCCESS            Connect to the other endpoint of the TCP socket\r
                                  successfully.\r
   @retval EFI_INVALID_PARAMETER  One or more parameters are invalid.\r
   @retval EFI_SUCCESS            Connect to the other endpoint of the TCP socket\r
                                  successfully.\r
   @retval EFI_INVALID_PARAMETER  One or more parameters are invalid.\r


@@ -671,7 +671,7 @@ TcpIoAccept (
   }\r
 \r
   //\r
   }\r
 \r
   //\r

-  // The new TCP instance handle created for the established connection is \r
+  // The new TCP instance handle created for the established connection is\r

   // in ListenToken.\r
   //\r
   if (!EFI_ERROR (Status)) {\r
   // in ListenToken.\r
   //\r
   if (!EFI_ERROR (Status)) {\r


@@ -680,7 +680,7 @@ TcpIoAccept (
     } else {\r
       ProtocolGuid = &gEfiTcp6ProtocolGuid;\r
     }\r
     } else {\r
       ProtocolGuid = &gEfiTcp6ProtocolGuid;\r
     }\r

-    \r
+\r

     Status = gBS->OpenProtocol (\r
                     TcpIo->ListenToken.Tcp4Token.NewChildHandle,\r
                     ProtocolGuid,\r
     Status = gBS->OpenProtocol (\r
                     TcpIo->ListenToken.Tcp4Token.NewChildHandle,\r
                     ProtocolGuid,\r


@@ -719,7 +719,7 @@ TcpIoReset (
   Tcp4               = NULL;\r
   Tcp6               = NULL;\r
 \r
   Tcp4               = NULL;\r
   Tcp6               = NULL;\r
 \r

-  if (TcpIo->TcpVersion == TCP_VERSION_4) { \r
+  if (TcpIo->TcpVersion == TCP_VERSION_4) {\r

     TcpIo->CloseToken.Tcp4Token.AbortOnClose = TRUE;\r
     Tcp4 = TcpIo->Tcp.Tcp4;\r
     Status = Tcp4->Close (Tcp4, &TcpIo->CloseToken.Tcp4Token);\r
     TcpIo->CloseToken.Tcp4Token.AbortOnClose = TRUE;\r
     Tcp4 = TcpIo->Tcp.Tcp4;\r
     Status = Tcp4->Close (Tcp4, &TcpIo->CloseToken.Tcp4Token);\r


@@ -744,13 +744,13 @@ TcpIoReset (
   }\r
 }\r
 \r
   }\r
 }\r
 \r

-  \r
+\r

 /**\r
   Transmit the Packet to the other endpoint of the socket.\r
 \r
   @param[in]   TcpIo           The TcpIo wrapping the TCP socket.\r
   @param[in]   Packet          The packet to transmit.\r
 /**\r
   Transmit the Packet to the other endpoint of the socket.\r
 \r
   @param[in]   TcpIo           The TcpIo wrapping the TCP socket.\r
   @param[in]   Packet          The packet to transmit.\r

-  \r
+\r

   @retval EFI_SUCCESS            The packet is trasmitted.\r
   @retval EFI_INVALID_PARAMETER  One or more parameters are invalid.\r
   @retval EFI_UNSUPPORTED        One or more of the control options are not\r
   @retval EFI_SUCCESS            The packet is trasmitted.\r
   @retval EFI_INVALID_PARAMETER  One or more parameters are invalid.\r
   @retval EFI_UNSUPPORTED        One or more of the control options are not\r


@@ -779,7 +779,7 @@ TcpIoTransmit (
 \r
   if (TcpIo->TcpVersion == TCP_VERSION_4) {\r
 \r
 \r
   if (TcpIo->TcpVersion == TCP_VERSION_4) {\r
 \r

-    Size = sizeof (EFI_TCP4_TRANSMIT_DATA) + \r
+    Size = sizeof (EFI_TCP4_TRANSMIT_DATA) +\r

            (Packet->BlockOpNum - 1) * sizeof (EFI_TCP4_FRAGMENT_DATA);\r
   } else if (TcpIo->TcpVersion == TCP_VERSION_6) {\r
     Size = sizeof (EFI_TCP6_TRANSMIT_DATA) +\r
            (Packet->BlockOpNum - 1) * sizeof (EFI_TCP4_FRAGMENT_DATA);\r
   } else if (TcpIo->TcpVersion == TCP_VERSION_6) {\r
     Size = sizeof (EFI_TCP6_TRANSMIT_DATA) +\r


@@ -825,7 +825,7 @@ TcpIoTransmit (
     if (Tcp4 == NULL) {\r
       goto ON_EXIT;\r
     }\r
     if (Tcp4 == NULL) {\r
       goto ON_EXIT;\r
     }\r

-    \r
+\r

     Status  = Tcp4->Transmit (Tcp4, &TcpIo->TxToken.Tcp4Token);\r
   } else {\r
     TcpIo->TxToken.Tcp6Token.Packet.TxData = (EFI_TCP6_TRANSMIT_DATA *) Data;\r
     Status  = Tcp4->Transmit (Tcp4, &TcpIo->TxToken.Tcp4Token);\r
   } else {\r
     TcpIo->TxToken.Tcp6Token.Packet.TxData = (EFI_TCP6_TRANSMIT_DATA *) Data;\r


@@ -929,7 +929,7 @@ TcpIoReceive (
     }\r
 \r
     if (Tcp6 == NULL) {\r
     }\r
 \r
     if (Tcp6 == NULL) {\r

-      return EFI_DEVICE_ERROR; \r
+      return EFI_DEVICE_ERROR;\r

     }\r
 \r
   } else {\r
     }\r
 \r
   } else {\r


@@ -961,11 +961,11 @@ TcpIoReceive (
     } else {\r
       Status = Tcp6->Receive (Tcp6, &TcpIo->RxToken.Tcp6Token);\r
     }\r
     } else {\r
       Status = Tcp6->Receive (Tcp6, &TcpIo->RxToken.Tcp6Token);\r
     }\r

-    \r
+\r

     if (EFI_ERROR (Status)) {\r
       goto ON_EXIT;\r
     }\r
     if (EFI_ERROR (Status)) {\r
       goto ON_EXIT;\r
     }\r

-    \r
+\r

     while (!TcpIo->IsRxDone && ((Timeout == NULL) || EFI_ERROR (gBS->CheckEvent (Timeout)))) {\r
       //\r
       // Poll until some data is received or an error occurs.\r
     while (!TcpIo->IsRxDone && ((Timeout == NULL) || EFI_ERROR (gBS->CheckEvent (Timeout)))) {\r
       //\r
       // Poll until some data is received or an error occurs.\r

diff --git a/MdeModulePkg/Library/DxeTcpIoLib/DxeTcpIoLib.inf b/MdeModulePkg/Library/DxeTcpIoLib/DxeTcpIoLib.inf
index 1b29dcec48779cc191db9e1c94b9793407504cd1..2dc74a73e29191a9bb7adaf662d6783f73bb3363 100644 (file)
--- a/MdeModulePkg/Library/DxeTcpIoLib/DxeTcpIoLib.inf
+++ b/MdeModulePkg/Library/DxeTcpIoLib/DxeTcpIoLib.inf
@@ -1,7 +1,7 @@
 ## @file\r
 #  This library instance provides TCP services by EFI TCPv4/TCPv6 Protocols.\r
 ## @file\r
 #  This library instance provides TCP services by EFI TCPv4/TCPv6 Protocols.\r

-#  \r
-#  Copyright (c) 2010 - 2017, Intel Corporation. All rights reserved.<BR>\r
+#\r
+#  Copyright (c) 2010 - 2018, Intel Corporation. All rights reserved.<BR>\r

 #  This program and the accompanying materials\r
 #  are licensed and made available under the terms and conditions of the BSD License\r
 #  which accompanies this distribution.  The full text of the license may be found at\r
 #  This program and the accompanying materials\r
 #  are licensed and made available under the terms and conditions of the BSD License\r
 #  which accompanies this distribution.  The full text of the license may be found at\r

diff --git a/MdeModulePkg/Library/DxeTcpIoLib/DxeTcpIoLib.uni b/MdeModulePkg/Library/DxeTcpIoLib/DxeTcpIoLib.uni
index 762361338365e9417235af905e1258937f47b22a..693dd37dea749699880523074cebf4e849898ddb 100644 (file)
--- a/MdeModulePkg/Library/DxeTcpIoLib/DxeTcpIoLib.uni
+++ b/MdeModulePkg/Library/DxeTcpIoLib/DxeTcpIoLib.uni
@@ -3,13 +3,13 @@
 //\r
 // This library instance provides TCP services by EFI TCPv4/TCPv6 Protocols.\r
 //\r
 //\r
 // This library instance provides TCP services by EFI TCPv4/TCPv6 Protocols.\r
 //\r

-// Copyright (c) 2010 - 2014, Intel Corporation. All rights reserved.<BR>\r
+// Copyright (c) 2010 - 2018, Intel Corporation. All rights reserved.<BR>\r

 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r
 // which accompanies this distribution.  The full text of the license may be found at\r
 // http://opensource.org/licenses/bsd-license.php\r
 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r
 // which accompanies this distribution.  The full text of the license may be found at\r
 // http://opensource.org/licenses/bsd-license.php\r

-// \r
+//\r

 // THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 // WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 //\r
 // THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 // WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 //\r

diff --git a/MdeModulePkg/Library/DxeUdpIoLib/DxeUdpIoLib.inf b/MdeModulePkg/Library/DxeUdpIoLib/DxeUdpIoLib.inf
index ce6e996a511360e0185612588270d4ac6ac468b8..3e541ee6ee2e0863ec44a5cb066c5dfc840ec3c9 100644 (file)
--- a/MdeModulePkg/Library/DxeUdpIoLib/DxeUdpIoLib.inf
+++ b/MdeModulePkg/Library/DxeUdpIoLib/DxeUdpIoLib.inf
@@ -1,7 +1,7 @@
 ## @file\r
 #  This library instance provides UDP services by consuming EFI UDPv4/UDPv6 Protocols.\r
 ## @file\r
 #  This library instance provides UDP services by consuming EFI UDPv4/UDPv6 Protocols.\r

-#  \r
-#  Copyright (c) 2008 - 2017, Intel Corporation. All rights reserved.<BR>\r
+#\r
+#  Copyright (c) 2008 - 2018, Intel Corporation. All rights reserved.<BR>\r

 #  This program and the accompanying materials\r
 #  are licensed and made available under the terms and conditions of the BSD License\r
 #  which accompanies this distribution.  The full text of the license may be found at\r
 #  This program and the accompanying materials\r
 #  are licensed and made available under the terms and conditions of the BSD License\r
 #  which accompanies this distribution.  The full text of the license may be found at\r

diff --git a/MdeModulePkg/Library/DxeUdpIoLib/DxeUpdIoLib.uni b/MdeModulePkg/Library/DxeUdpIoLib/DxeUpdIoLib.uni
index 7218f59acf906e2a0aed40b6d82f6a9884b28b9a..2bdaa8346a43f9e842c333bb1906a612ba6e6d4e 100644 (file)
--- a/MdeModulePkg/Library/DxeUdpIoLib/DxeUpdIoLib.uni
+++ b/MdeModulePkg/Library/DxeUdpIoLib/DxeUpdIoLib.uni
@@ -3,13 +3,13 @@
 //\r
 // This library instance provides UDP services by consuming EFI UDPv4/UDPv6 Protocols.\r
 //\r
 //\r
 // This library instance provides UDP services by consuming EFI UDPv4/UDPv6 Protocols.\r
 //\r

-// Copyright (c) 2008 - 2014, Intel Corporation. All rights reserved.<BR>\r
+// Copyright (c) 2008 - 2018, Intel Corporation. All rights reserved.<BR>\r

 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r
 // which accompanies this distribution.  The full text of the license may be found at\r
 // http://opensource.org/licenses/bsd-license.php\r
 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r
 // which accompanies this distribution.  The full text of the license may be found at\r
 // http://opensource.org/licenses/bsd-license.php\r

-// \r
+//\r

 // THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 // WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 //\r
 // THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 // WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 //\r

diff --git a/MdeModulePkg/Library/FileExplorerLib/FileExplorer.c b/MdeModulePkg/Library/FileExplorerLib/FileExplorer.c
index 9182751ad75bdaaee0f01a10bd132fc0bf4bc43b..d9ce57f8f40852a926b6236dea24c7868ad0b0ba 100644 (file)
--- a/MdeModulePkg/Library/FileExplorerLib/FileExplorer.c
+++ b/MdeModulePkg/Library/FileExplorerLib/FileExplorer.c
@@ -1,7 +1,7 @@
 /** @file\r
 File explorer related functions.\r
 \r
 /** @file\r
 File explorer related functions.\r
 \r

-Copyright (c) 2004 - 2017, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2004 - 2018, Intel Corporation. All rights reserved.<BR>\r

 This program and the accompanying materials are licensed and made available under\r
 the terms and conditions of the BSD License that accompanies this distribution.\r
 The full text of the license may be found at\r
 This program and the accompanying materials are licensed and made available under\r
 the terms and conditions of the BSD License that accompanies this distribution.\r
 The full text of the license may be found at\r


@@ -61,7 +61,7 @@ HII_VENDOR_DEVICE_PATH  FeHiiVendorDevicePath = {
   {\r
     END_DEVICE_PATH_TYPE,\r
     END_ENTIRE_DEVICE_PATH_SUBTYPE,\r
   {\r
     END_DEVICE_PATH_TYPE,\r
     END_ENTIRE_DEVICE_PATH_SUBTYPE,\r

-    { \r
+    {\r

       (UINT8) (END_DEVICE_PATH_LENGTH),\r
       (UINT8) ((END_DEVICE_PATH_LENGTH) >> 8)\r
     }\r
       (UINT8) (END_DEVICE_PATH_LENGTH),\r
       (UINT8) ((END_DEVICE_PATH_LENGTH) >> 8)\r
     }\r


@@ -554,7 +554,7 @@ LibFileInfo (
 \r
   Buffer      = NULL;\r
   BufferSize  = 0;\r
 \r
   Buffer      = NULL;\r
   BufferSize  = 0;\r

-  \r
+\r

   Status = FHand->GetInfo (\r
                     FHand,\r
                     InfoType,\r
   Status = FHand->GetInfo (\r
                     FHand,\r
                     InfoType,\r


@@ -691,19 +691,19 @@ LibAppendFileName (
 \r
   Size1 = StrSize (Str1);\r
   Size2 = StrSize (Str2);\r
 \r
   Size1 = StrSize (Str1);\r
   Size2 = StrSize (Str2);\r

-  \r
+\r

   //\r
   // Check overflow\r
   //\r
   if (((MAX_UINTN - Size1) < Size2) || ((MAX_UINTN - Size1 - Size2) < sizeof(CHAR16))) {\r
     return NULL;\r
   }\r
   //\r
   // Check overflow\r
   //\r
   if (((MAX_UINTN - Size1) < Size2) || ((MAX_UINTN - Size1 - Size2) < sizeof(CHAR16))) {\r
     return NULL;\r
   }\r

-  \r
+\r

   MaxLen = (Size1 + Size2 + sizeof (CHAR16))/ sizeof (CHAR16);\r
   Str   = AllocateZeroPool (Size1 + Size2 + sizeof (CHAR16));\r
   ASSERT (Str != NULL);\r
 \r
   MaxLen = (Size1 + Size2 + sizeof (CHAR16))/ sizeof (CHAR16);\r
   Str   = AllocateZeroPool (Size1 + Size2 + sizeof (CHAR16));\r
   ASSERT (Str != NULL);\r
 \r

-  TmpStr = AllocateZeroPool (Size1 + Size2 + sizeof (CHAR16)); \r
+  TmpStr = AllocateZeroPool (Size1 + Size2 + sizeof (CHAR16));\r

   ASSERT (TmpStr != NULL);\r
 \r
   StrCpyS (Str, MaxLen, Str1);\r
   ASSERT (TmpStr != NULL);\r
 \r
   StrCpyS (Str, MaxLen, Str1);\r


@@ -724,7 +724,7 @@ LibAppendFileName (
       //\r
 \r
       //\r
       //\r
 \r
       //\r

-      // Use TmpStr as a backup, as StrCpyS in BaseLib does not handle copy of two strings \r
+      // Use TmpStr as a backup, as StrCpyS in BaseLib does not handle copy of two strings\r

       // that overlap.\r
       //\r
       StrCpyS (TmpStr, MaxLen, Ptr + 3);\r
       // that overlap.\r
       //\r
       StrCpyS (TmpStr, MaxLen, Ptr + 3);\r


@@ -736,7 +736,7 @@ LibAppendFileName (
       //\r
 \r
       //\r
       //\r
 \r
       //\r

-      // Use TmpStr as a backup, as StrCpyS in BaseLib does not handle copy of two strings \r
+      // Use TmpStr as a backup, as StrCpyS in BaseLib does not handle copy of two strings\r

       // that overlap.\r
       //\r
       StrCpyS (TmpStr, MaxLen, Ptr + 2);\r
       // that overlap.\r
       //\r
       StrCpyS (TmpStr, MaxLen, Ptr + 2);\r


@@ -750,7 +750,7 @@ LibAppendFileName (
   }\r
 \r
   FreePool (TmpStr);\r
   }\r
 \r
   FreePool (TmpStr);\r

-  \r
+\r

   return Str;\r
 }\r
 \r
   return Str;\r
 }\r
 \r


@@ -845,7 +845,7 @@ LibFindFileSystem (
         VolumeLabel,\r
         MenuEntry->HelpString\r
         );\r
         VolumeLabel,\r
         MenuEntry->HelpString\r
         );\r

-         MenuEntry->DisplayStringToken = HiiSetString (\r
+      MenuEntry->DisplayStringToken = HiiSetString (\r

                                              gFileExplorerPrivate.FeHiiHandle,\r
                                              0,\r
                                              MenuEntry->DisplayString,\r
                                              gFileExplorerPrivate.FeHiiHandle,\r
                                              0,\r
                                              MenuEntry->DisplayString,\r


@@ -871,16 +871,16 @@ LibFindFileSystem (
 \r
 /**\r
   Find the file handle from the input menu info.\r
 \r
 /**\r
   Find the file handle from the input menu info.\r

-  \r
+\r

   @param  MenuEntry        Input Menu info.\r
   @param  RetFileHandle    Return the file handle for the input device path.\r
   @param  MenuEntry        Input Menu info.\r
   @param  RetFileHandle    Return the file handle for the input device path.\r

-  \r
+\r

   @retval EFI_SUCESS       Find the file handle success.\r
   @retval Other            Find the file handle failure.\r
 **/\r
 EFI_STATUS\r
 LibGetFileHandleFromMenu (\r
   @retval EFI_SUCESS       Find the file handle success.\r
   @retval Other            Find the file handle failure.\r
 **/\r
 EFI_STATUS\r
 LibGetFileHandleFromMenu (\r

-  IN  MENU_ENTRY                *MenuEntry,  \r
+  IN  MENU_ENTRY                *MenuEntry,\r

   OUT EFI_FILE_HANDLE           *RetFileHandle\r
   )\r
 {\r
   OUT EFI_FILE_HANDLE           *RetFileHandle\r
   )\r
 {\r


@@ -917,18 +917,18 @@ LibGetFileHandleFromMenu (
 \r
 /**\r
   Find the file handle from the input device path info.\r
 \r
 /**\r
   Find the file handle from the input device path info.\r

-  \r
+\r

   @param  RootDirectory    Device path info.\r
   @param  RetFileHandle    Return the file handle for the input device path.\r
   @param  ParentFileName   Parent file name.\r
   @param  DeviceHandle     Driver handle for this partition.\r
   @param  RootDirectory    Device path info.\r
   @param  RetFileHandle    Return the file handle for the input device path.\r
   @param  ParentFileName   Parent file name.\r
   @param  DeviceHandle     Driver handle for this partition.\r

-  \r
+\r

   @retval EFI_SUCESS       Find the file handle success.\r
   @retval Other            Find the file handle failure.\r
 **/\r
 EFI_STATUS\r
 LibGetFileHandleFromDevicePath (\r
   @retval EFI_SUCESS       Find the file handle success.\r
   @retval Other            Find the file handle failure.\r
 **/\r
 EFI_STATUS\r
 LibGetFileHandleFromDevicePath (\r

-  IN  EFI_DEVICE_PATH_PROTOCOL  *RootDirectory,  \r
+  IN  EFI_DEVICE_PATH_PROTOCOL  *RootDirectory,\r

   OUT EFI_FILE_HANDLE           *RetFileHandle,\r
   OUT UINT16                    **ParentFileName,\r
   OUT EFI_HANDLE                *DeviceHandle\r
   OUT EFI_FILE_HANDLE           *RetFileHandle,\r
   OUT UINT16                    **ParentFileName,\r
   OUT EFI_HANDLE                *DeviceHandle\r


@@ -953,12 +953,12 @@ LibGetFileHandleFromDevicePath (
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r

-  \r
+\r

   Status = gBS->HandleProtocol (Handle, &gEfiSimpleFileSystemProtocolGuid, (VOID**)&Volume);\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
   Status = gBS->HandleProtocol (Handle, &gEfiSimpleFileSystemProtocolGuid, (VOID**)&Volume);\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r

-  \r
+\r

   //\r
   // Open the Volume to get the File System handle\r
   //\r
   //\r
   // Open the Volume to get the File System handle\r
   //\r


@@ -974,7 +974,7 @@ LibGetFileHandleFromDevicePath (
     *RetFileHandle = FileHandle;\r
     return EFI_SUCCESS;\r
   }\r
     *RetFileHandle = FileHandle;\r
     return EFI_SUCCESS;\r
   }\r

-  \r
+\r

   //\r
   // Duplicate the device path to avoid the access to unaligned device path node.\r
   // Because the device path consists of one or more FILE PATH MEDIA DEVICE PATH\r
   //\r
   // Duplicate the device path to avoid the access to unaligned device path node.\r
   // Because the device path consists of one or more FILE PATH MEDIA DEVICE PATH\r


@@ -990,7 +990,7 @@ LibGetFileHandleFromDevicePath (
     Status = EFI_OUT_OF_RESOURCES;\r
     goto Done;\r
   }\r
     Status = EFI_OUT_OF_RESOURCES;\r
     goto Done;\r
   }\r

-        \r
+\r

   //\r
   // Parse each MEDIA_FILEPATH_DP node. There may be more than one, since the\r
   // directory information and filename can be seperate. The goal is to inch\r
   //\r
   // Parse each MEDIA_FILEPATH_DP node. There may be more than one, since the\r
   // directory information and filename can be seperate. The goal is to inch\r


@@ -1123,11 +1123,11 @@ LibCreateNewFile (
 \r
 /**\r
   Find files under current directory.\r
 \r
 /**\r
   Find files under current directory.\r

-  \r
+\r

   All files and sub-directories in current directory\r
   will be stored in DirectoryMenu for future use.\r
 \r
   All files and sub-directories in current directory\r
   will be stored in DirectoryMenu for future use.\r
 \r

-  @param FileHandle    Parent file handle. \r
+  @param FileHandle    Parent file handle.\r

   @param FileName      Parent file name.\r
   @param DeviceHandle  Driver handle for this partition.\r
 \r
   @param FileName      Parent file name.\r
   @param DeviceHandle  Driver handle for this partition.\r
 \r


@@ -1223,7 +1223,7 @@ LibFindFiles (
       } else {\r
         NewMenuEntry->DisplayString = LibStrDuplicate (DirInfo->FileName);\r
       }\r
       } else {\r
         NewMenuEntry->DisplayString = LibStrDuplicate (DirInfo->FileName);\r
       }\r

-      \r
+\r

       NewMenuEntry->DisplayStringToken = HiiSetString (\r
                                            gFileExplorerPrivate.FeHiiHandle,\r
                                            0,\r
       NewMenuEntry->DisplayStringToken = HiiSetString (\r
                                            gFileExplorerPrivate.FeHiiHandle,\r
                                            0,\r


@@ -1459,7 +1459,7 @@ LibGetDevicePath (
 }\r
 \r
 /**\r
 }\r
 \r
 /**\r

-  Choose a file in the specified directory. \r
+  Choose a file in the specified directory.\r

 \r
   If user input NULL for the RootDirectory, will choose file in the system.\r
 \r
 \r
   If user input NULL for the RootDirectory, will choose file in the system.\r
 \r


@@ -1612,7 +1612,7 @@ FileExplorerLibConstructor (
   //\r
   Status = gBS->LocateProtocol (&gEfiFormBrowser2ProtocolGuid, NULL, (VOID **) &gFileExplorerPrivate.FormBrowser2);\r
   ASSERT_EFI_ERROR (Status);\r
   //\r
   Status = gBS->LocateProtocol (&gEfiFormBrowser2ProtocolGuid, NULL, (VOID **) &gFileExplorerPrivate.FormBrowser2);\r
   ASSERT_EFI_ERROR (Status);\r

-    \r
+\r

   InitializeListHead (&gFileExplorerPrivate.FsOptionMenu->Head);\r
 \r
   return EFI_SUCCESS;\r
   InitializeListHead (&gFileExplorerPrivate.FsOptionMenu->Head);\r
 \r
   return EFI_SUCCESS;\r


@@ -1647,7 +1647,7 @@ FileExplorerLibDestructor (
                     NULL\r
                     );\r
     ASSERT_EFI_ERROR (Status);\r
                     NULL\r
                     );\r
     ASSERT_EFI_ERROR (Status);\r

-    \r
+\r

     HiiRemovePackages (gFileExplorerPrivate.FeHiiHandle);\r
   }\r
 \r
     HiiRemovePackages (gFileExplorerPrivate.FeHiiHandle);\r
   }\r
 \r

diff --git a/MdeModulePkg/Library/FileExplorerLib/FileExplorer.h b/MdeModulePkg/Library/FileExplorerLib/FileExplorer.h
index b9a84fb667cef8bb36a69d49f92edfa81efecd11..bf1450dbd5813eafa97289ed05eb9a7d4aaa3ee7 100644 (file)
--- a/MdeModulePkg/Library/FileExplorerLib/FileExplorer.h
+++ b/MdeModulePkg/Library/FileExplorerLib/FileExplorer.h
@@ -1,14 +1,14 @@
 /** @file\r
    File explorer lib.\r
 \r
 /** @file\r
    File explorer lib.\r
 \r

-Copyright (c) 2015 - 2017, Intel Corporation. All rights reserved.<BR>\r
-This program and the accompanying materials                          \r
-are licensed and made available under the terms and conditions of the BSD License         \r
-which accompanies this distribution.  The full text of the license may be found at        \r
-http://opensource.org/licenses/bsd-license.php                                            \r
-                                                                                          \r
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     \r
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             \r
+Copyright (c) 2015 - 2018, Intel Corporation. All rights reserved.<BR>\r
+This program and the accompanying materials\r
+are licensed and made available under the terms and conditions of the BSD License\r
+which accompanies this distribution.  The full text of the license may be found at\r
+http://opensource.org/licenses/bsd-license.php\r
+\r
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r

 **/\r
 \r
 #ifndef _FILE_EXPLORER_H_\r
 **/\r
 \r
 #ifndef _FILE_EXPLORER_H_\r


@@ -226,8 +226,8 @@ EFI_STATUS
 LibUpdateFileExplorer (\r
   IN UINT16                       KeyValue\r
   );\r
 LibUpdateFileExplorer (\r
   IN UINT16                       KeyValue\r
   );\r

-  \r
-  \r
+\r
+\r

 /**\r
   Get the device path info saved in the menu structure.\r
 \r
 /**\r
   Get the device path info saved in the menu structure.\r
 \r


@@ -239,4 +239,4 @@ LibGetDevicePath (
   IN UINT16                       KeyValue\r
   );\r
 \r
   IN UINT16                       KeyValue\r
   );\r
 \r

-#endif \r
+#endif\r

diff --git a/MdeModulePkg/Library/FileExplorerLib/FileExplorerLib.inf b/MdeModulePkg/Library/FileExplorerLib/FileExplorerLib.inf
index 75071d9541fed78b05c23759d6e9ccca88e7bbb9..5d9822d95f44fe116dd4843cb328e3ae6c3455ca 100644 (file)
--- a/MdeModulePkg/Library/FileExplorerLib/FileExplorerLib.inf
+++ b/MdeModulePkg/Library/FileExplorerLib/FileExplorerLib.inf
@@ -1,15 +1,15 @@
 ## @file\r
 #  library defines a set of interfaces for how to do file explorer.\r
 ## @file\r
 #  library defines a set of interfaces for how to do file explorer.\r

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

 #  This program and the accompanying materials are licensed and made available under\r
 #  the terms and conditions of the BSD License that accompanies this distribution.\r
 #  The full text of the license may be found at\r
 #  http://opensource.org/licenses/bsd-license.php.\r
 #  This program and the accompanying materials are licensed and made available under\r
 #  the terms and conditions of the BSD License that accompanies this distribution.\r
 #  The full text of the license may be found at\r
 #  http://opensource.org/licenses/bsd-license.php.\r

-#  \r
+#\r

 #  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 #  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 #  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 #  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r

-#  \r
+#\r

 ##\r
 [Defines]\r
   INF_VERSION                    = 0x00010005\r
 ##\r
 [Defines]\r
   INF_VERSION                    = 0x00010005\r


@@ -52,7 +52,7 @@
 [Guids]\r
   gEfiFileSystemVolumeLabelInfoIdGuid           ## SOMETIMES_CONSUMES ## GUID (Indicate the information type is volume)\r
   gEfiIfrTianoGuid                              ## SOMETIMES_CONSUMES ## GUID (Extended IFR Guid Opcode)\r
 [Guids]\r
   gEfiFileSystemVolumeLabelInfoIdGuid           ## SOMETIMES_CONSUMES ## GUID (Indicate the information type is volume)\r
   gEfiIfrTianoGuid                              ## SOMETIMES_CONSUMES ## GUID (Extended IFR Guid Opcode)\r

- \r
+\r

 [Protocols]\r
   gEfiSimpleFileSystemProtocolGuid              ## SOMETIMES_CONSUMES\r
   gEfiHiiConfigAccessProtocolGuid               ## PRODUCES\r
 [Protocols]\r
   gEfiSimpleFileSystemProtocolGuid              ## SOMETIMES_CONSUMES\r
   gEfiHiiConfigAccessProtocolGuid               ## PRODUCES\r


@@ -60,4 +60,4 @@
   gEfiDevicePathToTextProtocolGuid              ## PRODUCES\r
 \r
 [Depex.common.DXE_DRIVER]\r
   gEfiDevicePathToTextProtocolGuid              ## PRODUCES\r
 \r
 [Depex.common.DXE_DRIVER]\r

-  gEfiFormBrowser2ProtocolGuid AND gEfiHiiDatabaseProtocolGuid
\ No newline at end of file
+  gEfiFormBrowser2ProtocolGuid AND gEfiHiiDatabaseProtocolGuid\r

diff --git a/MdeModulePkg/Library/FileExplorerLib/FileExplorerString.uni b/MdeModulePkg/Library/FileExplorerLib/FileExplorerString.uni
index e16adb66fc5c8edd67625436ccce7b05ce3c1168..64f4a5884f449244291842db2b60511a6153020e 100644 (file)
--- a/MdeModulePkg/Library/FileExplorerLib/FileExplorerString.uni
+++ b/MdeModulePkg/Library/FileExplorerLib/FileExplorerString.uni
@@ -1,24 +1,24 @@
 ///** @file\r
 //\r
 ///** @file\r
 //\r

-// Copyright (c) 2007 - 2017, Intel Corporation. All rights reserved.<BR>\r
-// This program and the accompanying materials                          \r
-// are licensed and made available under the terms and conditions of the BSD License         \r
-// which accompanies this distribution.  The full text of the license may be found at        \r
-// http://opensource.org/licenses/bsd-license.php                                            \r
-//                                                                                           \r
-// THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     \r
-// WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             \r
-// \r
+// Copyright (c) 2007 - 2018, Intel Corporation. All rights reserved.<BR>\r
+// This program and the accompanying materials\r
+// are licensed and made available under the terms and conditions of the BSD License\r
+// which accompanies this distribution.  The full text of the license may be found at\r
+// http://opensource.org/licenses/bsd-license.php\r
+//\r
+// THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
+// WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
+//\r

 // Module Name:\r
 //\r
 //   FileExplorerString.uni\r
 // Module Name:\r
 //\r
 //   FileExplorerString.uni\r

-// \r
+//\r

 // Abstract:\r
 // Abstract:\r

-// \r
+//\r

 //   String definitions for file exporer library.\r
 //   String definitions for file exporer library.\r

-// \r
+//\r

 // Revision History:\r
 // Revision History:\r

-// \r
+//\r

 // --*/\r
 /=#\r
 \r
 // --*/\r
 /=#\r
 \r

diff --git a/MdeModulePkg/Library/FileExplorerLib/FileExplorerVfr.vfr b/MdeModulePkg/Library/FileExplorerLib/FileExplorerVfr.vfr
index b2bf94d5c70a5d5f67ca2cb14765edec06ad6310..b969d97a8ce0e174e80b17374b0a56a126cb380f 100644 (file)
--- a/MdeModulePkg/Library/FileExplorerLib/FileExplorerVfr.vfr
+++ b/MdeModulePkg/Library/FileExplorerLib/FileExplorerVfr.vfr
@@ -2,7 +2,7 @@
 //\r
 //    File Explorer Formset\r
 //\r
 //\r
 //    File Explorer Formset\r
 //\r

-//  Copyright (c) 2004 - 2017, Intel Corporation. All rights reserved.<BR>\r
+//  Copyright (c) 2004 - 2018, Intel Corporation. All rights reserved.<BR>\r

 //  This program and the accompanying materials\r
 //  are licensed and made available under the terms and conditions of the BSD License\r
 //  which accompanies this distribution.  The full text of the license may be found at\r
 //  This program and the accompanying materials\r
 //  are licensed and made available under the terms and conditions of the BSD License\r
 //  which accompanies this distribution.  The full text of the license may be found at\r


@@ -82,4 +82,4 @@ formset
         key    = KEY_VALUE_NO_CREATE_FOLDER_AND_EXIT;\r
   endform;\r
 \r
         key    = KEY_VALUE_NO_CREATE_FOLDER_AND_EXIT;\r
   endform;\r
 \r

-endformset;
\ No newline at end of file
+endformset;\r

diff --git a/MdeModulePkg/Library/LockBoxNullLib/LockBoxNullLib.c b/MdeModulePkg/Library/LockBoxNullLib/LockBoxNullLib.c
index 5d7b52c06e7efc7f2c437d2491a397302626d4f3..c40dfea3985892cb1b328fe14c28a3a4e31ff7c8 100644 (file)
--- a/MdeModulePkg/Library/LockBoxNullLib/LockBoxNullLib.c
+++ b/MdeModulePkg/Library/LockBoxNullLib/LockBoxNullLib.c
@@ -1,6 +1,6 @@
 /** @file\r
 \r
 /** @file\r
 \r

-Copyright (c) 2010, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2010 - 2018, Intel Corporation. All rights reserved.<BR>\r

 \r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions\r
 \r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions\r


@@ -103,7 +103,7 @@ UpdateLockBox (
 \r
   @retval RETURN_SUCCESS            the information is restored successfully.\r
   @retval RETURN_INVALID_PARAMETER  the Guid is NULL, or one of Buffer and Length is NULL.\r
 \r
   @retval RETURN_SUCCESS            the information is restored successfully.\r
   @retval RETURN_INVALID_PARAMETER  the Guid is NULL, or one of Buffer and Length is NULL.\r

-  @retval RETURN_WRITE_PROTECTED    Buffer and Length are NULL, but the LockBox has no \r
+  @retval RETURN_WRITE_PROTECTED    Buffer and Length are NULL, but the LockBox has no\r

                                     LOCK_BOX_ATTRIBUTE_RESTORE_IN_PLACE attribute.\r
   @retval RETURN_BUFFER_TOO_SMALL   the Length is too small to hold the confidential information.\r
   @retval RETURN_NOT_FOUND          the requested GUID not found.\r
                                     LOCK_BOX_ATTRIBUTE_RESTORE_IN_PLACE attribute.\r
   @retval RETURN_BUFFER_TOO_SMALL   the Length is too small to hold the confidential information.\r
   @retval RETURN_NOT_FOUND          the requested GUID not found.\r

diff --git a/MdeModulePkg/Library/LockBoxNullLib/LockBoxNullLib.inf b/MdeModulePkg/Library/LockBoxNullLib/LockBoxNullLib.inf
index 1018a69e81446836402b30d9632a935652ed0094..d824c59281ca74a19462a531cfa8ff57b23ea8bb 100644 (file)
--- a/MdeModulePkg/Library/LockBoxNullLib/LockBoxNullLib.inf
+++ b/MdeModulePkg/Library/LockBoxNullLib/LockBoxNullLib.inf
@@ -1,7 +1,7 @@
 ## @file\r
 #  NULL LockBox library instance.\r
 #\r
 ## @file\r
 #  NULL LockBox library instance.\r
 #\r

-#  Copyright (c) 2010 - 2014, Intel Corporation. All rights reserved.<BR>\r
+#  Copyright (c) 2010 - 2018, Intel Corporation. All rights reserved.<BR>\r

 #\r
 #  This program and the accompanying materials\r
 #  are licensed and made available under the terms and conditions\r
 #\r
 #  This program and the accompanying materials\r
 #  are licensed and made available under the terms and conditions\r


@@ -27,7 +27,7 @@
 #\r
 # The following information is for reference only and not required by the build tools.\r
 #\r
 #\r
 # The following information is for reference only and not required by the build tools.\r
 #\r

-#  VALID_ARCHITECTURES           = IA32 X64 \r
+#  VALID_ARCHITECTURES           = IA32 X64\r

 #\r
 \r
 [Sources]\r
 #\r
 \r
 [Sources]\r

diff --git a/MdeModulePkg/Library/LockBoxNullLib/LockBoxNullLib.uni b/MdeModulePkg/Library/LockBoxNullLib/LockBoxNullLib.uni
index e8164cccdc1832508593ab3abcc2f9af533bca0d..6b961e51aa95ab00070bf9d442f5e0c15fd47d2e 100644 (file)
--- a/MdeModulePkg/Library/LockBoxNullLib/LockBoxNullLib.uni
+++ b/MdeModulePkg/Library/LockBoxNullLib/LockBoxNullLib.uni
@@ -3,14 +3,14 @@
 //\r
 // NULL LockBox library instance.\r
 //\r
 //\r
 // NULL LockBox library instance.\r
 //\r

-// Copyright (c) 2010 - 2014, Intel Corporation. All rights reserved.<BR>\r
+// Copyright (c) 2010 - 2018, Intel Corporation. All rights reserved.<BR>\r

 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions\r
 // of the BSD License which accompanies this distribution.  The\r
 // full text of the license may be found at\r
 // http://opensource.org/licenses/bsd-license.php\r
 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions\r
 // of the BSD License which accompanies this distribution.  The\r
 // full text of the license may be found at\r
 // http://opensource.org/licenses/bsd-license.php\r

-// \r
+//\r

 // THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 // WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 //\r
 // THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 // WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 //\r

diff --git a/MdeModulePkg/Library/LzmaCustomDecompressLib/F86GuidedSectionExtraction.c b/MdeModulePkg/Library/LzmaCustomDecompressLib/F86GuidedSectionExtraction.c
index b02dc515f8a020b04b4e6612bf3467c30106a57c..29150d375ad1c8e8b1a2c29f8af84ecd3fc6d058 100644 (file)
--- a/MdeModulePkg/Library/LzmaCustomDecompressLib/F86GuidedSectionExtraction.c
+++ b/MdeModulePkg/Library/LzmaCustomDecompressLib/F86GuidedSectionExtraction.c
@@ -1,10 +1,10 @@
 /** @file\r
 /** @file\r

-  LZMA Decompress GUIDed Section Extraction Library, which produces LZMA custom \r
+  LZMA Decompress GUIDed Section Extraction Library, which produces LZMA custom\r

   decompression algorithm with the converter for the different arch code.\r
   It wraps Lzma decompress interfaces to GUIDed Section Extraction interfaces\r
   and registers them into GUIDed handler table.\r
 \r
   decompression algorithm with the converter for the different arch code.\r
   It wraps Lzma decompress interfaces to GUIDed Section Extraction interfaces\r
   and registers them into GUIDed handler table.\r
 \r

-  Copyright (c) 2012, Intel Corporation. All rights reserved.<BR>\r
+  Copyright (c) 2012 - 2018, Intel Corporation. All rights reserved.<BR>\r

   This program and the accompanying materials\r
   are licensed and made available under the terms and conditions of the BSD License\r
   which accompanies this distribution.  The full text of the license may be found at\r
   This program and the accompanying materials\r
   are licensed and made available under the terms and conditions of the BSD License\r
   which accompanies this distribution.  The full text of the license may be found at\r


@@ -22,16 +22,16 @@
   Examines a GUIDed section and returns the size of the decoded buffer and the\r
   size of an scratch buffer required to actually decode the data in a GUIDed section.\r
 \r
   Examines a GUIDed section and returns the size of the decoded buffer and the\r
   size of an scratch buffer required to actually decode the data in a GUIDed section.\r
 \r

-  Examines a GUIDed section specified by InputSection.  \r
+  Examines a GUIDed section specified by InputSection.\r

   If GUID for InputSection does not match the GUID that this handler supports,\r
   If GUID for InputSection does not match the GUID that this handler supports,\r

-  then RETURN_UNSUPPORTED is returned.  \r
+  then RETURN_UNSUPPORTED is returned.\r

   If the required information can not be retrieved from InputSection,\r
   then RETURN_INVALID_PARAMETER is returned.\r
   If the GUID of InputSection does match the GUID that this handler supports,\r
   then the size required to hold the decoded buffer is returned in OututBufferSize,\r
   the size of an optional scratch buffer is returned in ScratchSize, and the Attributes field\r
   from EFI_GUID_DEFINED_SECTION header of InputSection is returned in SectionAttribute.\r
   If the required information can not be retrieved from InputSection,\r
   then RETURN_INVALID_PARAMETER is returned.\r
   If the GUID of InputSection does match the GUID that this handler supports,\r
   then the size required to hold the decoded buffer is returned in OututBufferSize,\r
   the size of an optional scratch buffer is returned in ScratchSize, and the Attributes field\r
   from EFI_GUID_DEFINED_SECTION header of InputSection is returned in SectionAttribute.\r

-  \r
+\r

   If InputSection is NULL, then ASSERT().\r
   If OutputBufferSize is NULL, then ASSERT().\r
   If ScratchBufferSize is NULL, then ASSERT().\r
   If InputSection is NULL, then ASSERT().\r
   If OutputBufferSize is NULL, then ASSERT().\r
   If ScratchBufferSize is NULL, then ASSERT().\r


@@ -100,16 +100,16 @@ LzmaArchGuidedSectionGetInfo (
 \r
 /**\r
   Decompress a LZAM compressed GUIDed section into a caller allocated output buffer.\r
 \r
 /**\r
   Decompress a LZAM compressed GUIDed section into a caller allocated output buffer.\r

-  \r
-  Decodes the GUIDed section specified by InputSection.  \r
-  If GUID for InputSection does not match the GUID that this handler supports, then RETURN_UNSUPPORTED is returned.  \r
+\r
+  Decodes the GUIDed section specified by InputSection.\r
+  If GUID for InputSection does not match the GUID that this handler supports, then RETURN_UNSUPPORTED is returned.\r

   If the data in InputSection can not be decoded, then RETURN_INVALID_PARAMETER is returned.\r
   If the GUID of InputSection does match the GUID that this handler supports, then InputSection\r
   is decoded into the buffer specified by OutputBuffer and the authentication status of this\r
   decode operation is returned in AuthenticationStatus.  If the decoded buffer is identical to the\r
   data in InputSection, then OutputBuffer is set to point at the data in InputSection.  Otherwise,\r
   the decoded data will be placed in caller allocated buffer specified by OutputBuffer.\r
   If the data in InputSection can not be decoded, then RETURN_INVALID_PARAMETER is returned.\r
   If the GUID of InputSection does match the GUID that this handler supports, then InputSection\r
   is decoded into the buffer specified by OutputBuffer and the authentication status of this\r
   decode operation is returned in AuthenticationStatus.  If the decoded buffer is identical to the\r
   data in InputSection, then OutputBuffer is set to point at the data in InputSection.  Otherwise,\r
   the decoded data will be placed in caller allocated buffer specified by OutputBuffer.\r

-  \r
+\r

   If InputSection is NULL, then ASSERT().\r
   If OutputBuffer is NULL, then ASSERT().\r
   If ScratchBuffer is NULL and this decode operation requires a scratch buffer, then ASSERT().\r
   If InputSection is NULL, then ASSERT().\r
   If OutputBuffer is NULL, then ASSERT().\r
   If ScratchBuffer is NULL and this decode operation requires a scratch buffer, then ASSERT().\r


@@ -117,10 +117,10 @@ LzmaArchGuidedSectionGetInfo (
 \r
 \r
   @param[in]  InputSection  A pointer to a GUIDed section of an FFS formatted file.\r
 \r
 \r
   @param[in]  InputSection  A pointer to a GUIDed section of an FFS formatted file.\r

-  @param[out] OutputBuffer  A pointer to a buffer that contains the result of a decode operation. \r
+  @param[out] OutputBuffer  A pointer to a buffer that contains the result of a decode operation.\r

   @param[out] ScratchBuffer A caller allocated buffer that may be required by this function\r
   @param[out] ScratchBuffer A caller allocated buffer that may be required by this function\r

-                            as a scratch buffer to perform the decode operation. \r
-  @param[out] AuthenticationStatus \r
+                            as a scratch buffer to perform the decode operation.\r
+  @param[out] AuthenticationStatus\r

                             A pointer to the authentication status of the decoded output buffer.\r
                             See the definition of authentication status in the EFI_PEI_GUIDED_SECTION_EXTRACTION_PPI\r
                             section of the PI Specification. EFI_AUTH_STATUS_PLATFORM_OVERRIDE must\r
                             A pointer to the authentication status of the decoded output buffer.\r
                             See the definition of authentication status in the EFI_PEI_GUIDED_SECTION_EXTRACTION_PPI\r
                             section of the PI Specification. EFI_AUTH_STATUS_PLATFORM_OVERRIDE must\r


@@ -147,7 +147,7 @@ LzmaArchGuidedSectionExtraction (
   UINT32            X86State;\r
   UINT32            OutputBufferSize;\r
   UINT32            ScratchBufferSize;\r
   UINT32            X86State;\r
   UINT32            OutputBufferSize;\r
   UINT32            ScratchBufferSize;\r

-  \r
+\r

   ASSERT (OutputBuffer != NULL);\r
   ASSERT (InputSection != NULL);\r
 \r
   ASSERT (OutputBuffer != NULL);\r
   ASSERT (InputSection != NULL);\r
 \r


@@ -178,7 +178,7 @@ LzmaArchGuidedSectionExtraction (
            );\r
 \r
   //\r
            );\r
 \r
   //\r

-  // After decompress, the data need to be converted to the raw data. \r
+  // After decompress, the data need to be converted to the raw data.\r

   //\r
   if (!EFI_ERROR (Status)) {\r
     Status = LzmaUefiDecompressGetInfo (\r
   //\r
   if (!EFI_ERROR (Status)) {\r
     Status = LzmaUefiDecompressGetInfo (\r


@@ -187,13 +187,13 @@ LzmaArchGuidedSectionExtraction (
              &OutputBufferSize,\r
              &ScratchBufferSize\r
              );\r
              &OutputBufferSize,\r
              &ScratchBufferSize\r
              );\r

-    \r
+\r

     if (!EFI_ERROR (Status)) {\r
       x86_Convert_Init(X86State);\r
       x86_Convert(*OutputBuffer, OutputBufferSize, 0, &X86State, 0);\r
     }\r
   }\r
     if (!EFI_ERROR (Status)) {\r
       x86_Convert_Init(X86State);\r
       x86_Convert(*OutputBuffer, OutputBufferSize, 0, &X86State, 0);\r
     }\r
   }\r

-  \r
+\r

   return Status;\r
 }\r
 \r
   return Status;\r
 }\r
 \r

diff --git a/MdeModulePkg/Library/LzmaCustomDecompressLib/GuidedSectionExtraction.c b/MdeModulePkg/Library/LzmaCustomDecompressLib/GuidedSectionExtraction.c
index 7ef9fbbfc6bf9b3fac7238f6b20a723733c48bff..c15fa8bc0fe22cfeceea0c99cae90be0672c571b 100644 (file)
--- a/MdeModulePkg/Library/LzmaCustomDecompressLib/GuidedSectionExtraction.c
+++ b/MdeModulePkg/Library/LzmaCustomDecompressLib/GuidedSectionExtraction.c
@@ -3,7 +3,7 @@
   It wraps Lzma decompress interfaces to GUIDed Section Extraction interfaces\r
   and registers them into GUIDed handler table.\r
 \r
   It wraps Lzma decompress interfaces to GUIDed Section Extraction interfaces\r
   and registers them into GUIDed handler table.\r
 \r

-  Copyright (c) 2009 - 2011, Intel Corporation. All rights reserved.<BR>\r
+  Copyright (c) 2009 - 2018, Intel Corporation. All rights reserved.<BR>\r

   This program and the accompanying materials\r
   are licensed and made available under the terms and conditions of the BSD License\r
   which accompanies this distribution.  The full text of the license may be found at\r
   This program and the accompanying materials\r
   are licensed and made available under the terms and conditions of the BSD License\r
   which accompanies this distribution.  The full text of the license may be found at\r


@@ -20,16 +20,16 @@
   Examines a GUIDed section and returns the size of the decoded buffer and the\r
   size of an scratch buffer required to actually decode the data in a GUIDed section.\r
 \r
   Examines a GUIDed section and returns the size of the decoded buffer and the\r
   size of an scratch buffer required to actually decode the data in a GUIDed section.\r
 \r

-  Examines a GUIDed section specified by InputSection.  \r
+  Examines a GUIDed section specified by InputSection.\r

   If GUID for InputSection does not match the GUID that this handler supports,\r
   If GUID for InputSection does not match the GUID that this handler supports,\r

-  then RETURN_UNSUPPORTED is returned.  \r
+  then RETURN_UNSUPPORTED is returned.\r

   If the required information can not be retrieved from InputSection,\r
   then RETURN_INVALID_PARAMETER is returned.\r
   If the GUID of InputSection does match the GUID that this handler supports,\r
   then the size required to hold the decoded buffer is returned in OututBufferSize,\r
   the size of an optional scratch buffer is returned in ScratchSize, and the Attributes field\r
   from EFI_GUID_DEFINED_SECTION header of InputSection is returned in SectionAttribute.\r
   If the required information can not be retrieved from InputSection,\r
   then RETURN_INVALID_PARAMETER is returned.\r
   If the GUID of InputSection does match the GUID that this handler supports,\r
   then the size required to hold the decoded buffer is returned in OututBufferSize,\r
   the size of an optional scratch buffer is returned in ScratchSize, and the Attributes field\r
   from EFI_GUID_DEFINED_SECTION header of InputSection is returned in SectionAttribute.\r

-  \r
+\r

   If InputSection is NULL, then ASSERT().\r
   If OutputBufferSize is NULL, then ASSERT().\r
   If ScratchBufferSize is NULL, then ASSERT().\r
   If InputSection is NULL, then ASSERT().\r
   If OutputBufferSize is NULL, then ASSERT().\r
   If ScratchBufferSize is NULL, then ASSERT().\r


@@ -98,16 +98,16 @@ LzmaGuidedSectionGetInfo (
 \r
 /**\r
   Decompress a LZAM compressed GUIDed section into a caller allocated output buffer.\r
 \r
 /**\r
   Decompress a LZAM compressed GUIDed section into a caller allocated output buffer.\r

-  \r
-  Decodes the GUIDed section specified by InputSection.  \r
-  If GUID for InputSection does not match the GUID that this handler supports, then RETURN_UNSUPPORTED is returned.  \r
+\r
+  Decodes the GUIDed section specified by InputSection.\r
+  If GUID for InputSection does not match the GUID that this handler supports, then RETURN_UNSUPPORTED is returned.\r

   If the data in InputSection can not be decoded, then RETURN_INVALID_PARAMETER is returned.\r
   If the GUID of InputSection does match the GUID that this handler supports, then InputSection\r
   is decoded into the buffer specified by OutputBuffer and the authentication status of this\r
   decode operation is returned in AuthenticationStatus.  If the decoded buffer is identical to the\r
   data in InputSection, then OutputBuffer is set to point at the data in InputSection.  Otherwise,\r
   the decoded data will be placed in caller allocated buffer specified by OutputBuffer.\r
   If the data in InputSection can not be decoded, then RETURN_INVALID_PARAMETER is returned.\r
   If the GUID of InputSection does match the GUID that this handler supports, then InputSection\r
   is decoded into the buffer specified by OutputBuffer and the authentication status of this\r
   decode operation is returned in AuthenticationStatus.  If the decoded buffer is identical to the\r
   data in InputSection, then OutputBuffer is set to point at the data in InputSection.  Otherwise,\r
   the decoded data will be placed in caller allocated buffer specified by OutputBuffer.\r

-  \r
+\r

   If InputSection is NULL, then ASSERT().\r
   If OutputBuffer is NULL, then ASSERT().\r
   If ScratchBuffer is NULL and this decode operation requires a scratch buffer, then ASSERT().\r
   If InputSection is NULL, then ASSERT().\r
   If OutputBuffer is NULL, then ASSERT().\r
   If ScratchBuffer is NULL and this decode operation requires a scratch buffer, then ASSERT().\r


@@ -115,10 +115,10 @@ LzmaGuidedSectionGetInfo (
 \r
 \r
   @param[in]  InputSection  A pointer to a GUIDed section of an FFS formatted file.\r
 \r
 \r
   @param[in]  InputSection  A pointer to a GUIDed section of an FFS formatted file.\r

-  @param[out] OutputBuffer  A pointer to a buffer that contains the result of a decode operation. \r
+  @param[out] OutputBuffer  A pointer to a buffer that contains the result of a decode operation.\r

   @param[out] ScratchBuffer A caller allocated buffer that may be required by this function\r
   @param[out] ScratchBuffer A caller allocated buffer that may be required by this function\r

-                            as a scratch buffer to perform the decode operation. \r
-  @param[out] AuthenticationStatus \r
+                            as a scratch buffer to perform the decode operation.\r
+  @param[out] AuthenticationStatus\r

                             A pointer to the authentication status of the decoded output buffer.\r
                             See the definition of authentication status in the EFI_PEI_GUIDED_SECTION_EXTRACTION_PPI\r
                             section of the PI Specification. EFI_AUTH_STATUS_PLATFORM_OVERRIDE must\r
                             A pointer to the authentication status of the decoded output buffer.\r
                             See the definition of authentication status in the EFI_PEI_GUIDED_SECTION_EXTRACTION_PPI\r
                             section of the PI Specification. EFI_AUTH_STATUS_PLATFORM_OVERRIDE must\r


@@ -197,6 +197,6 @@ LzmaDecompressLibConstructor (
           &gLzmaCustomDecompressGuid,\r
           LzmaGuidedSectionGetInfo,\r
           LzmaGuidedSectionExtraction\r
           &gLzmaCustomDecompressGuid,\r
           LzmaGuidedSectionGetInfo,\r
           LzmaGuidedSectionExtraction\r

-          );      \r
+          );\r

 }\r
 \r
 }\r
 \r

diff --git a/MdeModulePkg/Library/LzmaCustomDecompressLib/LZMA-SDK-README.txt b/MdeModulePkg/Library/LzmaCustomDecompressLib/LZMA-SDK-README.txt
index 7a6a77f952ac25a44d2dcfc9b12989d8a057153d..0824bd75cd29ee64fa6c171f18e708040ee44351 100644 (file)
--- a/MdeModulePkg/Library/LzmaCustomDecompressLib/LZMA-SDK-README.txt
+++ b/MdeModulePkg/Library/LzmaCustomDecompressLib/LZMA-SDK-README.txt
@@ -1,4 +1,4 @@
 LzmaCustomDecompressLib is based on the LZMA SDK 16.04.\r
 LZMA SDK 16.04 was placed in the public domain on\r
 2016-10-04.  It was released on the\r
 LzmaCustomDecompressLib is based on the LZMA SDK 16.04.\r
 LZMA SDK 16.04 was placed in the public domain on\r
 2016-10-04.  It was released on the\r

-http://www.7-zip.org/sdk.html website.
\ No newline at end of file
+http://www.7-zip.org/sdk.html website.\r

diff --git a/MdeModulePkg/Library/LzmaCustomDecompressLib/LzmaDecompress.c b/MdeModulePkg/Library/LzmaCustomDecompressLib/LzmaDecompress.c
index cdf4c08cab37f74007ab7bf8cb7c39ab26ac9bb9..501a15d99d1f0c2118f9d8d92abe45fcc44a5293 100644 (file)
--- a/MdeModulePkg/Library/LzmaCustomDecompressLib/LzmaDecompress.c
+++ b/MdeModulePkg/Library/LzmaCustomDecompressLib/LzmaDecompress.c
@@ -1,7 +1,7 @@
 /** @file\r
   LZMA Decompress interfaces\r
 \r
 /** @file\r
   LZMA Decompress interfaces\r
 \r

-  Copyright (c) 2009 - 2016, Intel Corporation. All rights reserved.<BR>\r
+  Copyright (c) 2009 - 2018, Intel Corporation. All rights reserved.<BR>\r

   This program and the accompanying materials\r
   are licensed and made available under the terms and conditions of the BSD License\r
   which accompanies this distribution.  The full text of the license may be found at\r
   This program and the accompanying materials\r
   are licensed and made available under the terms and conditions of the BSD License\r
   which accompanies this distribution.  The full text of the license may be found at\r


@@ -105,15 +105,15 @@ GetDecodedSizeOfBuf(
 //\r
 \r
 /**\r
 //\r
 \r
 /**\r

-  Given a Lzma compressed source buffer, this function retrieves the size of \r
-  the uncompressed buffer and the size of the scratch buffer required \r
+  Given a Lzma compressed source buffer, this function retrieves the size of\r
+  the uncompressed buffer and the size of the scratch buffer required\r

   to decompress the compressed source buffer.\r
 \r
   to decompress the compressed source buffer.\r
 \r

-  Retrieves the size of the uncompressed buffer and the temporary scratch buffer \r
+  Retrieves the size of the uncompressed buffer and the temporary scratch buffer\r

   required to decompress the buffer specified by Source and SourceSize.\r
   required to decompress the buffer specified by Source and SourceSize.\r

-  The size of the uncompressed buffer is returned in DestinationSize, \r
+  The size of the uncompressed buffer is returned in DestinationSize,\r

   the size of the scratch buffer is returned in ScratchSize, and RETURN_SUCCESS is returned.\r
   the size of the scratch buffer is returned in ScratchSize, and RETURN_SUCCESS is returned.\r

-  This function does not have scratch buffer available to perform a thorough \r
+  This function does not have scratch buffer available to perform a thorough\r

   checking of the validity of the source data. It just retrieves the "Original Size"\r
   field from the LZMA_HEADER_SIZE beginning bytes of the source data and output it as DestinationSize.\r
   And ScratchSize is specific to the decompression implementation.\r
   checking of the validity of the source data. It just retrieves the "Original Size"\r
   field from the LZMA_HEADER_SIZE beginning bytes of the source data and output it as DestinationSize.\r
   And ScratchSize is specific to the decompression implementation.\r


@@ -126,11 +126,11 @@ GetDecodedSizeOfBuf(
                           that will be generated when the compressed buffer specified\r
                           by Source and SourceSize is decompressed.\r
   @param  ScratchSize     A pointer to the size, in bytes, of the scratch buffer that\r
                           that will be generated when the compressed buffer specified\r
                           by Source and SourceSize is decompressed.\r
   @param  ScratchSize     A pointer to the size, in bytes, of the scratch buffer that\r

-                          is required to decompress the compressed buffer specified \r
+                          is required to decompress the compressed buffer specified\r

                           by Source and SourceSize.\r
 \r
                           by Source and SourceSize.\r
 \r

-  @retval  RETURN_SUCCESS The size of the uncompressed data was returned \r
-                          in DestinationSize and the size of the scratch \r
+  @retval  RETURN_SUCCESS The size of the uncompressed data was returned\r
+                          in DestinationSize and the size of the scratch\r

                           buffer was returned in ScratchSize.\r
 \r
 **/\r
                           buffer was returned in ScratchSize.\r
 \r
 **/\r


@@ -158,8 +158,8 @@ LzmaUefiDecompressGetInfo (
   Decompresses a Lzma compressed source buffer.\r
 \r
   Extracts decompressed data to its original form.\r
   Decompresses a Lzma compressed source buffer.\r
 \r
   Extracts decompressed data to its original form.\r

-  If the compressed source data specified by Source is successfully decompressed \r
-  into Destination, then RETURN_SUCCESS is returned.  If the compressed source data \r
+  If the compressed source data specified by Source is successfully decompressed\r
+  into Destination, then RETURN_SUCCESS is returned.  If the compressed source data\r

   specified by Source is not in a valid compressed data format,\r
   then RETURN_INVALID_PARAMETER is returned.\r
 \r
   specified by Source is not in a valid compressed data format,\r
   then RETURN_INVALID_PARAMETER is returned.\r
 \r


@@ -167,13 +167,13 @@ LzmaUefiDecompressGetInfo (
   @param  SourceSize  The size of source buffer.\r
   @param  Destination The destination buffer to store the decompressed data\r
   @param  Scratch     A temporary scratch buffer that is used to perform the decompression.\r
   @param  SourceSize  The size of source buffer.\r
   @param  Destination The destination buffer to store the decompressed data\r
   @param  Scratch     A temporary scratch buffer that is used to perform the decompression.\r

-                      This is an optional parameter that may be NULL if the \r
+                      This is an optional parameter that may be NULL if the\r

                       required scratch buffer size is 0.\r
                       required scratch buffer size is 0.\r

-                     \r
-  @retval  RETURN_SUCCESS Decompression completed successfully, and \r
+\r
+  @retval  RETURN_SUCCESS Decompression completed successfully, and\r

                           the uncompressed buffer is returned in Destination.\r
                           the uncompressed buffer is returned in Destination.\r

-  @retval  RETURN_INVALID_PARAMETER \r
-                          The source buffer specified by Source is corrupted \r
+  @retval  RETURN_INVALID_PARAMETER\r
+                          The source buffer specified by Source is corrupted\r

                           (not in a valid compressed format).\r
 **/\r
 RETURN_STATUS\r
                           (not in a valid compressed format).\r
 **/\r
 RETURN_STATUS\r


@@ -195,7 +195,7 @@ LzmaUefiDecompress (
   AllocFuncs.Functions.Free   = SzFree;\r
   AllocFuncs.Buffer           = Scratch;\r
   AllocFuncs.BufferSize       = SCRATCH_BUFFER_REQUEST_SIZE;\r
   AllocFuncs.Functions.Free   = SzFree;\r
   AllocFuncs.Buffer           = Scratch;\r
   AllocFuncs.BufferSize       = SCRATCH_BUFFER_REQUEST_SIZE;\r

-  \r
+\r

   DecodedBufSize = (SizeT)GetDecodedSizeOfBuf((UINT8*)Source);\r
   EncodedDataSize = (SizeT) (SourceSize - LZMA_HEADER_SIZE);\r
 \r
   DecodedBufSize = (SizeT)GetDecodedSizeOfBuf((UINT8*)Source);\r
   EncodedDataSize = (SizeT) (SourceSize - LZMA_HEADER_SIZE);\r
 \r

diff --git a/MdeModulePkg/Library/LzmaCustomDecompressLib/LzmaDecompressLibInternal.h b/MdeModulePkg/Library/LzmaCustomDecompressLib/LzmaDecompressLibInternal.h
index 3096e91dbe64e294438758988aa634f4690f13ca..ac91d66009224afb58381192cc7d205abc396df1 100644 (file)
--- a/MdeModulePkg/Library/LzmaCustomDecompressLib/LzmaDecompressLibInternal.h
+++ b/MdeModulePkg/Library/LzmaCustomDecompressLib/LzmaDecompressLibInternal.h
@@ -1,7 +1,7 @@
 /** @file\r
   LZMA Decompress Library internal header file declares Lzma decompress interfaces.\r
 \r
 /** @file\r
   LZMA Decompress Library internal header file declares Lzma decompress interfaces.\r
 \r

-  Copyright (c) 2009 - 2010, Intel Corporation. All rights reserved.<BR>\r
+  Copyright (c) 2009 - 2018, Intel Corporation. All rights reserved.<BR>\r

   This program and the accompanying materials\r
   are licensed and made available under the terms and conditions of the BSD License\r
   which accompanies this distribution.  The full text of the license may be found at\r
   This program and the accompanying materials\r
   are licensed and made available under the terms and conditions of the BSD License\r
   which accompanies this distribution.  The full text of the license may be found at\r


@@ -23,15 +23,15 @@
 #include <Guid/LzmaDecompress.h>\r
 \r
 /**\r
 #include <Guid/LzmaDecompress.h>\r
 \r
 /**\r

-  Given a Lzma compressed source buffer, this function retrieves the size of \r
-  the uncompressed buffer and the size of the scratch buffer required \r
+  Given a Lzma compressed source buffer, this function retrieves the size of\r
+  the uncompressed buffer and the size of the scratch buffer required\r

   to decompress the compressed source buffer.\r
 \r
   to decompress the compressed source buffer.\r
 \r

-  Retrieves the size of the uncompressed buffer and the temporary scratch buffer \r
+  Retrieves the size of the uncompressed buffer and the temporary scratch buffer\r

   required to decompress the buffer specified by Source and SourceSize.\r
   required to decompress the buffer specified by Source and SourceSize.\r

-  The size of the uncompressed buffer is returned in DestinationSize, \r
+  The size of the uncompressed buffer is returned in DestinationSize,\r

   the size of the scratch buffer is returned in ScratchSize, and RETURN_SUCCESS is returned.\r
   the size of the scratch buffer is returned in ScratchSize, and RETURN_SUCCESS is returned.\r

-  This function does not have scratch buffer available to perform a thorough \r
+  This function does not have scratch buffer available to perform a thorough\r

   checking of the validity of the source data. It just retrieves the "Original Size"\r
   field from the LZMA_HEADER_SIZE beginning bytes of the source data and output it as DestinationSize.\r
   And ScratchSize is specific to the decompression implementation.\r
   checking of the validity of the source data. It just retrieves the "Original Size"\r
   field from the LZMA_HEADER_SIZE beginning bytes of the source data and output it as DestinationSize.\r
   And ScratchSize is specific to the decompression implementation.\r


@@ -44,11 +44,11 @@
                           that will be generated when the compressed buffer specified\r
                           by Source and SourceSize is decompressed.\r
   @param  ScratchSize     A pointer to the size, in bytes, of the scratch buffer that\r
                           that will be generated when the compressed buffer specified\r
                           by Source and SourceSize is decompressed.\r
   @param  ScratchSize     A pointer to the size, in bytes, of the scratch buffer that\r

-                          is required to decompress the compressed buffer specified \r
+                          is required to decompress the compressed buffer specified\r

                           by Source and SourceSize.\r
 \r
                           by Source and SourceSize.\r
 \r

-  @retval  RETURN_SUCCESS The size of the uncompressed data was returned \r
-                          in DestinationSize and the size of the scratch \r
+  @retval  RETURN_SUCCESS The size of the uncompressed data was returned\r
+                          in DestinationSize and the size of the scratch\r

                           buffer was returned in ScratchSize.\r
 \r
 **/\r
                           buffer was returned in ScratchSize.\r
 \r
 **/\r


@@ -65,8 +65,8 @@ LzmaUefiDecompressGetInfo (
   Decompresses a Lzma compressed source buffer.\r
 \r
   Extracts decompressed data to its original form.\r
   Decompresses a Lzma compressed source buffer.\r
 \r
   Extracts decompressed data to its original form.\r

-  If the compressed source data specified by Source is successfully decompressed \r
-  into Destination, then RETURN_SUCCESS is returned.  If the compressed source data \r
+  If the compressed source data specified by Source is successfully decompressed\r
+  into Destination, then RETURN_SUCCESS is returned.  If the compressed source data\r

   specified by Source is not in a valid compressed data format,\r
   then RETURN_INVALID_PARAMETER is returned.\r
 \r
   specified by Source is not in a valid compressed data format,\r
   then RETURN_INVALID_PARAMETER is returned.\r
 \r


@@ -74,13 +74,13 @@ LzmaUefiDecompressGetInfo (
   @param  SourceSize  The size of source buffer.\r
   @param  Destination The destination buffer to store the decompressed data\r
   @param  Scratch     A temporary scratch buffer that is used to perform the decompression.\r
   @param  SourceSize  The size of source buffer.\r
   @param  Destination The destination buffer to store the decompressed data\r
   @param  Scratch     A temporary scratch buffer that is used to perform the decompression.\r

-                      This is an optional parameter that may be NULL if the \r
+                      This is an optional parameter that may be NULL if the\r

                       required scratch buffer size is 0.\r
                       required scratch buffer size is 0.\r

-                     \r
-  @retval  RETURN_SUCCESS Decompression completed successfully, and \r
+\r
+  @retval  RETURN_SUCCESS Decompression completed successfully, and\r

                           the uncompressed buffer is returned in Destination.\r
                           the uncompressed buffer is returned in Destination.\r

-  @retval  RETURN_INVALID_PARAMETER \r
-                          The source buffer specified by Source is corrupted \r
+  @retval  RETURN_INVALID_PARAMETER\r
+                          The source buffer specified by Source is corrupted\r

                           (not in a valid compressed format).\r
 **/\r
 RETURN_STATUS\r
                           (not in a valid compressed format).\r
 **/\r
 RETURN_STATUS\r

diff --git a/MdeModulePkg/Library/OemHookStatusCodeLibNull/OemHookStatusCodeLibNull.c b/MdeModulePkg/Library/OemHookStatusCodeLibNull/OemHookStatusCodeLibNull.c
index 0df144fe799f84efb6e812455400a5cd23eadf3e..3ccd17254f8cd9816e34d5563d663d44db5b074e 100644 (file)
--- a/MdeModulePkg/Library/OemHookStatusCodeLibNull/OemHookStatusCodeLibNull.c
+++ b/MdeModulePkg/Library/OemHookStatusCodeLibNull/OemHookStatusCodeLibNull.c
@@ -1,7 +1,7 @@
 /** @file\r
   Null instance of OEM Hook Status Code Library with empty functions.\r
 \r
 /** @file\r
   Null instance of OEM Hook Status Code Library with empty functions.\r
 \r

-  Copyright (c) 2006 - 2009, Intel Corporation. All rights reserved.<BR>\r
+  Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r

   This program and the accompanying materials\r
   are licensed and made available under the terms and conditions of the BSD License\r
   which accompanies this distribution.  The full text of the license may be found at\r
   This program and the accompanying materials\r
   are licensed and made available under the terms and conditions of the BSD License\r
   which accompanies this distribution.  The full text of the license may be found at\r


@@ -30,20 +30,20 @@ OemHookStatusCodeInitialize (
 \r
 /**\r
   Report status code to OEM device.\r
 \r
 /**\r
   Report status code to OEM device.\r

- \r
+\r

   @param  CodeType      Indicates the type of status code being reported.\r
   @param  CodeType      Indicates the type of status code being reported.\r

-  @param  Value         Describes the current status of a hardware or software entity.  \r
-                        This included information about the class and subclass that is used to classify the entity \r
-                        as well as an operation.  For progress codes, the operation is the current activity. \r
-                        For error codes, it is the exception.  For debug codes, it is not defined at this time. \r
-  @param  Instance      The enumeration of a hardware or software entity within the system.  \r
-                        A system may contain multiple entities that match a class/subclass pairing. \r
-                        The instance differentiates between them.  An instance of 0 indicates that instance information is unavailable, \r
+  @param  Value         Describes the current status of a hardware or software entity.\r
+                        This included information about the class and subclass that is used to classify the entity\r
+                        as well as an operation.  For progress codes, the operation is the current activity.\r
+                        For error codes, it is the exception.  For debug codes, it is not defined at this time.\r
+  @param  Instance      The enumeration of a hardware or software entity within the system.\r
+                        A system may contain multiple entities that match a class/subclass pairing.\r
+                        The instance differentiates between them.  An instance of 0 indicates that instance information is unavailable,\r

                         not meaningful, or not relevant.  Valid instance numbers start with 1.\r
                         not meaningful, or not relevant.  Valid instance numbers start with 1.\r

-  @param  CallerId      This optional parameter may be used to identify the caller. \r
-                        This parameter allows the status code driver to apply different rules to different callers. \r
+  @param  CallerId      This optional parameter may be used to identify the caller.\r
+                        This parameter allows the status code driver to apply different rules to different callers.\r

   @param  Data          This optional parameter may be used to pass additional data\r
   @param  Data          This optional parameter may be used to pass additional data\r

- \r
+\r

   @retval EFI_SUCCESS   Always return EFI_SUCCESS.\r
 \r
 **/\r
   @retval EFI_SUCCESS   Always return EFI_SUCCESS.\r
 \r
 **/\r

diff --git a/MdeModulePkg/Library/OemHookStatusCodeLibNull/OemHookStatusCodeLibNull.inf b/MdeModulePkg/Library/OemHookStatusCodeLibNull/OemHookStatusCodeLibNull.inf
index 32ed1a41bf7432916e8ab424c5b6ae1f336b47fa..34555761a020ca4c87f80333f0787ac4e5c1ac3b 100644 (file)
--- a/MdeModulePkg/Library/OemHookStatusCodeLibNull/OemHookStatusCodeLibNull.inf
+++ b/MdeModulePkg/Library/OemHookStatusCodeLibNull/OemHookStatusCodeLibNull.inf
@@ -1,7 +1,7 @@
 ## @file\r
 #  Null instance of OEM Hook Status Code Library with empty functions.\r
 #\r
 ## @file\r
 #  Null instance of OEM Hook Status Code Library with empty functions.\r
 #\r

-#  Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.<BR>\r
+#  Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r

 #\r
 #  This program and the accompanying materials\r
 #  are licensed and made available under the terms and conditions of the BSD License\r
 #\r
 #  This program and the accompanying materials\r
 #  are licensed and made available under the terms and conditions of the BSD License\r


@@ -20,7 +20,7 @@
   FILE_GUID                      = 54D2878F-25CD-4a2b-8420-EBD18E609C76\r
   MODULE_TYPE                    = DXE_DRIVER\r
   VERSION_STRING                 = 1.0\r
   FILE_GUID                      = 54D2878F-25CD-4a2b-8420-EBD18E609C76\r
   MODULE_TYPE                    = DXE_DRIVER\r
   VERSION_STRING                 = 1.0\r

-  LIBRARY_CLASS                  = OemHookStatusCodeLib \r
+  LIBRARY_CLASS                  = OemHookStatusCodeLib\r

 \r
 #\r
 # The following information is for reference only and not required by the build tools.\r
 \r
 #\r
 # The following information is for reference only and not required by the build tools.\r


@@ -32,4 +32,4 @@
   OemHookStatusCodeLibNull.c\r
 \r
 [Packages]\r
   OemHookStatusCodeLibNull.c\r
 \r
 [Packages]\r

-  MdePkg/MdePkg.dec
\ No newline at end of file
+  MdePkg/MdePkg.dec\r

diff --git a/MdeModulePkg/Library/PeiCrc32GuidedSectionExtractLib/PeiCrc32GuidedSectionExtractLib.c b/MdeModulePkg/Library/PeiCrc32GuidedSectionExtractLib/PeiCrc32GuidedSectionExtractLib.c
index 34f1e170067c2e52ebd1b3581abeea8fbeee8969..fd71239f408d12a7d828cc04f967200e91f7d5fb 100644 (file)
--- a/MdeModulePkg/Library/PeiCrc32GuidedSectionExtractLib/PeiCrc32GuidedSectionExtractLib.c
+++ b/MdeModulePkg/Library/PeiCrc32GuidedSectionExtractLib/PeiCrc32GuidedSectionExtractLib.c
@@ -1,16 +1,16 @@
 /** @file\r
 \r
 /** @file\r
 \r

-  This library registers CRC32 guided section handler \r
+  This library registers CRC32 guided section handler\r

   to parse CRC32 encapsulation section and extract raw data.\r
 \r
   to parse CRC32 encapsulation section and extract raw data.\r
 \r

-Copyright (c) 2007 - 2017, Intel Corporation. All rights reserved.<BR>\r
-This program and the accompanying materials                          \r
-are licensed and made available under the terms and conditions of the BSD License         \r
-which accompanies this distribution.  The full text of the license may be found at        \r
-http://opensource.org/licenses/bsd-license.php                                            \r
-                                                                                          \r
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     \r
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             \r
+Copyright (c) 2007 - 2018, Intel Corporation. All rights reserved.<BR>\r
+This program and the accompanying materials\r
+are licensed and made available under the terms and conditions of the BSD License\r
+which accompanies this distribution.  The full text of the license may be found at\r
+http://opensource.org/licenses/bsd-license.php\r
+\r
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r

 \r
 **/\r
 \r
 \r
 **/\r
 \r


@@ -37,7 +37,7 @@ typedef struct {
 /**\r
 \r
   GetInfo gets raw data size and attribute of the input guided section.\r
 /**\r
 \r
   GetInfo gets raw data size and attribute of the input guided section.\r

-  It first checks whether the input guid section is supported. \r
+  It first checks whether the input guid section is supported.\r

   If not, EFI_INVALID_PARAMETER will return.\r
 \r
   @param InputSection       Buffer containing the input GUIDed section to be processed.\r
   If not, EFI_INVALID_PARAMETER will return.\r
 \r
   @param InputSection       Buffer containing the input GUIDed section to be processed.\r


@@ -45,7 +45,7 @@ typedef struct {
   @param ScratchBufferSize  The size of ScratchBuffer.\r
   @param SectionAttribute   The attribute of the input guided section.\r
 \r
   @param ScratchBufferSize  The size of ScratchBuffer.\r
   @param SectionAttribute   The attribute of the input guided section.\r
 \r

-  @retval EFI_SUCCESS            The size of destination buffer, the size of scratch buffer and \r
+  @retval EFI_SUCCESS            The size of destination buffer, the size of scratch buffer and\r

                                  the attribute of the input section are successfully retrieved.\r
   @retval EFI_INVALID_PARAMETER  The GUID in InputSection does not match this instance guid.\r
 \r
                                  the attribute of the input section are successfully retrieved.\r
   @retval EFI_INVALID_PARAMETER  The GUID in InputSection does not match this instance guid.\r
 \r


@@ -98,7 +98,7 @@ Crc32GuidedSectionGetInfo (
 \r
   Extraction handler tries to extract raw data from the input guided section.\r
   It also does authentication check for 32bit CRC value in the input guided section.\r
 \r
   Extraction handler tries to extract raw data from the input guided section.\r
   It also does authentication check for 32bit CRC value in the input guided section.\r

-  It first checks whether the input guid section is supported. \r
+  It first checks whether the input guid section is supported.\r

   If not, EFI_INVALID_PARAMETER will return.\r
 \r
   @param InputSection    Buffer containing the input GUIDed section to be processed.\r
   If not, EFI_INVALID_PARAMETER will return.\r
 \r
   @param InputSection    Buffer containing the input GUIDed section to be processed.\r


@@ -133,7 +133,7 @@ Crc32GuidedSectionHandler (
         &(((EFI_GUID_DEFINED_SECTION2 *) InputSection)->SectionDefinitionGuid))) {\r
       return EFI_INVALID_PARAMETER;\r
     }\r
         &(((EFI_GUID_DEFINED_SECTION2 *) InputSection)->SectionDefinitionGuid))) {\r
       return EFI_INVALID_PARAMETER;\r
     }\r

-  \r
+\r

     //\r
     // Get section Crc32 checksum.\r
     //\r
     //\r
     // Get section Crc32 checksum.\r
     //\r


@@ -155,7 +155,7 @@ Crc32GuidedSectionHandler (
         &(((EFI_GUID_DEFINED_SECTION *) InputSection)->SectionDefinitionGuid))) {\r
       return EFI_INVALID_PARAMETER;\r
     }\r
         &(((EFI_GUID_DEFINED_SECTION *) InputSection)->SectionDefinitionGuid))) {\r
       return EFI_INVALID_PARAMETER;\r
     }\r

-  \r
+\r

     //\r
     // Get section Crc32 checksum.\r
     //\r
     //\r
     // Get section Crc32 checksum.\r
     //\r

diff --git a/MdeModulePkg/Library/PeiCrc32GuidedSectionExtractLib/PeiCrc32GuidedSectionExtractLib.inf b/MdeModulePkg/Library/PeiCrc32GuidedSectionExtractLib/PeiCrc32GuidedSectionExtractLib.inf
index 45fd141f01ddd26f04ac0b49e8e58e10cfd2ba94..c1d6f2799221451dd7227ad30ce30b04ce6b9115 100644 (file)
--- a/MdeModulePkg/Library/PeiCrc32GuidedSectionExtractLib/PeiCrc32GuidedSectionExtractLib.inf
+++ b/MdeModulePkg/Library/PeiCrc32GuidedSectionExtractLib/PeiCrc32GuidedSectionExtractLib.inf
@@ -1,11 +1,11 @@
 ## @file\r
 #  Pei Crc32 Guided Section Extract library.\r
 #\r
 ## @file\r
 #  Pei Crc32 Guided Section Extract library.\r
 #\r

-#  This library doesn't produce any library class. The constructor function uses \r
+#  This library doesn't produce any library class. The constructor function uses\r

 #  ExtractGuidedSectionLib service to register CRC32 guided section handler\r
 #  that parses CRC32 encapsulation section and extracts raw data.\r
 #\r
 #  ExtractGuidedSectionLib service to register CRC32 guided section handler\r
 #  that parses CRC32 encapsulation section and extracts raw data.\r
 #\r

-# Copyright (c) 2006 - 2017, Intel Corporation. All rights reserved.<BR>\r
+# Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r

 #\r
 #  This program and the accompanying materials\r
 #  are licensed and made available under the terms and conditions of the BSD License\r
 #\r
 #  This program and the accompanying materials\r
 #  are licensed and made available under the terms and conditions of the BSD License\r

diff --git a/MdeModulePkg/Library/PeiDebugPrintHobLib/PeiDebugPrintHobLib.c b/MdeModulePkg/Library/PeiDebugPrintHobLib/PeiDebugPrintHobLib.c
index 4bcf0030a0cc8e76c09a4c3a55ce19de71cb9798..6314842dd03508f20c57b3bca307663c239a809a 100644 (file)
--- a/MdeModulePkg/Library/PeiDebugPrintHobLib/PeiDebugPrintHobLib.c
+++ b/MdeModulePkg/Library/PeiDebugPrintHobLib/PeiDebugPrintHobLib.c
@@ -25,7 +25,7 @@
 \r
 /**\r
   The constructor reads variable and sets HOB\r
 \r
 /**\r
   The constructor reads variable and sets HOB\r

-  \r
+\r

   @param  FileHandle   The handle of FFS header the loaded driver.\r
   @param  PeiServices  The pointer to the PEI services.\r
 \r
   @param  FileHandle   The handle of FFS header the loaded driver.\r
   @param  PeiServices  The pointer to the PEI services.\r
 \r


@@ -44,7 +44,7 @@ PeiDebugPrintHobLibConstructor (
   UINTN                           Size;\r
   UINT64                          GlobalErrorLevel;\r
   UINT32                          HobErrorLevel;\r
   UINTN                           Size;\r
   UINT64                          GlobalErrorLevel;\r
   UINT32                          HobErrorLevel;\r

-  \r
+\r

   Status = PeiServicesLocatePpi (\r
              &gEfiPeiReadOnlyVariable2PpiGuid,\r
              0,\r
   Status = PeiServicesLocatePpi (\r
              &gEfiPeiReadOnlyVariable2PpiGuid,\r
              0,\r


@@ -53,8 +53,8 @@ PeiDebugPrintHobLibConstructor (
              );\r
   if (!EFI_ERROR (Status)) {\r
     Size = sizeof (GlobalErrorLevel);\r
              );\r
   if (!EFI_ERROR (Status)) {\r
     Size = sizeof (GlobalErrorLevel);\r

-    Status = Variable->GetVariable ( \r
-                         Variable, \r
+    Status = Variable->GetVariable (\r
+                         Variable,\r

                          DEBUG_MASK_VARIABLE_NAME,\r
                          &gEfiGenericVariableGuid,\r
                          NULL,\r
                          DEBUG_MASK_VARIABLE_NAME,\r
                          &gEfiGenericVariableGuid,\r
                          NULL,\r

diff --git a/MdeModulePkg/Library/PeiDebugPrintHobLib/PeiDebugPrintHobLib.inf b/MdeModulePkg/Library/PeiDebugPrintHobLib/PeiDebugPrintHobLib.inf
index 0380dee01fbd404ae49e81f2e0af4fd1b4e0f78c..aeed739f265deac740bed898026ab40fbfe4409d 100644 (file)
--- a/MdeModulePkg/Library/PeiDebugPrintHobLib/PeiDebugPrintHobLib.inf
+++ b/MdeModulePkg/Library/PeiDebugPrintHobLib/PeiDebugPrintHobLib.inf
@@ -3,7 +3,7 @@
 #  HOB that contains the debug mask.\r
 #\r
 #  Copyright (c) 2011, Apple, Inc. All rights reserved.<BR>\r
 #  HOB that contains the debug mask.\r
 #\r
 #  Copyright (c) 2011, Apple, Inc. All rights reserved.<BR>\r

-#  Copyright (c) 2012 - 2014, Intel Corporation. All rights reserved.<BR>\r
+#  Copyright (c) 2012 - 2018, Intel Corporation. All rights reserved.<BR>\r

 #\r
 #  This program and the accompanying materials\r
 #  are licensed and made available under the terms and conditions of the BSD License\r
 #\r
 #  This program and the accompanying materials\r
 #  are licensed and made available under the terms and conditions of the BSD License\r


@@ -47,4 +47,4 @@
   gEfiGenericVariableGuid\r
 \r
 [Depex]\r
   gEfiGenericVariableGuid\r
 \r
 [Depex]\r

-  gEfiPeiReadOnlyVariable2PpiGuid
\ No newline at end of file
+  gEfiPeiReadOnlyVariable2PpiGuid\r

diff --git a/MdeModulePkg/Library/PeiDxeDebugLibReportStatusCode/DebugLib.c b/MdeModulePkg/Library/PeiDxeDebugLibReportStatusCode/DebugLib.c
index 96c9b30987298cabdf48025266cee63c54ab0b8d..6f0f41627384cfdbf5e527444b998aeeaa9f7746 100644 (file)
--- a/MdeModulePkg/Library/PeiDxeDebugLibReportStatusCode/DebugLib.c
+++ b/MdeModulePkg/Library/PeiDxeDebugLibReportStatusCode/DebugLib.c
@@ -30,8 +30,8 @@
 /**\r
   Prints a debug message to the debug output device if the specified error level is enabled.\r
 \r
 /**\r
   Prints a debug message to the debug output device if the specified error level is enabled.\r
 \r

-  If any bit in ErrorLevel is also set in DebugPrintErrorLevelLib function \r
-  GetDebugPrintErrorLevel (), then print the message specified by Format and the \r
+  If any bit in ErrorLevel is also set in DebugPrintErrorLevelLib function\r
+  GetDebugPrintErrorLevel (), then print the message specified by Format and the\r

   associated variable argument list to the debug output device.\r
 \r
   If Format is NULL, then ASSERT().\r
   associated variable argument list to the debug output device.\r
 \r
   If Format is NULL, then ASSERT().\r


@@ -41,7 +41,7 @@
 \r
   @param  ErrorLevel  The error level of the debug message.\r
   @param  Format      Format string for the debug message to print.\r
 \r
   @param  ErrorLevel  The error level of the debug message.\r
   @param  Format      Format string for the debug message to print.\r

-  @param  ...         Variable argument list whose contents are accessed \r
+  @param  ...         Variable argument list whose contents are accessed\r

                       based on the format string specified by Format.\r
 \r
 **/\r
                       based on the format string specified by Format.\r
 \r
 **/\r


@@ -75,7 +75,7 @@ DebugPrint (
 \r
   //\r
   // Compute the total size of the record.\r
 \r
   //\r
   // Compute the total size of the record.\r

-  // Note that the passing-in format string and variable parameters will be constructed to \r
+  // Note that the passing-in format string and variable parameters will be constructed to\r

   // the following layout:\r
   //\r
   //         Buffer->|------------------------|\r
   // the following layout:\r
   //\r
   //         Buffer->|------------------------|\r


@@ -173,7 +173,7 @@ DebugPrint (
       if (*Format == '\0') {\r
         //\r
         // Make no output if Format string terminates unexpectedly when\r
       if (*Format == '\0') {\r
         //\r
         // Make no output if Format string terminates unexpectedly when\r

-        // looking up for flag, width, precision and type. \r
+        // looking up for flag, width, precision and type.\r

         //\r
         Format--;\r
       }\r
         //\r
         Format--;\r
       }\r


@@ -183,7 +183,7 @@ DebugPrint (
       //\r
       break;\r
     }\r
       //\r
       break;\r
     }\r

-    \r
+\r

     //\r
     // Pack variable arguments into the storage area following EFI_DEBUG_INFO.\r
     //\r
     //\r
     // Pack variable arguments into the storage area following EFI_DEBUG_INFO.\r
     //\r


@@ -206,7 +206,7 @@ DebugPrint (
 \r
     //\r
     // If the converted BASE_LIST is larger than the 12 * sizeof (UINT64) allocated bytes, then ASSERT()\r
 \r
     //\r
     // If the converted BASE_LIST is larger than the 12 * sizeof (UINT64) allocated bytes, then ASSERT()\r

-    // This indicates that the DEBUG() macro is passing in more argument than can be handled by \r
+    // This indicates that the DEBUG() macro is passing in more argument than can be handled by\r

     // the EFI_DEBUG_INFO record\r
     //\r
     ASSERT ((CHAR8 *)BaseListMarker <= FormatString);\r
     // the EFI_DEBUG_INFO record\r
     //\r
     ASSERT ((CHAR8 *)BaseListMarker <= FormatString);\r


@@ -236,14 +236,14 @@ DebugPrint (
 }\r
 \r
 /**\r
 }\r
 \r
 /**\r

-  Prints an assert message containing a filename, line number, and description.  \r
+  Prints an assert message containing a filename, line number, and description.\r

   This may be followed by a breakpoint or a dead loop.\r
 \r
   Print a message of the form "ASSERT <FileName>(<LineNumber>): <Description>\n"\r
   This may be followed by a breakpoint or a dead loop.\r
 \r
   Print a message of the form "ASSERT <FileName>(<LineNumber>): <Description>\n"\r

-  to the debug output device.  If DEBUG_PROPERTY_ASSERT_BREAKPOINT_ENABLED bit of \r
-  PcdDebugProperyMask is set then CpuBreakpoint() is called. Otherwise, if \r
-  DEBUG_PROPERTY_ASSERT_DEADLOOP_ENABLED bit of PcdDebugProperyMask is set then \r
-  CpuDeadLoop() is called.  If neither of these bits are set, then this function \r
+  to the debug output device.  If DEBUG_PROPERTY_ASSERT_BREAKPOINT_ENABLED bit of\r
+  PcdDebugProperyMask is set then CpuBreakpoint() is called. Otherwise, if\r
+  DEBUG_PROPERTY_ASSERT_DEADLOOP_ENABLED bit of PcdDebugProperyMask is set then\r
+  CpuDeadLoop() is called.  If neither of these bits are set, then this function\r

   returns immediately after the message is printed to the debug output device.\r
   DebugAssert() must actively prevent recursion.  If DebugAssert() is called while\r
   processing another DebugAssert(), then DebugAssert() must return immediately.\r
   returns immediately after the message is printed to the debug output device.\r
   DebugAssert() must actively prevent recursion.  If DebugAssert() is called while\r
   processing another DebugAssert(), then DebugAssert() must return immediately.\r


@@ -367,14 +367,14 @@ DebugAssert (
 /**\r
   Fills a target buffer with PcdDebugClearMemoryValue, and returns the target buffer.\r
 \r
 /**\r
   Fills a target buffer with PcdDebugClearMemoryValue, and returns the target buffer.\r
 \r

-  This function fills Length bytes of Buffer with the value specified by \r
+  This function fills Length bytes of Buffer with the value specified by\r

   PcdDebugClearMemoryValue, and returns Buffer.\r
 \r
   If Buffer is NULL, then ASSERT().\r
   PcdDebugClearMemoryValue, and returns Buffer.\r
 \r
   If Buffer is NULL, then ASSERT().\r

-  If Length is greater than (MAX_ADDRESS - Buffer + 1), then ASSERT(). \r
+  If Length is greater than (MAX_ADDRESS - Buffer + 1), then ASSERT().\r

 \r
   @param   Buffer  Pointer to the target buffer to be filled with PcdDebugClearMemoryValue.\r
 \r
   @param   Buffer  Pointer to the target buffer to be filled with PcdDebugClearMemoryValue.\r

-  @param   Length  Number of bytes in Buffer to fill with zeros PcdDebugClearMemoryValue. \r
+  @param   Length  Number of bytes in Buffer to fill with zeros PcdDebugClearMemoryValue.\r

 \r
   @return  Buffer  Pointer to the target buffer filled with PcdDebugClearMemoryValue.\r
 \r
 \r
   @return  Buffer  Pointer to the target buffer filled with PcdDebugClearMemoryValue.\r
 \r


@@ -395,7 +395,7 @@ DebugClearMemory (
 /**\r
   Returns TRUE if ASSERT() macros are enabled.\r
 \r
 /**\r
   Returns TRUE if ASSERT() macros are enabled.\r
 \r

-  This function returns TRUE if the DEBUG_PROPERTY_DEBUG_ASSERT_ENABLED bit of \r
+  This function returns TRUE if the DEBUG_PROPERTY_DEBUG_ASSERT_ENABLED bit of\r

   PcdDebugProperyMask is set.  Otherwise FALSE is returned.\r
 \r
   @retval  TRUE    The DEBUG_PROPERTY_DEBUG_ASSERT_ENABLED bit of PcdDebugProperyMask is set.\r
   PcdDebugProperyMask is set.  Otherwise FALSE is returned.\r
 \r
   @retval  TRUE    The DEBUG_PROPERTY_DEBUG_ASSERT_ENABLED bit of PcdDebugProperyMask is set.\r


@@ -412,10 +412,10 @@ DebugAssertEnabled (
 }\r
 \r
 \r
 }\r
 \r
 \r

-/**  \r
+/**\r

   Returns TRUE if DEBUG() macros are enabled.\r
 \r
   Returns TRUE if DEBUG() macros are enabled.\r
 \r

-  This function returns TRUE if the DEBUG_PROPERTY_DEBUG_PRINT_ENABLED bit of \r
+  This function returns TRUE if the DEBUG_PROPERTY_DEBUG_PRINT_ENABLED bit of\r

   PcdDebugProperyMask is set.  Otherwise FALSE is returned.\r
 \r
   @retval  TRUE    The DEBUG_PROPERTY_DEBUG_PRINT_ENABLED bit of PcdDebugProperyMask is set.\r
   PcdDebugProperyMask is set.  Otherwise FALSE is returned.\r
 \r
   @retval  TRUE    The DEBUG_PROPERTY_DEBUG_PRINT_ENABLED bit of PcdDebugProperyMask is set.\r


@@ -432,10 +432,10 @@ DebugPrintEnabled (
 }\r
 \r
 \r
 }\r
 \r
 \r

-/**  \r
+/**\r

   Returns TRUE if DEBUG_CODE() macros are enabled.\r
 \r
   Returns TRUE if DEBUG_CODE() macros are enabled.\r
 \r

-  This function returns TRUE if the DEBUG_PROPERTY_DEBUG_CODE_ENABLED bit of \r
+  This function returns TRUE if the DEBUG_PROPERTY_DEBUG_CODE_ENABLED bit of\r

   PcdDebugProperyMask is set.  Otherwise FALSE is returned.\r
 \r
   @retval  TRUE    The DEBUG_PROPERTY_DEBUG_CODE_ENABLED bit of PcdDebugProperyMask is set.\r
   PcdDebugProperyMask is set.  Otherwise FALSE is returned.\r
 \r
   @retval  TRUE    The DEBUG_PROPERTY_DEBUG_CODE_ENABLED bit of PcdDebugProperyMask is set.\r


@@ -452,10 +452,10 @@ DebugCodeEnabled (
 }\r
 \r
 \r
 }\r
 \r
 \r

-/**  \r
+/**\r

   Returns TRUE if DEBUG_CLEAR_MEMORY() macro is enabled.\r
 \r
   Returns TRUE if DEBUG_CLEAR_MEMORY() macro is enabled.\r
 \r

-  This function returns TRUE if the DEBUG_PROPERTY_CLEAR_MEMORY_ENABLED bit of \r
+  This function returns TRUE if the DEBUG_PROPERTY_CLEAR_MEMORY_ENABLED bit of\r

   PcdDebugProperyMask is set.  Otherwise FALSE is returned.\r
 \r
   @retval  TRUE    The DEBUG_PROPERTY_CLEAR_MEMORY_ENABLED bit of PcdDebugProperyMask is set.\r
   PcdDebugProperyMask is set.  Otherwise FALSE is returned.\r
 \r
   @retval  TRUE    The DEBUG_PROPERTY_CLEAR_MEMORY_ENABLED bit of PcdDebugProperyMask is set.\r

diff --git a/MdeModulePkg/Library/PeiDxeDebugLibReportStatusCode/PeiDxeDebugLibReportStatusCode.inf b/MdeModulePkg/Library/PeiDxeDebugLibReportStatusCode/PeiDxeDebugLibReportStatusCode.inf
index 55446672d752a846a4c4379a7df63bed5963f446..12a063f5b84b3d3c5c38b22756b928218df51b8c 100644 (file)
--- a/MdeModulePkg/Library/PeiDxeDebugLibReportStatusCode/PeiDxeDebugLibReportStatusCode.inf
+++ b/MdeModulePkg/Library/PeiDxeDebugLibReportStatusCode/PeiDxeDebugLibReportStatusCode.inf
@@ -2,7 +2,7 @@
 #  Debug Library based on report status code library\r
 #\r
 #  Debug Library for PEIMs and DXE drivers that sends debug messages to ReportStatusCode\r
 #  Debug Library based on report status code library\r
 #\r
 #  Debug Library for PEIMs and DXE drivers that sends debug messages to ReportStatusCode\r

-#  Copyright (c) 2006 - 2015, Intel Corporation. All rights reserved.<BR>\r
+#  Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r

 #\r
 #  This program and the accompanying materials\r
 #  are licensed and made available under the terms and conditions of the BSD License\r
 #\r
 #  This program and the accompanying materials\r
 #  are licensed and made available under the terms and conditions of the BSD License\r


@@ -36,7 +36,7 @@
 [Packages]\r
   MdePkg/MdePkg.dec\r
   MdeModulePkg/MdeModulePkg.dec\r
 [Packages]\r
   MdePkg/MdePkg.dec\r
   MdeModulePkg/MdeModulePkg.dec\r

-  \r
+\r

 [LibraryClasses]\r
   PcdLib\r
   ReportStatusCodeLib\r
 [LibraryClasses]\r
   PcdLib\r
   ReportStatusCodeLib\r

diff --git a/MdeModulePkg/Library/PeiPerformanceLib/PeiPerformanceLib.c b/MdeModulePkg/Library/PeiPerformanceLib/PeiPerformanceLib.c
index cd1b0e34ef7e0d2b0e740dfa61276e14e33585b1..8a65a2a74726389b72ff799bfd4008e0d78b940d 100644 (file)
--- a/MdeModulePkg/Library/PeiPerformanceLib/PeiPerformanceLib.c
+++ b/MdeModulePkg/Library/PeiPerformanceLib/PeiPerformanceLib.c
@@ -4,7 +4,7 @@
   This file implements all APIs in Performance Library class in MdePkg. It creates\r
   performance logging GUIDed HOB on the first performance logging and then logs the\r
   performance data to the GUIDed HOB. Due to the limitation of temporary RAM, the maximum\r
   This file implements all APIs in Performance Library class in MdePkg. It creates\r
   performance logging GUIDed HOB on the first performance logging and then logs the\r
   performance data to the GUIDed HOB. Due to the limitation of temporary RAM, the maximum\r

-  number of performance logging entry is specified by PcdMaxPeiPerformanceLogEntries or \r
+  number of performance logging entry is specified by PcdMaxPeiPerformanceLogEntries or\r

   PcdMaxPeiPerformanceLogEntries16.\r
 \r
 Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r
   PcdMaxPeiPerformanceLogEntries16.\r
 \r
 Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r

diff --git a/MdeModulePkg/Library/PeiPerformanceLib/PeiPerformanceLib.inf b/MdeModulePkg/Library/PeiPerformanceLib/PeiPerformanceLib.inf
index ce49db1c8d2fc4b0ea1abc7087fa1e3ca41633c4..cad3a120a20bf893876aae3418ae4d514eb116f7 100644 (file)
--- a/MdeModulePkg/Library/PeiPerformanceLib/PeiPerformanceLib.inf
+++ b/MdeModulePkg/Library/PeiPerformanceLib/PeiPerformanceLib.inf
@@ -1,20 +1,20 @@
-## @file \r
+## @file\r

 #  Performance library instance used in PEI phase.\r
 #  Performance library instance used in PEI phase.\r

-#  \r
+#\r

 #  This library provides the performance measurement interfaces in PEI phase, it creates\r
 #  and consumes GUIDed HOB for performance logging. The GUIDed HOB is passed to DXE phase\r
 #  This library provides the performance measurement interfaces in PEI phase, it creates\r
 #  and consumes GUIDed HOB for performance logging. The GUIDed HOB is passed to DXE phase\r

-#  so that it can be taken over by DxeCorePerformanceLib.  \r
-#  \r
+#  so that it can be taken over by DxeCorePerformanceLib.\r
+#\r

 #  Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r
 # (C) Copyright 2016 Hewlett Packard Enterprise Development LP<BR>\r
 #  This program and the accompanying materials\r
 #  are licensed and made available under the terms and conditions of the BSD License\r
 #  which accompanies this distribution.  The full text of the license may be found at\r
 #  http://opensource.org/licenses/bsd-license.php\r
 #  Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r
 # (C) Copyright 2016 Hewlett Packard Enterprise Development LP<BR>\r
 #  This program and the accompanying materials\r
 #  are licensed and made available under the terms and conditions of the BSD License\r
 #  which accompanies this distribution.  The full text of the license may be found at\r
 #  http://opensource.org/licenses/bsd-license.php\r

-#  \r
+#\r

 #  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 #  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 #  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 #  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r

-#  \r
+#\r

 ##\r
 \r
 [Defines]\r
 ##\r
 \r
 [Defines]\r

diff --git a/MdeModulePkg/Library/PeiPerformanceLib/PeiPerformanceLib.uni b/MdeModulePkg/Library/PeiPerformanceLib/PeiPerformanceLib.uni
index 79a50d3505e6142664eaa00d2e482fba0a224da2..243c2e53ef88a9ba1bd7dee18d4071d4206a8173 100644 (file)
--- a/MdeModulePkg/Library/PeiPerformanceLib/PeiPerformanceLib.uni
+++ b/MdeModulePkg/Library/PeiPerformanceLib/PeiPerformanceLib.uni
@@ -5,13 +5,13 @@
 // and consumes GUIDed HOB for performance logging. The GUIDed HOB is passed to DXE phase\r
 // so that it can be taken over by DxeCorePerformanceLib.\r
 //\r
 // and consumes GUIDed HOB for performance logging. The GUIDed HOB is passed to DXE phase\r
 // so that it can be taken over by DxeCorePerformanceLib.\r
 //\r

-// Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.<BR>\r
+// Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r

 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r
 // which accompanies this distribution.  The full text of the license may be found at\r
 // http://opensource.org/licenses/bsd-license.php\r
 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r
 // which accompanies this distribution.  The full text of the license may be found at\r
 // http://opensource.org/licenses/bsd-license.php\r

-// \r
+//\r

 // THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 // WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 //\r
 // THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 // WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 //\r

diff --git a/MdeModulePkg/Library/PeiRecoveryLibNull/PeiRecoveryLibNull.c b/MdeModulePkg/Library/PeiRecoveryLibNull/PeiRecoveryLibNull.c
index d77c6e544bb9000a57d15532b684a8eba8dc1a78..f39a21b711673d7d042d58061111c433e894b12d 100644 (file)
--- a/MdeModulePkg/Library/PeiRecoveryLibNull/PeiRecoveryLibNull.c
+++ b/MdeModulePkg/Library/PeiRecoveryLibNull/PeiRecoveryLibNull.c
@@ -3,9 +3,9 @@
 \r
   This library instance is no longer used and module using this library\r
   class should update to directly locate EFI_PEI_RECOVERY_MODULE_PPI defined\r
 \r
   This library instance is no longer used and module using this library\r
   class should update to directly locate EFI_PEI_RECOVERY_MODULE_PPI defined\r

-  in PI 1.2 specification. \r
+  in PI 1.2 specification.\r

 \r
 \r

-Copyright (c) 2006 - 2008, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r

 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r


@@ -20,7 +20,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 \r
 /**\r
   Calling this function causes the system do recovery boot path.\r
 \r
 /**\r
   Calling this function causes the system do recovery boot path.\r

-  \r
+\r

   @retval EFI_UNSUPPORTED       Recovery is not supported.\r
 **/\r
 EFI_STATUS\r
   @retval EFI_UNSUPPORTED       Recovery is not supported.\r
 **/\r
 EFI_STATUS\r

diff --git a/MdeModulePkg/Library/PeiRecoveryLibNull/PeiRecoveryLibNull.inf b/MdeModulePkg/Library/PeiRecoveryLibNull/PeiRecoveryLibNull.inf
index 6c565acc4043bd0de3ec161d57111e0377749efc..70c9a884911ebfe218748e706f3f464d27013b1b 100644 (file)
--- a/MdeModulePkg/Library/PeiRecoveryLibNull/PeiRecoveryLibNull.inf
+++ b/MdeModulePkg/Library/PeiRecoveryLibNull/PeiRecoveryLibNull.inf
@@ -1,18 +1,18 @@
-## @file \r
+## @file\r

 #  Null Recovery library instance for PEIM module\r
 #  This library instance is no longer used and module using this library\r
 #  class should update to directly locate EFI_PEI_RECOVERY_MODULE_PPI defined\r
 #  Null Recovery library instance for PEIM module\r
 #  This library instance is no longer used and module using this library\r
 #  class should update to directly locate EFI_PEI_RECOVERY_MODULE_PPI defined\r

-#  in PI 1.2 specification. \r
-#  \r
-#  Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.<BR>\r
+#  in PI 1.2 specification.\r
+#\r
+#  Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r

 #  This program and the accompanying materials\r
 #  are licensed and made available under the terms and conditions of the BSD License\r
 #  which accompanies this distribution.  The full text of the license may be found at\r
 #  http://opensource.org/licenses/bsd-license.php\r
 #  This program and the accompanying materials\r
 #  are licensed and made available under the terms and conditions of the BSD License\r
 #  which accompanies this distribution.  The full text of the license may be found at\r
 #  http://opensource.org/licenses/bsd-license.php\r

-#  \r
+#\r

 #  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 #  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 #  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 #  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r

-#  \r
+#\r

 ##\r
 \r
 [Defines]\r
 ##\r
 \r
 [Defines]\r

diff --git a/MdeModulePkg/Library/PeiRecoveryLibNull/PeiRecoveryLibNull.uni b/MdeModulePkg/Library/PeiRecoveryLibNull/PeiRecoveryLibNull.uni
index f02af2f624ed08ae098efebe58d5fb197a7c4a03..14385297f42c90e610314e83c2ba1fd8931a4dd8 100644 (file)
--- a/MdeModulePkg/Library/PeiRecoveryLibNull/PeiRecoveryLibNull.uni
+++ b/MdeModulePkg/Library/PeiRecoveryLibNull/PeiRecoveryLibNull.uni
@@ -5,13 +5,13 @@
 // class should update to directly locate EFI_PEI_RECOVERY_MODULE_PPI defined\r
 // in PI 1.2 specification.\r
 //\r
 // class should update to directly locate EFI_PEI_RECOVERY_MODULE_PPI defined\r
 // in PI 1.2 specification.\r
 //\r

-// Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.<BR>\r
+// Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r

 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r
 // which accompanies this distribution.  The full text of the license may be found at\r
 // http://opensource.org/licenses/bsd-license.php\r
 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r
 // which accompanies this distribution.  The full text of the license may be found at\r
 // http://opensource.org/licenses/bsd-license.php\r

-// \r
+//\r

 // THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 // WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 //\r
 // THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 // WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 //\r

diff --git a/MdeModulePkg/Library/PeiReportStatusCodeLib/PeiReportStatusCodeLib.inf b/MdeModulePkg/Library/PeiReportStatusCodeLib/PeiReportStatusCodeLib.inf
index f66ce80cd5fdc2559a1d1563bd566313c8f8bd03..5b1df7e2bbea991b4d3512e6d30061df9dfe1adc 100644 (file)
--- a/MdeModulePkg/Library/PeiReportStatusCodeLib/PeiReportStatusCodeLib.inf
+++ b/MdeModulePkg/Library/PeiReportStatusCodeLib/PeiReportStatusCodeLib.inf
@@ -5,7 +5,7 @@
 #  code via PEI Status Code Service. If the service is not available, it then tries calling\r
 #  OEM Hook Status Code Library.\r
 #\r
 #  code via PEI Status Code Service. If the service is not available, it then tries calling\r
 #  OEM Hook Status Code Library.\r
 #\r

-#  Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.<BR>\r
+#  Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r

 #\r
 #  This program and the accompanying materials\r
 #  are licensed and made available under the terms and conditions of the BSD License\r
 #\r
 #  This program and the accompanying materials\r
 #  are licensed and made available under the terms and conditions of the BSD License\r


@@ -25,7 +25,7 @@
   MODULE_TYPE                    = PEIM\r
   VERSION_STRING                 = 1.0\r
   LIBRARY_CLASS                  = ReportStatusCodeLib|SEC PEIM PEI_CORE\r
   MODULE_TYPE                    = PEIM\r
   VERSION_STRING                 = 1.0\r
   LIBRARY_CLASS                  = ReportStatusCodeLib|SEC PEIM PEI_CORE\r

-  \r
+\r

 #\r
 # The following information is for reference only and not required by the build tools.\r
 #\r
 #\r
 # The following information is for reference only and not required by the build tools.\r
 #\r

diff --git a/MdeModulePkg/Library/PeiResetSystemLib/PeiResetSystemLib.c b/MdeModulePkg/Library/PeiResetSystemLib/PeiResetSystemLib.c
index 30225d73a5728e9bf1ea4bdbe652e5283ad297b1..d8219775d1f798c9c368ad1ef8f4e2d2da2042c2 100644 (file)
--- a/MdeModulePkg/Library/PeiResetSystemLib/PeiResetSystemLib.c
+++ b/MdeModulePkg/Library/PeiResetSystemLib/PeiResetSystemLib.c
@@ -18,11 +18,11 @@
 \r
 /**\r
   This function causes a system-wide reset (cold reset), in which\r
 \r
 /**\r
   This function causes a system-wide reset (cold reset), in which\r

-  all circuitry within the system returns to its initial state. This type of reset \r
+  all circuitry within the system returns to its initial state. This type of reset\r

   is asynchronous to system operation and operates without regard to\r
   cycle boundaries.\r
 \r
   is asynchronous to system operation and operates without regard to\r
   cycle boundaries.\r
 \r

-  If this function returns, it means that the system does not support cold reset. \r
+  If this function returns, it means that the system does not support cold reset.\r

 **/\r
 VOID\r
 EFIAPI\r
 **/\r
 VOID\r
 EFIAPI\r


@@ -34,7 +34,7 @@ ResetCold (
 }\r
 \r
 /**\r
 }\r
 \r
 /**\r

-  This function causes a system-wide initialization (warm reset), in which all processors \r
+  This function causes a system-wide initialization (warm reset), in which all processors\r

   are set to their initial state. Pending cycles are not corrupted.\r
 \r
   If this function returns, it means that the system does not support warm reset.\r
   are set to their initial state. Pending cycles are not corrupted.\r
 \r
   If this function returns, it means that the system does not support warm reset.\r


@@ -49,7 +49,7 @@ ResetWarm (
 }\r
 \r
 /**\r
 }\r
 \r
 /**\r

-  This function causes the system to enter a power state equivalent \r
+  This function causes the system to enter a power state equivalent\r

   to the ACPI G2/S5 or G3 states.\r
 \r
   If this function returns, it means that the system does not support shut down reset.\r
   to the ACPI G2/S5 or G3 states.\r
 \r
   If this function returns, it means that the system does not support shut down reset.\r

diff --git a/MdeModulePkg/Library/PeiS3LibNull/PeiS3LibNull.c b/MdeModulePkg/Library/PeiS3LibNull/PeiS3LibNull.c
index 82882b870651bfc798b39337240378f2cddccebd..d0b53917f933c1e4d2450b3f6272089c4ae1abd1 100644 (file)
--- a/MdeModulePkg/Library/PeiS3LibNull/PeiS3LibNull.c
+++ b/MdeModulePkg/Library/PeiS3LibNull/PeiS3LibNull.c
@@ -3,9 +3,9 @@
 \r
   This library instance is no longer used and module using this library\r
   class should update to directly locate EFI_PEI_S3_RESUME_PPI defined\r
 \r
   This library instance is no longer used and module using this library\r
   class should update to directly locate EFI_PEI_S3_RESUME_PPI defined\r

-  in PI 1.2 specification. \r
+  in PI 1.2 specification.\r

 \r
 \r

-Copyright (c) 2006 - 2008, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r

 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r


@@ -20,7 +20,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 \r
 /**\r
   This function is responsible for calling the S3 resume vector in the ACPI Tables.\r
 \r
 /**\r
   This function is responsible for calling the S3 resume vector in the ACPI Tables.\r

-  \r
+\r

   @retval EFI_SUCESS   Success to restore config from S3.\r
   @retval Others       Fail to restore config from S3.\r
 **/\r
   @retval EFI_SUCESS   Success to restore config from S3.\r
   @retval Others       Fail to restore config from S3.\r
 **/\r

diff --git a/MdeModulePkg/Library/PeiS3LibNull/PeiS3LibNull.inf b/MdeModulePkg/Library/PeiS3LibNull/PeiS3LibNull.inf
index f582054870c9500f609278821831925dff279e73..f408d7f5283493174b39e4967f2117f2e33374cc 100644 (file)
--- a/MdeModulePkg/Library/PeiS3LibNull/PeiS3LibNull.inf
+++ b/MdeModulePkg/Library/PeiS3LibNull/PeiS3LibNull.inf
@@ -2,15 +2,15 @@
 #  Null S3 library instance for PEIM module.\r
 #  This library instance is no longer used and module using this library\r
 #  class should update to directly locate EFI_PEI_S3_RESUME_PPI defined\r
 #  Null S3 library instance for PEIM module.\r
 #  This library instance is no longer used and module using this library\r
 #  class should update to directly locate EFI_PEI_S3_RESUME_PPI defined\r

-#  in PI 1.2 specification. \r
-#  \r
-#  Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.<BR>\r
+#  in PI 1.2 specification.\r
+#\r
+#  Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r

 #\r
 #  This program and the accompanying materials\r
 #  are licensed and made available under the terms and conditions of the BSD License\r
 #  which accompanies this distribution.  The full text of the license may be found at\r
 #  http://opensource.org/licenses/bsd-license.php\r
 #\r
 #  This program and the accompanying materials\r
 #  are licensed and made available under the terms and conditions of the BSD License\r
 #  which accompanies this distribution.  The full text of the license may be found at\r
 #  http://opensource.org/licenses/bsd-license.php\r

-#  \r
+#\r

 #  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 #  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 #\r
 #  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 #  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 #\r

diff --git a/MdeModulePkg/Library/PeiS3LibNull/PeiS3LibNull.uni b/MdeModulePkg/Library/PeiS3LibNull/PeiS3LibNull.uni
index 0814fa72492cda32e2b541f8fe9ca448d36ad5dc..5a8a91a12e83d2f177bbd9764f548d832c53499a 100644 (file)
--- a/MdeModulePkg/Library/PeiS3LibNull/PeiS3LibNull.uni
+++ b/MdeModulePkg/Library/PeiS3LibNull/PeiS3LibNull.uni
@@ -5,13 +5,13 @@
 // class should update to directly locate EFI_PEI_S3_RESUME_PPI defined\r
 // in PI 1.2 specification.\r
 //\r
 // class should update to directly locate EFI_PEI_S3_RESUME_PPI defined\r
 // in PI 1.2 specification.\r
 //\r

-// Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.<BR>\r
+// Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r

 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r
 // which accompanies this distribution.  The full text of the license may be found at\r
 // http://opensource.org/licenses/bsd-license.php\r
 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r
 // which accompanies this distribution.  The full text of the license may be found at\r
 // http://opensource.org/licenses/bsd-license.php\r

-// \r
+//\r

 // THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 // WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 //\r
 // THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 // WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 //\r

diff --git a/MdeModulePkg/Library/PiSmmCoreMemoryAllocationLib/MemoryAllocationLib.c b/MdeModulePkg/Library/PiSmmCoreMemoryAllocationLib/MemoryAllocationLib.c
index 4216a12d18f557bcb2edb3169b88f1520d63ac53..895fa2062a8a37303149bac940fdb8ab8a21d955 100644 (file)
--- a/MdeModulePkg/Library/PiSmmCoreMemoryAllocationLib/MemoryAllocationLib.c
+++ b/MdeModulePkg/Library/PiSmmCoreMemoryAllocationLib/MemoryAllocationLib.c
@@ -1,24 +1,24 @@
 /** @file\r
   Support routines for memory allocation routines based on SMM Core internal functions,\r
   with memory profile support.\r
 /** @file\r
   Support routines for memory allocation routines based on SMM Core internal functions,\r
   with memory profile support.\r

-  \r
+\r

   The PI System Management Mode Core Interface Specification only allows the use\r
   The PI System Management Mode Core Interface Specification only allows the use\r

-  of EfiRuntimeServicesCode and EfiRuntimeServicesData memory types for memory \r
-  allocations as the SMRAM space should be reserved after BDS phase.  The functions \r
-  in the Memory Allocation Library use EfiBootServicesData as the default memory \r
-  allocation type.  For this SMM specific instance of the Memory Allocation Library, \r
-  EfiRuntimeServicesData is used as the default memory type for all allocations. \r
-  In addition, allocation for the Reserved memory types are not supported and will \r
+  of EfiRuntimeServicesCode and EfiRuntimeServicesData memory types for memory\r
+  allocations as the SMRAM space should be reserved after BDS phase.  The functions\r
+  in the Memory Allocation Library use EfiBootServicesData as the default memory\r
+  allocation type.  For this SMM specific instance of the Memory Allocation Library,\r
+  EfiRuntimeServicesData is used as the default memory type for all allocations.\r
+  In addition, allocation for the Reserved memory types are not supported and will\r

   always return NULL.\r
 \r
   always return NULL.\r
 \r

-  Copyright (c) 2006 - 2017, Intel Corporation. All rights reserved.<BR>\r
-  This program and the accompanying materials                          \r
-  are licensed and made available under the terms and conditions of the BSD License         \r
-  which accompanies this distribution.  The full text of the license may be found at        \r
-  http://opensource.org/licenses/bsd-license.php                                            \r
+  Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r
+  This program and the accompanying materials\r
+  are licensed and made available under the terms and conditions of the BSD License\r
+  which accompanies this distribution.  The full text of the license may be found at\r
+  http://opensource.org/licenses/bsd-license.php\r

 \r
 \r

-  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     \r
-  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             \r
+  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
+  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r

 \r
 **/\r
 \r
 \r
 **/\r
 \r


@@ -52,7 +52,7 @@ BufferInSmram (
   UINTN  Index;\r
 \r
   for (Index = 0; Index < mSmmCoreMemoryAllocLibSmramRangeCount; Index ++) {\r
   UINTN  Index;\r
 \r
   for (Index = 0; Index < mSmmCoreMemoryAllocLibSmramRangeCount; Index ++) {\r

-    if (((EFI_PHYSICAL_ADDRESS) (UINTN) Buffer >= mSmmCoreMemoryAllocLibSmramRanges[Index].CpuStart) && \r
+    if (((EFI_PHYSICAL_ADDRESS) (UINTN) Buffer >= mSmmCoreMemoryAllocLibSmramRanges[Index].CpuStart) &&\r

         ((EFI_PHYSICAL_ADDRESS) (UINTN) Buffer < (mSmmCoreMemoryAllocLibSmramRanges[Index].CpuStart + mSmmCoreMemoryAllocLibSmramRanges[Index].PhysicalSize))) {\r
       return TRUE;\r
     }\r
         ((EFI_PHYSICAL_ADDRESS) (UINTN) Buffer < (mSmmCoreMemoryAllocLibSmramRanges[Index].CpuStart + mSmmCoreMemoryAllocLibSmramRanges[Index].PhysicalSize))) {\r
       return TRUE;\r
     }\r


@@ -76,12 +76,12 @@ BufferInSmram (
 **/\r
 VOID *\r
 InternalAllocatePages (\r
 **/\r
 VOID *\r
 InternalAllocatePages (\r

-  IN EFI_MEMORY_TYPE  MemoryType,  \r
+  IN EFI_MEMORY_TYPE  MemoryType,\r

   IN UINTN            Pages\r
   )\r
 {\r
   EFI_STATUS            Status;\r
   IN UINTN            Pages\r
   )\r
 {\r
   EFI_STATUS            Status;\r

-  EFI_PHYSICAL_ADDRESS  Memory; \r
+  EFI_PHYSICAL_ADDRESS  Memory;\r

 \r
   if (Pages == 0) {\r
     return NULL;\r
 \r
   if (Pages == 0) {\r
     return NULL;\r


@@ -194,11 +194,11 @@ AllocateReservedPages (
   must have been allocated on a previous call to the page allocation services of the Memory\r
   Allocation Library.  If it is not possible to free allocated pages, then this function will\r
   perform no actions.\r
   must have been allocated on a previous call to the page allocation services of the Memory\r
   Allocation Library.  If it is not possible to free allocated pages, then this function will\r
   perform no actions.\r

-  \r
+\r

   If Buffer was not allocated with a page allocation function in the Memory Allocation Library,\r
   then ASSERT().\r
   If Pages is zero, then ASSERT().\r
   If Buffer was not allocated with a page allocation function in the Memory Allocation Library,\r
   then ASSERT().\r
   If Pages is zero, then ASSERT().\r

- \r
+\r

   @param  Buffer                Pointer to the buffer of pages to free.\r
   @param  Pages                 The number of 4 KB pages to free.\r
 \r
   @param  Buffer                Pointer to the buffer of pages to free.\r
   @param  Pages                 The number of 4 KB pages to free.\r
 \r


@@ -249,7 +249,7 @@ FreePages (
 **/\r
 VOID *\r
 InternalAllocateAlignedPages (\r
 **/\r
 VOID *\r
 InternalAllocateAlignedPages (\r

-  IN EFI_MEMORY_TYPE  MemoryType,  \r
+  IN EFI_MEMORY_TYPE  MemoryType,\r

   IN UINTN            Pages,\r
   IN UINTN            Alignment\r
   )\r
   IN UINTN            Pages,\r
   IN UINTN            Alignment\r
   )\r


@@ -265,7 +265,7 @@ InternalAllocateAlignedPages (
   // Alignment must be a power of two or zero.\r
   //\r
   ASSERT ((Alignment & (Alignment - 1)) == 0);\r
   // Alignment must be a power of two or zero.\r
   //\r
   ASSERT ((Alignment & (Alignment - 1)) == 0);\r

- \r
+\r

   if (Pages == 0) {\r
     return NULL;\r
   }\r
   if (Pages == 0) {\r
     return NULL;\r
   }\r


@@ -279,7 +279,7 @@ InternalAllocateAlignedPages (
     // Make sure that Pages plus EFI_SIZE_TO_PAGES (Alignment) does not overflow.\r
     //\r
     ASSERT (RealPages > Pages);\r
     // Make sure that Pages plus EFI_SIZE_TO_PAGES (Alignment) does not overflow.\r
     //\r
     ASSERT (RealPages > Pages);\r

- \r
+\r

     Status         = SmmAllocatePages (AllocateAnyPages, MemoryType, RealPages, &Memory);\r
     if (EFI_ERROR (Status)) {\r
       return NULL;\r
     Status         = SmmAllocatePages (AllocateAnyPages, MemoryType, RealPages, &Memory);\r
     if (EFI_ERROR (Status)) {\r
       return NULL;\r


@@ -322,7 +322,7 @@ InternalAllocateAlignedPages (
   alignment specified by Alignment.  The allocated buffer is returned.  If Pages is 0, then NULL is\r
   returned.  If there is not enough memory at the specified alignment remaining to satisfy the\r
   request, then NULL is returned.\r
   alignment specified by Alignment.  The allocated buffer is returned.  If Pages is 0, then NULL is\r
   returned.  If there is not enough memory at the specified alignment remaining to satisfy the\r
   request, then NULL is returned.\r

-  \r
+\r

   If Alignment is not a power of two and Alignment is not zero, then ASSERT().\r
   If Pages plus EFI_SIZE_TO_PAGES (Alignment) overflows, then ASSERT().\r
 \r
   If Alignment is not a power of two and Alignment is not zero, then ASSERT().\r
   If Pages plus EFI_SIZE_TO_PAGES (Alignment) overflows, then ASSERT().\r
 \r


@@ -363,7 +363,7 @@ AllocateAlignedPages (
   alignment specified by Alignment.  The allocated buffer is returned.  If Pages is 0, then NULL is\r
   returned.  If there is not enough memory at the specified alignment remaining to satisfy the\r
   request, then NULL is returned.\r
   alignment specified by Alignment.  The allocated buffer is returned.  If Pages is 0, then NULL is\r
   returned.  If there is not enough memory at the specified alignment remaining to satisfy the\r
   request, then NULL is returned.\r

-  \r
+\r

   If Alignment is not a power of two and Alignment is not zero, then ASSERT().\r
   If Pages plus EFI_SIZE_TO_PAGES (Alignment) overflows, then ASSERT().\r
 \r
   If Alignment is not a power of two and Alignment is not zero, then ASSERT().\r
   If Pages plus EFI_SIZE_TO_PAGES (Alignment) overflows, then ASSERT().\r
 \r


@@ -404,7 +404,7 @@ AllocateAlignedRuntimePages (
   alignment specified by Alignment.  The allocated buffer is returned.  If Pages is 0, then NULL is\r
   returned.  If there is not enough memory at the specified alignment remaining to satisfy the\r
   request, then NULL is returned.\r
   alignment specified by Alignment.  The allocated buffer is returned.  If Pages is 0, then NULL is\r
   returned.  If there is not enough memory at the specified alignment remaining to satisfy the\r
   request, then NULL is returned.\r

-  \r
+\r

   If Alignment is not a power of two and Alignment is not zero, then ASSERT().\r
   If Pages plus EFI_SIZE_TO_PAGES (Alignment) overflows, then ASSERT().\r
 \r
   If Alignment is not a power of two and Alignment is not zero, then ASSERT().\r
   If Pages plus EFI_SIZE_TO_PAGES (Alignment) overflows, then ASSERT().\r
 \r


@@ -431,13 +431,13 @@ AllocateAlignedReservedPages (
 \r
   Frees the number of 4KB pages specified by Pages from the buffer specified by Buffer.  Buffer\r
   must have been allocated on a previous call to the aligned page allocation services of the Memory\r
 \r
   Frees the number of 4KB pages specified by Pages from the buffer specified by Buffer.  Buffer\r
   must have been allocated on a previous call to the aligned page allocation services of the Memory\r

-  Allocation Library.  If it is not possible to free allocated pages, then this function will \r
+  Allocation Library.  If it is not possible to free allocated pages, then this function will\r

   perform no actions.\r
   perform no actions.\r

-  \r
+\r

   If Buffer was not allocated with an aligned page allocation function in the Memory Allocation\r
   Library, then ASSERT().\r
   If Pages is zero, then ASSERT().\r
   If Buffer was not allocated with an aligned page allocation function in the Memory Allocation\r
   Library, then ASSERT().\r
   If Pages is zero, then ASSERT().\r

-  \r
+\r

   @param  Buffer                Pointer to the buffer of pages to free.\r
   @param  Pages                 The number of 4 KB pages to free.\r
 \r
   @param  Buffer                Pointer to the buffer of pages to free.\r
   @param  Pages                 The number of 4 KB pages to free.\r
 \r


@@ -483,7 +483,7 @@ FreeAlignedPages (
 **/\r
 VOID *\r
 InternalAllocatePool (\r
 **/\r
 VOID *\r
 InternalAllocatePool (\r

-  IN EFI_MEMORY_TYPE  MemoryType,  \r
+  IN EFI_MEMORY_TYPE  MemoryType,\r

   IN UINTN            AllocationSize\r
   )\r
 {\r
   IN UINTN            AllocationSize\r
   )\r
 {\r


@@ -604,9 +604,9 @@ AllocateReservedPool (
 **/\r
 VOID *\r
 InternalAllocateZeroPool (\r
 **/\r
 VOID *\r
 InternalAllocateZeroPool (\r

-  IN EFI_MEMORY_TYPE  PoolType,  \r
+  IN EFI_MEMORY_TYPE  PoolType,\r

   IN UINTN            AllocationSize\r
   IN UINTN            AllocationSize\r

-  ) \r
+  )\r

 {\r
   VOID  *Memory;\r
 \r
 {\r
   VOID  *Memory;\r
 \r


@@ -717,7 +717,7 @@ AllocateReservedZeroPool (
   allocated buffer.  If AllocationSize is 0, then a valid buffer of 0 size is returned.  If there\r
   is not enough memory remaining to satisfy the request, then NULL is returned.\r
   If Buffer is NULL, then ASSERT().\r
   allocated buffer.  If AllocationSize is 0, then a valid buffer of 0 size is returned.  If there\r
   is not enough memory remaining to satisfy the request, then NULL is returned.\r
   If Buffer is NULL, then ASSERT().\r

-  If AllocationSize is greater than (MAX_ADDRESS - Buffer + 1), then ASSERT(). \r
+  If AllocationSize is greater than (MAX_ADDRESS - Buffer + 1), then ASSERT().\r

 \r
   @param  PoolType              The type of pool to allocate.\r
   @param  AllocationSize        The number of bytes to allocate and zero.\r
 \r
   @param  PoolType              The type of pool to allocate.\r
   @param  AllocationSize        The number of bytes to allocate and zero.\r


@@ -728,10 +728,10 @@ AllocateReservedZeroPool (
 **/\r
 VOID *\r
 InternalAllocateCopyPool (\r
 **/\r
 VOID *\r
 InternalAllocateCopyPool (\r

-  IN EFI_MEMORY_TYPE  PoolType,  \r
+  IN EFI_MEMORY_TYPE  PoolType,\r

   IN UINTN            AllocationSize,\r
   IN CONST VOID       *Buffer\r
   IN UINTN            AllocationSize,\r
   IN CONST VOID       *Buffer\r

-  ) \r
+  )\r

 {\r
   VOID  *Memory;\r
 \r
 {\r
   VOID  *Memory;\r
 \r


@@ -743,7 +743,7 @@ InternalAllocateCopyPool (
      Memory = CopyMem (Memory, Buffer, AllocationSize);\r
   }\r
   return Memory;\r
      Memory = CopyMem (Memory, Buffer, AllocationSize);\r
   }\r
   return Memory;\r

-} \r
+}\r

 \r
 /**\r
   Copies a buffer to an allocated buffer of type EfiRuntimeServicesData.\r
 \r
 /**\r
   Copies a buffer to an allocated buffer of type EfiRuntimeServicesData.\r


@@ -752,9 +752,9 @@ InternalAllocateCopyPool (
   AllocationSize bytes from Buffer to the newly allocated buffer, and returns a pointer to the\r
   allocated buffer.  If AllocationSize is 0, then a valid buffer of 0 size is returned.  If there\r
   is not enough memory remaining to satisfy the request, then NULL is returned.\r
   AllocationSize bytes from Buffer to the newly allocated buffer, and returns a pointer to the\r
   allocated buffer.  If AllocationSize is 0, then a valid buffer of 0 size is returned.  If there\r
   is not enough memory remaining to satisfy the request, then NULL is returned.\r

-  \r
+\r

   If Buffer is NULL, then ASSERT().\r
   If Buffer is NULL, then ASSERT().\r

-  If AllocationSize is greater than (MAX_ADDRESS - Buffer + 1), then ASSERT(). \r
+  If AllocationSize is greater than (MAX_ADDRESS - Buffer + 1), then ASSERT().\r

 \r
   @param  AllocationSize        The number of bytes to allocate and zero.\r
   @param  Buffer                The buffer to copy to the allocated buffer.\r
 \r
   @param  AllocationSize        The number of bytes to allocate and zero.\r
   @param  Buffer                The buffer to copy to the allocated buffer.\r


@@ -792,9 +792,9 @@ AllocateCopyPool (
   AllocationSize bytes from Buffer to the newly allocated buffer, and returns a pointer to the\r
   allocated buffer.  If AllocationSize is 0, then a valid buffer of 0 size is returned.  If there\r
   is not enough memory remaining to satisfy the request, then NULL is returned.\r
   AllocationSize bytes from Buffer to the newly allocated buffer, and returns a pointer to the\r
   allocated buffer.  If AllocationSize is 0, then a valid buffer of 0 size is returned.  If there\r
   is not enough memory remaining to satisfy the request, then NULL is returned.\r

-  \r
+\r

   If Buffer is NULL, then ASSERT().\r
   If Buffer is NULL, then ASSERT().\r

-  If AllocationSize is greater than (MAX_ADDRESS - Buffer + 1), then ASSERT(). \r
+  If AllocationSize is greater than (MAX_ADDRESS - Buffer + 1), then ASSERT().\r

 \r
   @param  AllocationSize        The number of bytes to allocate and zero.\r
   @param  Buffer                The buffer to copy to the allocated buffer.\r
 \r
   @param  AllocationSize        The number of bytes to allocate and zero.\r
   @param  Buffer                The buffer to copy to the allocated buffer.\r


@@ -832,9 +832,9 @@ AllocateRuntimeCopyPool (
   AllocationSize bytes from Buffer to the newly allocated buffer, and returns a pointer to the\r
   allocated buffer.  If AllocationSize is 0, then a valid buffer of 0 size is returned.  If there\r
   is not enough memory remaining to satisfy the request, then NULL is returned.\r
   AllocationSize bytes from Buffer to the newly allocated buffer, and returns a pointer to the\r
   allocated buffer.  If AllocationSize is 0, then a valid buffer of 0 size is returned.  If there\r
   is not enough memory remaining to satisfy the request, then NULL is returned.\r

-  \r
+\r

   If Buffer is NULL, then ASSERT().\r
   If Buffer is NULL, then ASSERT().\r

-  If AllocationSize is greater than (MAX_ADDRESS - Buffer + 1), then ASSERT(). \r
+  If AllocationSize is greater than (MAX_ADDRESS - Buffer + 1), then ASSERT().\r

 \r
   @param  AllocationSize        The number of bytes to allocate and zero.\r
   @param  Buffer                The buffer to copy to the allocated buffer.\r
 \r
   @param  AllocationSize        The number of bytes to allocate and zero.\r
   @param  Buffer                The buffer to copy to the allocated buffer.\r


@@ -856,19 +856,19 @@ AllocateReservedCopyPool (
   Reallocates a buffer of a specified memory type.\r
 \r
   Allocates and zeros the number bytes specified by NewSize from memory of the type\r
   Reallocates a buffer of a specified memory type.\r
 \r
   Allocates and zeros the number bytes specified by NewSize from memory of the type\r

-  specified by PoolType.  If OldBuffer is not NULL, then the smaller of OldSize and \r
-  NewSize bytes are copied from OldBuffer to the newly allocated buffer, and \r
-  OldBuffer is freed.  A pointer to the newly allocated buffer is returned.  \r
-  If NewSize is 0, then a valid buffer of 0 size is  returned.  If there is not \r
+  specified by PoolType.  If OldBuffer is not NULL, then the smaller of OldSize and\r
+  NewSize bytes are copied from OldBuffer to the newly allocated buffer, and\r
+  OldBuffer is freed.  A pointer to the newly allocated buffer is returned.\r
+  If NewSize is 0, then a valid buffer of 0 size is  returned.  If there is not\r

   enough memory remaining to satisfy the request, then NULL is returned.\r
   enough memory remaining to satisfy the request, then NULL is returned.\r

-  \r
+\r

   If the allocation of the new buffer is successful and the smaller of NewSize and OldSize\r
   is greater than (MAX_ADDRESS - OldBuffer + 1), then ASSERT().\r
 \r
   @param  PoolType       The type of pool to allocate.\r
   @param  OldSize        The size, in bytes, of OldBuffer.\r
   @param  NewSize        The size, in bytes, of the buffer to reallocate.\r
   If the allocation of the new buffer is successful and the smaller of NewSize and OldSize\r
   is greater than (MAX_ADDRESS - OldBuffer + 1), then ASSERT().\r
 \r
   @param  PoolType       The type of pool to allocate.\r
   @param  OldSize        The size, in bytes, of OldBuffer.\r
   @param  NewSize        The size, in bytes, of the buffer to reallocate.\r

-  @param  OldBuffer      The buffer to copy to the allocated buffer.  This is an optional \r
+  @param  OldBuffer      The buffer to copy to the allocated buffer.  This is an optional\r

                          parameter that may be NULL.\r
 \r
   @return A pointer to the allocated buffer or NULL if allocation fails.\r
                          parameter that may be NULL.\r
 \r
   @return A pointer to the allocated buffer or NULL if allocation fails.\r


@@ -876,7 +876,7 @@ AllocateReservedCopyPool (
 **/\r
 VOID *\r
 InternalReallocatePool (\r
 **/\r
 VOID *\r
 InternalReallocatePool (\r

-  IN EFI_MEMORY_TYPE  PoolType,  \r
+  IN EFI_MEMORY_TYPE  PoolType,\r

   IN UINTN            OldSize,\r
   IN UINTN            NewSize,\r
   IN VOID             *OldBuffer  OPTIONAL\r
   IN UINTN            OldSize,\r
   IN UINTN            NewSize,\r
   IN VOID             *OldBuffer  OPTIONAL\r


@@ -896,18 +896,18 @@ InternalReallocatePool (
   Reallocates a buffer of type EfiRuntimeServicesData.\r
 \r
   Allocates and zeros the number bytes specified by NewSize from memory of type\r
   Reallocates a buffer of type EfiRuntimeServicesData.\r
 \r
   Allocates and zeros the number bytes specified by NewSize from memory of type\r

-  EfiRuntimeServicesData.  If OldBuffer is not NULL, then the smaller of OldSize and \r
-  NewSize bytes are copied from OldBuffer to the newly allocated buffer, and \r
-  OldBuffer is freed.  A pointer to the newly allocated buffer is returned.  \r
-  If NewSize is 0, then a valid buffer of 0 size is  returned.  If there is not \r
+  EfiRuntimeServicesData.  If OldBuffer is not NULL, then the smaller of OldSize and\r
+  NewSize bytes are copied from OldBuffer to the newly allocated buffer, and\r
+  OldBuffer is freed.  A pointer to the newly allocated buffer is returned.\r
+  If NewSize is 0, then a valid buffer of 0 size is  returned.  If there is not\r

   enough memory remaining to satisfy the request, then NULL is returned.\r
   enough memory remaining to satisfy the request, then NULL is returned.\r

-  \r
+\r

   If the allocation of the new buffer is successful and the smaller of NewSize and OldSize\r
   is greater than (MAX_ADDRESS - OldBuffer + 1), then ASSERT().\r
 \r
   @param  OldSize        The size, in bytes, of OldBuffer.\r
   @param  NewSize        The size, in bytes, of the buffer to reallocate.\r
   If the allocation of the new buffer is successful and the smaller of NewSize and OldSize\r
   is greater than (MAX_ADDRESS - OldBuffer + 1), then ASSERT().\r
 \r
   @param  OldSize        The size, in bytes, of OldBuffer.\r
   @param  NewSize        The size, in bytes, of the buffer to reallocate.\r

-  @param  OldBuffer      The buffer to copy to the allocated buffer.  This is an optional \r
+  @param  OldBuffer      The buffer to copy to the allocated buffer.  This is an optional\r

                          parameter that may be NULL.\r
 \r
   @return A pointer to the allocated buffer or NULL if allocation fails.\r
                          parameter that may be NULL.\r
 \r
   @return A pointer to the allocated buffer or NULL if allocation fails.\r


@@ -941,10 +941,10 @@ ReallocatePool (
   Reallocates a buffer of type EfiRuntimeServicesData.\r
 \r
   Allocates and zeros the number bytes specified by NewSize from memory of type\r
   Reallocates a buffer of type EfiRuntimeServicesData.\r
 \r
   Allocates and zeros the number bytes specified by NewSize from memory of type\r

-  EfiRuntimeServicesData.  If OldBuffer is not NULL, then the smaller of OldSize and \r
-  NewSize bytes are copied from OldBuffer to the newly allocated buffer, and \r
-  OldBuffer is freed.  A pointer to the newly allocated buffer is returned.  \r
-  If NewSize is 0, then a valid buffer of 0 size is  returned.  If there is not \r
+  EfiRuntimeServicesData.  If OldBuffer is not NULL, then the smaller of OldSize and\r
+  NewSize bytes are copied from OldBuffer to the newly allocated buffer, and\r
+  OldBuffer is freed.  A pointer to the newly allocated buffer is returned.\r
+  If NewSize is 0, then a valid buffer of 0 size is  returned.  If there is not\r

   enough memory remaining to satisfy the request, then NULL is returned.\r
 \r
   If the allocation of the new buffer is successful and the smaller of NewSize and OldSize\r
   enough memory remaining to satisfy the request, then NULL is returned.\r
 \r
   If the allocation of the new buffer is successful and the smaller of NewSize and OldSize\r


@@ -952,7 +952,7 @@ ReallocatePool (
 \r
   @param  OldSize        The size, in bytes, of OldBuffer.\r
   @param  NewSize        The size, in bytes, of the buffer to reallocate.\r
 \r
   @param  OldSize        The size, in bytes, of OldBuffer.\r
   @param  NewSize        The size, in bytes, of the buffer to reallocate.\r

-  @param  OldBuffer      The buffer to copy to the allocated buffer.  This is an optional \r
+  @param  OldBuffer      The buffer to copy to the allocated buffer.  This is an optional\r

                          parameter that may be NULL.\r
 \r
   @return A pointer to the allocated buffer or NULL if allocation fails.\r
                          parameter that may be NULL.\r
 \r
   @return A pointer to the allocated buffer or NULL if allocation fails.\r


@@ -986,10 +986,10 @@ ReallocateRuntimePool (
   Reallocates a buffer of type EfiReservedMemoryType.\r
 \r
   Allocates and zeros the number bytes specified by NewSize from memory of type\r
   Reallocates a buffer of type EfiReservedMemoryType.\r
 \r
   Allocates and zeros the number bytes specified by NewSize from memory of type\r

-  EfiReservedMemoryType.  If OldBuffer is not NULL, then the smaller of OldSize and \r
-  NewSize bytes are copied from OldBuffer to the newly allocated buffer, and \r
-  OldBuffer is freed.  A pointer to the newly allocated buffer is returned.  \r
-  If NewSize is 0, then a valid buffer of 0 size is  returned.  If there is not \r
+  EfiReservedMemoryType.  If OldBuffer is not NULL, then the smaller of OldSize and\r
+  NewSize bytes are copied from OldBuffer to the newly allocated buffer, and\r
+  OldBuffer is freed.  A pointer to the newly allocated buffer is returned.\r
+  If NewSize is 0, then a valid buffer of 0 size is  returned.  If there is not\r

   enough memory remaining to satisfy the request, then NULL is returned.\r
 \r
   If the allocation of the new buffer is successful and the smaller of NewSize and OldSize\r
   enough memory remaining to satisfy the request, then NULL is returned.\r
 \r
   If the allocation of the new buffer is successful and the smaller of NewSize and OldSize\r


@@ -997,7 +997,7 @@ ReallocateRuntimePool (
 \r
   @param  OldSize        The size, in bytes, of OldBuffer.\r
   @param  NewSize        The size, in bytes, of the buffer to reallocate.\r
 \r
   @param  OldSize        The size, in bytes, of OldBuffer.\r
   @param  NewSize        The size, in bytes, of the buffer to reallocate.\r

-  @param  OldBuffer      The buffer to copy to the allocated buffer.  This is an optional \r
+  @param  OldBuffer      The buffer to copy to the allocated buffer.  This is an optional\r

                          parameter that may be NULL.\r
 \r
   @return A pointer to the allocated buffer or NULL if allocation fails.\r
                          parameter that may be NULL.\r
 \r
   @return A pointer to the allocated buffer or NULL if allocation fails.\r


@@ -1021,7 +1021,7 @@ ReallocateReservedPool (
   Frees the buffer specified by Buffer.  Buffer must have been allocated on a previous call to the\r
   pool allocation services of the Memory Allocation Library.  If it is not possible to free pool\r
   resources, then this function will perform no actions.\r
   Frees the buffer specified by Buffer.  Buffer must have been allocated on a previous call to the\r
   pool allocation services of the Memory Allocation Library.  If it is not possible to free pool\r
   resources, then this function will perform no actions.\r

-  \r
+\r

   If Buffer was not allocated with a pool allocation function in the Memory Allocation Library,\r
   then ASSERT().\r
 \r
   If Buffer was not allocated with a pool allocation function in the Memory Allocation Library,\r
   then ASSERT().\r
 \r

diff --git a/MdeModulePkg/Library/PiSmmCoreMemoryAllocationLib/PiSmmCoreMemoryAllocationServices.h b/MdeModulePkg/Library/PiSmmCoreMemoryAllocationLib/PiSmmCoreMemoryAllocationServices.h
index a2b89acf5de11c14895b50243e6386cb4442365b..3ff0d15e291d692f51c0ccd99ab6d8e114544446 100644 (file)
--- a/MdeModulePkg/Library/PiSmmCoreMemoryAllocationLib/PiSmmCoreMemoryAllocationServices.h
+++ b/MdeModulePkg/Library/PiSmmCoreMemoryAllocationLib/PiSmmCoreMemoryAllocationServices.h
@@ -2,16 +2,16 @@
   Contains function prototypes for Memory Services in the SMM Core.\r
 \r
   This header file borrows the PiSmmCore Memory Allocation services as the primitive\r
   Contains function prototypes for Memory Services in the SMM Core.\r
 \r
   This header file borrows the PiSmmCore Memory Allocation services as the primitive\r

-  for memory allocation. \r
+  for memory allocation.\r

 \r
 \r

-  Copyright (c) 2008 - 2015, Intel Corporation. All rights reserved.<BR>\r
-  This program and the accompanying materials                          \r
-  are licensed and made available under the terms and conditions of the BSD License         \r
-  which accompanies this distribution.  The full text of the license may be found at        \r
-  http://opensource.org/licenses/bsd-license.php                                            \r
+  Copyright (c) 2008 - 2018, Intel Corporation. All rights reserved.<BR>\r
+  This program and the accompanying materials\r
+  are licensed and made available under the terms and conditions of the BSD License\r
+  which accompanies this distribution.  The full text of the license may be found at\r
+  http://opensource.org/licenses/bsd-license.php\r

 \r
 \r

-  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     \r
-  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             \r
+  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
+  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r

 \r
 **/\r
 \r
 \r
 **/\r
 \r


@@ -44,43 +44,43 @@ typedef struct {
   EFI_SMRAM_DESCRIPTOR            *SmramRanges;\r
 \r
   ///\r
   EFI_SMRAM_DESCRIPTOR            *SmramRanges;\r
 \r
   ///\r

-  /// The SMM Foundation Entry Point.  The SMM Core fills in this field when the \r
-  /// SMM Core is initialized.  The SMM IPL is responsbile for registering this entry \r
-  /// point with the SMM Configuration Protocol.  The SMM Configuration Protocol may \r
+  /// The SMM Foundation Entry Point.  The SMM Core fills in this field when the\r
+  /// SMM Core is initialized.  The SMM IPL is responsbile for registering this entry\r
+  /// point with the SMM Configuration Protocol.  The SMM Configuration Protocol may\r

   /// not be available at the time the SMM IPL and SMM Core are started, so the SMM IPL\r
   /// not be available at the time the SMM IPL and SMM Core are started, so the SMM IPL\r

-  /// sets up a protocol notification on the SMM Configuration Protocol and registers \r
-  /// the SMM Foundation Entry Point as soon as the SMM Configuration Protocol is \r
+  /// sets up a protocol notification on the SMM Configuration Protocol and registers\r
+  /// the SMM Foundation Entry Point as soon as the SMM Configuration Protocol is\r

   /// available.\r
   ///\r
   EFI_SMM_ENTRY_POINT             SmmEntryPoint;\r
   /// available.\r
   ///\r
   EFI_SMM_ENTRY_POINT             SmmEntryPoint;\r

-  \r
+\r

   ///\r
   /// Boolean flag set to TRUE while an SMI is being processed by the SMM Core.\r
   ///\r
   /// Boolean flag set to TRUE while an SMI is being processed by the SMM Core.\r

-  /// \r
+  ///\r

   BOOLEAN                         SmmEntryPointRegistered;\r
 \r
   ///\r
   /// Boolean flag set to TRUE while an SMI is being processed by the SMM Core.\r
   BOOLEAN                         SmmEntryPointRegistered;\r
 \r
   ///\r
   /// Boolean flag set to TRUE while an SMI is being processed by the SMM Core.\r

-  /// \r
+  ///\r

   BOOLEAN                         InSmm;\r
 \r
   ///\r
   /// This field is set by the SMM Core then the SMM Core is initialized.  This field is\r
   /// used by the SMM Base 2 Protocol and SMM Communication Protocol implementations in\r
   BOOLEAN                         InSmm;\r
 \r
   ///\r
   /// This field is set by the SMM Core then the SMM Core is initialized.  This field is\r
   /// used by the SMM Base 2 Protocol and SMM Communication Protocol implementations in\r

-  /// the SMM IPL.  \r
+  /// the SMM IPL.\r

   ///\r
   EFI_SMM_SYSTEM_TABLE2           *Smst;\r
 \r
   ///\r
   ///\r
   EFI_SMM_SYSTEM_TABLE2           *Smst;\r
 \r
   ///\r

-  /// This field is used by the SMM Communicatioon Protocol to pass a buffer into \r
+  /// This field is used by the SMM Communicatioon Protocol to pass a buffer into\r

   /// a software SMI handler and for the software SMI handler to pass a buffer back to\r
   /// a software SMI handler and for the software SMI handler to pass a buffer back to\r

-  /// the caller of the SMM Communication Protocol.  \r
+  /// the caller of the SMM Communication Protocol.\r

   ///\r
   VOID                            *CommunicationBuffer;\r
 \r
   ///\r
   /// This field is used by the SMM Communicatioon Protocol to pass the size of a buffer,\r
   ///\r
   VOID                            *CommunicationBuffer;\r
 \r
   ///\r
   /// This field is used by the SMM Communicatioon Protocol to pass the size of a buffer,\r

-  /// in bytes, into a software SMI handler and for the software SMI handler to pass the \r
+  /// in bytes, into a software SMI handler and for the software SMI handler to pass the\r

   /// size, in bytes, of a buffer back to the caller of the SMM Communication Protocol.\r
   ///\r
   UINTN                           BufferSize;\r
   /// size, in bytes, of a buffer back to the caller of the SMM Communication Protocol.\r
   ///\r
   UINTN                           BufferSize;\r

diff --git a/MdeModulePkg/Library/PiSmmCoreMemoryAllocationLib/PiSmmCoreMemoryProfileLib.c b/MdeModulePkg/Library/PiSmmCoreMemoryAllocationLib/PiSmmCoreMemoryProfileLib.c
index ffae2212a86132715f5df831be8bdf8f4a6e497e..afebbbd54bf9595b4119550fcb2ad8f40745f850 100644 (file)
--- a/MdeModulePkg/Library/PiSmmCoreMemoryAllocationLib/PiSmmCoreMemoryProfileLib.c
+++ b/MdeModulePkg/Library/PiSmmCoreMemoryAllocationLib/PiSmmCoreMemoryProfileLib.c
@@ -1,14 +1,14 @@
 /** @file\r
   Support routines for memory profile for PiSmmCore.\r
 \r
 /** @file\r
   Support routines for memory profile for PiSmmCore.\r
 \r

-  Copyright (c) 2016, Intel Corporation. All rights reserved.<BR>\r
-  This program and the accompanying materials                          \r
-  are licensed and made available under the terms and conditions of the BSD License         \r
-  which accompanies this distribution.  The full text of the license may be found at        \r
-  http://opensource.org/licenses/bsd-license.php.                                            \r
-\r
-  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     \r
-  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             \r
+  Copyright (c) 2016 - 2018, Intel Corporation. All rights reserved.<BR>\r
+  This program and the accompanying materials\r
+  are licensed and made available under the terms and conditions of the BSD License\r
+  which accompanies this distribution.  The full text of the license may be found at\r
+  http://opensource.org/licenses/bsd-license.php.\r
+\r
+  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
+  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r

 \r
 **/\r
 \r
 \r
 **/\r
 \r

diff --git a/MdeModulePkg/Library/PiSmmCoreMemoryAllocationLib/PiSmmCoreMemoryProfileLibNull.c b/MdeModulePkg/Library/PiSmmCoreMemoryAllocationLib/PiSmmCoreMemoryProfileLibNull.c
index 6f6c2ebc91ecfe21af23eba1afe5144686385e60..df9f19e721aba6fbc0529d35f4eaddc16ab43880 100644 (file)
--- a/MdeModulePkg/Library/PiSmmCoreMemoryAllocationLib/PiSmmCoreMemoryProfileLibNull.c
+++ b/MdeModulePkg/Library/PiSmmCoreMemoryAllocationLib/PiSmmCoreMemoryProfileLibNull.c
@@ -1,14 +1,14 @@
 /** @file\r
   Null routines for memory profile for PiSmmCore.\r
 \r
 /** @file\r
   Null routines for memory profile for PiSmmCore.\r
 \r

-  Copyright (c) 2016, Intel Corporation. All rights reserved.<BR>\r
-  This program and the accompanying materials                          \r
-  are licensed and made available under the terms and conditions of the BSD License         \r
-  which accompanies this distribution.  The full text of the license may be found at        \r
-  http://opensource.org/licenses/bsd-license.php.                                            \r
-\r
-  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     \r
-  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             \r
+  Copyright (c) 2016 - 2018, Intel Corporation. All rights reserved.<BR>\r
+  This program and the accompanying materials\r
+  are licensed and made available under the terms and conditions of the BSD License\r
+  which accompanies this distribution.  The full text of the license may be found at\r
+  http://opensource.org/licenses/bsd-license.php.\r
+\r
+  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
+  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r

 \r
 **/\r
 \r
 \r
 **/\r
 \r

diff --git a/MdeModulePkg/Library/PiSmmCoreMemoryAllocationLib/PiSmmCoreMemoryProfileServices.h b/MdeModulePkg/Library/PiSmmCoreMemoryAllocationLib/PiSmmCoreMemoryProfileServices.h
index 29923ea0a24a4ecb7f1301c522581c914bfab60c..29f39336c319f8c4fef2f139023bfee6a9fa1ef5 100644 (file)
--- a/MdeModulePkg/Library/PiSmmCoreMemoryAllocationLib/PiSmmCoreMemoryProfileServices.h
+++ b/MdeModulePkg/Library/PiSmmCoreMemoryAllocationLib/PiSmmCoreMemoryProfileServices.h
@@ -4,14 +4,14 @@
   This header file borrows the PiSmmCore Memory Profile services as the primitive\r
   for memory profile.\r
 \r
   This header file borrows the PiSmmCore Memory Profile services as the primitive\r
   for memory profile.\r
 \r

-  Copyright (c) 2016, Intel Corporation. All rights reserved.<BR>\r
-  This program and the accompanying materials                          \r
-  are licensed and made available under the terms and conditions of the BSD License         \r
-  which accompanies this distribution.  The full text of the license may be found at        \r
-  http://opensource.org/licenses/bsd-license.php                                            \r
-\r
-  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     \r
-  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             \r
+  Copyright (c) 2016 - 2018, Intel Corporation. All rights reserved.<BR>\r
+  This program and the accompanying materials\r
+  are licensed and made available under the terms and conditions of the BSD License\r
+  which accompanies this distribution.  The full text of the license may be found at\r
+  http://opensource.org/licenses/bsd-license.php\r
+\r
+  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
+  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r

 \r
 **/\r
 \r
 \r
 **/\r
 \r

diff --git a/MdeModulePkg/Library/PiSmmCoreSmmServicesTableLib/PiSmmCoreSmmServicesTableLib.c b/MdeModulePkg/Library/PiSmmCoreSmmServicesTableLib/PiSmmCoreSmmServicesTableLib.c
index 788fafae35c376c7b39156ef73de1b6e819f20d5..c1ea2944338d24a99f6574f45118e0e5019b2729 100644 (file)
--- a/MdeModulePkg/Library/PiSmmCoreSmmServicesTableLib/PiSmmCoreSmmServicesTableLib.c
+++ b/MdeModulePkg/Library/PiSmmCoreSmmServicesTableLib/PiSmmCoreSmmServicesTableLib.c
@@ -1,7 +1,7 @@
 /** @file\r
   SMM Core SMM Services Table Library.\r
 \r
 /** @file\r
   SMM Core SMM Services Table Library.\r
 \r

-  Copyright (c) 2010 - 2014, Intel Corporation. All rights reserved.<BR>\r
+  Copyright (c) 2010 - 2018, Intel Corporation. All rights reserved.<BR>\r

   This program and the accompanying materials\r
   are licensed and made available under the terms and conditions of the BSD License\r
   which accompanies this distribution.  The full text of the license may be found at\r
   This program and the accompanying materials\r
   are licensed and made available under the terms and conditions of the BSD License\r
   which accompanies this distribution.  The full text of the license may be found at\r


@@ -40,14 +40,14 @@ SmmCoreSmmServicesTableLibConstructor (
 }\r
 \r
 /**\r
 }\r
 \r
 /**\r

-  This function allows the caller to determine if the driver is executing in \r
+  This function allows the caller to determine if the driver is executing in\r

   System Management Mode(SMM).\r
 \r
   System Management Mode(SMM).\r
 \r

-  This function returns TRUE if the driver is executing in SMM and FALSE if the \r
+  This function returns TRUE if the driver is executing in SMM and FALSE if the\r

   driver is not executing in SMM.\r
 \r
   @retval  TRUE  The driver is executing in System Management Mode (SMM).\r
   driver is not executing in SMM.\r
 \r
   @retval  TRUE  The driver is executing in System Management Mode (SMM).\r

-  @retval  FALSE The driver is not executing in System Management Mode (SMM). \r
+  @retval  FALSE The driver is not executing in System Management Mode (SMM).\r

 \r
 **/\r
 BOOLEAN\r
 \r
 **/\r
 BOOLEAN\r

diff --git a/MdeModulePkg/Library/PlatformVarCleanupLib/VfrStrings.uni b/MdeModulePkg/Library/PlatformVarCleanupLib/VfrStrings.uni
index d30512329f2ace5e9fbface28c6d00c6801d92b5..e36f7a5d7d988dcc5a22b979c0309b9241b45bca 100644 (file)
--- a/MdeModulePkg/Library/PlatformVarCleanupLib/VfrStrings.uni
+++ b/MdeModulePkg/Library/PlatformVarCleanupLib/VfrStrings.uni
@@ -1,7 +1,7 @@
 ///** @file\r
 //  String definitions for platform variable cleanup.\r
 //\r
 ///** @file\r
 //  String definitions for platform variable cleanup.\r
 //\r

-//  Copyright (c) 2015, Intel Corporation. All rights reserved.<BR>\r
+//  Copyright (c) 2015 - 2018, Intel Corporation. All rights reserved.<BR>\r

 //  This program and the accompanying materials\r
 //  are licensed and made available under the terms and conditions of the BSD License\r
 //  which accompanies this distribution.  The full text of the license may be found at\r
 //  This program and the accompanying materials\r
 //  are licensed and made available under the terms and conditions of the BSD License\r
 //  which accompanies this distribution.  The full text of the license may be found at\r


@@ -32,4 +32,4 @@
 #string STR_SAVE_AND_EXIT                       #language en-US  "Commit Changes and Exit"\r
                                                 #language fr-FR  "fr-FR: Commit Changes and Exit"\r
 #string STR_NO_SAVE_AND_EXIT                    #language en-US  "Discard Changes and Exit"\r
 #string STR_SAVE_AND_EXIT                       #language en-US  "Commit Changes and Exit"\r
                                                 #language fr-FR  "fr-FR: Commit Changes and Exit"\r
 #string STR_NO_SAVE_AND_EXIT                    #language en-US  "Discard Changes and Exit"\r

-                                                #language fr-FR  "fr-FR: Discard Changes and Exit"
\ No newline at end of file
+                                                #language fr-FR  "fr-FR: Discard Changes and Exit"\r

diff --git a/MdeModulePkg/Library/ResetUtilityLib/ResetUtility.c b/MdeModulePkg/Library/ResetUtilityLib/ResetUtility.c
index da5fa7b094671b27f281f5dc6de900c02dd9f6c5..e3de4f117af86bc66157835c3dba12b0deb62e5a 100644 (file)
--- a/MdeModulePkg/Library/ResetUtilityLib/ResetUtility.c
+++ b/MdeModulePkg/Library/ResetUtilityLib/ResetUtility.c
@@ -56,7 +56,7 @@ ResetPlatformSpecificGuid (
 /**\r
   This function examines the DataSize and ResetData parameters passed to\r
   to ResetSystem() and detemrines if the ResetData contains a Null-terminated\r
 /**\r
   This function examines the DataSize and ResetData parameters passed to\r
   to ResetSystem() and detemrines if the ResetData contains a Null-terminated\r

-  Unicode string followed by a GUID specific subtype.  If the GUID specific \r
+  Unicode string followed by a GUID specific subtype.  If the GUID specific\r

   subtype is present, then a pointer to the GUID value in ResetData is returned.\r
 \r
   @param[in]  DataSize    The size, in bytes, of ResetData.\r
   subtype is present, then a pointer to the GUID value in ResetData is returned.\r
 \r
   @param[in]  DataSize    The size, in bytes, of ResetData.\r


@@ -107,7 +107,7 @@ GetResetPlatformSpecificGuid (
 }\r
 \r
 /**\r
 }\r
 \r
 /**\r

-  This is a helper function that creates the reset data buffer that can be \r
+  This is a helper function that creates the reset data buffer that can be\r

   passed into ResetSystem().\r
 \r
   The reset data buffer is returned in ResetData and contains ResetString\r
   passed into ResetSystem().\r
 \r
   The reset data buffer is returned in ResetData and contains ResetString\r


@@ -179,7 +179,7 @@ BuildResetData (
   if (ResetString == NULL) {\r
     ResetString = L"";     // Use an empty string.\r
   }\r
   if (ResetString == NULL) {\r
     ResetString = L"";     // Use an empty string.\r
   }\r

-  \r
+\r

   //\r
   // Calculate the total buffer required for ResetData.\r
   //\r
   //\r
   // Calculate the total buffer required for ResetData.\r
   //\r


@@ -215,6 +215,6 @@ BuildResetData (
   if (ExtraDataSize > 0) {\r
     CopyMem (Data, ExtraData, ExtraDataSize);\r
   }\r
   if (ExtraDataSize > 0) {\r
     CopyMem (Data, ExtraData, ExtraDataSize);\r
   }\r

-  \r
+\r

   return RETURN_SUCCESS;\r
 }\r
   return RETURN_SUCCESS;\r
 }\r

diff --git a/MdeModulePkg/Library/ResetUtilityLib/ResetUtilityLib.inf b/MdeModulePkg/Library/ResetUtilityLib/ResetUtilityLib.inf
index 2a4e53a8a6a38d23a1fd8b44dab605804a694af4..4760b1972d16240072ae0083e71d80bd86c125cd 100644 (file)
--- a/MdeModulePkg/Library/ResetUtilityLib/ResetUtilityLib.inf
+++ b/MdeModulePkg/Library/ResetUtilityLib/ResetUtilityLib.inf
@@ -7,10 +7,10 @@
 #  are licensed and made available under the terms and conditions of the BSD License\r
 #  which accompanies this distribution.  The full text of the license may be found at\r
 #  http://opensource.org/licenses/bsd-license.php\r
 #  are licensed and made available under the terms and conditions of the BSD License\r
 #  which accompanies this distribution.  The full text of the license may be found at\r
 #  http://opensource.org/licenses/bsd-license.php\r

-#  \r
+#\r

 #  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 #  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 #  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 #  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r

-#  \r
+#\r

 ##\r
 [Defines]\r
   INF_VERSION         = 0x00010017\r
 ##\r
 [Defines]\r
   INF_VERSION         = 0x00010017\r

diff --git a/MdeModulePkg/Library/RuntimeDxeReportStatusCodeLib/ReportStatusCodeLib.c b/MdeModulePkg/Library/RuntimeDxeReportStatusCodeLib/ReportStatusCodeLib.c
index e533af3d338cca32aa0cfbe43e1b5a23b87561f8..b73103517ab2065c29fc593eeb5fbc6b98a91e24 100644 (file)
--- a/MdeModulePkg/Library/RuntimeDxeReportStatusCodeLib/ReportStatusCodeLib.c
+++ b/MdeModulePkg/Library/RuntimeDxeReportStatusCodeLib/ReportStatusCodeLib.c
@@ -1,7 +1,7 @@
 /** @file\r
   API implementation for instance of Report Status Code Library.\r
 \r
 /** @file\r
   API implementation for instance of Report Status Code Library.\r
 \r

-  Copyright (c) 2006 - 2012, Intel Corporation. All rights reserved.<BR>\r
+  Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r

   This program and the accompanying materials\r
   are licensed and made available under the terms and conditions of the BSD License\r
   which accompanies this distribution.  The full text of the license may be found at\r
   This program and the accompanying materials\r
   are licensed and made available under the terms and conditions of the BSD License\r
   which accompanies this distribution.  The full text of the license may be found at\r


@@ -54,11 +54,11 @@ InternalGetReportStatusCode (
   if (mReportStatusCodeLibStatusCodeProtocol != NULL) {\r
     return;\r
   }\r
   if (mReportStatusCodeLibStatusCodeProtocol != NULL) {\r
     return;\r
   }\r

-  \r
+\r

   if (mHaveExitedBootServices) {\r
     return;\r
   }\r
   if (mHaveExitedBootServices) {\r
     return;\r
   }\r

-  \r
+\r

   //\r
   // Check gBS just in case ReportStatusCode is called before gBS is initialized.\r
   //\r
   //\r
   // Check gBS just in case ReportStatusCode is called before gBS is initialized.\r
   //\r


@@ -106,9 +106,9 @@ ReportStatusCodeLibExitBootServices (
 {\r
   //\r
   // Locate the report status code service before enter runtime.\r
 {\r
   //\r
   // Locate the report status code service before enter runtime.\r

-  // \r
+  //\r

   InternalGetReportStatusCode ();\r
   InternalGetReportStatusCode ();\r

-  \r
+\r

   mHaveExitedBootServices = TRUE;\r
 }\r
 \r
   mHaveExitedBootServices = TRUE;\r
 }\r
 \r


@@ -120,7 +120,7 @@ ReportStatusCodeLibExitBootServices (
 \r
   @param  ImageHandle   The firmware allocated handle for the EFI image.\r
   @param  SystemTable   A pointer to the EFI System Table.\r
 \r
   @param  ImageHandle   The firmware allocated handle for the EFI image.\r
   @param  SystemTable   A pointer to the EFI System Table.\r

-  \r
+\r

   @retval EFI_SUCCESS   The constructor always returns EFI_SUCCESS.\r
 \r
 **/\r
   @retval EFI_SUCCESS   The constructor always returns EFI_SUCCESS.\r
 \r
 **/\r


@@ -135,12 +135,12 @@ ReportStatusCodeLibConstructor (
 \r
   //\r
   // Cache the report status code service\r
 \r
   //\r
   // Cache the report status code service\r

-  // \r
+  //\r

   InternalGetReportStatusCode ();\r
 \r
   //\r
   // Register notify function for EVT_SIGNAL_VIRTUAL_ADDRESS_CHANGE\r
   InternalGetReportStatusCode ();\r
 \r
   //\r
   // Register notify function for EVT_SIGNAL_VIRTUAL_ADDRESS_CHANGE\r

-  // \r
+  //\r

   Status = gBS->CreateEventEx (\r
                   EVT_NOTIFY_SIGNAL,\r
                   TPL_NOTIFY,\r
   Status = gBS->CreateEventEx (\r
                   EVT_NOTIFY_SIGNAL,\r
                   TPL_NOTIFY,\r


@@ -153,7 +153,7 @@ ReportStatusCodeLibConstructor (
 \r
   //\r
   // Register notify function for EVT_SIGNAL_EXIT_BOOT_SERVICES\r
 \r
   //\r
   // Register notify function for EVT_SIGNAL_EXIT_BOOT_SERVICES\r

-  // \r
+  //\r

   Status = gBS->CreateEventEx (\r
                   EVT_NOTIFY_SIGNAL,\r
                   TPL_NOTIFY,\r
   Status = gBS->CreateEventEx (\r
                   EVT_NOTIFY_SIGNAL,\r
                   TPL_NOTIFY,\r


@@ -169,13 +169,13 @@ ReportStatusCodeLibConstructor (
 \r
 /**\r
   The destructor function of Runtime DXE Report Status Code Lib.\r
 \r
 /**\r
   The destructor function of Runtime DXE Report Status Code Lib.\r

-  \r
+\r

   The destructor function frees memory allocated by constructor, and closes related events.\r
   The destructor function frees memory allocated by constructor, and closes related events.\r

-  It will ASSERT() if that related operation fails and it will always return EFI_SUCCESS. \r
+  It will ASSERT() if that related operation fails and it will always return EFI_SUCCESS.\r

 \r
   @param  ImageHandle   The firmware allocated handle for the EFI image.\r
   @param  SystemTable   A pointer to the EFI System Table.\r
 \r
   @param  ImageHandle   The firmware allocated handle for the EFI image.\r
   @param  SystemTable   A pointer to the EFI System Table.\r

-  \r
+\r

   @retval EFI_SUCCESS   The constructor always returns EFI_SUCCESS.\r
 \r
 **/\r
   @retval EFI_SUCCESS   The constructor always returns EFI_SUCCESS.\r
 \r
 **/\r


@@ -246,7 +246,7 @@ InternalReportStatusCode (
     //\r
     return mReportStatusCodeLibStatusCodeProtocol->ReportStatusCode (Type, Value, Instance, (EFI_GUID *)CallerId, Data);\r
   }\r
     //\r
     return mReportStatusCodeLibStatusCodeProtocol->ReportStatusCode (Type, Value, Instance, (EFI_GUID *)CallerId, Data);\r
   }\r

-  \r
+\r

   return EFI_UNSUPPORTED;\r
 }\r
 \r
   return EFI_UNSUPPORTED;\r
 }\r
 \r


@@ -641,7 +641,7 @@ ReportStatusCodeEx (
     if (gBS == NULL || gBS->AllocatePool == NULL || gBS->FreePool == NULL) {\r
       return EFI_UNSUPPORTED;\r
     }\r
     if (gBS == NULL || gBS->AllocatePool == NULL || gBS->FreePool == NULL) {\r
       return EFI_UNSUPPORTED;\r
     }\r

-  \r
+\r

     //\r
     // Allocate space for the Status Code Header and its buffer\r
     //\r
     //\r
     // Allocate space for the Status Code Header and its buffer\r
     //\r

diff --git a/MdeModulePkg/Library/RuntimeDxeReportStatusCodeLib/RuntimeDxeReportStatusCodeLib.inf b/MdeModulePkg/Library/RuntimeDxeReportStatusCodeLib/RuntimeDxeReportStatusCodeLib.inf
index 49d9933b58dec4e01aa895296207e6c43990c969..9f03e2a1ed837fca168f5b89b3ceb928d9135aae 100644 (file)
--- a/MdeModulePkg/Library/RuntimeDxeReportStatusCodeLib/RuntimeDxeReportStatusCodeLib.inf
+++ b/MdeModulePkg/Library/RuntimeDxeReportStatusCodeLib/RuntimeDxeReportStatusCodeLib.inf
@@ -1,7 +1,7 @@
 ## @file\r
 #  Report status code library instance which supports logging message in DXE & runtime phase.\r
 #\r
 ## @file\r
 #  Report status code library instance which supports logging message in DXE & runtime phase.\r
 #\r

-#  Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.<BR>\r
+#  Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r

 #\r
 #  This program and the accompanying materials\r
 #  are licensed and made available under the terms and conditions of the BSD License\r
 #\r
 #  This program and the accompanying materials\r
 #  are licensed and made available under the terms and conditions of the BSD License\r


@@ -31,7 +31,7 @@
 \r
 [Sources]\r
   ReportStatusCodeLib.c\r
 \r
 [Sources]\r
   ReportStatusCodeLib.c\r

-  \r
+\r

 [Packages]\r
   MdePkg/MdePkg.dec\r
   MdeModulePkg/MdeModulePkg.dec\r
 [Packages]\r
   MdePkg/MdePkg.dec\r
   MdeModulePkg/MdeModulePkg.dec\r

diff --git a/MdeModulePkg/Library/SmmCorePerformanceLib/SmmCorePerformanceLib.inf b/MdeModulePkg/Library/SmmCorePerformanceLib/SmmCorePerformanceLib.inf
index 61b9283665787dc77fb1d9eed51d335305ce5836..88052f8037fe41cab03f332f6ea5fb1d52647877 100644 (file)
--- a/MdeModulePkg/Library/SmmCorePerformanceLib/SmmCorePerformanceLib.inf
+++ b/MdeModulePkg/Library/SmmCorePerformanceLib/SmmCorePerformanceLib.inf
@@ -1,22 +1,22 @@
 ## @file\r
 #  Performance library instance used by SMM Core.\r
 ## @file\r
 #  Performance library instance used by SMM Core.\r

-#  \r
+#\r

 #  This library provides the performance measurement interfaces and initializes performance\r
 #  logging for the SMM phase.\r
 #  It initializes SMM phase performance logging by publishing the SMM Performance and PerformanceEx Protocol,\r
 #  which is consumed by SmmPerformanceLib to logging performance data in SMM phase.\r
 #  This library is mainly used by SMM Core to start performance logging to ensure that\r
 #  SMM Performance and PerformanceEx Protocol are installed at the very beginning of SMM phase.\r
 #  This library provides the performance measurement interfaces and initializes performance\r
 #  logging for the SMM phase.\r
 #  It initializes SMM phase performance logging by publishing the SMM Performance and PerformanceEx Protocol,\r
 #  which is consumed by SmmPerformanceLib to logging performance data in SMM phase.\r
 #  This library is mainly used by SMM Core to start performance logging to ensure that\r
 #  SMM Performance and PerformanceEx Protocol are installed at the very beginning of SMM phase.\r

-#  \r
+#\r

 #  Copyright (c) 2011 - 2018, Intel Corporation. All rights reserved.<BR>\r
 #  This program and the accompanying materials\r
 #  are licensed and made available under the terms and conditions of the BSD License\r
 #  which accompanies this distribution.  The full text of the license may be found at\r
 #  http://opensource.org/licenses/bsd-license.php\r
 #  Copyright (c) 2011 - 2018, Intel Corporation. All rights reserved.<BR>\r
 #  This program and the accompanying materials\r
 #  are licensed and made available under the terms and conditions of the BSD License\r
 #  which accompanies this distribution.  The full text of the license may be found at\r
 #  http://opensource.org/licenses/bsd-license.php\r

-#  \r
+#\r

 #  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 #  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 #  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 #  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r

-#  \r
+#\r

 ##\r
 \r
 [Defines]\r
 ##\r
 \r
 [Defines]\r

diff --git a/MdeModulePkg/Library/SmmCorePerformanceLib/SmmCorePerformanceLib.uni b/MdeModulePkg/Library/SmmCorePerformanceLib/SmmCorePerformanceLib.uni
index c3264fcfb94d81f80b40507dc59be1727e0b8313..09968ab9f84a11a89deb7272fcf545182863a284 100644 (file)
--- a/MdeModulePkg/Library/SmmCorePerformanceLib/SmmCorePerformanceLib.uni
+++ b/MdeModulePkg/Library/SmmCorePerformanceLib/SmmCorePerformanceLib.uni
@@ -8,13 +8,13 @@
 // This library is mainly used by SMM Core to start performance logging to ensure that\r
 // SMM Performance and PerformanceEx Protocol are installed at the very beginning of SMM phase.\r
 //\r
 // This library is mainly used by SMM Core to start performance logging to ensure that\r
 // SMM Performance and PerformanceEx Protocol are installed at the very beginning of SMM phase.\r
 //\r

-// Copyright (c) 2011 - 2014, Intel Corporation. All rights reserved.<BR>\r
+// Copyright (c) 2011 - 2018, Intel Corporation. All rights reserved.<BR>\r

 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r
 // which accompanies this distribution.  The full text of the license may be found at\r
 // http://opensource.org/licenses/bsd-license.php\r
 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r
 // which accompanies this distribution.  The full text of the license may be found at\r
 // http://opensource.org/licenses/bsd-license.php\r

-// \r
+//\r

 // THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 // WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 //\r
 // THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 // WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 //\r

diff --git a/MdeModulePkg/Library/SmmCorePerformanceLib/SmmCorePerformanceLibInternal.h b/MdeModulePkg/Library/SmmCorePerformanceLib/SmmCorePerformanceLibInternal.h
index 76f24984735d0b205de44f25f7420fd04441d1eb..2c710bd9c13a542f237bfb1cf546ad7db155b611 100644 (file)
--- a/MdeModulePkg/Library/SmmCorePerformanceLib/SmmCorePerformanceLibInternal.h
+++ b/MdeModulePkg/Library/SmmCorePerformanceLib/SmmCorePerformanceLibInternal.h
@@ -14,7 +14,7 @@ THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
 WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 \r
 **/\r
 WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 \r
 **/\r

-  \r
+\r

 #ifndef _SMM_CORE_PERFORMANCE_LIB_INTERNAL_H_\r
 #define _SMM_CORE_PERFORMANCE_LIB_INTERNAL_H_\r
 \r
 #ifndef _SMM_CORE_PERFORMANCE_LIB_INTERNAL_H_\r
 #define _SMM_CORE_PERFORMANCE_LIB_INTERNAL_H_\r
 \r


@@ -33,7 +33,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #include <Library/BaseMemoryLib.h>\r
 #include <Library/TimerLib.h>\r
 #include <Library/PcdLib.h>\r
 #include <Library/BaseMemoryLib.h>\r
 #include <Library/TimerLib.h>\r
 #include <Library/PcdLib.h>\r

-#include <Library/UefiLib.h>                   \r
+#include <Library/UefiLib.h>\r

 #include <Library/UefiBootServicesTableLib.h>\r
 #include <Library/MemoryAllocationLib.h>\r
 #include <Library/SynchronizationLib.h>\r
 #include <Library/UefiBootServicesTableLib.h>\r
 #include <Library/MemoryAllocationLib.h>\r
 #include <Library/SynchronizationLib.h>\r

diff --git a/MdeModulePkg/Library/SmmCorePlatformHookLibNull/SmmCorePlatformHookLibNull.c b/MdeModulePkg/Library/SmmCorePlatformHookLibNull/SmmCorePlatformHookLibNull.c
index ef38c8fdf5802cc357f69cd28fbde43179fd5fe1..5381a49c0fc84e914a6c8643947b7289f0a3ff4e 100644 (file)
--- a/MdeModulePkg/Library/SmmCorePlatformHookLibNull/SmmCorePlatformHookLibNull.c
+++ b/MdeModulePkg/Library/SmmCorePlatformHookLibNull/SmmCorePlatformHookLibNull.c
@@ -1,7 +1,7 @@
 /** @file\r
   Null instance of SmmCorePlatformHookLibNull.\r
 \r
 /** @file\r
   Null instance of SmmCorePlatformHookLibNull.\r
 \r

-  Copyright (c) 2011, Intel Corporation. All rights reserved.<BR>\r
+  Copyright (c) 2011 - 2018, Intel Corporation. All rights reserved.<BR>\r

   This program and the accompanying materials\r
   are licensed and made available under the terms and conditions of the BSD License\r
   which accompanies this distribution.  The full text of the license may be found at\r
   This program and the accompanying materials\r
   are licensed and made available under the terms and conditions of the BSD License\r
   which accompanies this distribution.  The full text of the license may be found at\r


@@ -16,9 +16,9 @@
 \r
 /**\r
   Performs platform specific tasks before invoking registered SMI handlers.\r
 \r
 /**\r
   Performs platform specific tasks before invoking registered SMI handlers.\r

-  \r
+\r

   This function performs platform specific tasks before invoking registered SMI handlers.\r
   This function performs platform specific tasks before invoking registered SMI handlers.\r

-  \r
+\r

   @retval EFI_SUCCESS       The platform hook completes successfully.\r
   @retval Other values      The paltform hook cannot complete due to some error.\r
 \r
   @retval EFI_SUCCESS       The platform hook completes successfully.\r
   @retval Other values      The paltform hook cannot complete due to some error.\r
 \r


@@ -35,9 +35,9 @@ PlatformHookBeforeSmmDispatch (
 \r
 /**\r
   Performs platform specific tasks after invoking registered SMI handlers.\r
 \r
 /**\r
   Performs platform specific tasks after invoking registered SMI handlers.\r

-  \r
+\r

   This function performs platform specific tasks after invoking registered SMI handlers.\r
   This function performs platform specific tasks after invoking registered SMI handlers.\r

-  \r
+\r

   @retval EFI_SUCCESS       The platform hook completes successfully.\r
   @retval Other values      The paltform hook cannot complete due to some error.\r
 \r
   @retval EFI_SUCCESS       The platform hook completes successfully.\r
   @retval Other values      The paltform hook cannot complete due to some error.\r
 \r

diff --git a/MdeModulePkg/Library/SmmLockBoxLib/SmmLockBoxDxeLib.c b/MdeModulePkg/Library/SmmLockBoxLib/SmmLockBoxDxeLib.c
index 9b6f0bedbd4fdb55c06b72622231b47ac5457fe1..ac8bcd2ff790a64d3e8de65d3bd981918f9140f2 100644 (file)
--- a/MdeModulePkg/Library/SmmLockBoxLib/SmmLockBoxDxeLib.c
+++ b/MdeModulePkg/Library/SmmLockBoxLib/SmmLockBoxDxeLib.c
@@ -387,7 +387,7 @@ UpdateLockBox (
 \r
   @retval RETURN_SUCCESS            the information is restored successfully.\r
   @retval RETURN_INVALID_PARAMETER  the Guid is NULL, or one of Buffer and Length is NULL.\r
 \r
   @retval RETURN_SUCCESS            the information is restored successfully.\r
   @retval RETURN_INVALID_PARAMETER  the Guid is NULL, or one of Buffer and Length is NULL.\r

-  @retval RETURN_WRITE_PROTECTED    Buffer and Length are NULL, but the LockBox has no \r
+  @retval RETURN_WRITE_PROTECTED    Buffer and Length are NULL, but the LockBox has no\r

                                     LOCK_BOX_ATTRIBUTE_RESTORE_IN_PLACE attribute.\r
   @retval RETURN_BUFFER_TOO_SMALL   the Length is too small to hold the confidential information.\r
   @retval RETURN_NOT_FOUND          the requested GUID not found.\r
                                     LOCK_BOX_ATTRIBUTE_RESTORE_IN_PLACE attribute.\r
   @retval RETURN_BUFFER_TOO_SMALL   the Length is too small to hold the confidential information.\r
   @retval RETURN_NOT_FOUND          the requested GUID not found.\r

diff --git a/MdeModulePkg/Library/SmmLockBoxLib/SmmLockBoxDxeLib.inf b/MdeModulePkg/Library/SmmLockBoxLib/SmmLockBoxDxeLib.inf
index f3120ccb42d58bf20f9bd7a2391d2e998f13fd8a..f9ac74891f4b3b857193981f0e929dc44e1c74ef 100644 (file)
--- a/MdeModulePkg/Library/SmmLockBoxLib/SmmLockBoxDxeLib.inf
+++ b/MdeModulePkg/Library/SmmLockBoxLib/SmmLockBoxDxeLib.inf
@@ -1,7 +1,7 @@
 ## @file\r
 #  DXE LockBox library instance.\r
 #\r
 ## @file\r
 #  DXE LockBox library instance.\r
 #\r

-#  Copyright (c) 2010 - 2017, Intel Corporation. All rights reserved.<BR>\r
+#  Copyright (c) 2010 - 2018, Intel Corporation. All rights reserved.<BR>\r

 #\r
 #  This program and the accompanying materials\r
 #  are licensed and made available under the terms and conditions\r
 #\r
 #  This program and the accompanying materials\r
 #  are licensed and made available under the terms and conditions\r


@@ -26,7 +26,7 @@
 #\r
 # The following information is for reference only and not required by the build tools.\r
 #\r
 #\r
 # The following information is for reference only and not required by the build tools.\r
 #\r

-#  VALID_ARCHITECTURES           = IA32 X64 \r
+#  VALID_ARCHITECTURES           = IA32 X64\r

 #\r
 \r
 [Sources]\r
 #\r
 \r
 [Sources]\r

diff --git a/MdeModulePkg/Library/SmmLockBoxLib/SmmLockBoxDxeLib.uni b/MdeModulePkg/Library/SmmLockBoxLib/SmmLockBoxDxeLib.uni
index d68c912afeb04bdf666ffc4d2eb9ca0c1ab7028f..09f6e59c5611fc33da36ea38b6d1d28ae6892c8b 100644 (file)
--- a/MdeModulePkg/Library/SmmLockBoxLib/SmmLockBoxDxeLib.uni
+++ b/MdeModulePkg/Library/SmmLockBoxLib/SmmLockBoxDxeLib.uni
@@ -3,14 +3,14 @@
 //\r
 // DXE LockBox library instance.\r
 //\r
 //\r
 // DXE LockBox library instance.\r
 //\r

-// Copyright (c) 2010 - 2014, Intel Corporation. All rights reserved.<BR>\r
+// Copyright (c) 2010 - 2018, Intel Corporation. All rights reserved.<BR>\r

 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions\r
 // of the BSD License which accompanies this distribution.  The\r
 // full text of the license may be found at\r
 // http://opensource.org/licenses/bsd-license.php\r
 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions\r
 // of the BSD License which accompanies this distribution.  The\r
 // full text of the license may be found at\r
 // http://opensource.org/licenses/bsd-license.php\r

-// \r
+//\r

 // THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 // WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 //\r
 // THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 // WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 //\r

diff --git a/MdeModulePkg/Library/SmmLockBoxLib/SmmLockBoxPeiLib.c b/MdeModulePkg/Library/SmmLockBoxLib/SmmLockBoxPeiLib.c
index cea1fed682d4614711b27e6115db0154f3bbee8d..8a168663c4af6cce42dab813a74d13b2130bb32e 100644 (file)
--- a/MdeModulePkg/Library/SmmLockBoxLib/SmmLockBoxPeiLib.c
+++ b/MdeModulePkg/Library/SmmLockBoxLib/SmmLockBoxPeiLib.c
@@ -1,6 +1,6 @@
 /** @file\r
 \r
 /** @file\r
 \r

-Copyright (c) 2010 - 2011, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2010 - 2018, Intel Corporation. All rights reserved.<BR>\r

 \r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions\r
 \r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions\r


@@ -237,7 +237,7 @@ InternalGetSmmLockBoxContext (
   @param Length the length of the restored confidential information\r
 \r
   @retval RETURN_SUCCESS            the information is restored successfully.\r
   @param Length the length of the restored confidential information\r
 \r
   @retval RETURN_SUCCESS            the information is restored successfully.\r

-  @retval RETURN_WRITE_PROTECTED    Buffer and Length are NULL, but the LockBox has no \r
+  @retval RETURN_WRITE_PROTECTED    Buffer and Length are NULL, but the LockBox has no\r

                                     LOCK_BOX_ATTRIBUTE_RESTORE_IN_PLACE attribute.\r
   @retval RETURN_BUFFER_TOO_SMALL   the Length is too small to hold the confidential information.\r
   @retval RETURN_NOT_FOUND          the requested GUID not found.\r
                                     LOCK_BOX_ATTRIBUTE_RESTORE_IN_PLACE attribute.\r
   @retval RETURN_BUFFER_TOO_SMALL   the Length is too small to hold the confidential information.\r
   @retval RETURN_NOT_FOUND          the requested GUID not found.\r


@@ -509,7 +509,7 @@ UpdateLockBox (
 \r
   @retval RETURN_SUCCESS            the information is restored successfully.\r
   @retval RETURN_INVALID_PARAMETER  the Guid is NULL, or one of Buffer and Length is NULL.\r
 \r
   @retval RETURN_SUCCESS            the information is restored successfully.\r
   @retval RETURN_INVALID_PARAMETER  the Guid is NULL, or one of Buffer and Length is NULL.\r

-  @retval RETURN_WRITE_PROTECTED    Buffer and Length are NULL, but the LockBox has no \r
+  @retval RETURN_WRITE_PROTECTED    Buffer and Length are NULL, but the LockBox has no\r

                                     LOCK_BOX_ATTRIBUTE_RESTORE_IN_PLACE attribute.\r
   @retval RETURN_BUFFER_TOO_SMALL   the Length is too small to hold the confidential information.\r
   @retval RETURN_NOT_FOUND          the requested GUID not found.\r
                                     LOCK_BOX_ATTRIBUTE_RESTORE_IN_PLACE attribute.\r
   @retval RETURN_BUFFER_TOO_SMALL   the Length is too small to hold the confidential information.\r
   @retval RETURN_NOT_FOUND          the requested GUID not found.\r

diff --git a/MdeModulePkg/Library/SmmLockBoxLib/SmmLockBoxPeiLib.inf b/MdeModulePkg/Library/SmmLockBoxLib/SmmLockBoxPeiLib.inf
index dceff8f0f6738e34e16bfc7dd320cd568d771132..093957ec0adfeb5d99153d08ca42b92c265aac80 100644 (file)
--- a/MdeModulePkg/Library/SmmLockBoxLib/SmmLockBoxPeiLib.inf
+++ b/MdeModulePkg/Library/SmmLockBoxLib/SmmLockBoxPeiLib.inf
@@ -1,7 +1,7 @@
 ## @file\r
 #  PEI LockBox library instance.\r
 #\r
 ## @file\r
 #  PEI LockBox library instance.\r
 #\r

-#  Copyright (c) 2010 - 2014, Intel Corporation. All rights reserved.<BR>\r
+#  Copyright (c) 2010 - 2018, Intel Corporation. All rights reserved.<BR>\r

 #\r
 #  This program and the accompanying materials\r
 #  are licensed and made available under the terms and conditions\r
 #\r
 #  This program and the accompanying materials\r
 #  are licensed and made available under the terms and conditions\r


@@ -26,7 +26,7 @@
 #\r
 # The following information is for reference only and not required by the build tools.\r
 #\r
 #\r
 # The following information is for reference only and not required by the build tools.\r
 #\r

-#  VALID_ARCHITECTURES           = IA32 X64 \r
+#  VALID_ARCHITECTURES           = IA32 X64\r

 #\r
 \r
 [Sources]\r
 #\r
 \r
 [Sources]\r

diff --git a/MdeModulePkg/Library/SmmLockBoxLib/SmmLockBoxPeiLib.uni b/MdeModulePkg/Library/SmmLockBoxLib/SmmLockBoxPeiLib.uni
index 37bb75663ce65fa24aa48dde5c83ba2227ffd91d..d3e6a83a76a216737b98f0f9b859079dc160e7e7 100644 (file)
--- a/MdeModulePkg/Library/SmmLockBoxLib/SmmLockBoxPeiLib.uni
+++ b/MdeModulePkg/Library/SmmLockBoxLib/SmmLockBoxPeiLib.uni
@@ -3,14 +3,14 @@
 //\r
 // PEI LockBox library instance.\r
 //\r
 //\r
 // PEI LockBox library instance.\r
 //\r

-// Copyright (c) 2010 - 2014, Intel Corporation. All rights reserved.<BR>\r
+// Copyright (c) 2010 - 2018, Intel Corporation. All rights reserved.<BR>\r

 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions\r
 // of the BSD License which accompanies this distribution.  The\r
 // full text of the license may be found at\r
 // http://opensource.org/licenses/bsd-license.php\r
 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions\r
 // of the BSD License which accompanies this distribution.  The\r
 // full text of the license may be found at\r
 // http://opensource.org/licenses/bsd-license.php\r

-// \r
+//\r

 // THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 // WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 //\r
 // THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 // WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 //\r

diff --git a/MdeModulePkg/Library/SmmLockBoxLib/SmmLockBoxSmmLib.c b/MdeModulePkg/Library/SmmLockBoxLib/SmmLockBoxSmmLib.c
index 32a57b6a76654d853b3f0d99b61b2a180f55702c..54a81d6521b74cb732001094b9df573538c40dc7 100644 (file)
--- a/MdeModulePkg/Library/SmmLockBoxLib/SmmLockBoxSmmLib.c
+++ b/MdeModulePkg/Library/SmmLockBoxLib/SmmLockBoxSmmLib.c
@@ -201,7 +201,7 @@ SmmLockBoxEndOfS3ResumeNotify (
   @param[in] ImageHandle  Image handle of this driver.\r
   @param[in] SystemTable  A Pointer to the EFI System Table.\r
 \r
   @param[in] ImageHandle  Image handle of this driver.\r
   @param[in] SystemTable  A Pointer to the EFI System Table.\r
 \r

-  @retval EFI_SUCEESS     \r
+  @retval EFI_SUCEESS\r

   @return Others          Some error occurs.\r
 **/\r
 EFI_STATUS\r
   @return Others          Some error occurs.\r
 **/\r
 EFI_STATUS\r


@@ -666,7 +666,7 @@ UpdateLockBox (
 \r
   @retval RETURN_SUCCESS            the information is restored successfully.\r
   @retval RETURN_INVALID_PARAMETER  the Guid is NULL, or one of Buffer and Length is NULL.\r
 \r
   @retval RETURN_SUCCESS            the information is restored successfully.\r
   @retval RETURN_INVALID_PARAMETER  the Guid is NULL, or one of Buffer and Length is NULL.\r

-  @retval RETURN_WRITE_PROTECTED    Buffer and Length are NULL, but the LockBox has no \r
+  @retval RETURN_WRITE_PROTECTED    Buffer and Length are NULL, but the LockBox has no\r

                                     LOCK_BOX_ATTRIBUTE_RESTORE_IN_PLACE attribute.\r
   @retval RETURN_BUFFER_TOO_SMALL   the Length is too small to hold the confidential information.\r
   @retval RETURN_NOT_FOUND          the requested GUID not found.\r
                                     LOCK_BOX_ATTRIBUTE_RESTORE_IN_PLACE attribute.\r
   @retval RETURN_BUFFER_TOO_SMALL   the Length is too small to hold the confidential information.\r
   @retval RETURN_NOT_FOUND          the requested GUID not found.\r

diff --git a/MdeModulePkg/Library/SmmLockBoxLib/SmmLockBoxSmmLib.inf b/MdeModulePkg/Library/SmmLockBoxLib/SmmLockBoxSmmLib.inf
index 426af4cccfe033d134bec964d8dfbf44ab7c8ff2..a1715e4c36f982ab7bd6ce924254f8ee88125098 100644 (file)
--- a/MdeModulePkg/Library/SmmLockBoxLib/SmmLockBoxSmmLib.inf
+++ b/MdeModulePkg/Library/SmmLockBoxLib/SmmLockBoxSmmLib.inf
@@ -28,7 +28,7 @@
 #\r
 # The following information is for reference only and not required by the build tools.\r
 #\r
 #\r
 # The following information is for reference only and not required by the build tools.\r
 #\r

-#  VALID_ARCHITECTURES           = IA32 X64 \r
+#  VALID_ARCHITECTURES           = IA32 X64\r

 #\r
 \r
 [Sources]\r
 #\r
 \r
 [Sources]\r

diff --git a/MdeModulePkg/Library/SmmLockBoxLib/SmmLockBoxSmmLib.uni b/MdeModulePkg/Library/SmmLockBoxLib/SmmLockBoxSmmLib.uni
index 4e719facbe9e0f9082b042afe308fdb9b06ed8c1..45cfd8e3bf30b563e3a1f39727c303e7792a91cb 100644 (file)
--- a/MdeModulePkg/Library/SmmLockBoxLib/SmmLockBoxSmmLib.uni
+++ b/MdeModulePkg/Library/SmmLockBoxLib/SmmLockBoxSmmLib.uni
@@ -3,14 +3,14 @@
 //\r
 // SMM LockBox library instance.\r
 //\r
 //\r
 // SMM LockBox library instance.\r
 //\r

-// Copyright (c) 2010 - 2014, Intel Corporation. All rights reserved.<BR>\r
+// Copyright (c) 2010 - 2018, Intel Corporation. All rights reserved.<BR>\r

 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions\r
 // of the BSD License which accompanies this distribution.  The\r
 // full text of the license may be found at\r
 // http://opensource.org/licenses/bsd-license.php\r
 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions\r
 // of the BSD License which accompanies this distribution.  The\r
 // full text of the license may be found at\r
 // http://opensource.org/licenses/bsd-license.php\r

-// \r
+//\r

 // THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 // WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 //\r
 // THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 // WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 //\r

diff --git a/MdeModulePkg/Library/SmmMemoryAllocationProfileLib/MemoryAllocationLib.c b/MdeModulePkg/Library/SmmMemoryAllocationProfileLib/MemoryAllocationLib.c
index 2a18155e56060cf9fa116ae7410c5b62fb0a77b2..a1e6a3a7a1d953ebbd2d2eb704b2814fc3e1f61e 100644 (file)
--- a/MdeModulePkg/Library/SmmMemoryAllocationProfileLib/MemoryAllocationLib.c
+++ b/MdeModulePkg/Library/SmmMemoryAllocationProfileLib/MemoryAllocationLib.c
@@ -1,25 +1,25 @@
 /** @file\r
 /** @file\r

-  Support routines for memory allocation routines based \r
+  Support routines for memory allocation routines based\r

   on SMM Services Table services for SMM phase drivers, with memory profile support.\r
   on SMM Services Table services for SMM phase drivers, with memory profile support.\r

-  \r
+\r

   The PI System Management Mode Core Interface Specification only allows the use\r
   The PI System Management Mode Core Interface Specification only allows the use\r

-  of EfiRuntimeServicesCode and EfiRuntimeServicesData memory types for memory \r
-  allocations through the SMM Services Table as the SMRAM space should be \r
+  of EfiRuntimeServicesCode and EfiRuntimeServicesData memory types for memory\r
+  allocations through the SMM Services Table as the SMRAM space should be\r

   reserved after BDS phase.  The functions in the Memory Allocation Library use\r
   reserved after BDS phase.  The functions in the Memory Allocation Library use\r

-  EfiBootServicesData as the default memory allocation type.  For this SMM \r
-  specific instance of the Memory Allocation Library, EfiRuntimeServicesData \r
-  is used as the default memory type for all allocations. In addition, \r
-  allocation for the Reserved memory types are not supported and will always \r
+  EfiBootServicesData as the default memory allocation type.  For this SMM\r
+  specific instance of the Memory Allocation Library, EfiRuntimeServicesData\r
+  is used as the default memory type for all allocations. In addition,\r
+  allocation for the Reserved memory types are not supported and will always\r

   return NULL.\r
 \r
   return NULL.\r
 \r

-  Copyright (c) 2006 - 2017, Intel Corporation. All rights reserved.<BR>\r
-  This program and the accompanying materials                          \r
-  are licensed and made available under the terms and conditions of the BSD License         \r
-  which accompanies this distribution.  The full text of the license may be found at        \r
-  http://opensource.org/licenses/bsd-license.php.                                            \r
+  Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r
+  This program and the accompanying materials\r
+  are licensed and made available under the terms and conditions of the BSD License\r
+  which accompanies this distribution.  The full text of the license may be found at\r
+  http://opensource.org/licenses/bsd-license.php.\r

 \r
 \r

-  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     \r
-  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             \r
+  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
+  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r

 \r
 **/\r
 \r
 \r
 **/\r
 \r


@@ -39,10 +39,10 @@ UINTN                 mSmramRangeCount;
 \r
 /**\r
   The constructor function caches SMRAM ranges that are present in the system.\r
 \r
 /**\r
   The constructor function caches SMRAM ranges that are present in the system.\r

-    \r
+\r

   It will ASSERT() if SMM Access2 Protocol doesn't exist.\r
   It will ASSERT() if SMRAM ranges can't be got.\r
   It will ASSERT() if SMM Access2 Protocol doesn't exist.\r
   It will ASSERT() if SMRAM ranges can't be got.\r

-  It will ASSERT() if Resource can't be allocated for cache SMRAM range. \r
+  It will ASSERT() if Resource can't be allocated for cache SMRAM range.\r

   It will always return EFI_SUCCESS.\r
 \r
   @param  ImageHandle   The firmware allocated handle for the EFI image.\r
   It will always return EFI_SUCCESS.\r
 \r
   @param  ImageHandle   The firmware allocated handle for the EFI image.\r


@@ -66,8 +66,8 @@ SmmMemoryAllocationLibConstructor (
   // Locate SMM Access2 Protocol\r
   //\r
   Status = gBS->LocateProtocol (\r
   // Locate SMM Access2 Protocol\r
   //\r
   Status = gBS->LocateProtocol (\r

-                  &gEfiSmmAccess2ProtocolGuid, \r
-                  NULL, \r
+                  &gEfiSmmAccess2ProtocolGuid,\r
+                  NULL,\r

                   (VOID **)&SmmAccess\r
                   );\r
   ASSERT_EFI_ERROR (Status);\r
                   (VOID **)&SmmAccess\r
                   );\r
   ASSERT_EFI_ERROR (Status);\r


@@ -91,7 +91,7 @@ SmmMemoryAllocationLibConstructor (
 }\r
 \r
 /**\r
 }\r
 \r
 /**\r

-  If SMM driver exits with an error, it must call this routine \r
+  If SMM driver exits with an error, it must call this routine\r

   to free the allocated resource before the exiting.\r
 \r
   @param[in]  ImageHandle   The firmware allocated handle for the EFI image.\r
   to free the allocated resource before the exiting.\r
 \r
   @param[in]  ImageHandle   The firmware allocated handle for the EFI image.\r


@@ -128,7 +128,7 @@ BufferInSmram (
   UINTN  Index;\r
 \r
   for (Index = 0; Index < mSmramRangeCount; Index ++) {\r
   UINTN  Index;\r
 \r
   for (Index = 0; Index < mSmramRangeCount; Index ++) {\r

-    if (((EFI_PHYSICAL_ADDRESS) (UINTN) Buffer >= mSmramRanges[Index].CpuStart) && \r
+    if (((EFI_PHYSICAL_ADDRESS) (UINTN) Buffer >= mSmramRanges[Index].CpuStart) &&\r

         ((EFI_PHYSICAL_ADDRESS) (UINTN) Buffer < (mSmramRanges[Index].CpuStart + mSmramRanges[Index].PhysicalSize))) {\r
       return TRUE;\r
     }\r
         ((EFI_PHYSICAL_ADDRESS) (UINTN) Buffer < (mSmramRanges[Index].CpuStart + mSmramRanges[Index].PhysicalSize))) {\r
       return TRUE;\r
     }\r


@@ -140,9 +140,9 @@ BufferInSmram (
 /**\r
   Allocates one or more 4KB pages of a certain memory type.\r
 \r
 /**\r
   Allocates one or more 4KB pages of a certain memory type.\r
 \r

-  Allocates the number of 4KB pages of a certain memory type and returns a pointer \r
-  to the allocated buffer.  The buffer returned is aligned on a 4KB boundary.  If \r
-  Pages is 0, then NULL is returned.   If there is not enough memory remaining to \r
+  Allocates the number of 4KB pages of a certain memory type and returns a pointer\r
+  to the allocated buffer.  The buffer returned is aligned on a 4KB boundary.  If\r
+  Pages is 0, then NULL is returned.   If there is not enough memory remaining to\r

   satisfy the request, then NULL is returned.\r
 \r
   @param  MemoryType            The type of memory to allocate.\r
   satisfy the request, then NULL is returned.\r
 \r
   @param  MemoryType            The type of memory to allocate.\r


@@ -153,12 +153,12 @@ BufferInSmram (
 **/\r
 VOID *\r
 InternalAllocatePages (\r
 **/\r
 VOID *\r
 InternalAllocatePages (\r

-  IN EFI_MEMORY_TYPE  MemoryType,  \r
+  IN EFI_MEMORY_TYPE  MemoryType,\r

   IN UINTN            Pages\r
   )\r
 {\r
   EFI_STATUS            Status;\r
   IN UINTN            Pages\r
   )\r
 {\r
   EFI_STATUS            Status;\r

-  EFI_PHYSICAL_ADDRESS  Memory; \r
+  EFI_PHYSICAL_ADDRESS  Memory;\r

 \r
   if (Pages == 0) {\r
     return NULL;\r
 \r
   if (Pages == 0) {\r
     return NULL;\r


@@ -174,9 +174,9 @@ InternalAllocatePages (
 /**\r
   Allocates one or more 4KB pages of type EfiRuntimeServicesData.\r
 \r
 /**\r
   Allocates one or more 4KB pages of type EfiRuntimeServicesData.\r
 \r

-  Allocates the number of 4KB pages of type EfiRuntimeServicesData and returns a pointer \r
-  to the allocated buffer.  The buffer returned is aligned on a 4KB boundary.  If \r
-  Pages is 0, then NULL is returned.  If there is not enough memory remaining to \r
+  Allocates the number of 4KB pages of type EfiRuntimeServicesData and returns a pointer\r
+  to the allocated buffer.  The buffer returned is aligned on a 4KB boundary.  If\r
+  Pages is 0, then NULL is returned.  If there is not enough memory remaining to\r

   satisfy the request, then NULL is returned.\r
 \r
   @param  Pages                 The number of 4 KB pages to allocate.\r
   satisfy the request, then NULL is returned.\r
 \r
   @param  Pages                 The number of 4 KB pages to allocate.\r


@@ -209,9 +209,9 @@ AllocatePages (
 /**\r
   Allocates one or more 4KB pages of type EfiRuntimeServicesData.\r
 \r
 /**\r
   Allocates one or more 4KB pages of type EfiRuntimeServicesData.\r
 \r

-  Allocates the number of 4KB pages of type EfiRuntimeServicesData and returns a \r
-  pointer to the allocated buffer.  The buffer returned is aligned on a 4KB boundary.  \r
-  If Pages is 0, then NULL is returned.  If there is not enough memory remaining \r
+  Allocates the number of 4KB pages of type EfiRuntimeServicesData and returns a\r
+  pointer to the allocated buffer.  The buffer returned is aligned on a 4KB boundary.\r
+  If Pages is 0, then NULL is returned.  If there is not enough memory remaining\r

   to satisfy the request, then NULL is returned.\r
 \r
   @param  Pages                 The number of 4 KB pages to allocate.\r
   to satisfy the request, then NULL is returned.\r
 \r
   @param  Pages                 The number of 4 KB pages to allocate.\r


@@ -244,9 +244,9 @@ AllocateRuntimePages (
 /**\r
   Allocates one or more 4KB pages of type EfiReservedMemoryType.\r
 \r
 /**\r
   Allocates one or more 4KB pages of type EfiReservedMemoryType.\r
 \r

-  Allocates the number of 4KB pages of type EfiReservedMemoryType and returns a \r
-  pointer to the allocated buffer.  The buffer returned is aligned on a 4KB boundary.  \r
-  If Pages is 0, then NULL is returned.  If there is not enough memory remaining \r
+  Allocates the number of 4KB pages of type EfiReservedMemoryType and returns a\r
+  pointer to the allocated buffer.  The buffer returned is aligned on a 4KB boundary.\r
+  If Pages is 0, then NULL is returned.  If there is not enough memory remaining\r

   to satisfy the request, then NULL is returned.\r
 \r
   @param  Pages                 The number of 4 KB pages to allocate.\r
   to satisfy the request, then NULL is returned.\r
 \r
   @param  Pages                 The number of 4 KB pages to allocate.\r


@@ -267,15 +267,15 @@ AllocateReservedPages (
   Frees one or more 4KB pages that were previously allocated with one of the page allocation\r
   functions in the Memory Allocation Library.\r
 \r
   Frees one or more 4KB pages that were previously allocated with one of the page allocation\r
   functions in the Memory Allocation Library.\r
 \r

-  Frees the number of 4KB pages specified by Pages from the buffer specified by Buffer.  \r
-  Buffer must have been allocated on a previous call to the page allocation services \r
-  of the Memory Allocation Library.  If it is not possible to free allocated pages, \r
+  Frees the number of 4KB pages specified by Pages from the buffer specified by Buffer.\r
+  Buffer must have been allocated on a previous call to the page allocation services\r
+  of the Memory Allocation Library.  If it is not possible to free allocated pages,\r

   then this function will perform no actions.\r
   then this function will perform no actions.\r

-  \r
-  If Buffer was not allocated with a page allocation function in the Memory Allocation \r
+\r
+  If Buffer was not allocated with a page allocation function in the Memory Allocation\r

   Library, then ASSERT().\r
   If Pages is zero, then ASSERT().\r
   Library, then ASSERT().\r
   If Pages is zero, then ASSERT().\r

- \r
+\r

   @param  Buffer                The pointer to the buffer of pages to free.\r
   @param  Pages                 The number of 4 KB pages to free.\r
 \r
   @param  Buffer                The pointer to the buffer of pages to free.\r
   @param  Pages                 The number of 4 KB pages to free.\r
 \r


@@ -309,16 +309,16 @@ FreePages (
 /**\r
   Allocates one or more 4KB pages of a certain memory type at a specified alignment.\r
 \r
 /**\r
   Allocates one or more 4KB pages of a certain memory type at a specified alignment.\r
 \r

-  Allocates the number of 4KB pages specified by Pages of a certain memory type \r
-  with an alignment specified by Alignment.  The allocated buffer is returned.  \r
-  If Pages is 0, then NULL is returned. If there is not enough memory at the \r
+  Allocates the number of 4KB pages specified by Pages of a certain memory type\r
+  with an alignment specified by Alignment.  The allocated buffer is returned.\r
+  If Pages is 0, then NULL is returned. If there is not enough memory at the\r

   specified alignment remaining to satisfy the request, then NULL is returned.\r
   If Alignment is not a power of two and Alignment is not zero, then ASSERT().\r
   If Pages plus EFI_SIZE_TO_PAGES (Alignment) overflows, then ASSERT().\r
 \r
   @param  MemoryType            The type of memory to allocate.\r
   @param  Pages                 The number of 4 KB pages to allocate.\r
   specified alignment remaining to satisfy the request, then NULL is returned.\r
   If Alignment is not a power of two and Alignment is not zero, then ASSERT().\r
   If Pages plus EFI_SIZE_TO_PAGES (Alignment) overflows, then ASSERT().\r
 \r
   @param  MemoryType            The type of memory to allocate.\r
   @param  Pages                 The number of 4 KB pages to allocate.\r

-  @param  Alignment             The requested alignment of the allocation.  \r
+  @param  Alignment             The requested alignment of the allocation.\r

                                 Must be a power of two.\r
                                 If Alignment is zero, then byte alignment is used.\r
 \r
                                 Must be a power of two.\r
                                 If Alignment is zero, then byte alignment is used.\r
 \r


@@ -327,7 +327,7 @@ FreePages (
 **/\r
 VOID *\r
 InternalAllocateAlignedPages (\r
 **/\r
 VOID *\r
 InternalAllocateAlignedPages (\r

-  IN EFI_MEMORY_TYPE  MemoryType,  \r
+  IN EFI_MEMORY_TYPE  MemoryType,\r

   IN UINTN            Pages,\r
   IN UINTN            Alignment\r
   )\r
   IN UINTN            Pages,\r
   IN UINTN            Alignment\r
   )\r


@@ -343,7 +343,7 @@ InternalAllocateAlignedPages (
   // Alignment must be a power of two or zero.\r
   //\r
   ASSERT ((Alignment & (Alignment - 1)) == 0);\r
   // Alignment must be a power of two or zero.\r
   //\r
   ASSERT ((Alignment & (Alignment - 1)) == 0);\r

- \r
+\r

   if (Pages == 0) {\r
     return NULL;\r
   }\r
   if (Pages == 0) {\r
     return NULL;\r
   }\r


@@ -357,7 +357,7 @@ InternalAllocateAlignedPages (
     // Make sure that Pages plus EFI_SIZE_TO_PAGES (Alignment) does not overflow.\r
     //\r
     ASSERT (RealPages > Pages);\r
     // Make sure that Pages plus EFI_SIZE_TO_PAGES (Alignment) does not overflow.\r
     //\r
     ASSERT (RealPages > Pages);\r

- \r
+\r

     Status         = gSmst->SmmAllocatePages (AllocateAnyPages, MemoryType, RealPages, &Memory);\r
     if (EFI_ERROR (Status)) {\r
       return NULL;\r
     Status         = gSmst->SmmAllocatePages (AllocateAnyPages, MemoryType, RealPages, &Memory);\r
     if (EFI_ERROR (Status)) {\r
       return NULL;\r


@@ -396,16 +396,16 @@ InternalAllocateAlignedPages (
 /**\r
   Allocates one or more 4KB pages of type EfiRuntimeServicesData at a specified alignment.\r
 \r
 /**\r
   Allocates one or more 4KB pages of type EfiRuntimeServicesData at a specified alignment.\r
 \r

-  Allocates the number of 4KB pages specified by Pages of type EfiRuntimeServicesData \r
-  with an alignment specified by Alignment.  The allocated buffer is returned.  \r
-  If Pages is 0, then NULL is returned.  If there is not enough memory at the \r
+  Allocates the number of 4KB pages specified by Pages of type EfiRuntimeServicesData\r
+  with an alignment specified by Alignment.  The allocated buffer is returned.\r
+  If Pages is 0, then NULL is returned.  If there is not enough memory at the\r

   specified alignment remaining to satisfy the request, then NULL is returned.\r
   specified alignment remaining to satisfy the request, then NULL is returned.\r

-  \r
+\r

   If Alignment is not a power of two and Alignment is not zero, then ASSERT().\r
   If Pages plus EFI_SIZE_TO_PAGES (Alignment) overflows, then ASSERT().\r
 \r
   @param  Pages                 The number of 4 KB pages to allocate.\r
   If Alignment is not a power of two and Alignment is not zero, then ASSERT().\r
   If Pages plus EFI_SIZE_TO_PAGES (Alignment) overflows, then ASSERT().\r
 \r
   @param  Pages                 The number of 4 KB pages to allocate.\r

-  @param  Alignment             The requested alignment of the allocation.  \r
+  @param  Alignment             The requested alignment of the allocation.\r

                                 Must be a power of two.\r
                                 If Alignment is zero, then byte alignment is used.\r
 \r
                                 Must be a power of two.\r
                                 If Alignment is zero, then byte alignment is used.\r
 \r


@@ -438,16 +438,16 @@ AllocateAlignedPages (
 /**\r
   Allocates one or more 4KB pages of type EfiRuntimeServicesData at a specified alignment.\r
 \r
 /**\r
   Allocates one or more 4KB pages of type EfiRuntimeServicesData at a specified alignment.\r
 \r

-  Allocates the number of 4KB pages specified by Pages of type EfiRuntimeServicesData \r
-  with an alignment specified by Alignment.  The allocated buffer is returned.  \r
-  If Pages is 0, then NULL is returned.  If there is not enough memory at the \r
+  Allocates the number of 4KB pages specified by Pages of type EfiRuntimeServicesData\r
+  with an alignment specified by Alignment.  The allocated buffer is returned.\r
+  If Pages is 0, then NULL is returned.  If there is not enough memory at the\r

   specified alignment remaining to satisfy the request, then NULL is returned.\r
   specified alignment remaining to satisfy the request, then NULL is returned.\r

-  \r
+\r

   If Alignment is not a power of two and Alignment is not zero, then ASSERT().\r
   If Pages plus EFI_SIZE_TO_PAGES (Alignment) overflows, then ASSERT().\r
 \r
   @param  Pages                 The number of 4 KB pages to allocate.\r
   If Alignment is not a power of two and Alignment is not zero, then ASSERT().\r
   If Pages plus EFI_SIZE_TO_PAGES (Alignment) overflows, then ASSERT().\r
 \r
   @param  Pages                 The number of 4 KB pages to allocate.\r

-  @param  Alignment             The requested alignment of the allocation.  \r
+  @param  Alignment             The requested alignment of the allocation.\r

                                 Must be a power of two.\r
                                 If Alignment is zero, then byte alignment is used.\r
 \r
                                 Must be a power of two.\r
                                 If Alignment is zero, then byte alignment is used.\r
 \r


@@ -480,16 +480,16 @@ AllocateAlignedRuntimePages (
 /**\r
   Allocates one or more 4KB pages of type EfiReservedMemoryType at a specified alignment.\r
 \r
 /**\r
   Allocates one or more 4KB pages of type EfiReservedMemoryType at a specified alignment.\r
 \r

-  Allocates the number of 4KB pages specified by Pages of type EfiReservedMemoryType \r
-  with an alignment specified by Alignment.  The allocated buffer is returned.  \r
-  If Pages is 0, then NULL is returned.  If there is not enough memory at the \r
+  Allocates the number of 4KB pages specified by Pages of type EfiReservedMemoryType\r
+  with an alignment specified by Alignment.  The allocated buffer is returned.\r
+  If Pages is 0, then NULL is returned.  If there is not enough memory at the\r

   specified alignment remaining to satisfy the request, then NULL is returned.\r
   specified alignment remaining to satisfy the request, then NULL is returned.\r

-  \r
+\r

   If Alignment is not a power of two and Alignment is not zero, then ASSERT().\r
   If Pages plus EFI_SIZE_TO_PAGES (Alignment) overflows, then ASSERT().\r
 \r
   @param  Pages                 The number of 4 KB pages to allocate.\r
   If Alignment is not a power of two and Alignment is not zero, then ASSERT().\r
   If Pages plus EFI_SIZE_TO_PAGES (Alignment) overflows, then ASSERT().\r
 \r
   @param  Pages                 The number of 4 KB pages to allocate.\r

-  @param  Alignment             The requested alignment of the allocation.  \r
+  @param  Alignment             The requested alignment of the allocation.\r

                                 Must be a power of two.\r
                                 If Alignment is zero, then byte alignment is used.\r
 \r
                                 Must be a power of two.\r
                                 If Alignment is zero, then byte alignment is used.\r
 \r


@@ -510,15 +510,15 @@ AllocateAlignedReservedPages (
   Frees one or more 4KB pages that were previously allocated with one of the aligned page\r
   allocation functions in the Memory Allocation Library.\r
 \r
   Frees one or more 4KB pages that were previously allocated with one of the aligned page\r
   allocation functions in the Memory Allocation Library.\r
 \r

-  Frees the number of 4KB pages specified by Pages from the buffer specified by \r
-  Buffer.  Buffer must have been allocated on a previous call to the aligned page \r
-  allocation services of the Memory Allocation Library.  If it is not possible to \r
+  Frees the number of 4KB pages specified by Pages from the buffer specified by\r
+  Buffer.  Buffer must have been allocated on a previous call to the aligned page\r
+  allocation services of the Memory Allocation Library.  If it is not possible to\r

   free allocated pages, then this function will perform no actions.\r
   free allocated pages, then this function will perform no actions.\r

-  \r
-  If Buffer was not allocated with an aligned page allocation function in the \r
+\r
+  If Buffer was not allocated with an aligned page allocation function in the\r

   Memory Allocation Library, then ASSERT().\r
   If Pages is zero, then ASSERT().\r
   Memory Allocation Library, then ASSERT().\r
   If Pages is zero, then ASSERT().\r

-  \r
+\r

   @param  Buffer                The pointer to the buffer of pages to free.\r
   @param  Pages                 The number of 4 KB pages to free.\r
 \r
   @param  Buffer                The pointer to the buffer of pages to free.\r
   @param  Pages                 The number of 4 KB pages to free.\r
 \r


@@ -552,9 +552,9 @@ FreeAlignedPages (
 /**\r
   Allocates a buffer of a certain pool type.\r
 \r
 /**\r
   Allocates a buffer of a certain pool type.\r
 \r

-  Allocates the number bytes specified by AllocationSize of a certain pool type \r
-  and returns a pointer to the allocated buffer.  If AllocationSize is 0, then a \r
-  valid buffer of 0 size is returned.  If there is not enough memory remaining to \r
+  Allocates the number bytes specified by AllocationSize of a certain pool type\r
+  and returns a pointer to the allocated buffer.  If AllocationSize is 0, then a\r
+  valid buffer of 0 size is returned.  If there is not enough memory remaining to\r

   satisfy the request, then NULL is returned.\r
 \r
   @param  MemoryType            The type of memory to allocate.\r
   satisfy the request, then NULL is returned.\r
 \r
   @param  MemoryType            The type of memory to allocate.\r


@@ -565,7 +565,7 @@ FreeAlignedPages (
 **/\r
 VOID *\r
 InternalAllocatePool (\r
 **/\r
 VOID *\r
 InternalAllocatePool (\r

-  IN EFI_MEMORY_TYPE  MemoryType,  \r
+  IN EFI_MEMORY_TYPE  MemoryType,\r

   IN UINTN            AllocationSize\r
   )\r
 {\r
   IN UINTN            AllocationSize\r
   )\r
 {\r


@@ -582,9 +582,9 @@ InternalAllocatePool (
 /**\r
   Allocates a buffer of type EfiRuntimeServicesData.\r
 \r
 /**\r
   Allocates a buffer of type EfiRuntimeServicesData.\r
 \r

-  Allocates the number bytes specified by AllocationSize of type EfiRuntimeServicesData \r
-  and returns a pointer to the allocated buffer.  If AllocationSize is 0, then a \r
-  valid buffer of 0 size is returned.  If there is not enough memory remaining to \r
+  Allocates the number bytes specified by AllocationSize of type EfiRuntimeServicesData\r
+  and returns a pointer to the allocated buffer.  If AllocationSize is 0, then a\r
+  valid buffer of 0 size is returned.  If there is not enough memory remaining to\r

   satisfy the request, then NULL is returned.\r
 \r
   @param  AllocationSize        The number of bytes to allocate.\r
   satisfy the request, then NULL is returned.\r
 \r
   @param  AllocationSize        The number of bytes to allocate.\r


@@ -617,9 +617,9 @@ AllocatePool (
 /**\r
   Allocates a buffer of type EfiRuntimeServicesData.\r
 \r
 /**\r
   Allocates a buffer of type EfiRuntimeServicesData.\r
 \r

-  Allocates the number bytes specified by AllocationSize of type EfiRuntimeServicesData \r
-  and returns a pointer to the allocated buffer.  If AllocationSize is 0, then a \r
-  valid buffer of 0 size is returned.  If there is not enough memory remaining to \r
+  Allocates the number bytes specified by AllocationSize of type EfiRuntimeServicesData\r
+  and returns a pointer to the allocated buffer.  If AllocationSize is 0, then a\r
+  valid buffer of 0 size is returned.  If there is not enough memory remaining to\r

   satisfy the request, then NULL is returned.\r
 \r
   @param  AllocationSize        The number of bytes to allocate.\r
   satisfy the request, then NULL is returned.\r
 \r
   @param  AllocationSize        The number of bytes to allocate.\r


@@ -652,9 +652,9 @@ AllocateRuntimePool (
 /**\r
   Allocates a buffer of type EfiReservedMemoryType.\r
 \r
 /**\r
   Allocates a buffer of type EfiReservedMemoryType.\r
 \r

-  Allocates the number bytes specified by AllocationSize of type EfiReservedMemoryType \r
-  and returns a pointer to the allocated buffer.  If AllocationSize is 0, then a \r
-  valid buffer of 0 size is returned.  If there is not enough memory remaining to \r
+  Allocates the number bytes specified by AllocationSize of type EfiReservedMemoryType\r
+  and returns a pointer to the allocated buffer.  If AllocationSize is 0, then a\r
+  valid buffer of 0 size is returned.  If there is not enough memory remaining to\r

   satisfy the request, then NULL is returned.\r
 \r
   @param  AllocationSize        The number of bytes to allocate.\r
   satisfy the request, then NULL is returned.\r
 \r
   @param  AllocationSize        The number of bytes to allocate.\r


@@ -674,9 +674,9 @@ AllocateReservedPool (
 /**\r
   Allocates and zeros a buffer of a certain pool type.\r
 \r
 /**\r
   Allocates and zeros a buffer of a certain pool type.\r
 \r

-  Allocates the number bytes specified by AllocationSize of a certain pool type, \r
-  clears the buffer with zeros, and returns a pointer to the allocated buffer.  \r
-  If AllocationSize is 0, then a valid buffer of 0 size is returned.  If there is \r
+  Allocates the number bytes specified by AllocationSize of a certain pool type,\r
+  clears the buffer with zeros, and returns a pointer to the allocated buffer.\r
+  If AllocationSize is 0, then a valid buffer of 0 size is returned.  If there is\r

   not enough memory remaining to satisfy the request, then NULL is returned.\r
 \r
   @param  PoolType              The type of memory to allocate.\r
   not enough memory remaining to satisfy the request, then NULL is returned.\r
 \r
   @param  PoolType              The type of memory to allocate.\r


@@ -687,9 +687,9 @@ AllocateReservedPool (
 **/\r
 VOID *\r
 InternalAllocateZeroPool (\r
 **/\r
 VOID *\r
 InternalAllocateZeroPool (\r

-  IN EFI_MEMORY_TYPE  PoolType,  \r
+  IN EFI_MEMORY_TYPE  PoolType,\r

   IN UINTN            AllocationSize\r
   IN UINTN            AllocationSize\r

-  ) \r
+  )\r

 {\r
   VOID  *Memory;\r
 \r
 {\r
   VOID  *Memory;\r
 \r


@@ -703,9 +703,9 @@ InternalAllocateZeroPool (
 /**\r
   Allocates and zeros a buffer of type EfiRuntimeServicesData.\r
 \r
 /**\r
   Allocates and zeros a buffer of type EfiRuntimeServicesData.\r
 \r

-  Allocates the number bytes specified by AllocationSize of type EfiRuntimeServicesData, \r
-  clears the buffer with zeros, and returns a pointer to the allocated buffer.  \r
-  If AllocationSize is 0, then a valid buffer of 0 size is returned.  If there is \r
+  Allocates the number bytes specified by AllocationSize of type EfiRuntimeServicesData,\r
+  clears the buffer with zeros, and returns a pointer to the allocated buffer.\r
+  If AllocationSize is 0, then a valid buffer of 0 size is returned.  If there is\r

   not enough memory remaining to satisfy the request, then NULL is returned.\r
 \r
   @param  AllocationSize        The number of bytes to allocate and zero.\r
   not enough memory remaining to satisfy the request, then NULL is returned.\r
 \r
   @param  AllocationSize        The number of bytes to allocate and zero.\r


@@ -738,9 +738,9 @@ AllocateZeroPool (
 /**\r
   Allocates and zeros a buffer of type EfiRuntimeServicesData.\r
 \r
 /**\r
   Allocates and zeros a buffer of type EfiRuntimeServicesData.\r
 \r

-  Allocates the number bytes specified by AllocationSize of type EfiRuntimeServicesData, \r
-  clears the buffer with zeros, and returns a pointer to the allocated buffer.  \r
-  If AllocationSize is 0, then a valid buffer of 0 size is returned.  If there is \r
+  Allocates the number bytes specified by AllocationSize of type EfiRuntimeServicesData,\r
+  clears the buffer with zeros, and returns a pointer to the allocated buffer.\r
+  If AllocationSize is 0, then a valid buffer of 0 size is returned.  If there is\r

   not enough memory remaining to satisfy the request, then NULL is returned.\r
 \r
   @param  AllocationSize        The number of bytes to allocate and zero.\r
   not enough memory remaining to satisfy the request, then NULL is returned.\r
 \r
   @param  AllocationSize        The number of bytes to allocate and zero.\r


@@ -773,9 +773,9 @@ AllocateRuntimeZeroPool (
 /**\r
   Allocates and zeros a buffer of type EfiReservedMemoryType.\r
 \r
 /**\r
   Allocates and zeros a buffer of type EfiReservedMemoryType.\r
 \r

-  Allocates the number bytes specified by AllocationSize of type EfiReservedMemoryType, \r
-  clears the   buffer with zeros, and returns a pointer to the allocated buffer.  \r
-  If AllocationSize is 0, then a valid buffer of 0 size is returned.  If there is \r
+  Allocates the number bytes specified by AllocationSize of type EfiReservedMemoryType,\r
+  clears the   buffer with zeros, and returns a pointer to the allocated buffer.\r
+  If AllocationSize is 0, then a valid buffer of 0 size is returned.  If there is\r

   not enough memory remaining to satisfy the request, then NULL is returned.\r
 \r
   @param  AllocationSize        The number of bytes to allocate and zero.\r
   not enough memory remaining to satisfy the request, then NULL is returned.\r
 \r
   @param  AllocationSize        The number of bytes to allocate and zero.\r


@@ -795,12 +795,12 @@ AllocateReservedZeroPool (
 /**\r
   Copies a buffer to an allocated buffer of a certain pool type.\r
 \r
 /**\r
   Copies a buffer to an allocated buffer of a certain pool type.\r
 \r

-  Allocates the number bytes specified by AllocationSize of a certain pool type, \r
-  copies AllocationSize bytes from Buffer to the newly allocated buffer, and returns \r
-  a pointer to the allocated buffer.  If AllocationSize is 0, then a valid buffer \r
-  of 0 size is returned.  If there is not enough memory remaining to satisfy the \r
+  Allocates the number bytes specified by AllocationSize of a certain pool type,\r
+  copies AllocationSize bytes from Buffer to the newly allocated buffer, and returns\r
+  a pointer to the allocated buffer.  If AllocationSize is 0, then a valid buffer\r
+  of 0 size is returned.  If there is not enough memory remaining to satisfy the\r

   request, then NULL is returned. If Buffer is NULL, then ASSERT().\r
   request, then NULL is returned. If Buffer is NULL, then ASSERT().\r

-  If AllocationSize is greater than (MAX_ADDRESS - Buffer + 1), then ASSERT(). \r
+  If AllocationSize is greater than (MAX_ADDRESS - Buffer + 1), then ASSERT().\r

 \r
   @param  PoolType              The type of pool to allocate.\r
   @param  AllocationSize        The number of bytes to allocate and zero.\r
 \r
   @param  PoolType              The type of pool to allocate.\r
   @param  AllocationSize        The number of bytes to allocate and zero.\r


@@ -811,10 +811,10 @@ AllocateReservedZeroPool (
 **/\r
 VOID *\r
 InternalAllocateCopyPool (\r
 **/\r
 VOID *\r
 InternalAllocateCopyPool (\r

-  IN EFI_MEMORY_TYPE  PoolType,  \r
+  IN EFI_MEMORY_TYPE  PoolType,\r

   IN UINTN            AllocationSize,\r
   IN CONST VOID       *Buffer\r
   IN UINTN            AllocationSize,\r
   IN CONST VOID       *Buffer\r

-  ) \r
+  )\r

 {\r
   VOID  *Memory;\r
 \r
 {\r
   VOID  *Memory;\r
 \r


@@ -826,19 +826,19 @@ InternalAllocateCopyPool (
      Memory = CopyMem (Memory, Buffer, AllocationSize);\r
   }\r
   return Memory;\r
      Memory = CopyMem (Memory, Buffer, AllocationSize);\r
   }\r
   return Memory;\r

-} \r
+}\r

 \r
 /**\r
   Copies a buffer to an allocated buffer of type EfiRuntimeServicesData.\r
 \r
 \r
 /**\r
   Copies a buffer to an allocated buffer of type EfiRuntimeServicesData.\r
 \r

-  Allocates the number bytes specified by AllocationSize of type EfiRuntimeServicesData, \r
-  copies AllocationSize bytes from Buffer to the newly allocated buffer, and returns \r
-  a pointer to the allocated buffer.  If AllocationSize is 0, then a valid buffer \r
-  of 0 size is returned.  If there is not enough memory remaining to satisfy the \r
+  Allocates the number bytes specified by AllocationSize of type EfiRuntimeServicesData,\r
+  copies AllocationSize bytes from Buffer to the newly allocated buffer, and returns\r
+  a pointer to the allocated buffer.  If AllocationSize is 0, then a valid buffer\r
+  of 0 size is returned.  If there is not enough memory remaining to satisfy the\r

   request, then NULL is returned.\r
   request, then NULL is returned.\r

-  \r
+\r

   If Buffer is NULL, then ASSERT().\r
   If Buffer is NULL, then ASSERT().\r

-  If AllocationSize is greater than (MAX_ADDRESS - Buffer + 1), then ASSERT(). \r
+  If AllocationSize is greater than (MAX_ADDRESS - Buffer + 1), then ASSERT().\r

 \r
   @param  AllocationSize        The number of bytes to allocate and zero.\r
   @param  Buffer                The buffer to copy to the allocated buffer.\r
 \r
   @param  AllocationSize        The number of bytes to allocate and zero.\r
   @param  Buffer                The buffer to copy to the allocated buffer.\r


@@ -872,14 +872,14 @@ AllocateCopyPool (
 /**\r
   Copies a buffer to an allocated buffer of type EfiRuntimeServicesData.\r
 \r
 /**\r
   Copies a buffer to an allocated buffer of type EfiRuntimeServicesData.\r
 \r

-  Allocates the number bytes specified by AllocationSize of type EfiRuntimeServicesData, \r
-  copies AllocationSize bytes from Buffer to the newly allocated buffer, and returns \r
-  a pointer to the allocated buffer.  If AllocationSize is 0, then a valid buffer \r
-  of 0 size is returned.  If there is not enough memory remaining to satisfy the \r
+  Allocates the number bytes specified by AllocationSize of type EfiRuntimeServicesData,\r
+  copies AllocationSize bytes from Buffer to the newly allocated buffer, and returns\r
+  a pointer to the allocated buffer.  If AllocationSize is 0, then a valid buffer\r
+  of 0 size is returned.  If there is not enough memory remaining to satisfy the\r

   request, then NULL is returned.\r
   request, then NULL is returned.\r

-  \r
+\r

   If Buffer is NULL, then ASSERT().\r
   If Buffer is NULL, then ASSERT().\r

-  If AllocationSize is greater than (MAX_ADDRESS - Buffer + 1), then ASSERT(). \r
+  If AllocationSize is greater than (MAX_ADDRESS - Buffer + 1), then ASSERT().\r

 \r
   @param  AllocationSize        The number of bytes to allocate and zero.\r
   @param  Buffer                The buffer to copy to the allocated buffer.\r
 \r
   @param  AllocationSize        The number of bytes to allocate and zero.\r
   @param  Buffer                The buffer to copy to the allocated buffer.\r


@@ -913,14 +913,14 @@ AllocateRuntimeCopyPool (
 /**\r
   Copies a buffer to an allocated buffer of type EfiReservedMemoryType.\r
 \r
 /**\r
   Copies a buffer to an allocated buffer of type EfiReservedMemoryType.\r
 \r

-  Allocates the number bytes specified by AllocationSize of type EfiReservedMemoryType, \r
-  copies AllocationSize bytes from Buffer to the newly allocated buffer, and returns \r
-  a pointer to the allocated buffer.  If AllocationSize is 0, then a valid buffer \r
-  of 0 size is returned.  If there is not enough memory remaining to satisfy the \r
+  Allocates the number bytes specified by AllocationSize of type EfiReservedMemoryType,\r
+  copies AllocationSize bytes from Buffer to the newly allocated buffer, and returns\r
+  a pointer to the allocated buffer.  If AllocationSize is 0, then a valid buffer\r
+  of 0 size is returned.  If there is not enough memory remaining to satisfy the\r

   request, then NULL is returned.\r
   request, then NULL is returned.\r

-  \r
+\r

   If Buffer is NULL, then ASSERT().\r
   If Buffer is NULL, then ASSERT().\r

-  If AllocationSize is greater than (MAX_ADDRESS - Buffer + 1), then ASSERT(). \r
+  If AllocationSize is greater than (MAX_ADDRESS - Buffer + 1), then ASSERT().\r

 \r
   @param  AllocationSize        The number of bytes to allocate and zero.\r
   @param  Buffer                The buffer to copy to the allocated buffer.\r
 \r
   @param  AllocationSize        The number of bytes to allocate and zero.\r
   @param  Buffer                The buffer to copy to the allocated buffer.\r


@@ -942,19 +942,19 @@ AllocateReservedCopyPool (
   Reallocates a buffer of a specified memory type.\r
 \r
   Allocates and zeros the number bytes specified by NewSize from memory of the type\r
   Reallocates a buffer of a specified memory type.\r
 \r
   Allocates and zeros the number bytes specified by NewSize from memory of the type\r

-  specified by PoolType.  If OldBuffer is not NULL, then the smaller of OldSize and \r
-  NewSize bytes are copied from OldBuffer to the newly allocated buffer, and \r
-  OldBuffer is freed.  A pointer to the newly allocated buffer is returned.  \r
-  If NewSize is 0, then a valid buffer of 0 size is  returned.  If there is not \r
+  specified by PoolType.  If OldBuffer is not NULL, then the smaller of OldSize and\r
+  NewSize bytes are copied from OldBuffer to the newly allocated buffer, and\r
+  OldBuffer is freed.  A pointer to the newly allocated buffer is returned.\r
+  If NewSize is 0, then a valid buffer of 0 size is  returned.  If there is not\r

   enough memory remaining to satisfy the request, then NULL is returned.\r
   enough memory remaining to satisfy the request, then NULL is returned.\r

-  \r
-  If the allocation of the new buffer is successful and the smaller of NewSize \r
+\r
+  If the allocation of the new buffer is successful and the smaller of NewSize\r

   and OldSize is greater than (MAX_ADDRESS - OldBuffer + 1), then ASSERT().\r
 \r
   @param  PoolType       The type of pool to allocate.\r
   @param  OldSize        The size, in bytes, of OldBuffer.\r
   @param  NewSize        The size, in bytes, of the buffer to reallocate.\r
   and OldSize is greater than (MAX_ADDRESS - OldBuffer + 1), then ASSERT().\r
 \r
   @param  PoolType       The type of pool to allocate.\r
   @param  OldSize        The size, in bytes, of OldBuffer.\r
   @param  NewSize        The size, in bytes, of the buffer to reallocate.\r

-  @param  OldBuffer      The buffer to copy to the allocated buffer.  This is an \r
+  @param  OldBuffer      The buffer to copy to the allocated buffer.  This is an\r

                          optional parameter that may be NULL.\r
 \r
   @return A pointer to the allocated buffer or NULL if allocation fails.\r
                          optional parameter that may be NULL.\r
 \r
   @return A pointer to the allocated buffer or NULL if allocation fails.\r


@@ -962,7 +962,7 @@ AllocateReservedCopyPool (
 **/\r
 VOID *\r
 InternalReallocatePool (\r
 **/\r
 VOID *\r
 InternalReallocatePool (\r

-  IN EFI_MEMORY_TYPE  PoolType,  \r
+  IN EFI_MEMORY_TYPE  PoolType,\r

   IN UINTN            OldSize,\r
   IN UINTN            NewSize,\r
   IN VOID             *OldBuffer  OPTIONAL\r
   IN UINTN            OldSize,\r
   IN UINTN            NewSize,\r
   IN VOID             *OldBuffer  OPTIONAL\r


@@ -982,18 +982,18 @@ InternalReallocatePool (
   Reallocates a buffer of type EfiRuntimeServicesData.\r
 \r
   Allocates and zeros the number bytes specified by NewSize from memory of type\r
   Reallocates a buffer of type EfiRuntimeServicesData.\r
 \r
   Allocates and zeros the number bytes specified by NewSize from memory of type\r

-  EfiRuntimeServicesData.  If OldBuffer is not NULL, then the smaller of OldSize and \r
-  NewSize bytes are copied from OldBuffer to the newly allocated buffer, and \r
-  OldBuffer is freed.  A pointer to the newly allocated buffer is returned.  \r
-  If NewSize is 0, then a valid buffer of 0 size is  returned.  If there is not \r
+  EfiRuntimeServicesData.  If OldBuffer is not NULL, then the smaller of OldSize and\r
+  NewSize bytes are copied from OldBuffer to the newly allocated buffer, and\r
+  OldBuffer is freed.  A pointer to the newly allocated buffer is returned.\r
+  If NewSize is 0, then a valid buffer of 0 size is  returned.  If there is not\r

   enough memory remaining to satisfy the request, then NULL is returned.\r
   enough memory remaining to satisfy the request, then NULL is returned.\r

-  \r
-  If the allocation of the new buffer is successful and the smaller of NewSize \r
+\r
+  If the allocation of the new buffer is successful and the smaller of NewSize\r

   and OldSize is greater than (MAX_ADDRESS - OldBuffer + 1), then ASSERT().\r
 \r
   @param  OldSize        The size, in bytes, of OldBuffer.\r
   @param  NewSize        The size, in bytes, of the buffer to reallocate.\r
   and OldSize is greater than (MAX_ADDRESS - OldBuffer + 1), then ASSERT().\r
 \r
   @param  OldSize        The size, in bytes, of OldBuffer.\r
   @param  NewSize        The size, in bytes, of the buffer to reallocate.\r

-  @param  OldBuffer      The buffer to copy to the allocated buffer.  This is an \r
+  @param  OldBuffer      The buffer to copy to the allocated buffer.  This is an\r

                          optional parameter that may be NULL.\r
 \r
   @return A pointer to the allocated buffer or NULL if allocation fails.\r
                          optional parameter that may be NULL.\r
 \r
   @return A pointer to the allocated buffer or NULL if allocation fails.\r


@@ -1027,18 +1027,18 @@ ReallocatePool (
   Reallocates a buffer of type EfiRuntimeServicesData.\r
 \r
   Allocates and zeros the number bytes specified by NewSize from memory of type\r
   Reallocates a buffer of type EfiRuntimeServicesData.\r
 \r
   Allocates and zeros the number bytes specified by NewSize from memory of type\r

-  EfiRuntimeServicesData.  If OldBuffer is not NULL, then the smaller of OldSize \r
-  and NewSize bytes are copied from OldBuffer to the newly allocated buffer, and \r
-  OldBuffer is freed.  A pointer to the newly allocated buffer is returned.  \r
-  If NewSize is 0, then a valid buffer of 0 size is  returned.  If there is not \r
+  EfiRuntimeServicesData.  If OldBuffer is not NULL, then the smaller of OldSize\r
+  and NewSize bytes are copied from OldBuffer to the newly allocated buffer, and\r
+  OldBuffer is freed.  A pointer to the newly allocated buffer is returned.\r
+  If NewSize is 0, then a valid buffer of 0 size is  returned.  If there is not\r

   enough memory remaining to satisfy the request, then NULL is returned.\r
 \r
   enough memory remaining to satisfy the request, then NULL is returned.\r
 \r

-  If the allocation of the new buffer is successful and the smaller of NewSize \r
+  If the allocation of the new buffer is successful and the smaller of NewSize\r

   and OldSize is greater than (MAX_ADDRESS - OldBuffer + 1), then ASSERT().\r
 \r
   @param  OldSize        The size, in bytes, of OldBuffer.\r
   @param  NewSize        The size, in bytes, of the buffer to reallocate.\r
   and OldSize is greater than (MAX_ADDRESS - OldBuffer + 1), then ASSERT().\r
 \r
   @param  OldSize        The size, in bytes, of OldBuffer.\r
   @param  NewSize        The size, in bytes, of the buffer to reallocate.\r

-  @param  OldBuffer      The buffer to copy to the allocated buffer.  This is an \r
+  @param  OldBuffer      The buffer to copy to the allocated buffer.  This is an\r

                          optional parameter that may be NULL.\r
 \r
   @return A pointer to the allocated buffer or NULL if allocation fails.\r
                          optional parameter that may be NULL.\r
 \r
   @return A pointer to the allocated buffer or NULL if allocation fails.\r


@@ -1072,18 +1072,18 @@ ReallocateRuntimePool (
   Reallocates a buffer of type EfiReservedMemoryType.\r
 \r
   Allocates and zeros the number bytes specified by NewSize from memory of type\r
   Reallocates a buffer of type EfiReservedMemoryType.\r
 \r
   Allocates and zeros the number bytes specified by NewSize from memory of type\r

-  EfiReservedMemoryType.  If OldBuffer is not NULL, then the smaller of OldSize \r
-  and NewSize bytes are copied from OldBuffer to the newly allocated buffer, and \r
-  OldBuffer is freed.  A pointer to the newly allocated buffer is returned.  \r
-  If NewSize is 0, then a valid buffer of 0 size is  returned.  If there is not \r
+  EfiReservedMemoryType.  If OldBuffer is not NULL, then the smaller of OldSize\r
+  and NewSize bytes are copied from OldBuffer to the newly allocated buffer, and\r
+  OldBuffer is freed.  A pointer to the newly allocated buffer is returned.\r
+  If NewSize is 0, then a valid buffer of 0 size is  returned.  If there is not\r

   enough memory remaining to satisfy the request, then NULL is returned.\r
 \r
   enough memory remaining to satisfy the request, then NULL is returned.\r
 \r

-  If the allocation of the new buffer is successful and the smaller of NewSize \r
+  If the allocation of the new buffer is successful and the smaller of NewSize\r

   and OldSize is greater than (MAX_ADDRESS - OldBuffer + 1), then ASSERT().\r
 \r
   @param  OldSize        The size, in bytes, of OldBuffer.\r
   @param  NewSize        The size, in bytes, of the buffer to reallocate.\r
   and OldSize is greater than (MAX_ADDRESS - OldBuffer + 1), then ASSERT().\r
 \r
   @param  OldSize        The size, in bytes, of OldBuffer.\r
   @param  NewSize        The size, in bytes, of the buffer to reallocate.\r

-  @param  OldBuffer      The buffer to copy to the allocated buffer.  This is an \r
+  @param  OldBuffer      The buffer to copy to the allocated buffer.  This is an\r

                          optional parameter that may be NULL.\r
 \r
   @return A pointer to the allocated buffer or NULL if allocation fails.\r
                          optional parameter that may be NULL.\r
 \r
   @return A pointer to the allocated buffer or NULL if allocation fails.\r


@@ -1101,15 +1101,15 @@ ReallocateReservedPool (
 }\r
 \r
 /**\r
 }\r
 \r
 /**\r

-  Frees a buffer that was previously allocated with one of the pool allocation \r
+  Frees a buffer that was previously allocated with one of the pool allocation\r

   functions in the Memory Allocation Library.\r
 \r
   functions in the Memory Allocation Library.\r
 \r

-  Frees the buffer specified by Buffer.  Buffer must have been allocated on a \r
-  previous call to the pool allocation services of the Memory Allocation Library.  \r
-  If it is not possible to free pool resources, then this function will perform \r
+  Frees the buffer specified by Buffer.  Buffer must have been allocated on a\r
+  previous call to the pool allocation services of the Memory Allocation Library.\r
+  If it is not possible to free pool resources, then this function will perform\r

   no actions.\r
   no actions.\r

-  \r
-  If Buffer was not allocated with a pool allocation function in the Memory \r
+\r
+  If Buffer was not allocated with a pool allocation function in the Memory\r

   Allocation Library, then ASSERT().\r
 \r
   @param  Buffer                The pointer to the buffer to free.\r
   Allocation Library, then ASSERT().\r
 \r
   @param  Buffer                The pointer to the buffer to free.\r

diff --git a/MdeModulePkg/Library/SmmMemoryAllocationProfileLib/SmmMemoryAllocationProfileLib.inf b/MdeModulePkg/Library/SmmMemoryAllocationProfileLib/SmmMemoryAllocationProfileLib.inf
index 60ec75c30e8e189cf04d076e1b26fe385513ab59..0fdb27f20fcae3d04cf1f5cc8aa192262e02b1c1 100644 (file)
--- a/MdeModulePkg/Library/SmmMemoryAllocationProfileLib/SmmMemoryAllocationProfileLib.inf
+++ b/MdeModulePkg/Library/SmmMemoryAllocationProfileLib/SmmMemoryAllocationProfileLib.inf
@@ -2,13 +2,13 @@
 # Instance of Memory Allocation Library using SMM Services Table,\r
 # with memory profile support.\r
 #\r
 # Instance of Memory Allocation Library using SMM Services Table,\r
 # with memory profile support.\r
 #\r

-# Memory Allocation Library that uses services from the SMM Services Table to \r
+# Memory Allocation Library that uses services from the SMM Services Table to\r

 # allocate and free memory, with memory profile support.\r
 #\r
 # The implementation of this instance is copied from UefiMemoryAllocationLib\r
 # in MdePkg and updated to support both MemoryAllocationLib and MemoryProfileLib.\r
 #\r
 # allocate and free memory, with memory profile support.\r
 #\r
 # The implementation of this instance is copied from UefiMemoryAllocationLib\r
 # in MdePkg and updated to support both MemoryAllocationLib and MemoryProfileLib.\r
 #\r

-# Copyright (c) 2010 - 2016, Intel Corporation. All rights reserved.<BR>\r
+# Copyright (c) 2010 - 2018, Intel Corporation. All rights reserved.<BR>\r

 # This program and the accompanying materials\r
 # are licensed and made available under the terms and conditions of the BSD License\r
 # which accompanies this distribution. The full text of the license may be found at\r
 # This program and the accompanying materials\r
 # are licensed and made available under the terms and conditions of the BSD License\r
 # which accompanies this distribution. The full text of the license may be found at\r


@@ -26,7 +26,7 @@
   MODULE_TYPE                    = DXE_SMM_DRIVER\r
   VERSION_STRING                 = 1.0\r
   PI_SPECIFICATION_VERSION       = 0x0001000A\r
   MODULE_TYPE                    = DXE_SMM_DRIVER\r
   VERSION_STRING                 = 1.0\r
   PI_SPECIFICATION_VERSION       = 0x0001000A\r

-  LIBRARY_CLASS                  = MemoryAllocationLib|DXE_SMM_DRIVER \r
+  LIBRARY_CLASS                  = MemoryAllocationLib|DXE_SMM_DRIVER\r

   CONSTRUCTOR                    = SmmMemoryAllocationLibConstructor\r
   DESTRUCTOR                     = SmmMemoryAllocationLibDestructor\r
   LIBRARY_CLASS                  = MemoryProfileLib|DXE_SMM_DRIVER\r
   CONSTRUCTOR                    = SmmMemoryAllocationLibConstructor\r
   DESTRUCTOR                     = SmmMemoryAllocationLibDestructor\r
   LIBRARY_CLASS                  = MemoryProfileLib|DXE_SMM_DRIVER\r


@@ -51,7 +51,7 @@
   UefiBootServicesTableLib\r
 \r
 [Protocols]\r
   UefiBootServicesTableLib\r
 \r
 [Protocols]\r

-  gEfiSmmAccess2ProtocolGuid    ## CONSUMES  \r
+  gEfiSmmAccess2ProtocolGuid    ## CONSUMES\r

 \r
 [Guids]\r
   gEdkiiMemoryProfileGuid       ## SOMETIMES_CONSUMES   ## GUID # Locate protocol\r
 \r
 [Guids]\r
   gEdkiiMemoryProfileGuid       ## SOMETIMES_CONSUMES   ## GUID # Locate protocol\r

diff --git a/MdeModulePkg/Library/SmmMemoryAllocationProfileLib/SmmMemoryProfileLib.c b/MdeModulePkg/Library/SmmMemoryAllocationProfileLib/SmmMemoryProfileLib.c
index 85e7c9c132bdb378da3bb92b738e0bd1f39841c4..6dd14732ca45278ea0315e8671c6cbe5f8041987 100644 (file)
--- a/MdeModulePkg/Library/SmmMemoryAllocationProfileLib/SmmMemoryProfileLib.c
+++ b/MdeModulePkg/Library/SmmMemoryAllocationProfileLib/SmmMemoryProfileLib.c
@@ -1,14 +1,14 @@
 /** @file\r
   Support routines for memory profile for Smm phase drivers.\r
 \r
 /** @file\r
   Support routines for memory profile for Smm phase drivers.\r
 \r

-  Copyright (c) 2016, Intel Corporation. All rights reserved.<BR>\r
-  This program and the accompanying materials                          \r
-  are licensed and made available under the terms and conditions of the BSD License         \r
-  which accompanies this distribution.  The full text of the license may be found at        \r
-  http://opensource.org/licenses/bsd-license.php.                                            \r
-\r
-  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     \r
-  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             \r
+  Copyright (c) 2016 - 2018, Intel Corporation. All rights reserved.<BR>\r
+  This program and the accompanying materials\r
+  are licensed and made available under the terms and conditions of the BSD License\r
+  which accompanies this distribution.  The full text of the license may be found at\r
+  http://opensource.org/licenses/bsd-license.php.\r
+\r
+  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
+  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r

 \r
 **/\r
 \r
 \r
 **/\r
 \r

diff --git a/MdeModulePkg/Library/SmmPerformanceLib/SmmPerformanceLib.c b/MdeModulePkg/Library/SmmPerformanceLib/SmmPerformanceLib.c
index 830037befa6d602a3dac7e019095e7a0e65d6b25..120155b98ee8a707adc4cd3e48aff53a1a607b00 100644 (file)
--- a/MdeModulePkg/Library/SmmPerformanceLib/SmmPerformanceLib.c
+++ b/MdeModulePkg/Library/SmmPerformanceLib/SmmPerformanceLib.c
@@ -6,7 +6,7 @@
   to log performance data. If both SMM PerformanceEx and Performance Protocol are not available, it does not log any\r
   performance information.\r
 \r
   to log performance data. If both SMM PerformanceEx and Performance Protocol are not available, it does not log any\r
   performance information.\r
 \r

-  Copyright (c) 2011 - 2016, Intel Corporation. All rights reserved.<BR>\r
+  Copyright (c) 2011 - 2018, Intel Corporation. All rights reserved.<BR>\r

 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r


@@ -47,7 +47,7 @@ SmmPerformanceLibConstructor (
   IN EFI_SYSTEM_TABLE  *SystemTable\r
   )\r
 {\r
   IN EFI_SYSTEM_TABLE  *SystemTable\r
   )\r
 {\r

-  \r
+\r

   mPerformanceMeasurementEnabled =  (BOOLEAN) ((PcdGet8(PcdPerformanceLibraryPropertyMask) & PERFORMANCE_LIBRARY_PROPERTY_MEASUREMENT_ENABLED) != 0);\r
 \r
   return EFI_SUCCESS;\r
   mPerformanceMeasurementEnabled =  (BOOLEAN) ((PcdGet8(PcdPerformanceLibraryPropertyMask) & PERFORMANCE_LIBRARY_PROPERTY_MEASUREMENT_ENABLED) != 0);\r
 \r
   return EFI_SUCCESS;\r


@@ -246,7 +246,7 @@ EndPerformanceMeasurementEx (
 UINTN\r
 EFIAPI\r
 GetPerformanceMeasurementEx (\r
 UINTN\r
 EFIAPI\r
 GetPerformanceMeasurementEx (\r

-  IN  UINTN       LogEntryKey, \r
+  IN  UINTN       LogEntryKey,\r

   OUT CONST VOID  **Handle,\r
   OUT CONST CHAR8 **Token,\r
   OUT CONST CHAR8 **Module,\r
   OUT CONST VOID  **Handle,\r
   OUT CONST CHAR8 **Token,\r
   OUT CONST CHAR8 **Module,\r

diff --git a/MdeModulePkg/Library/SmmPerformanceLib/SmmPerformanceLib.inf b/MdeModulePkg/Library/SmmPerformanceLib/SmmPerformanceLib.inf
index 174ed3f1e59167bd9c6caa9e895055277efa1597..9e3109140b80193ebd89e345358c9400ea2949e8 100644 (file)
--- a/MdeModulePkg/Library/SmmPerformanceLib/SmmPerformanceLib.inf
+++ b/MdeModulePkg/Library/SmmPerformanceLib/SmmPerformanceLib.inf
@@ -1,20 +1,20 @@
 ## @file\r
 #  Performance library instance used in SMM phase.\r
 ## @file\r
 #  Performance library instance used in SMM phase.\r

-#  \r
+#\r

 #  This library instance provides infrastructure for SMM drivers to log performance\r
 #  data. It consumes SMM PerformanceEx or Performance Protocol published by SmmCorePerformanceLib\r
 #  to log performance data. If both SMM PerformanceEx and Performance Protocol are not available,\r
 #  it does not log any performance information.\r
 #  This library instance provides infrastructure for SMM drivers to log performance\r
 #  data. It consumes SMM PerformanceEx or Performance Protocol published by SmmCorePerformanceLib\r
 #  to log performance data. If both SMM PerformanceEx and Performance Protocol are not available,\r
 #  it does not log any performance information.\r

-#  \r
+#\r

 #  Copyright (c) 2011 - 2018, Intel Corporation. All rights reserved.<BR>\r
 #  This program and the accompanying materials\r
 #  are licensed and made available under the terms and conditions of the BSD License\r
 #  which accompanies this distribution.  The full text of the license may be found at\r
 #  http://opensource.org/licenses/bsd-license.php\r
 #  Copyright (c) 2011 - 2018, Intel Corporation. All rights reserved.<BR>\r
 #  This program and the accompanying materials\r
 #  are licensed and made available under the terms and conditions of the BSD License\r
 #  which accompanies this distribution.  The full text of the license may be found at\r
 #  http://opensource.org/licenses/bsd-license.php\r

-#  \r
+#\r

 #  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 #  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 #  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 #  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r

-#  \r
+#\r

 ##\r
 \r
 [Defines]\r
 ##\r
 \r
 [Defines]\r

diff --git a/MdeModulePkg/Library/SmmPerformanceLib/SmmPerformanceLib.uni b/MdeModulePkg/Library/SmmPerformanceLib/SmmPerformanceLib.uni
index 9751183d9b8fd81945242ca2f0f7b76014b635cb..5db9ffb4451d2d3b5cb6c57d975b2226b7397654 100644 (file)
--- a/MdeModulePkg/Library/SmmPerformanceLib/SmmPerformanceLib.uni
+++ b/MdeModulePkg/Library/SmmPerformanceLib/SmmPerformanceLib.uni
@@ -6,13 +6,13 @@
 // to log performance data. If both SMM PerformanceEx and Performance Protocol are not available,\r
 // it does not log any performance information.\r
 //\r
 // to log performance data. If both SMM PerformanceEx and Performance Protocol are not available,\r
 // it does not log any performance information.\r
 //\r

-// Copyright (c) 2011 - 2014, Intel Corporation. All rights reserved.<BR>\r
+// Copyright (c) 2011 - 2018, Intel Corporation. All rights reserved.<BR>\r

 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r
 // which accompanies this distribution.  The full text of the license may be found at\r
 // http://opensource.org/licenses/bsd-license.php\r
 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r
 // which accompanies this distribution.  The full text of the license may be found at\r
 // http://opensource.org/licenses/bsd-license.php\r

-// \r
+//\r

 // THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 // WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 //\r
 // THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 // WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 //\r

diff --git a/MdeModulePkg/Library/SmmReportStatusCodeLib/ReportStatusCodeLib.c b/MdeModulePkg/Library/SmmReportStatusCodeLib/ReportStatusCodeLib.c
index 5394fb9e97b1d8fda93173cdfea7f2e741ce9f52..c2fd33e8c1ca236d3e7cc57cea216dde742ba869 100644 (file)
--- a/MdeModulePkg/Library/SmmReportStatusCodeLib/ReportStatusCodeLib.c
+++ b/MdeModulePkg/Library/SmmReportStatusCodeLib/ReportStatusCodeLib.c
@@ -1,7 +1,7 @@
 /** @file\r
   Report Status Code Library for SMM Phase.\r
 \r
 /** @file\r
   Report Status Code Library for SMM Phase.\r
 \r

-  Copyright (c) 2009 - 2010, Intel Corporation. All rights reserved.<BR>\r
+  Copyright (c) 2009 - 2018, Intel Corporation. All rights reserved.<BR>\r

   This program and the accompanying materials\r
   are licensed and made available under the terms and conditions of the BSD License\r
   which accompanies this distribution.  The full text of the license may be found at\r
   This program and the accompanying materials\r
   are licensed and made available under the terms and conditions of the BSD License\r
   which accompanies this distribution.  The full text of the license may be found at\r


@@ -92,13 +92,13 @@ InternalReportStatusCode (
         return EFI_UNSUPPORTED;\r
       }\r
     }\r
         return EFI_UNSUPPORTED;\r
       }\r
     }\r

-  \r
+\r

     //\r
     // A status code service is present in system, so pass in all the parameters to the service.\r
     //\r
     return (*mReportStatusCode) (mStatusCodeProtocol, Type, Value, Instance, (EFI_GUID *)CallerId, Data);\r
   }\r
     //\r
     // A status code service is present in system, so pass in all the parameters to the service.\r
     //\r
     return (*mReportStatusCode) (mStatusCodeProtocol, Type, Value, Instance, (EFI_GUID *)CallerId, Data);\r
   }\r

-  \r
+\r

   return EFI_UNSUPPORTED;\r
 }\r
 \r
   return EFI_UNSUPPORTED;\r
 }\r
 \r

diff --git a/MdeModulePkg/Library/UefiBootManagerLib/BmBoot.c b/MdeModulePkg/Library/UefiBootManagerLib/BmBoot.c
index 59bd1e4c6c00ca3c59fbade40c075c86d636345a..6a23477eb8730dfa94faa4e6447b792d514cd901 100644 (file)
--- a/MdeModulePkg/Library/UefiBootManagerLib/BmBoot.c
+++ b/MdeModulePkg/Library/UefiBootManagerLib/BmBoot.c
@@ -109,7 +109,7 @@ BmFindBootOptionInVariable (
   EFI_BOOT_MANAGER_LOAD_OPTION *BootOptions;\r
   UINTN                        BootOptionCount;\r
   UINTN                        Index;\r
   EFI_BOOT_MANAGER_LOAD_OPTION *BootOptions;\r
   UINTN                        BootOptionCount;\r
   UINTN                        Index;\r

-  \r
+\r

   OptionNumber = LoadOptionNumberUnassigned;\r
 \r
   //\r
   OptionNumber = LoadOptionNumberUnassigned;\r
 \r
   //\r


@@ -233,7 +233,7 @@ BmAdjustFvFilePath (
       break;\r
     }\r
   }\r
       break;\r
     }\r
   }\r

-  \r
+\r

   if (FvHandles != NULL) {\r
     FreePool (FvHandles);\r
   }\r
   if (FvHandles != NULL) {\r
     FreePool (FvHandles);\r
   }\r


@@ -242,7 +242,7 @@ BmAdjustFvFilePath (
 \r
 /**\r
   Check if it's a Device Path pointing to FV file.\r
 \r
 /**\r
   Check if it's a Device Path pointing to FV file.\r

-  \r
+\r

   The function doesn't garentee the device path points to existing FV file.\r
 \r
   @param  DevicePath     Input device path.\r
   The function doesn't garentee the device path points to existing FV file.\r
 \r
   @param  DevicePath     Input device path.\r


@@ -471,13 +471,13 @@ BmMatchUsbWwid (
 }\r
 \r
 /**\r
 }\r
 \r
 /**\r

-  Find a USB device which match the specified short-form device path start with \r
+  Find a USB device which match the specified short-form device path start with\r

   USB Class or USB WWID device path. If ParentDevicePath is NULL, this function\r
   will search in all USB devices of the platform. If ParentDevicePath is not NULL,\r
   this function will only search in its child devices.\r
 \r
   @param DevicePath           The device path that contains USB Class or USB WWID device path.\r
   USB Class or USB WWID device path. If ParentDevicePath is NULL, this function\r
   will search in all USB devices of the platform. If ParentDevicePath is not NULL,\r
   this function will only search in its child devices.\r
 \r
   @param DevicePath           The device path that contains USB Class or USB WWID device path.\r

-  @param ParentDevicePathSize The length of the device path before the USB Class or \r
+  @param ParentDevicePathSize The length of the device path before the USB Class or\r

                               USB WWID device path.\r
   @param UsbIoHandleCount     A pointer to the count of the returned USB IO handles.\r
 \r
                               USB WWID device path.\r
   @param UsbIoHandleCount     A pointer to the count of the returned USB IO handles.\r
 \r


@@ -499,7 +499,7 @@ BmFindUsbDevice (
   UINTN                     Index;\r
   BOOLEAN                   Matched;\r
 \r
   UINTN                     Index;\r
   BOOLEAN                   Matched;\r
 \r

-  ASSERT (UsbIoHandleCount != NULL);  \r
+  ASSERT (UsbIoHandleCount != NULL);\r

 \r
   //\r
   // Get all UsbIo Handles.\r
 \r
   //\r
   // Get all UsbIo Handles.\r


@@ -655,7 +655,7 @@ BmExpandFileDevicePath (
   UINTN                           MediaType;\r
   EFI_DEVICE_PATH_PROTOCOL        *NextFullPath;\r
   BOOLEAN                         GetNext;\r
   UINTN                           MediaType;\r
   EFI_DEVICE_PATH_PROTOCOL        *NextFullPath;\r
   BOOLEAN                         GetNext;\r

-  \r
+\r

   EfiBootManagerConnectAll ();\r
   Status = gBS->LocateHandleBuffer (ByProtocol, &gEfiSimpleFileSystemProtocolGuid, NULL, &HandleCount, &Handles);\r
   if (EFI_ERROR (Status)) {\r
   EfiBootManagerConnectAll ();\r
   Status = gBS->LocateHandleBuffer (ByProtocol, &gEfiSimpleFileSystemProtocolGuid, NULL, &HandleCount, &Handles);\r
   if (EFI_ERROR (Status)) {\r


@@ -780,7 +780,7 @@ BmCachePartitionDevicePath (
 {\r
   EFI_DEVICE_PATH_PROTOCOL        *TempDevicePath;\r
   UINTN                           Count;\r
 {\r
   EFI_DEVICE_PATH_PROTOCOL        *TempDevicePath;\r
   UINTN                           Count;\r

-  \r
+\r

   if (BmMatchDevicePaths (*CachedDevicePath, DevicePath)) {\r
     TempDevicePath = *CachedDevicePath;\r
     *CachedDevicePath = BmDelPartMatchInstance (*CachedDevicePath, DevicePath);\r
   if (BmMatchDevicePaths (*CachedDevicePath, DevicePath)) {\r
     TempDevicePath = *CachedDevicePath;\r
     *CachedDevicePath = BmDelPartMatchInstance (*CachedDevicePath, DevicePath);\r


@@ -1670,12 +1670,12 @@ BmIsBootManagerMenuFilePath (
 /**\r
   Attempt to boot the EFI boot option. This routine sets L"BootCurent" and\r
   also signals the EFI ready to boot event. If the device path for the option\r
 /**\r
   Attempt to boot the EFI boot option. This routine sets L"BootCurent" and\r
   also signals the EFI ready to boot event. If the device path for the option\r

-  starts with a BBS device path a legacy boot is attempted via the registered \r
-  gLegacyBoot function. Short form device paths are also supported via this \r
+  starts with a BBS device path a legacy boot is attempted via the registered\r
+  gLegacyBoot function. Short form device paths are also supported via this\r

   rountine. A device path starting with MEDIA_HARDDRIVE_DP, MSG_USB_WWID_DP,\r
   MSG_USB_CLASS_DP gets expaned out to find the first device that matches.\r
   rountine. A device path starting with MEDIA_HARDDRIVE_DP, MSG_USB_WWID_DP,\r
   MSG_USB_CLASS_DP gets expaned out to find the first device that matches.\r

-  If the BootOption Device Path fails the removable media boot algorithm \r
-  is attempted (\EFI\BOOTIA32.EFI, \EFI\BOOTX64.EFI,... only one file type \r
+  If the BootOption Device Path fails the removable media boot algorithm\r
+  is attempted (\EFI\BOOTIA32.EFI, \EFI\BOOTX64.EFI,... only one file type\r

   is tried per processor type)\r
 \r
   @param  BootOption    Boot Option to try and boot.\r
   is tried per processor type)\r
 \r
   @param  BootOption    Boot Option to try and boot.\r


@@ -1854,7 +1854,7 @@ EfiBootManagerBoot (
         Status = EfiCreateEventLegacyBootEx(\r
                    TPL_NOTIFY,\r
                    BmEndOfBdsPerfCode,\r
         Status = EfiCreateEventLegacyBootEx(\r
                    TPL_NOTIFY,\r
                    BmEndOfBdsPerfCode,\r

-                   NULL, \r
+                   NULL,\r

                    &LegacyBootEvent\r
                    );\r
         ASSERT_EFI_ERROR (Status);\r
                    &LegacyBootEvent\r
                    );\r
         ASSERT_EFI_ERROR (Status);\r


@@ -1868,7 +1868,7 @@ EfiBootManagerBoot (
     PERF_END_EX (gImageHandle, "BdsAttempt", NULL, 0, (UINT32) OptionNumber);\r
     return;\r
   }\r
     PERF_END_EX (gImageHandle, "BdsAttempt", NULL, 0, (UINT32) OptionNumber);\r
     return;\r
   }\r

- \r
+\r

   //\r
   // Provide the image with its load options\r
   //\r
   //\r
   // Provide the image with its load options\r
   //\r


@@ -2021,7 +2021,7 @@ BmMatchPartitionDevicePathNode (
   3. Non-BlockIo SimpleFileSystem - The boot option points to a device supporting\r
                                     SimpleFileSystem Protocol, but not supporting BlockIo\r
                                     protocol.\r
   3. Non-BlockIo SimpleFileSystem - The boot option points to a device supporting\r
                                     SimpleFileSystem Protocol, but not supporting BlockIo\r
                                     protocol.\r

-  4. LoadFile                     - The boot option points to the media supporting \r
+  4. LoadFile                     - The boot option points to the media supporting\r

                                     LoadFile protocol.\r
   Reference: UEFI Spec chapter 3.3 Boot Option Variables Default Boot Behavior\r
 \r
                                     LoadFile protocol.\r
   Reference: UEFI Spec chapter 3.3 Boot Option Variables Default Boot Behavior\r
 \r


@@ -2246,7 +2246,7 @@ EfiBootManagerRefreshAllBootOption (
   // Remove invalid EFI boot options from NV\r
   //\r
   for (Index = 0; Index < NvBootOptionCount; Index++) {\r
   // Remove invalid EFI boot options from NV\r
   //\r
   for (Index = 0; Index < NvBootOptionCount; Index++) {\r

-    if (((DevicePathType (NvBootOptions[Index].FilePath) != BBS_DEVICE_PATH) || \r
+    if (((DevicePathType (NvBootOptions[Index].FilePath) != BBS_DEVICE_PATH) ||\r

          (DevicePathSubType (NvBootOptions[Index].FilePath) != BBS_BBS_DP)\r
         ) && BmIsAutoCreateBootOption (&NvBootOptions[Index])\r
        ) {\r
          (DevicePathSubType (NvBootOptions[Index].FilePath) != BBS_BBS_DP)\r
         ) && BmIsAutoCreateBootOption (&NvBootOptions[Index])\r
        ) {\r


@@ -2429,7 +2429,7 @@ EfiBootManagerGetBootManagerMenu (
   UINTN                        BootOptionCount;\r
   EFI_BOOT_MANAGER_LOAD_OPTION *BootOptions;\r
   UINTN                        Index;\r
   UINTN                        BootOptionCount;\r
   EFI_BOOT_MANAGER_LOAD_OPTION *BootOptions;\r
   UINTN                        Index;\r

-  \r
+\r

   BootOptions = EfiBootManagerGetLoadOptions (&BootOptionCount, LoadOptionTypeBoot);\r
 \r
   for (Index = 0; Index < BootOptionCount; Index++) {\r
   BootOptions = EfiBootManagerGetLoadOptions (&BootOptionCount, LoadOptionTypeBoot);\r
 \r
   for (Index = 0; Index < BootOptionCount; Index++) {\r

diff --git a/MdeModulePkg/Library/UefiBootManagerLib/BmBootDescription.c b/MdeModulePkg/Library/UefiBootManagerLib/BmBootDescription.c
index d56c3e7e2ca7acf41b7d602b27371dcf8c600e87..551df3f7ec5f1f757b2713637283236c442770cd 100644 (file)
--- a/MdeModulePkg/Library/UefiBootManagerLib/BmBootDescription.c
+++ b/MdeModulePkg/Library/UefiBootManagerLib/BmBootDescription.c
@@ -1,7 +1,7 @@
 /** @file\r
   Library functions which relate with boot option description.\r
 \r
 /** @file\r
   Library functions which relate with boot option description.\r
 \r

-Copyright (c) 2011 - 2017, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2011 - 2018, Intel Corporation. All rights reserved.<BR>\r

 (C) Copyright 2015 Hewlett Packard Enterprise Development LP<BR>\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 (C) Copyright 2015 Hewlett Packard Enterprise Development LP<BR>\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r


@@ -460,7 +460,7 @@ BmGetNetworkDescription (
   } else {\r
     Ip = NULL;\r
   }\r
   } else {\r
     Ip = NULL;\r
   }\r

-  \r
+\r

   //\r
   // Skip the optional DNS node\r
   //\r
   //\r
   // Skip the optional DNS node\r
   //\r

diff --git a/MdeModulePkg/Library/UefiBootManagerLib/BmConnect.c b/MdeModulePkg/Library/UefiBootManagerLib/BmConnect.c
index b1c94ad9d9c743cab7d230943fb6d4dceee2aaa5..3831a9658d006f5c6a8eee49033ab59d4f2dff7c 100644 (file)
--- a/MdeModulePkg/Library/UefiBootManagerLib/BmConnect.c
+++ b/MdeModulePkg/Library/UefiBootManagerLib/BmConnect.c
@@ -1,7 +1,7 @@
 /** @file\r
   Library functions which relate with connecting the device.\r
 \r
 /** @file\r
   Library functions which relate with connecting the device.\r
 \r

-Copyright (c) 2011 - 2015, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2011 - 2018, Intel Corporation. All rights reserved.<BR>\r

 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r


@@ -107,7 +107,7 @@ EfiBootManagerConnectAll (
   @retval EFI_OUT_OF_RESOURCES   There is no resource to create new handles.\r
   @retval EFI_NOT_FOUND          Create the handle associate with one device path\r
                                  node failed.\r
   @retval EFI_OUT_OF_RESOURCES   There is no resource to create new handles.\r
   @retval EFI_NOT_FOUND          Create the handle associate with one device path\r
                                  node failed.\r

-  @retval EFI_SECURITY_VIOLATION The user has no permission to start UEFI device \r
+  @retval EFI_SECURITY_VIOLATION The user has no permission to start UEFI device\r

                                  drivers on the DevicePath.\r
 **/\r
 EFI_STATUS\r
                                  drivers on the DevicePath.\r
 **/\r
 EFI_STATUS\r


@@ -167,7 +167,7 @@ EfiBootManagerConnectDevicePath (
         // Connect all drivers that apply to Handle and RemainingDevicePath,\r
         // the Recursive flag is FALSE so only one level will be expanded.\r
         //\r
         // Connect all drivers that apply to Handle and RemainingDevicePath,\r
         // the Recursive flag is FALSE so only one level will be expanded.\r
         //\r

-        // If ConnectController fails to find a driver, then still give the chance to \r
+        // If ConnectController fails to find a driver, then still give the chance to\r

         // do dispatch, because partial RemainingDevicePath may be in the new FV\r
         //\r
         // 1. If the connect fail, RemainingDevicepath and handle will not\r
         // do dispatch, because partial RemainingDevicePath may be in the new FV\r
         //\r
         // 1. If the connect fail, RemainingDevicepath and handle will not\r


@@ -197,8 +197,8 @@ EfiBootManagerConnectDevicePath (
 }\r
 \r
 /**\r
 }\r
 \r
 /**\r

-  This function will disconnect all current system handles. \r
-  \r
+  This function will disconnect all current system handles.\r
+\r

   gBS->DisconnectController() is invoked for each handle exists in system handle buffer.\r
   If handle is a bus type handle, all childrens also are disconnected recursively by\r
   gBS->DisconnectController().\r
   gBS->DisconnectController() is invoked for each handle exists in system handle buffer.\r
   If handle is a bus type handle, all childrens also are disconnected recursively by\r
   gBS->DisconnectController().\r

diff --git a/MdeModulePkg/Library/UefiBootManagerLib/BmConsole.c b/MdeModulePkg/Library/UefiBootManagerLib/BmConsole.c
index d85b603d64a09acf04311a3fcb3805c422a6181c..2525c8da6929ec310dd8e557e6cdeb5968ae445a 100644 (file)
--- a/MdeModulePkg/Library/UefiBootManagerLib/BmConsole.c
+++ b/MdeModulePkg/Library/UefiBootManagerLib/BmConsole.c
@@ -1,7 +1,7 @@
 /** @file\r
   Library functions which contain all the code to connect console device.\r
 \r
 /** @file\r
   Library functions which contain all the code to connect console device.\r
 \r

-Copyright (c) 2011 - 2015, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2011 - 2018, Intel Corporation. All rights reserved.<BR>\r

 (C) Copyright 2015 Hewlett Packard Enterprise Development LP<BR>\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 (C) Copyright 2015 Hewlett Packard Enterprise Development LP<BR>\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r


@@ -104,12 +104,12 @@ BmGetVideoController (
     }\r
   }\r
   FreePool (RootBridgeHandleBuffer);\r
     }\r
   }\r
   FreePool (RootBridgeHandleBuffer);\r

-  \r
+\r

   return VideoController;\r
 }\r
 \r
 /**\r
   return VideoController;\r
 }\r
 \r
 /**\r

-  Query all the children of VideoController and return the device paths of all the \r
+  Query all the children of VideoController and return the device paths of all the\r

   children that support GraphicsOutput protocol.\r
 \r
   @param VideoController       PCI handle of video controller.\r
   children that support GraphicsOutput protocol.\r
 \r
   @param VideoController       PCI handle of video controller.\r


@@ -238,14 +238,14 @@ EfiBootManagerConnectVideoController (
   )\r
 {\r
   EFI_DEVICE_PATH_PROTOCOL   *Gop;\r
   )\r
 {\r
   EFI_DEVICE_PATH_PROTOCOL   *Gop;\r

-  \r
+\r

   if (VideoController == NULL) {\r
     //\r
     // Get the platform vga device\r
     //\r
     VideoController = BmGetVideoController ();\r
   }\r
   if (VideoController == NULL) {\r
     //\r
     // Get the platform vga device\r
     //\r
     VideoController = BmGetVideoController ();\r
   }\r

- \r
+\r

   if (VideoController == NULL) {\r
     return EFI_NOT_FOUND;\r
   }\r
   if (VideoController == NULL) {\r
     return EFI_NOT_FOUND;\r
   }\r


@@ -253,7 +253,7 @@ EfiBootManagerConnectVideoController (
   //\r
   // Try to connect the PCI device path, so that GOP driver could start on this\r
   // device and create child handles with GraphicsOutput Protocol installed\r
   //\r
   // Try to connect the PCI device path, so that GOP driver could start on this\r
   // device and create child handles with GraphicsOutput Protocol installed\r

-  // on them, then we get device paths of these child handles and select \r
+  // on them, then we get device paths of these child handles and select\r

   // them as possible console device.\r
   //\r
   gBS->ConnectController (VideoController, NULL, NULL, FALSE);\r
   // them as possible console device.\r
   //\r
   gBS->ConnectController (VideoController, NULL, NULL, FALSE);\r


@@ -276,20 +276,20 @@ EfiBootManagerConnectVideoController (
   Fill console handle in System Table if there are no valid console handle in.\r
 \r
   Firstly, check the validation of console handle in System Table. If it is invalid,\r
   Fill console handle in System Table if there are no valid console handle in.\r
 \r
   Firstly, check the validation of console handle in System Table. If it is invalid,\r

-  update it by the first console device handle from EFI console variable. \r
+  update it by the first console device handle from EFI console variable.\r

 \r
   @param  VarName            The name of the EFI console variable.\r
   @param  ConsoleGuid        Specified Console protocol GUID.\r
 \r
   @param  VarName            The name of the EFI console variable.\r
   @param  ConsoleGuid        Specified Console protocol GUID.\r

-  @param  ConsoleHandle      On IN,  console handle in System Table to be checked. \r
+  @param  ConsoleHandle      On IN,  console handle in System Table to be checked.\r

                              On OUT, new console handle in system table.\r
                              On OUT, new console handle in system table.\r

-  @param  ProtocolInterface  On IN,  console protocol on console handle in System Table to be checked. \r
+  @param  ProtocolInterface  On IN,  console protocol on console handle in System Table to be checked.\r

                              On OUT, new console protocol on new console handle in system table.\r
 \r
   @retval TRUE               System Table has been updated.\r
   @retval FALSE              System Table hasn't been updated.\r
 \r
 **/\r
                              On OUT, new console protocol on new console handle in system table.\r
 \r
   @retval TRUE               System Table has been updated.\r
   @retval FALSE              System Table hasn't been updated.\r
 \r
 **/\r

-BOOLEAN \r
+BOOLEAN\r

 BmUpdateSystemTableConsole (\r
   IN     CHAR16                   *VarName,\r
   IN     EFI_GUID                 *ConsoleGuid,\r
 BmUpdateSystemTableConsole (\r
   IN     CHAR16                   *VarName,\r
   IN     EFI_GUID                 *ConsoleGuid,\r


@@ -326,7 +326,7 @@ BmUpdateSystemTableConsole (
       return FALSE;\r
     }\r
   }\r
       return FALSE;\r
     }\r
   }\r

-  \r
+\r

   //\r
   // Get all possible consoles device path from EFI variable\r
   //\r
   //\r
   // Get all possible consoles device path from EFI variable\r
   //\r


@@ -352,7 +352,7 @@ BmUpdateSystemTableConsole (
       FreePool (FullDevicePath);\r
       return FALSE;\r
     }\r
       FreePool (FullDevicePath);\r
       return FALSE;\r
     }\r

-    \r
+\r

     //\r
     // Find console device handle by device path instance\r
     //\r
     //\r
     // Find console device handle by device path instance\r
     //\r


@@ -559,7 +559,7 @@ EfiBootManagerConnectConsoleVariable (
       FreePool (StartDevicePath);\r
       return EFI_UNSUPPORTED;\r
     }\r
       FreePool (StartDevicePath);\r
       return EFI_UNSUPPORTED;\r
     }\r

-    \r
+\r

     Next      = Instance;\r
     while (!IsDevicePathEndType (Next)) {\r
       Next = NextDevicePathNode (Next);\r
     Next      = Instance;\r
     while (!IsDevicePathEndType (Next)) {\r
       Next = NextDevicePathNode (Next);\r


@@ -568,7 +568,7 @@ EfiBootManagerConnectConsoleVariable (
     SetDevicePathEndNode (Next);\r
     //\r
     // Connect the USB console\r
     SetDevicePathEndNode (Next);\r
     //\r
     // Connect the USB console\r

-    // USB console device path is a short-form device path that \r
+    // USB console device path is a short-form device path that\r

     //  starts with the first element being a USB WWID\r
     //  or a USB Class device path\r
     //\r
     //  starts with the first element being a USB WWID\r
     //  or a USB Class device path\r
     //\r


@@ -583,7 +583,7 @@ EfiBootManagerConnectConsoleVariable (
       for (Next = Instance; !IsDevicePathEnd (Next); Next = NextDevicePathNode (Next)) {\r
         if (DevicePathType (Next) == ACPI_DEVICE_PATH && DevicePathSubType (Next) == ACPI_ADR_DP) {\r
           break;\r
       for (Next = Instance; !IsDevicePathEnd (Next); Next = NextDevicePathNode (Next)) {\r
         if (DevicePathType (Next) == ACPI_DEVICE_PATH && DevicePathSubType (Next) == ACPI_ADR_DP) {\r
           break;\r

-        } else if (DevicePathType (Next) == HARDWARE_DEVICE_PATH && \r
+        } else if (DevicePathType (Next) == HARDWARE_DEVICE_PATH &&\r

                    DevicePathSubType (Next) == HW_CONTROLLER_DP &&\r
                    DevicePathType (NextDevicePathNode (Next)) == ACPI_DEVICE_PATH &&\r
                    DevicePathSubType (NextDevicePathNode (Next)) == ACPI_ADR_DP\r
                    DevicePathSubType (Next) == HW_CONTROLLER_DP &&\r
                    DevicePathType (NextDevicePathNode (Next)) == ACPI_DEVICE_PATH &&\r
                    DevicePathSubType (NextDevicePathNode (Next)) == ACPI_ADR_DP\r


@@ -724,7 +724,7 @@ EfiBootManagerConnectAllDefaultConsoles (
   }\r
   PERF_EVENT ("ConOutReady");\r
 \r
   }\r
   PERF_EVENT ("ConOutReady");\r
 \r

-  \r
+\r

   Status = EfiBootManagerConnectConsoleVariable (ConIn);\r
   if (!EFI_ERROR (Status)) {\r
     OneConnected = TRUE;\r
   Status = EfiBootManagerConnectConsoleVariable (ConIn);\r
   if (!EFI_ERROR (Status)) {\r
     OneConnected = TRUE;\r

diff --git a/MdeModulePkg/Library/UefiBootManagerLib/BmDriverHealth.c b/MdeModulePkg/Library/UefiBootManagerLib/BmDriverHealth.c
index db2f859ae73da750dafd2bd1a749c1e675e996a1..ecd01bbb81e356512a024722abffd0d0926fe19a 100644 (file)
--- a/MdeModulePkg/Library/UefiBootManagerLib/BmDriverHealth.c
+++ b/MdeModulePkg/Library/UefiBootManagerLib/BmDriverHealth.c
@@ -1,7 +1,7 @@
 /** @file\r
   Library functions which relates with driver health.\r
 \r
 /** @file\r
   Library functions which relates with driver health.\r
 \r

-Copyright (c) 2011 - 2016, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2011 - 2018, Intel Corporation. All rights reserved.<BR>\r

 (C) Copyright 2015 Hewlett-Packard Development Company, L.P.<BR>\r
 (C) Copyright 2016 Hewlett Packard Enterprise Development LP<BR>\r
 This program and the accompanying materials\r
 (C) Copyright 2015 Hewlett-Packard Development Company, L.P.<BR>\r
 (C) Copyright 2016 Hewlett Packard Enterprise Development LP<BR>\r
 This program and the accompanying materials\r


@@ -92,7 +92,7 @@ BmGetControllerName (
 \r
     Status = ComponentName->GetControllerName (\r
                               ComponentName,\r
 \r
     Status = ComponentName->GetControllerName (\r
                               ComponentName,\r

-                              ControllerHandle, \r
+                              ControllerHandle,\r

                               ChildHandle,\r
                               BestLanguage,\r
                               &ControllerName\r
                               ChildHandle,\r
                               BestLanguage,\r
                               &ControllerName\r


@@ -131,7 +131,7 @@ BmDisplayMessages (
 \r
   ControllerName = BmGetControllerName (\r
                      DriverHealthInfo->DriverHealthHandle,\r
 \r
   ControllerName = BmGetControllerName (\r
                      DriverHealthInfo->DriverHealthHandle,\r

-                     DriverHealthInfo->ControllerHandle, \r
+                     DriverHealthInfo->ControllerHandle,\r

                      DriverHealthInfo->ChildHandle\r
                      );\r
 \r
                      DriverHealthInfo->ChildHandle\r
                      );\r
 \r


@@ -181,7 +181,7 @@ BmRepairNotify (
 \r
 /**\r
   Collect the Driver Health status of a single controller.\r
 \r
 /**\r
   Collect the Driver Health status of a single controller.\r

-  \r
+\r

   @param DriverHealthInfo        A pointer to the array containing all of the platform driver health information.\r
   @param Count                   Return the updated array count.\r
   @param DriverHealthHandle      The handle on which the Driver Health protocol instance is retrieved.\r
   @param DriverHealthInfo        A pointer to the array containing all of the platform driver health information.\r
   @param Count                   Return the updated array count.\r
   @param DriverHealthHandle      The handle on which the Driver Health protocol instance is retrieved.\r


@@ -218,7 +218,7 @@ BmGetSingleControllerHealthStatus (
                   (VOID **) &DriverHealth\r
                   );\r
   ASSERT_EFI_ERROR (Status);\r
                   (VOID **) &DriverHealth\r
                   );\r
   ASSERT_EFI_ERROR (Status);\r

-  \r
+\r

 \r
   if (ControllerHandle == NULL) {\r
     //\r
 \r
   if (ControllerHandle == NULL) {\r
     //\r


@@ -471,7 +471,7 @@ BmRepairAllControllers (
       if (DriverHealthInfo[Index].HealthStatus == EfiDriverHealthStatusConfigurationRequired) {\r
         ConfigurationRequired = TRUE;\r
       }\r
       if (DriverHealthInfo[Index].HealthStatus == EfiDriverHealthStatusConfigurationRequired) {\r
         ConfigurationRequired = TRUE;\r
       }\r

-      \r
+\r

       if (DriverHealthInfo[Index].HealthStatus == EfiDriverHealthStatusRepairRequired) {\r
         RepairRequired        = TRUE;\r
 \r
       if (DriverHealthInfo[Index].HealthStatus == EfiDriverHealthStatusRepairRequired) {\r
         RepairRequired        = TRUE;\r
 \r


@@ -519,7 +519,7 @@ BmRepairAllControllers (
         FreePool (HiiHandles);\r
       }\r
     }\r
         FreePool (HiiHandles);\r
       }\r
     }\r

-  \r
+\r

     EfiBootManagerFreeDriverHealthInfo (DriverHealthInfo, Count);\r
     RepairCount++;\r
   } while ((RepairRequired || ConfigurationRequired) && ((MaxRepairCount == 0) || (RepairCount < MaxRepairCount)));\r
     EfiBootManagerFreeDriverHealthInfo (DriverHealthInfo, Count);\r
     RepairCount++;\r
   } while ((RepairRequired || ConfigurationRequired) && ((MaxRepairCount == 0) || (RepairCount < MaxRepairCount)));\r

diff --git a/MdeModulePkg/Library/UefiBootManagerLib/BmHotkey.c b/MdeModulePkg/Library/UefiBootManagerLib/BmHotkey.c
index d18ce02eb3461a0ad52cedcbea73ec130ec9383c..f799117c93ae3e426a42d8362ebd0f845e38a593 100644 (file)
--- a/MdeModulePkg/Library/UefiBootManagerLib/BmHotkey.c
+++ b/MdeModulePkg/Library/UefiBootManagerLib/BmHotkey.c
@@ -1,7 +1,7 @@
 /** @file\r
   Hotkey library functions.\r
 \r
 /** @file\r
   Hotkey library functions.\r
 \r

-Copyright (c) 2011 - 2017, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2011 - 2018, Intel Corporation. All rights reserved.<BR>\r

 (C) Copyright 2016 Hewlett Packard Enterprise Development LP<BR>\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 (C) Copyright 2016 Hewlett Packard Enterprise Development LP<BR>\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r


@@ -116,7 +116,7 @@ BmIsKeyOptionVariable (
 {\r
   UINTN         Index;\r
   UINTN         Uint;\r
 {\r
   UINTN         Index;\r
   UINTN         Uint;\r

-  \r
+\r

   if (!CompareGuid (Guid, &gEfiGlobalVariableGuid) ||\r
       (StrSize (Name) != sizeof (L"Key####")) ||\r
       (StrnCmp (Name, L"Key", 3) != 0)\r
   if (!CompareGuid (Guid, &gEfiGlobalVariableGuid) ||\r
       (StrSize (Name) != sizeof (L"Key####")) ||\r
       (StrnCmp (Name, L"Key", 3) != 0)\r


@@ -375,7 +375,7 @@ BmHotkeyCallback (
     HotkeyData = &Hotkey->KeyData[Hotkey->WaitingKey];\r
     if ((KeyData->Key.ScanCode == HotkeyData->Key.ScanCode) &&\r
         (KeyData->Key.UnicodeChar == HotkeyData->Key.UnicodeChar) &&\r
     HotkeyData = &Hotkey->KeyData[Hotkey->WaitingKey];\r
     if ((KeyData->Key.ScanCode == HotkeyData->Key.ScanCode) &&\r
         (KeyData->Key.UnicodeChar == HotkeyData->Key.UnicodeChar) &&\r

-        (((KeyData->KeyState.KeyShiftState & EFI_SHIFT_STATE_VALID) != 0) ? \r
+        (((KeyData->KeyState.KeyShiftState & EFI_SHIFT_STATE_VALID) != 0) ?\r

           (KeyData->KeyState.KeyShiftState == HotkeyData->KeyState.KeyShiftState) : TRUE\r
         )\r
        ) {\r
           (KeyData->KeyState.KeyShiftState == HotkeyData->KeyState.KeyShiftState) : TRUE\r
         )\r
        ) {\r


@@ -799,7 +799,7 @@ EfiBootManagerRegisterContinueKeyOption (
   EFI_STATUS                   Status;\r
   EFI_BOOT_MANAGER_KEY_OPTION  KeyOption;\r
   VA_LIST                      Args;\r
   EFI_STATUS                   Status;\r
   EFI_BOOT_MANAGER_KEY_OPTION  KeyOption;\r
   VA_LIST                      Args;\r

-  \r
+\r

   if (mBmContinueKeyOption != NULL) {\r
     return EFI_ALREADY_STARTED;\r
   }\r
   if (mBmContinueKeyOption != NULL) {\r
     return EFI_ALREADY_STARTED;\r
   }\r


@@ -822,7 +822,7 @@ EfiBootManagerRegisterContinueKeyOption (
 \r
 /**\r
   Stop the hotkey processing.\r
 \r
 /**\r
   Stop the hotkey processing.\r

-  \r
+\r

   @param    Event          Event pointer related to hotkey service.\r
   @param    Context        Context pass to this function.\r
 **/\r
   @param    Event          Event pointer related to hotkey service.\r
   @param    Context        Context pass to this function.\r
 **/\r


@@ -852,7 +852,7 @@ BmStopHotkeyService (
 /**\r
   Start the hot key service so that the key press can trigger the boot option.\r
 \r
 /**\r
   Start the hot key service so that the key press can trigger the boot option.\r
 \r

-  @param HotkeyTriggered  Return the waitable event and it will be signaled \r
+  @param HotkeyTriggered  Return the waitable event and it will be signaled\r

                           when a valid hot key is pressed.\r
 \r
   @retval EFI_SUCCESS     The hot key service is started.\r
                           when a valid hot key is pressed.\r
 \r
   @retval EFI_SUCCESS     The hot key service is started.\r

diff --git a/MdeModulePkg/Library/UefiBootManagerLib/BmLoadOption.c b/MdeModulePkg/Library/UefiBootManagerLib/BmLoadOption.c
index f88f8e02451c71ad75f7399bfe6f661aa504c3e3..ff0c65a2efc6cba4f77eaff354f3a7541bed6210 100644 (file)
--- a/MdeModulePkg/Library/UefiBootManagerLib/BmLoadOption.c
+++ b/MdeModulePkg/Library/UefiBootManagerLib/BmLoadOption.c
@@ -1,7 +1,7 @@
 /** @file\r
   Load option library functions which relate with creating and processing load options.\r
 \r
 /** @file\r
   Load option library functions which relate with creating and processing load options.\r
 \r

-Copyright (c) 2011 - 2017, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2011 - 2018, Intel Corporation. All rights reserved.<BR>\r

 (C) Copyright 2015-2016 Hewlett Packard Enterprise Development LP<BR>\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 (C) Copyright 2015-2016 Hewlett Packard Enterprise Development LP<BR>\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r


@@ -90,7 +90,7 @@ BmGetFreeOptionNumber (
   OUT UINT16                            *FreeOptionNumber\r
   )\r
 {\r
   OUT UINT16                            *FreeOptionNumber\r
   )\r
 {\r

-  \r
+\r

   UINTN         OptionNumber;\r
   UINTN         Index;\r
   UINT16        *OptionOrder;\r
   UINTN         OptionNumber;\r
   UINTN         Index;\r
   UINT16        *OptionOrder;\r


@@ -98,7 +98,7 @@ BmGetFreeOptionNumber (
   UINT16        *BootNext;\r
 \r
   ASSERT (FreeOptionNumber != NULL);\r
   UINT16        *BootNext;\r
 \r
   ASSERT (FreeOptionNumber != NULL);\r

-  ASSERT (LoadOptionType == LoadOptionTypeDriver || \r
+  ASSERT (LoadOptionType == LoadOptionTypeDriver ||\r

           LoadOptionType == LoadOptionTypeBoot ||\r
           LoadOptionType == LoadOptionTypeSysPrep);\r
 \r
           LoadOptionType == LoadOptionTypeBoot ||\r
           LoadOptionType == LoadOptionTypeSysPrep);\r
 \r


@@ -110,9 +110,9 @@ BmGetFreeOptionNumber (
     GetEfiGlobalVariable2 (L"BootNext", (VOID**) &BootNext, NULL);\r
   }\r
 \r
     GetEfiGlobalVariable2 (L"BootNext", (VOID**) &BootNext, NULL);\r
   }\r
 \r

-  for (OptionNumber = 0; \r
+  for (OptionNumber = 0;\r

        OptionNumber < OptionOrderSize / sizeof (UINT16)\r
        OptionNumber < OptionOrderSize / sizeof (UINT16)\r

-                    + ((BootNext != NULL) ? 1 : 0); \r
+                    + ((BootNext != NULL) ? 1 : 0);\r

        OptionNumber++\r
        ) {\r
     //\r
        OptionNumber++\r
        ) {\r
     //\r


@@ -125,10 +125,10 @@ BmGetFreeOptionNumber (
     }\r
 \r
     //\r
     }\r
 \r
     //\r

-    // We didn't find it in the ****Order array and it doesn't equal to BootNext \r
+    // We didn't find it in the ****Order array and it doesn't equal to BootNext\r

     // Otherwise, OptionNumber equals to OptionOrderSize / sizeof (UINT16) + 1\r
     //\r
     // Otherwise, OptionNumber equals to OptionOrderSize / sizeof (UINT16) + 1\r
     //\r

-    if ((Index == OptionOrderSize / sizeof (UINT16)) && \r
+    if ((Index == OptionOrderSize / sizeof (UINT16)) &&\r

         ((BootNext == NULL) || (OptionNumber != *BootNext))\r
         ) {\r
       break;\r
         ((BootNext == NULL) || (OptionNumber != *BootNext))\r
         ) {\r
       break;\r


@@ -203,12 +203,12 @@ EfiBootManagerLoadOptionToVariable (
   EFI_DEVICE_PATH_PROTOCOL    FilePathList[];\r
   UINT8                       OptionalData[];\r
 TODO: FilePathList[] IS:\r
   EFI_DEVICE_PATH_PROTOCOL    FilePathList[];\r
   UINT8                       OptionalData[];\r
 TODO: FilePathList[] IS:\r

-A packed array of UEFI device paths.  The first element of the \r
-array is a device path that describes the device and location of the \r
-Image for this load option.  The FilePathList[0] is specific \r
-to the device type.  Other device paths may optionally exist in the \r
-FilePathList, but their usage is OSV specific. Each element \r
-in the array is variable length, and ends at the device path end \r
+A packed array of UEFI device paths.  The first element of the\r
+array is a device path that describes the device and location of the\r
+Image for this load option.  The FilePathList[0] is specific\r
+to the device type.  Other device paths may optionally exist in the\r
+FilePathList, but their usage is OSV specific. Each element\r
+in the array is variable length, and ends at the device path end\r

 structure.\r
   */\r
   VariableSize = sizeof (Option->Attributes)\r
 structure.\r
   */\r
   VariableSize = sizeof (Option->Attributes)\r


@@ -359,7 +359,7 @@ EfiBootManagerAddLoadOptionVariable (
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r

-  if (Option->OptionType != LoadOptionTypeDriver && \r
+  if (Option->OptionType != LoadOptionTypeDriver &&\r

       Option->OptionType != LoadOptionTypeSysPrep &&\r
       Option->OptionType != LoadOptionTypeBoot\r
       ) {\r
       Option->OptionType != LoadOptionTypeSysPrep &&\r
       Option->OptionType != LoadOptionTypeBoot\r
       ) {\r


@@ -399,7 +399,7 @@ EfiBootManagerAddLoadOptionVariable (
 }\r
 \r
 /**\r
 }\r
 \r
 /**\r

-  Sort the load option. The DriverOrder or BootOrder will be re-created to \r
+  Sort the load option. The DriverOrder or BootOrder will be re-created to\r

   reflect the new order.\r
 \r
   @param OptionType             Load option type\r
   reflect the new order.\r
 \r
   @param OptionType             Load option type\r


@@ -514,7 +514,7 @@ EfiBootManagerInitializeLoadOption (
 /**\r
   Return the index of the load option in the load option array.\r
 \r
 /**\r
   Return the index of the load option in the load option array.\r
 \r

-  The function consider two load options are equal when the \r
+  The function consider two load options are equal when the\r

   OptionType, Attributes, Description, FilePath and OptionalData are equal.\r
 \r
   @param Key    Pointer to the load option to be found.\r
   OptionType, Attributes, Description, FilePath and OptionalData are equal.\r
 \r
   @param Key    Pointer to the load option to be found.\r


@@ -618,15 +618,15 @@ EfiBootManagerDeleteLoadOptionVariable (
 /**\r
   Returns the size of a device path in bytes.\r
 \r
 /**\r
   Returns the size of a device path in bytes.\r
 \r

-  This function returns the size, in bytes, of the device path data structure \r
-  specified by DevicePath including the end of device path node. If DevicePath \r
+  This function returns the size, in bytes, of the device path data structure\r
+  specified by DevicePath including the end of device path node. If DevicePath\r

   is NULL, then 0 is returned. If the length of the device path is bigger than\r
   MaxSize, also return 0 to indicate this is an invalidate device path.\r
 \r
   @param  DevicePath         A pointer to a device path data structure.\r
   is NULL, then 0 is returned. If the length of the device path is bigger than\r
   MaxSize, also return 0 to indicate this is an invalidate device path.\r
 \r
   @param  DevicePath         A pointer to a device path data structure.\r

-  @param  MaxSize            Max valid device path size. If big than this size, \r
+  @param  MaxSize            Max valid device path size. If big than this size,\r

                              return error.\r
                              return error.\r

-  \r
+\r

   @retval 0                  An invalid device path.\r
   @retval Others             The size of a device path in bytes.\r
 \r
   @retval 0                  An invalid device path.\r
   @retval Others             The size of a device path in bytes.\r
 \r


@@ -668,12 +668,12 @@ BmGetDevicePathSizeEx (
 }\r
 \r
 /**\r
 }\r
 \r
 /**\r

-  Returns the length of a Null-terminated Unicode string. If the length is \r
-  bigger than MaxStringLen, return length 0 to indicate that this is an \r
+  Returns the length of a Null-terminated Unicode string. If the length is\r
+  bigger than MaxStringLen, return length 0 to indicate that this is an\r

   invalidate string.\r
 \r
   This function returns the number of Unicode characters in the Null-terminated\r
   invalidate string.\r
 \r
   This function returns the number of Unicode characters in the Null-terminated\r

-  Unicode string specified by String. \r
+  Unicode string specified by String.\r

 \r
   If String is NULL, then ASSERT().\r
   If String is not aligned on a 16-bit boundary, then ASSERT().\r
 \r
   If String is NULL, then ASSERT().\r
   If String is not aligned on a 16-bit boundary, then ASSERT().\r


@@ -716,7 +716,7 @@ BmStrSizeEx (
   @retval FALSE                 The variable data is corrupted.\r
 \r
 **/\r
   @retval FALSE                 The variable data is corrupted.\r
 \r
 **/\r

-BOOLEAN \r
+BOOLEAN\r

 BmValidateOption (\r
   UINT8                     *Variable,\r
   UINTN                     VariableSize\r
 BmValidateOption (\r
   UINT8                     *Variable,\r
   UINTN                     VariableSize\r


@@ -862,7 +862,7 @@ EFIAPI
 EfiBootManagerVariableToLoadOptionEx (\r
   IN CHAR16                           *VariableName,\r
   IN EFI_GUID                         *VendorGuid,\r
 EfiBootManagerVariableToLoadOptionEx (\r
   IN CHAR16                           *VariableName,\r
   IN EFI_GUID                         *VendorGuid,\r

-  IN OUT EFI_BOOT_MANAGER_LOAD_OPTION *Option  \r
+  IN OUT EFI_BOOT_MANAGER_LOAD_OPTION *Option\r

   )\r
 {\r
   EFI_STATUS                         Status;\r
   )\r
 {\r
   EFI_STATUS                         Status;\r


@@ -1034,7 +1034,7 @@ BmCollectLoadOptions (
 /**\r
   Returns an array of load options based on the EFI variable\r
   L"BootOrder"/L"DriverOrder" and the L"Boot####"/L"Driver####" variables impled by it.\r
 /**\r
   Returns an array of load options based on the EFI variable\r
   L"BootOrder"/L"DriverOrder" and the L"Boot####"/L"Driver####" variables impled by it.\r

-  #### is the hex value of the UINT16 in each BootOrder/DriverOrder entry. \r
+  #### is the hex value of the UINT16 in each BootOrder/DriverOrder entry.\r

 \r
   @param  LoadOptionCount   Returns number of entries in the array.\r
   @param  LoadOptionType    The type of the load option.\r
 \r
   @param  LoadOptionCount   Returns number of entries in the array.\r
   @param  LoadOptionType    The type of the load option.\r


@@ -1122,8 +1122,8 @@ EfiBootManagerGetLoadOptions (
 \r
   @param  LoadOption   Pointer to boot option to Free.\r
 \r
 \r
   @param  LoadOption   Pointer to boot option to Free.\r
 \r

-  @return EFI_SUCCESS   BootOption was freed \r
-  @return EFI_NOT_FOUND BootOption == NULL \r
+  @return EFI_SUCCESS   BootOption was freed\r
+  @return EFI_NOT_FOUND BootOption == NULL\r

 \r
 **/\r
 EFI_STATUS\r
 \r
 **/\r
 EFI_STATUS\r


@@ -1150,14 +1150,14 @@ EfiBootManagerFreeLoadOption (
 }\r
 \r
 /**\r
 }\r
 \r
 /**\r

-  Free an EFI_BOOT_MANGER_LOAD_OPTION array that was allocated by \r
+  Free an EFI_BOOT_MANGER_LOAD_OPTION array that was allocated by\r

   EfiBootManagerGetLoadOptions().\r
 \r
   @param  Option       Pointer to boot option array to free.\r
   @param  OptionCount  Number of array entries in BootOption\r
 \r
   EfiBootManagerGetLoadOptions().\r
 \r
   @param  Option       Pointer to boot option array to free.\r
   @param  OptionCount  Number of array entries in BootOption\r
 \r

-  @return EFI_SUCCESS   BootOption was freed \r
-  @return EFI_NOT_FOUND BootOption == NULL \r
+  @return EFI_SUCCESS   BootOption was freed\r
+  @return EFI_NOT_FOUND BootOption == NULL\r

 \r
 **/\r
 EFI_STATUS\r
 \r
 **/\r
 EFI_STATUS\r


@@ -1230,7 +1230,7 @@ BmIsLoadOptionPeHeaderValid (
       // Check PE32 or PE32+ magic, and machine type\r
       //\r
       OptionalHeader = (EFI_IMAGE_OPTIONAL_HEADER32 *) &PeHeader->Pe32.OptionalHeader;\r
       // Check PE32 or PE32+ magic, and machine type\r
       //\r
       OptionalHeader = (EFI_IMAGE_OPTIONAL_HEADER32 *) &PeHeader->Pe32.OptionalHeader;\r

-      if ((OptionalHeader->Magic == EFI_IMAGE_NT_OPTIONAL_HDR32_MAGIC || \r
+      if ((OptionalHeader->Magic == EFI_IMAGE_NT_OPTIONAL_HDR32_MAGIC ||\r

            OptionalHeader->Magic == EFI_IMAGE_NT_OPTIONAL_HDR64_MAGIC) &&\r
           EFI_IMAGE_MACHINE_TYPE_SUPPORTED (PeHeader->Pe32.FileHeader.Machine)\r
           ) {\r
            OptionalHeader->Magic == EFI_IMAGE_NT_OPTIONAL_HDR64_MAGIC) &&\r
           EFI_IMAGE_MACHINE_TYPE_SUPPORTED (PeHeader->Pe32.FileHeader.Machine)\r
           ) {\r


@@ -1346,7 +1346,7 @@ BmGetNextLoadOptionBuffer (
 \r
   @param LoadOption  Pointer to the load option.\r
 \r
 \r
   @param LoadOption  Pointer to the load option.\r
 \r

-  @retval EFI_INVALID_PARAMETER  The load option type is invalid, \r
+  @retval EFI_INVALID_PARAMETER  The load option type is invalid,\r

                                  or the load option file path doesn't point to a valid file.\r
   @retval EFI_UNSUPPORTED        The load option type is of LoadOptionTypeBoot.\r
   @retval EFI_SUCCESS            The load option is inactive, or successfully loaded and executed.\r
                                  or the load option file path doesn't point to a valid file.\r
   @retval EFI_UNSUPPORTED        The load option type is of LoadOptionTypeBoot.\r
   @retval EFI_SUCCESS            The load option is inactive, or successfully loaded and executed.\r

diff --git a/MdeModulePkg/Library/UefiBootManagerLib/BmMisc.c b/MdeModulePkg/Library/UefiBootManagerLib/BmMisc.c
index 81d365940043c9bcf1ea28195c977bd789249df6..89ce40a2858e323e41aa8ecc2b2b51c1e94e0e53 100644 (file)
--- a/MdeModulePkg/Library/UefiBootManagerLib/BmMisc.c
+++ b/MdeModulePkg/Library/UefiBootManagerLib/BmMisc.c
@@ -1,7 +1,7 @@
 /** @file\r
   Misc library functions.\r
 \r
 /** @file\r
   Misc library functions.\r
 \r

-Copyright (c) 2011 - 2017, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2011 - 2018, Intel Corporation. All rights reserved.<BR>\r

 (C) Copyright 2016 Hewlett Packard Enterprise Development LP<BR>\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 (C) Copyright 2016 Hewlett Packard Enterprise Development LP<BR>\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r


@@ -122,7 +122,7 @@ BmMatchDevicePaths (
 }\r
 \r
 /**\r
 }\r
 \r
 /**\r

-  This routine adjust the memory information for different memory type and \r
+  This routine adjust the memory information for different memory type and\r

   save them into the variables for next boot. It resets the system when\r
   memory information is updated and the current boot option belongs to\r
   boot category instead of application category. It doesn't count the\r
   save them into the variables for next boot. It resets the system when\r
   memory information is updated and the current boot option belongs to\r
   boot category instead of application category. It doesn't count the\r


@@ -163,7 +163,7 @@ BmSetMemoryTypeInformationVariable (
   }\r
 \r
   //\r
   }\r
 \r
   //\r

-  // Only check the the Memory Type Information variable in the boot mode \r
+  // Only check the the Memory Type Information variable in the boot mode\r

   // other than BOOT_WITH_DEFAULT_SETTINGS because the Memory Type\r
   // Information is not valid in this boot mode.\r
   //\r
   // other than BOOT_WITH_DEFAULT_SETTINGS because the Memory Type\r
   // Information is not valid in this boot mode.\r
   //\r


@@ -172,8 +172,8 @@ BmSetMemoryTypeInformationVariable (
     Status = gRT->GetVariable (\r
                     EFI_MEMORY_TYPE_INFORMATION_VARIABLE_NAME,\r
                     &gEfiMemoryTypeInformationGuid,\r
     Status = gRT->GetVariable (\r
                     EFI_MEMORY_TYPE_INFORMATION_VARIABLE_NAME,\r
                     &gEfiMemoryTypeInformationGuid,\r

-                    NULL, \r
-                    &VariableSize, \r
+                    NULL,\r
+                    &VariableSize,\r

                     NULL\r
                     );\r
     if (Status == EFI_BUFFER_TOO_SMALL) {\r
                     NULL\r
                     );\r
     if (Status == EFI_BUFFER_TOO_SMALL) {\r


@@ -304,14 +304,14 @@ BmSetMemoryTypeInformationVariable (
                                  then EFI_INVALID_PARAMETER is returned.\r
   @param  VendorGuid             A unique identifier for the vendor.\r
   @param  Attributes             Attributes bitmask to set for the variable.\r
                                  then EFI_INVALID_PARAMETER is returned.\r
   @param  VendorGuid             A unique identifier for the vendor.\r
   @param  Attributes             Attributes bitmask to set for the variable.\r

-  @param  DataSize               The size in bytes of the Data buffer. Unless the EFI_VARIABLE_APPEND_WRITE, \r
+  @param  DataSize               The size in bytes of the Data buffer. Unless the EFI_VARIABLE_APPEND_WRITE,\r

                                  or EFI_VARIABLE_TIME_BASED_AUTHENTICATED_WRITE_ACCESS attribute is set, a size of zero\r
                                  or EFI_VARIABLE_TIME_BASED_AUTHENTICATED_WRITE_ACCESS attribute is set, a size of zero\r

-                                 causes the variable to be deleted. When the EFI_VARIABLE_APPEND_WRITE attribute is \r
-                                 set, then a SetVariable() call with a DataSize of zero will not cause any change to \r
-                                 the variable value (the timestamp associated with the variable may be updated however \r
-                                 even if no new data value is provided,see the description of the \r
-                                 EFI_VARIABLE_AUTHENTICATION_2 descriptor below. In this case the DataSize will not \r
-                                 be zero since the EFI_VARIABLE_AUTHENTICATION_2 descriptor will be populated). \r
+                                 causes the variable to be deleted. When the EFI_VARIABLE_APPEND_WRITE attribute is\r
+                                 set, then a SetVariable() call with a DataSize of zero will not cause any change to\r
+                                 the variable value (the timestamp associated with the variable may be updated however\r
+                                 even if no new data value is provided,see the description of the\r
+                                 EFI_VARIABLE_AUTHENTICATION_2 descriptor below. In this case the DataSize will not\r
+                                 be zero since the EFI_VARIABLE_AUTHENTICATION_2 descriptor will be populated).\r

   @param  Data                   The contents for the variable.\r
 \r
   @retval EFI_SUCCESS            The firmware has successfully stored the variable and its data as\r
   @param  Data                   The contents for the variable.\r
 \r
   @retval EFI_SUCCESS            The firmware has successfully stored the variable and its data as\r

diff --git a/MdeModulePkg/Library/UefiBootManagerLib/InternalBm.h b/MdeModulePkg/Library/UefiBootManagerLib/InternalBm.h
index 21ecd8584d24afd7b6ab20b1da367bda0b888d75..978fbff966f6eeba850ef3157039e6cf45414dbb 100644 (file)
--- a/MdeModulePkg/Library/UefiBootManagerLib/InternalBm.h
+++ b/MdeModulePkg/Library/UefiBootManagerLib/InternalBm.h
@@ -1,7 +1,7 @@
 /** @file\r
   BDS library definition, include the file and data structure\r
 \r
 /** @file\r
   BDS library definition, include the file and data structure\r
 \r

-Copyright (c) 2004 - 2017, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2004 - 2018, Intel Corporation. All rights reserved.<BR>\r

 (C) Copyright 2015 Hewlett Packard Enterprise Development LP<BR>\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 (C) Copyright 2015 Hewlett Packard Enterprise Development LP<BR>\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r


@@ -192,7 +192,7 @@ BmGetFreeOptionNumber (
   );\r
 \r
 /**\r
   );\r
 \r
 /**\r

-  This routine adjust the memory information for different memory type and \r
+  This routine adjust the memory information for different memory type and\r

   save them into the variables for next boot. It resets the system when\r
   memory information is updated and the current boot option belongs to\r
   boot category instead of application category. It doesn't count the\r
   save them into the variables for next boot. It resets the system when\r
   memory information is updated and the current boot option belongs to\r
   boot category instead of application category. It doesn't count the\r


@@ -245,9 +245,9 @@ BmConnectUsbShortFormDevicePath (
 \r
 /**\r
   Stop the hotkey processing.\r
 \r
 /**\r
   Stop the hotkey processing.\r

-  \r
-  @param    Event          Event pointer related to hotkey service. \r
-  @param    Context        Context pass to this function. \r
+\r
+  @param    Event          Event pointer related to hotkey service.\r
+  @param    Context        Context pass to this function.\r

 **/\r
 VOID\r
 EFIAPI\r
 **/\r
 VOID\r
 EFIAPI\r


@@ -265,14 +265,14 @@ BmStopHotkeyService (
                                  then EFI_INVALID_PARAMETER is returned.\r
   @param  VendorGuid             A unique identifier for the vendor.\r
   @param  Attributes             Attributes bitmask to set for the variable.\r
                                  then EFI_INVALID_PARAMETER is returned.\r
   @param  VendorGuid             A unique identifier for the vendor.\r
   @param  Attributes             Attributes bitmask to set for the variable.\r

-  @param  DataSize               The size in bytes of the Data buffer. Unless the EFI_VARIABLE_APPEND_WRITE, \r
+  @param  DataSize               The size in bytes of the Data buffer. Unless the EFI_VARIABLE_APPEND_WRITE,\r

                                  or EFI_VARIABLE_TIME_BASED_AUTHENTICATED_WRITE_ACCESS attribute is set, a size of zero\r
                                  or EFI_VARIABLE_TIME_BASED_AUTHENTICATED_WRITE_ACCESS attribute is set, a size of zero\r

-                                 causes the variable to be deleted. When the EFI_VARIABLE_APPEND_WRITE attribute is \r
-                                 set, then a SetVariable() call with a DataSize of zero will not cause any change to \r
-                                 the variable value (the timestamp associated with the variable may be updated however \r
-                                 even if no new data value is provided,see the description of the \r
-                                 EFI_VARIABLE_AUTHENTICATION_2 descriptor below. In this case the DataSize will not \r
-                                 be zero since the EFI_VARIABLE_AUTHENTICATION_2 descriptor will be populated). \r
+                                 causes the variable to be deleted. When the EFI_VARIABLE_APPEND_WRITE attribute is\r
+                                 set, then a SetVariable() call with a DataSize of zero will not cause any change to\r
+                                 the variable value (the timestamp associated with the variable may be updated however\r
+                                 even if no new data value is provided,see the description of the\r
+                                 EFI_VARIABLE_AUTHENTICATION_2 descriptor below. In this case the DataSize will not\r
+                                 be zero since the EFI_VARIABLE_AUTHENTICATION_2 descriptor will be populated).\r

   @param  Data                   The contents for the variable.\r
 \r
   @retval EFI_SUCCESS            The firmware has successfully stored the variable and its data as\r
   @param  Data                   The contents for the variable.\r
 \r
   @retval EFI_SUCCESS            The firmware has successfully stored the variable and its data as\r

diff --git a/MdeModulePkg/Library/UefiBootManagerLib/UefiBootManagerLib.inf b/MdeModulePkg/Library/UefiBootManagerLib/UefiBootManagerLib.inf
index 8d5b89ea2970d1e30cf8192481b091d80a5c2280..72c5ca1cd59e6518042f18394277e9eaf37a286c 100644 (file)
--- a/MdeModulePkg/Library/UefiBootManagerLib/UefiBootManagerLib.inf
+++ b/MdeModulePkg/Library/UefiBootManagerLib/UefiBootManagerLib.inf
@@ -24,7 +24,7 @@
   FILE_GUID                      = 8D4752BC-595E-49a2-B4AF-F3F57B601DE9\r
   MODULE_TYPE                    = DXE_DRIVER\r
   VERSION_STRING                 = 1.0\r
   FILE_GUID                      = 8D4752BC-595E-49a2-B4AF-F3F57B601DE9\r
   MODULE_TYPE                    = DXE_DRIVER\r
   VERSION_STRING                 = 1.0\r

-  LIBRARY_CLASS                  = UefiBootManagerLib|DXE_DRIVER DXE_RUNTIME_DRIVER UEFI_APPLICATION UEFI_DRIVER \r
+  LIBRARY_CLASS                  = UefiBootManagerLib|DXE_DRIVER DXE_RUNTIME_DRIVER UEFI_APPLICATION UEFI_DRIVER\r

 \r
 #\r
 # The following information is for reference only and not required by the build tools.\r
 \r
 #\r
 # The following information is for reference only and not required by the build tools.\r


@@ -42,7 +42,7 @@
   BmHotkey.c\r
   BmDriverHealth.c\r
   InternalBm.h\r
   BmHotkey.c\r
   BmDriverHealth.c\r
   InternalBm.h\r

-  \r
+\r

 [Packages]\r
   MdePkg/MdePkg.dec\r
   MdeModulePkg/MdeModulePkg.dec\r
 [Packages]\r
   MdePkg/MdePkg.dec\r
   MdeModulePkg/MdeModulePkg.dec\r

diff --git a/MdeModulePkg/Library/UefiHiiLib/HiiLanguage.c b/MdeModulePkg/Library/UefiHiiLib/HiiLanguage.c
index f4ef36cec26d53db86eac9b4518a1bc33a9afac8..aca0606f0b679671987b7d59005fb018b1a323fa 100644 (file)
--- a/MdeModulePkg/Library/UefiHiiLib/HiiLanguage.c
+++ b/MdeModulePkg/Library/UefiHiiLib/HiiLanguage.c
@@ -1,7 +1,7 @@
 /** @file\r
   Language related HII Library implementation.\r
 \r
 /** @file\r
   Language related HII Library implementation.\r
 \r

-  Copyright (c) 2006 - 2008, Intel Corporation. All rights reserved.<BR>\r
+  Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r

   This program and the accompanying materials\r
   are licensed and made available under the terms and conditions of the BSD License\r
   which accompanies this distribution.  The full text of the license may be found at\r
   This program and the accompanying materials\r
   are licensed and made available under the terms and conditions of the BSD License\r
   which accompanies this distribution.  The full text of the license may be found at\r


@@ -16,12 +16,12 @@
 #include "InternalHiiLib.h"\r
 \r
 /**\r
 #include "InternalHiiLib.h"\r
 \r
 /**\r

-  Retrieves a pointer to the a Null-terminated ASCII string containing the list \r
-  of languages that an HII handle in the HII Database supports.  The returned \r
+  Retrieves a pointer to the a Null-terminated ASCII string containing the list\r
+  of languages that an HII handle in the HII Database supports.  The returned\r

   string is allocated using AllocatePool().  The caller is responsible for freeing\r
   the returned string using FreePool().  The format of the returned string follows\r
   the language format assumed the HII Database.\r
   string is allocated using AllocatePool().  The caller is responsible for freeing\r
   the returned string using FreePool().  The format of the returned string follows\r
   the language format assumed the HII Database.\r

-  \r
+\r

   If HiiHandle is NULL, then ASSERT().\r
 \r
   @param[in]  HiiHandle  A handle that was previously registered in the HII Database.\r
   If HiiHandle is NULL, then ASSERT().\r
 \r
   @param[in]  HiiHandle  A handle that was previously registered in the HII Database.\r


@@ -53,8 +53,8 @@ HiiGetSupportedLanguages (
   Status = gHiiString->GetLanguages (gHiiString, HiiHandle, &TempSupportedLanguages, &LanguageSize);\r
 \r
   //\r
   Status = gHiiString->GetLanguages (gHiiString, HiiHandle, &TempSupportedLanguages, &LanguageSize);\r
 \r
   //\r

-  // If GetLanguages() returns EFI_SUCCESS for a zero size, \r
-  // then there are no supported languages registered for HiiHandle.  If GetLanguages() \r
+  // If GetLanguages() returns EFI_SUCCESS for a zero size,\r
+  // then there are no supported languages registered for HiiHandle.  If GetLanguages()\r

   // returns an error other than EFI_BUFFER_TOO_SMALL, then HiiHandle is not present\r
   // in the HII Database\r
   //\r
   // returns an error other than EFI_BUFFER_TOO_SMALL, then HiiHandle is not present\r
   // in the HII Database\r
   //\r

diff --git a/MdeModulePkg/Library/UefiHiiLib/HiiLib.c b/MdeModulePkg/Library/UefiHiiLib/HiiLib.c
index f9b8c3df27826ca3295093165e6df2c6e5e08253..3f43c7c8e6264a20cf9a196c81102e08e45e4d43 100644 (file)
--- a/MdeModulePkg/Library/UefiHiiLib/HiiLib.c
+++ b/MdeModulePkg/Library/UefiHiiLib/HiiLib.c
@@ -1,7 +1,7 @@
 /** @file\r
   HII Library implementation that uses DXE protocols and services.\r
 \r
 /** @file\r
   HII Library implementation that uses DXE protocols and services.\r
 \r

-  Copyright (c) 2006 - 2017, Intel Corporation. All rights reserved.<BR>\r
+  Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r

   This program and the accompanying materials\r
   are licensed and made available under the terms and conditions of the BSD License\r
   which accompanies this distribution.  The full text of the license may be found at\r
   This program and the accompanying materials\r
   are licensed and made available under the terms and conditions of the BSD License\r
   which accompanies this distribution.  The full text of the license may be found at\r


@@ -44,7 +44,7 @@ GLOBAL_REMOVE_IF_UNREFERENCED CONST CHAR16 mConfigHdrTemplate[] = L"GUID=0000000
 EFI_FORM_BROWSER2_PROTOCOL  *mUefiFormBrowser2 = NULL;\r
 \r
 //\r
 EFI_FORM_BROWSER2_PROTOCOL  *mUefiFormBrowser2 = NULL;\r
 \r
 //\r

-// Template used to mark the end of a list of packages \r
+// Template used to mark the end of a list of packages\r

 //\r
 GLOBAL_REMOVE_IF_UNREFERENCED CONST EFI_HII_PACKAGE_HEADER  mEndOfPakageList = {\r
   sizeof (EFI_HII_PACKAGE_HEADER),\r
 //\r
 GLOBAL_REMOVE_IF_UNREFERENCED CONST EFI_HII_PACKAGE_HEADER  mEndOfPakageList = {\r
   sizeof (EFI_HII_PACKAGE_HEADER),\r


@@ -85,7 +85,7 @@ InternalHiiExtractGuidFromHiiHandle (
 \r
   Status = gHiiDatabase->ExportPackageLists (gHiiDatabase, Handle, &BufferSize, HiiPackageList);\r
   ASSERT (Status != EFI_NOT_FOUND);\r
 \r
   Status = gHiiDatabase->ExportPackageLists (gHiiDatabase, Handle, &BufferSize, HiiPackageList);\r
   ASSERT (Status != EFI_NOT_FOUND);\r

-  \r
+\r

   if (Status == EFI_BUFFER_TOO_SMALL) {\r
     HiiPackageList = AllocatePool (BufferSize);\r
     ASSERT (HiiPackageList != NULL);\r
   if (Status == EFI_BUFFER_TOO_SMALL) {\r
     HiiPackageList = AllocatePool (BufferSize);\r
     ASSERT (HiiPackageList != NULL);\r


@@ -115,7 +115,7 @@ InternalHiiExtractGuidFromHiiHandle (
   If an empty list of packages is passed in, then NULL is returned.  If the size of\r
   the list of package is 0, then NULL is returned.\r
 \r
   If an empty list of packages is passed in, then NULL is returned.  If the size of\r
   the list of package is 0, then NULL is returned.\r
 \r

-  The variable arguments are pointers which point to package header that defined \r
+  The variable arguments are pointers which point to package header that defined\r

   by UEFI VFR compiler and StringGather tool.\r
 \r
   #pragma pack (push, 1)\r
   by UEFI VFR compiler and StringGather tool.\r
 \r
   #pragma pack (push, 1)\r


@@ -124,13 +124,13 @@ InternalHiiExtractGuidFromHiiHandle (
     EFI_HII_PACKAGE_HEADER  PackageHeader;\r
   } EDKII_AUTOGEN_PACKAGES_HEADER;\r
   #pragma pack (pop)\r
     EFI_HII_PACKAGE_HEADER  PackageHeader;\r
   } EDKII_AUTOGEN_PACKAGES_HEADER;\r
   #pragma pack (pop)\r

-  \r
+\r

   @param[in]  PackageListGuid  The GUID of the package list.\r
   @param[in]  PackageListGuid  The GUID of the package list.\r

-  @param[in]  DeviceHandle     If not NULL, the Device Handle on which \r
+  @param[in]  DeviceHandle     If not NULL, the Device Handle on which\r

                                an instance of DEVICE_PATH_PROTOCOL is installed.\r
                                an instance of DEVICE_PATH_PROTOCOL is installed.\r

-                               This Device Handle uniquely defines the device that \r
+                               This Device Handle uniquely defines the device that\r

                                the added packages are associated with.\r
                                the added packages are associated with.\r

-  @param[in]  ...              The variable argument list that contains pointers \r
+  @param[in]  ...              The variable argument list that contains pointers\r

                                to packages terminated by a NULL.\r
 \r
   @retval NULL   A HII Handle has already been registered in the HII Database with\r
                                to packages terminated by a NULL.\r
 \r
   @retval NULL   A HII Handle has already been registered in the HII Database with\r


@@ -168,7 +168,7 @@ HiiAddPackages (
   VA_END (Args);\r
 \r
   //\r
   VA_END (Args);\r
 \r
   //\r

-  // If there are no packages in the variable argument list or all the packages \r
+  // If there are no packages in the variable argument list or all the packages\r

   // are empty, then return a NULL HII Handle\r
   //\r
   if (Length == 0) {\r
   // are empty, then return a NULL HII Handle\r
   //\r
   if (Length == 0) {\r


@@ -176,7 +176,7 @@ HiiAddPackages (
   }\r
 \r
   //\r
   }\r
 \r
   //\r

-  // Add the length of the Package List Header and the terminating Package Header \r
+  // Add the length of the Package List Header and the terminating Package Header\r

   //\r
   Length += sizeof (EFI_HII_PACKAGE_LIST_HEADER) + sizeof (EFI_HII_PACKAGE_HEADER);\r
 \r
   //\r
   Length += sizeof (EFI_HII_PACKAGE_LIST_HEADER) + sizeof (EFI_HII_PACKAGE_HEADER);\r
 \r


@@ -222,9 +222,9 @@ HiiAddPackages (
   // Register the package list with the HII Database\r
   //\r
   Status = gHiiDatabase->NewPackageList (\r
   // Register the package list with the HII Database\r
   //\r
   Status = gHiiDatabase->NewPackageList (\r

-                           gHiiDatabase, \r
-                           PackageListHeader, \r
-                           DeviceHandle, \r
+                           gHiiDatabase,\r
+                           PackageListHeader,\r
+                           DeviceHandle,\r

                            &HiiHandle\r
                            );\r
   if (EFI_ERROR (Status)) {\r
                            &HiiHandle\r
                            );\r
   if (EFI_ERROR (Status)) {\r


@@ -272,12 +272,12 @@ HiiRemovePackages (
   This function allocates the returned array using AllocatePool().\r
   The caller is responsible for freeing the array with FreePool().\r
 \r
   This function allocates the returned array using AllocatePool().\r
   The caller is responsible for freeing the array with FreePool().\r
 \r

-  @param[in]  PackageListGuid  An optional parameter that is used to request \r
+  @param[in]  PackageListGuid  An optional parameter that is used to request\r

                                HII Handles associated with a specific\r
                                Package List GUID.  If this parameter is NULL,\r
                                then all the HII Handles in the HII Database\r
                                are returned.  If this parameter is not NULL,\r
                                HII Handles associated with a specific\r
                                Package List GUID.  If this parameter is NULL,\r
                                then all the HII Handles in the HII Database\r
                                are returned.  If this parameter is not NULL,\r

-                               then zero or more HII Handles associated with \r
+                               then zero or more HII Handles associated with\r

                                PackageListGuid are returned.\r
 \r
   @retval NULL   No HII handles were found in the HII database\r
                                PackageListGuid are returned.\r
 \r
   @retval NULL   No HII handles were found in the HII database\r


@@ -312,14 +312,14 @@ HiiGetHiiHandles (
                            );\r
 \r
   //\r
                            );\r
 \r
   //\r

-  // If ListPackageLists() returns EFI_SUCCESS for a zero size, \r
-  // then there are no HII handles in the HII database.  If ListPackageLists() \r
-  // returns an error other than EFI_BUFFER_TOO_SMALL, then there are no HII \r
+  // If ListPackageLists() returns EFI_SUCCESS for a zero size,\r
+  // then there are no HII handles in the HII database.  If ListPackageLists()\r
+  // returns an error other than EFI_BUFFER_TOO_SMALL, then there are no HII\r

   // handles in the HII database.\r
   //\r
   if (Status != EFI_BUFFER_TOO_SMALL) {\r
     //\r
   // handles in the HII database.\r
   //\r
   if (Status != EFI_BUFFER_TOO_SMALL) {\r
     //\r

-    // Return NULL if the size can not be retrieved, or if there are no HII \r
+    // Return NULL if the size can not be retrieved, or if there are no HII\r

     // handles in the HII Database\r
     //\r
     return NULL;\r
     // handles in the HII Database\r
     //\r
     return NULL;\r


@@ -364,7 +364,7 @@ HiiGetHiiHandles (
       Status = InternalHiiExtractGuidFromHiiHandle (HiiHandleBuffer[Index1], &Guid);\r
       ASSERT_EFI_ERROR (Status);\r
       if (CompareGuid (&Guid, PackageListGuid)) {\r
       Status = InternalHiiExtractGuidFromHiiHandle (HiiHandleBuffer[Index1], &Guid);\r
       ASSERT_EFI_ERROR (Status);\r
       if (CompareGuid (&Guid, PackageListGuid)) {\r

-        HiiHandleBuffer[Index2++] = HiiHandleBuffer[Index1];       \r
+        HiiHandleBuffer[Index2++] = HiiHandleBuffer[Index1];\r

       }\r
     }\r
     if (Index2 > 0) {\r
       }\r
     }\r
     if (Index2 > 0) {\r


@@ -379,7 +379,7 @@ HiiGetHiiHandles (
 \r
 /**\r
   This function allows a caller to extract the form set opcode form the Hii Handle.\r
 \r
 /**\r
   This function allows a caller to extract the form set opcode form the Hii Handle.\r

-  The returned buffer is allocated using AllocatePool().The caller is responsible \r
+  The returned buffer is allocated using AllocatePool().The caller is responsible\r

   for freeing the allocated buffer using FreePool().\r
 \r
   @param Handle            The HII handle.\r
   for freeing the allocated buffer using FreePool().\r
 \r
   @param Handle            The HII handle.\r


@@ -503,7 +503,7 @@ Done:
 }\r
 \r
 /**\r
 }\r
 \r
 /**\r

-  Converts all hex dtring characters in range ['A'..'F'] to ['a'..'f'] for \r
+  Converts all hex dtring characters in range ['A'..'F'] to ['a'..'f'] for\r

   hex digits that appear between a '=' and a '&' in a config string.\r
 \r
   If ConfigString is NULL, then ASSERT().\r
   hex digits that appear between a '=' and a '&' in a config string.\r
 \r
   If ConfigString is NULL, then ASSERT().\r


@@ -541,7 +541,7 @@ InternalHiiLowerConfigString (
 }\r
 \r
 /**\r
 }\r
 \r
 /**\r

-  Uses the BlockToConfig() service of the Config Routing Protocol to \r
+  Uses the BlockToConfig() service of the Config Routing Protocol to\r

   convert <ConfigRequest> and a buffer to a <ConfigResp>\r
 \r
   If ConfigRequest is NULL, then ASSERT().\r
   convert <ConfigRequest> and a buffer to a <ConfigResp>\r
 \r
   If ConfigRequest is NULL, then ASSERT().\r


@@ -588,14 +588,14 @@ InternalHiiBlockToConfig (
 }\r
 \r
 /**\r
 }\r
 \r
 /**\r

-  Uses the BrowserCallback() service of the Form Browser Protocol to retrieve \r
-  or set uncommitted data.  If sata i being retrieved, then the buffer is \r
-  allocated using AllocatePool().  The caller is then responsible for freeing \r
+  Uses the BrowserCallback() service of the Form Browser Protocol to retrieve\r
+  or set uncommitted data.  If sata i being retrieved, then the buffer is\r
+  allocated using AllocatePool().  The caller is then responsible for freeing\r

   the buffer using FreePool().\r
 \r
   the buffer using FreePool().\r
 \r

-  @param[in]  VariableGuid    Pointer to an EFI_GUID structure.  This is an optional \r
+  @param[in]  VariableGuid    Pointer to an EFI_GUID structure.  This is an optional\r

                               parameter that may be NULL.\r
                               parameter that may be NULL.\r

-  @param[in]  VariableName    Pointer to a Null-terminated Unicode string.  This \r
+  @param[in]  VariableName    Pointer to a Null-terminated Unicode string.  This\r

                               is an optional parameter that may be NULL.\r
   @param[in]  SetResultsData  If not NULL, then this parameter specified the buffer\r
                               of uncommited data to set.  If this parameter is NULL,\r
                               is an optional parameter that may be NULL.\r
   @param[in]  SetResultsData  If not NULL, then this parameter specified the buffer\r
                               of uncommited data to set.  If this parameter is NULL,\r


@@ -648,7 +648,7 @@ InternalHiiBrowserCallback (
                               VariableGuid,\r
                               VariableName\r
                               );\r
                               VariableGuid,\r
                               VariableName\r
                               );\r

-    \r
+\r

     if (!EFI_ERROR (Status)) {\r
       //\r
       // No Resluts Data, only allocate one char for '\0'\r
     if (!EFI_ERROR (Status)) {\r
       //\r
       // No Resluts Data, only allocate one char for '\0'\r


@@ -689,23 +689,23 @@ InternalHiiBrowserCallback (
 }\r
 \r
 /**\r
 }\r
 \r
 /**\r

-  Allocates and returns a Null-terminated Unicode <ConfigHdr> string using routing \r
+  Allocates and returns a Null-terminated Unicode <ConfigHdr> string using routing\r

   information that includes a GUID, an optional Unicode string name, and a device\r
   information that includes a GUID, an optional Unicode string name, and a device\r

-  path.  The string returned is allocated with AllocatePool().  The caller is \r
+  path.  The string returned is allocated with AllocatePool().  The caller is\r

   responsible for freeing the allocated string with FreePool().\r
   responsible for freeing the allocated string with FreePool().\r

-  \r
+\r

   The format of a <ConfigHdr> is as follows:\r
 \r
     GUID=<HexCh>32&NAME=<Char>NameLength&PATH=<HexChar>DevicePathSize<Null>\r
 \r
   @param[in]  Guid          Pointer to an EFI_GUID that is the routing information\r
   The format of a <ConfigHdr> is as follows:\r
 \r
     GUID=<HexCh>32&NAME=<Char>NameLength&PATH=<HexChar>DevicePathSize<Null>\r
 \r
   @param[in]  Guid          Pointer to an EFI_GUID that is the routing information\r

-                            GUID.  Each of the 16 bytes in Guid is converted to \r
+                            GUID.  Each of the 16 bytes in Guid is converted to\r

                             a 2 Unicode character hexadecimal string.  This is\r
                             an optional parameter that may be NULL.\r
                             a 2 Unicode character hexadecimal string.  This is\r
                             an optional parameter that may be NULL.\r

-  @param[in]  Name          Pointer to a Null-terminated Unicode string that is \r
-                            the routing information NAME.  This is an optional \r
-                            parameter that may be NULL.  Each 16-bit Unicode \r
-                            character in Name is converted to a 4 character Unicode \r
+  @param[in]  Name          Pointer to a Null-terminated Unicode string that is\r
+                            the routing information NAME.  This is an optional\r
+                            parameter that may be NULL.  Each 16-bit Unicode\r
+                            character in Name is converted to a 4 character Unicode\r

                             hexadecimal string.\r
   @param[in]  DriverHandle  The driver handle which supports a Device Path Protocol\r
                             that is the routing information PATH.  Each byte of\r
                             hexadecimal string.\r
   @param[in]  DriverHandle  The driver handle which supports a Device Path Protocol\r
                             that is the routing information PATH.  Each byte of\r


@@ -734,7 +734,7 @@ HiiConstructConfigHdr (
   UINTN                     MaxLen;\r
 \r
   //\r
   UINTN                     MaxLen;\r
 \r
   //\r

-  // Compute the length of Name in Unicode characters.  \r
+  // Compute the length of Name in Unicode characters.\r

   // If Name is NULL, then the length is 0.\r
   //\r
   NameLength = 0;\r
   // If Name is NULL, then the length is 0.\r
   //\r
   NameLength = 0;\r


@@ -790,7 +790,7 @@ HiiConstructConfigHdr (
       String += StrnLenS (String, MaxLen - ((UINTN)String - (UINTN)ReturnString) / sizeof (CHAR16));\r
     }\r
   }\r
       String += StrnLenS (String, MaxLen - ((UINTN)String - (UINTN)ReturnString) / sizeof (CHAR16));\r
     }\r
   }\r

-  \r
+\r

   //\r
   // Append L"&NAME="\r
   //\r
   //\r
   // Append L"&NAME="\r
   //\r


@@ -845,7 +845,7 @@ HiiConstructConfigHdr (
 }\r
 \r
 /**\r
 }\r
 \r
 /**\r

-  Convert the hex UNICODE encoding string of UEFI GUID, NAME or device path \r
+  Convert the hex UNICODE encoding string of UEFI GUID, NAME or device path\r

   to binary buffer from <ConfigHdr>.\r
 \r
   This is a internal function.\r
   to binary buffer from <ConfigHdr>.\r
 \r
   This is a internal function.\r


@@ -878,7 +878,7 @@ InternalHiiGetBufferFromString (
   if (String == NULL || Buffer == NULL) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
   if (String == NULL || Buffer == NULL) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r

-  \r
+\r

   DataBuffer = NULL;\r
   StringPtr  = NULL;\r
   ConfigHdr  = String;\r
   DataBuffer = NULL;\r
   StringPtr  = NULL;\r
   ConfigHdr  = String;\r


@@ -913,14 +913,14 @@ InternalHiiGetBufferFromString (
         DataBuffer [Index/2] = (UINT8) ((DataBuffer [Index/2] << 4) + DigitUint8);\r
       }\r
     }\r
         DataBuffer [Index/2] = (UINT8) ((DataBuffer [Index/2] << 4) + DigitUint8);\r
       }\r
     }\r

-    \r
+\r

     *Buffer = DataBuffer;\r
     break;\r
 \r
   case NAME_CONFIG_STRING_TYPE:\r
     //\r
     // Convert Config String to Unicode String, e.g. "0041004200430044" => "ABCD"\r
     *Buffer = DataBuffer;\r
     break;\r
 \r
   case NAME_CONFIG_STRING_TYPE:\r
     //\r
     // Convert Config String to Unicode String, e.g. "0041004200430044" => "ABCD"\r

-    // \r
+    //\r

 \r
     //\r
     // Add the tailling char L'\0'\r
 \r
     //\r
     // Add the tailling char L'\0'\r


@@ -956,10 +956,10 @@ InternalHiiGetBufferFromString (
 /**\r
   This function checks VarOffset and VarWidth is in the block range.\r
 \r
 /**\r
   This function checks VarOffset and VarWidth is in the block range.\r
 \r

-  @param  BlockArray         The block array is to be checked. \r
+  @param  BlockArray         The block array is to be checked.\r

   @param  VarOffset          Offset of var to the structure\r
   @param  VarWidth           Width of var.\r
   @param  VarOffset          Offset of var to the structure\r
   @param  VarWidth           Width of var.\r

-  \r
+\r

   @retval TRUE   This Var is in the block range.\r
   @retval FALSE  This Var is not in the block range.\r
 **/\r
   @retval TRUE   This Var is in the block range.\r
   @retval FALSE  This Var is not in the block range.\r
 **/\r


@@ -972,14 +972,14 @@ BlockArrayCheck (
 {\r
   LIST_ENTRY          *Link;\r
   IFR_BLOCK_DATA      *BlockData;\r
 {\r
   LIST_ENTRY          *Link;\r
   IFR_BLOCK_DATA      *BlockData;\r

-  \r
+\r

   //\r
   // No Request Block array, all vars are got.\r
   //\r
   if (BlockArray == NULL) {\r
     return TRUE;\r
   }\r
   //\r
   // No Request Block array, all vars are got.\r
   //\r
   if (BlockArray == NULL) {\r
     return TRUE;\r
   }\r

-  \r
+\r

   //\r
   // Check the input var is in the request block range.\r
   //\r
   //\r
   // Check the input var is in the request block range.\r
   //\r


@@ -1036,7 +1036,7 @@ InternalHiiGetValueOfNumber (
     StringPtr++;\r
   }\r
   Length = StringPtr - ValueString;\r
     StringPtr++;\r
   }\r
   Length = StringPtr - ValueString;\r

-  \r
+\r

   //\r
   // Allocate buffer to store the value\r
   //\r
   //\r
   // Allocate buffer to store the value\r
   //\r


@@ -1044,7 +1044,7 @@ InternalHiiGetValueOfNumber (
   if (Buf == NULL) {\r
     return EFI_OUT_OF_RESOURCES;\r
   }\r
   if (Buf == NULL) {\r
     return EFI_OUT_OF_RESOURCES;\r
   }\r

-  \r
+\r

   //\r
   // Convert character one by one to the value buffer\r
   //\r
   //\r
   // Convert character one by one to the value buffer\r
   //\r


@@ -1058,7 +1058,7 @@ InternalHiiGetValueOfNumber (
       Buf [Index/2] = (UINT8) ((DigitUint8 << 4) + Buf [Index/2]);\r
     }\r
   }\r
       Buf [Index/2] = (UINT8) ((DigitUint8 << 4) + Buf [Index/2]);\r
     }\r
   }\r

-  \r
+\r

   //\r
   // Set the converted value and string length.\r
   //\r
   //\r
   // Set the converted value and string length.\r
   //\r


@@ -1073,7 +1073,7 @@ InternalHiiGetValueOfNumber (
   @param ConfigElement           ConfigResp string contains the current setting.\r
   @param VarName                 The variable name which need to get value.\r
   @param VarValue                The return value.\r
   @param ConfigElement           ConfigResp string contains the current setting.\r
   @param VarName                 The variable name which need to get value.\r
   @param VarValue                The return value.\r

-  \r
+\r

   @retval EFI_SUCCESS            Get the value for the VarName\r
   @retval EFI_OUT_OF_RESOURCES   The memory is not enough.\r
 **/\r
   @retval EFI_SUCCESS            Get the value for the VarName\r
   @retval EFI_OUT_OF_RESOURCES   The memory is not enough.\r
 **/\r


@@ -1131,7 +1131,7 @@ GetValueFromRequest (
   @param RequestElement     The config string for this storage.\r
   @param HiiHandle          The HiiHandle for this formset.\r
   @param NameValueType      Whether current storage is name/value varstore or not.\r
   @param RequestElement     The config string for this storage.\r
   @param HiiHandle          The HiiHandle for this formset.\r
   @param NameValueType      Whether current storage is name/value varstore or not.\r

-  \r
+\r

   @retval EFI_SUCCESS            The current setting is valid.\r
   @retval EFI_OUT_OF_RESOURCES   The memory is not enough.\r
   @retval EFI_INVALID_PARAMETER  The config string or the Hii package is invalid.\r
   @retval EFI_SUCCESS            The current setting is valid.\r
   @retval EFI_OUT_OF_RESOURCES   The memory is not enough.\r
   @retval EFI_INVALID_PARAMETER  The config string or the Hii package is invalid.\r


@@ -1279,8 +1279,8 @@ ValidateQuestionFromVfr (
           IfrEfiVarStore = (EFI_IFR_VARSTORE_EFI *) IfrOpHdr;\r
 \r
           //\r
           IfrEfiVarStore = (EFI_IFR_VARSTORE_EFI *) IfrOpHdr;\r
 \r
           //\r

-          // If the length is small than the structure, this is from old efi \r
-          // varstore definition. Old efi varstore get config directly from \r
+          // If the length is small than the structure, this is from old efi\r
+          // varstore definition. Old efi varstore get config directly from\r

           // GetVariable function.\r
           //\r
           if (IfrOpHdr->Length < sizeof (EFI_IFR_VARSTORE_EFI)) {\r
           // GetVariable function.\r
           //\r
           if (IfrOpHdr->Length < sizeof (EFI_IFR_VARSTORE_EFI)) {\r


@@ -1327,12 +1327,12 @@ ValidateQuestionFromVfr (
           //\r
 \r
           //\r
           //\r
 \r
           //\r

-          // OneOf question is not in IFR Form. This IFR form is not valid. \r
+          // OneOf question is not in IFR Form. This IFR form is not valid.\r

           //\r
           if (VarStoreData.VarStoreId == 0) {\r
             return EFI_INVALID_PARAMETER;\r
           }\r
           //\r
           if (VarStoreData.VarStoreId == 0) {\r
             return EFI_INVALID_PARAMETER;\r
           }\r

-          // \r
+          //\r

           // Check whether this question is for the requested varstore.\r
           //\r
           IfrOneOf = (EFI_IFR_ONE_OF *) IfrOpHdr;\r
           // Check whether this question is for the requested varstore.\r
           //\r
           IfrOneOf = (EFI_IFR_ONE_OF *) IfrOpHdr;\r


@@ -1382,11 +1382,11 @@ ValidateQuestionFromVfr (
               break;\r
             }\r
             //\r
               break;\r
             }\r
             //\r

-            // Check this var question is in the var storage \r
+            // Check this var question is in the var storage\r

             //\r
             if ((Offset + Width) > VarStoreData.Size) {\r
               //\r
             //\r
             if ((Offset + Width) > VarStoreData.Size) {\r
               //\r

-              // This question exceeds the var store size. \r
+              // This question exceeds the var store size.\r

               //\r
               return EFI_INVALID_PARAMETER;\r
             }\r
               //\r
               return EFI_INVALID_PARAMETER;\r
             }\r


@@ -1419,7 +1419,7 @@ ValidateQuestionFromVfr (
           //\r
 \r
           //\r
           //\r
 \r
           //\r

-          // Numeric question is not in IFR Form. This IFR form is not valid. \r
+          // Numeric question is not in IFR Form. This IFR form is not valid.\r

           //\r
           if (VarStoreData.VarStoreId == 0) {\r
             return EFI_INVALID_PARAMETER;\r
           //\r
           if (VarStoreData.VarStoreId == 0) {\r
             return EFI_INVALID_PARAMETER;\r


@@ -1442,7 +1442,7 @@ ValidateQuestionFromVfr (
               //\r
               break;\r
             }\r
               //\r
               break;\r
             }\r

-            \r
+\r

             Status = GetValueFromRequest (RequestElement, QuestionName, &VarValue);\r
             if (EFI_ERROR (Status)) {\r
               return Status;\r
             Status = GetValueFromRequest (RequestElement, QuestionName, &VarValue);\r
             if (EFI_ERROR (Status)) {\r
               return Status;\r


@@ -1474,11 +1474,11 @@ ValidateQuestionFromVfr (
               break;\r
             }\r
             //\r
               break;\r
             }\r
             //\r

-            // Check this var question is in the var storage \r
+            // Check this var question is in the var storage\r

             //\r
             if ((Offset + Width) > VarStoreData.Size) {\r
               //\r
             //\r
             if ((Offset + Width) > VarStoreData.Size) {\r
               //\r

-              // This question exceeds the var store size. \r
+              // This question exceeds the var store size.\r

               //\r
               return EFI_INVALID_PARAMETER;\r
             }\r
               //\r
               return EFI_INVALID_PARAMETER;\r
             }\r


@@ -1598,7 +1598,7 @@ ValidateQuestionFromVfr (
           //\r
 \r
           //\r
           //\r
 \r
           //\r

-          // CheckBox question is not in IFR Form. This IFR form is not valid. \r
+          // CheckBox question is not in IFR Form. This IFR form is not valid.\r

           //\r
           if (VarStoreData.VarStoreId == 0) {\r
             return EFI_INVALID_PARAMETER;\r
           //\r
           if (VarStoreData.VarStoreId == 0) {\r
             return EFI_INVALID_PARAMETER;\r


@@ -1622,7 +1622,7 @@ ValidateQuestionFromVfr (
               //\r
               break;\r
             }\r
               //\r
               break;\r
             }\r

-            \r
+\r

             Status = GetValueFromRequest (RequestElement, QuestionName, &VarValue);\r
             if (EFI_ERROR (Status)) {\r
               return Status;\r
             Status = GetValueFromRequest (RequestElement, QuestionName, &VarValue);\r
             if (EFI_ERROR (Status)) {\r
               return Status;\r


@@ -1654,11 +1654,11 @@ ValidateQuestionFromVfr (
               break;\r
             }\r
             //\r
               break;\r
             }\r
             //\r

-            // Check this var question is in the var storage \r
+            // Check this var question is in the var storage\r

             //\r
             if ((Offset + Width) > VarStoreData.Size) {\r
               //\r
             //\r
             if ((Offset + Width) > VarStoreData.Size) {\r
               //\r

-              // This question exceeds the var store size. \r
+              // This question exceeds the var store size.\r

               //\r
               return EFI_INVALID_PARAMETER;\r
             }\r
               //\r
               return EFI_INVALID_PARAMETER;\r
             }\r


@@ -1691,7 +1691,7 @@ ValidateQuestionFromVfr (
           //\r
 \r
           //\r
           //\r
 \r
           //\r

-          // CheckBox question is not in IFR Form. This IFR form is not valid. \r
+          // CheckBox question is not in IFR Form. This IFR form is not valid.\r

           //\r
           if (VarStoreData.VarStoreId == 0) {\r
             return EFI_INVALID_PARAMETER;\r
           //\r
           if (VarStoreData.VarStoreId == 0) {\r
             return EFI_INVALID_PARAMETER;\r


@@ -1726,9 +1726,9 @@ ValidateQuestionFromVfr (
 \r
             //\r
             // Skip the "=".\r
 \r
             //\r
             // Skip the "=".\r

-            // \r
+            //\r

             StringPtr += 1;\r
             StringPtr += 1;\r

-            \r
+\r

             //\r
             // Check current string length is less than maxsize\r
             // e.g Config String: "0041004200430044", Unicode String: "ABCD". Unicode String length = Config String length / 4.\r
             //\r
             // Check current string length is less than maxsize\r
             // e.g Config String: "0041004200430044", Unicode String: "ABCD". Unicode String length = Config String length / 4.\r


@@ -1755,11 +1755,11 @@ ValidateQuestionFromVfr (
               break;\r
             }\r
             //\r
               break;\r
             }\r
             //\r

-            // Check this var question is in the var storage \r
+            // Check this var question is in the var storage\r

             //\r
             if ((Offset + Width) > VarStoreData.Size) {\r
               //\r
             //\r
             if ((Offset + Width) > VarStoreData.Size) {\r
               //\r

-              // This question exceeds the var store size. \r
+              // This question exceeds the var store size.\r

               //\r
               return EFI_INVALID_PARAMETER;\r
             }\r
               //\r
               return EFI_INVALID_PARAMETER;\r
             }\r


@@ -1774,7 +1774,7 @@ ValidateQuestionFromVfr (
           break;\r
         case EFI_IFR_ONE_OF_OPTION_OP:\r
           //\r
           break;\r
         case EFI_IFR_ONE_OF_OPTION_OP:\r
           //\r

-          // Opcode Scope is zero. This one of option is not to be checked. \r
+          // Opcode Scope is zero. This one of option is not to be checked.\r

           //\r
           if (VarBlockData.Scope == 0) {\r
             break;\r
           //\r
           if (VarBlockData.Scope == 0) {\r
             break;\r


@@ -1810,7 +1810,7 @@ ValidateQuestionFromVfr (
           }\r
 \r
           //\r
           }\r
 \r
           //\r

-          // OneOf value doesn't belong to one of option value. \r
+          // OneOf value doesn't belong to one of option value.\r

           //\r
           if ((VarBlockData.Scope == 0) && (VarBlockData.OpCode == EFI_IFR_ONE_OF_OP)) {\r
             return EFI_INVALID_PARAMETER;\r
           //\r
           if ((VarBlockData.Scope == 0) && (VarBlockData.OpCode == EFI_IFR_ONE_OF_OP)) {\r
             return EFI_INVALID_PARAMETER;\r


@@ -1856,7 +1856,7 @@ ValidateQuestionFromVfr (
   @param ConfigElement         ConfigResp element string contains the current setting.\r
   @param CurrentBlockArray     Current block array.\r
   @param VarBuffer             Data buffer for this varstore.\r
   @param ConfigElement         ConfigResp element string contains the current setting.\r
   @param CurrentBlockArray     Current block array.\r
   @param VarBuffer             Data buffer for this varstore.\r

-  \r
+\r

   @retval EFI_SUCCESS            The current setting is valid.\r
   @retval EFI_OUT_OF_RESOURCES   The memory is not enough.\r
   @retval EFI_INVALID_PARAMETER  The config string or the Hii package is invalid.\r
   @retval EFI_SUCCESS            The current setting is valid.\r
   @retval EFI_OUT_OF_RESOURCES   The memory is not enough.\r
   @retval EFI_INVALID_PARAMETER  The config string or the Hii package is invalid.\r


@@ -1880,7 +1880,7 @@ GetBlockDataInfo (
   EFI_STATUS                   Status;\r
   IFR_BLOCK_DATA               *BlockArray;\r
   UINT8                        *DataBuffer;\r
   EFI_STATUS                   Status;\r
   IFR_BLOCK_DATA               *BlockArray;\r
   UINT8                        *DataBuffer;\r

-  \r
+\r

   //\r
   // Initialize the local variables.\r
   //\r
   //\r
   // Initialize the local variables.\r
   //\r


@@ -1916,7 +1916,7 @@ GetBlockDataInfo (
   while (*StringPtr != 0 && StrnCmp (StringPtr, L"&OFFSET=", StrLen (L"&OFFSET=")) == 0) {\r
     //\r
     // Skip the &OFFSET= string\r
   while (*StringPtr != 0 && StrnCmp (StringPtr, L"&OFFSET=", StrLen (L"&OFFSET=")) == 0) {\r
     //\r
     // Skip the &OFFSET= string\r

-    // \r
+    //\r

     StringPtr += StrLen (L"&OFFSET=");\r
 \r
     //\r
     StringPtr += StrLen (L"&OFFSET=");\r
 \r
     //\r


@@ -2046,13 +2046,13 @@ GetBlockDataInfo (
     }\r
 \r
     //\r
     }\r
 \r
     //\r

-    // If '\0', parsing is finished. \r
+    // If '\0', parsing is finished.\r

     //\r
     if (*StringPtr == 0) {\r
       break;\r
     }\r
     //\r
     //\r
     if (*StringPtr == 0) {\r
       break;\r
     }\r
     //\r

-    // Go to next ConfigBlock \r
+    // Go to next ConfigBlock\r

     //\r
   }\r
 \r
     //\r
   }\r
 \r


@@ -2082,7 +2082,7 @@ Done:
   if (DataBuffer != NULL) {\r
     FreePool (DataBuffer);\r
   }\r
   if (DataBuffer != NULL) {\r
     FreePool (DataBuffer);\r
   }\r

-  \r
+\r

   if (BlockArray != NULL) {\r
     //\r
     // Free Link Array CurrentBlockArray\r
   if (BlockArray != NULL) {\r
     //\r
     // Free Link Array CurrentBlockArray\r


@@ -2107,7 +2107,7 @@ Done:
   @param VarGuid            Guid of the buffer storage.\r
   @param VarName            Name of the buffer storage.\r
   @param HiiHandle          The HiiHandle for this package.\r
   @param VarGuid            Guid of the buffer storage.\r
   @param VarName            Name of the buffer storage.\r
   @param HiiHandle          The HiiHandle for this package.\r

-  \r
+\r

   @retval EFI_SUCCESS            The current setting is valid.\r
   @retval EFI_OUT_OF_RESOURCES   The memory is not enough.\r
   @retval EFI_INVALID_PARAMETER  The config string or the Hii package is invalid.\r
   @retval EFI_SUCCESS            The current setting is valid.\r
   @retval EFI_OUT_OF_RESOURCES   The memory is not enough.\r
   @retval EFI_INVALID_PARAMETER  The config string or the Hii package is invalid.\r


@@ -2176,7 +2176,7 @@ InternalHiiValidateCurrentSetting (
   if (VarBuffer != NULL) {\r
     FreePool (VarBuffer);\r
   }\r
   if (VarBuffer != NULL) {\r
     FreePool (VarBuffer);\r
   }\r

-  \r
+\r

   if (CurrentBlockArray != NULL) {\r
     //\r
     // Free Link Array CurrentBlockArray\r
   if (CurrentBlockArray != NULL) {\r
     //\r
     // Free Link Array CurrentBlockArray\r


@@ -2201,7 +2201,7 @@ InternalHiiValidateCurrentSetting (
 \r
   @retval  TRUE              The input include config request elements.\r
   @retval  FALSE             The input string not includes.\r
 \r
   @retval  TRUE              The input include config request elements.\r
   @retval  FALSE             The input string not includes.\r

-                                 \r
+\r

 **/\r
 BOOLEAN\r
 GetElementsFromRequest (\r
 **/\r
 BOOLEAN\r
 GetElementsFromRequest (\r


@@ -2224,15 +2224,15 @@ GetElementsFromRequest (
   This function parses the input ConfigRequest string and its matched IFR code\r
   string for setting default value and validating current setting.\r
 \r
   This function parses the input ConfigRequest string and its matched IFR code\r
   string for setting default value and validating current setting.\r
 \r

-  1. For setting default action, Reset the default value specified by DefaultId \r
+  1. For setting default action, Reset the default value specified by DefaultId\r

   to the driver configuration got by Request string.\r
   to the driver configuration got by Request string.\r

-  2. For validating current setting, Validate the current configuration \r
+  2. For validating current setting, Validate the current configuration\r

   by parsing HII form IFR opcode.\r
 \r
   NULL request string support depends on the ExportConfig interface of\r
   HiiConfigRouting protocol in UEFI specification.\r
   by parsing HII form IFR opcode.\r
 \r
   NULL request string support depends on the ExportConfig interface of\r
   HiiConfigRouting protocol in UEFI specification.\r

-  \r
-  @param Request    A null-terminated Unicode string in \r
+\r
+  @param Request    A null-terminated Unicode string in\r

                     <MultiConfigRequest> format. It can be NULL.\r
                     If it is NULL, all current configuration for the\r
                     entirety of the current HII database will be validated.\r
                     <MultiConfigRequest> format. It can be NULL.\r
                     If it is NULL, all current configuration for the\r
                     entirety of the current HII database will be validated.\r


@@ -2240,7 +2240,7 @@ GetElementsFromRequest (
                     entirety of the current HII database will be reset.\r
   @param DefaultId  Specifies the type of defaults to retrieve only for setting default action.\r
   @param ActionType Action supports setting defaults and validate current setting.\r
                     entirety of the current HII database will be reset.\r
   @param DefaultId  Specifies the type of defaults to retrieve only for setting default action.\r
   @param ActionType Action supports setting defaults and validate current setting.\r

-  \r
+\r

   @retval TRUE    Action runs successfully.\r
   @retval FALSE   Action is not valid or Action can't be executed successfully..\r
 **/\r
   @retval TRUE    Action runs successfully.\r
   @retval FALSE   Action is not valid or Action can't be executed successfully..\r
 **/\r


@@ -2284,7 +2284,7 @@ InternalHiiIfrValueAction (
   TempDriverHandle = NULL;\r
   HiiHandle        = NULL;\r
   HiiPackageList   = NULL;\r
   TempDriverHandle = NULL;\r
   HiiHandle        = NULL;\r
   HiiPackageList   = NULL;\r

-  \r
+\r

   //\r
   // Only support set default and validate setting action.\r
   //\r
   //\r
   // Only support set default and validate setting action.\r
   //\r


@@ -2308,11 +2308,11 @@ InternalHiiIfrValueAction (
                                   &ConfigAltResp\r
                                 );\r
   }\r
                                   &ConfigAltResp\r
                                 );\r
   }\r

-  \r
+\r

   if (EFI_ERROR (Status)) {\r
     return FALSE;\r
   }\r
   if (EFI_ERROR (Status)) {\r
     return FALSE;\r
   }\r

-  \r
+\r

   StringPtr = ConfigAltResp;\r
   ASSERT (StringPtr != NULL);\r
 \r
   StringPtr = ConfigAltResp;\r
   ASSERT (StringPtr != NULL);\r
 \r


@@ -2350,7 +2350,7 @@ InternalHiiIfrValueAction (
     if (EFI_ERROR (Status)) {\r
       goto Done;\r
     }\r
     if (EFI_ERROR (Status)) {\r
       goto Done;\r
     }\r

-    \r
+\r

     //\r
     // Get Path value DevicePath\r
     //\r
     //\r
     // Get Path value DevicePath\r
     //\r


@@ -2375,7 +2375,7 @@ InternalHiiIfrValueAction (
     if (EFI_ERROR (Status)) {\r
       goto Done;\r
     }\r
     if (EFI_ERROR (Status)) {\r
       goto Done;\r
     }\r

-    \r
+\r

     //\r
     // Find the matched Hii Handle for the found Driver handle\r
     //\r
     //\r
     // Find the matched Hii Handle for the found Driver handle\r
     //\r


@@ -2399,7 +2399,7 @@ InternalHiiIfrValueAction (
       //\r
       // This request string has no its Hii package.\r
       // Its default value and validating can't execute by parsing IFR data.\r
       //\r
       // This request string has no its Hii package.\r
       // Its default value and validating can't execute by parsing IFR data.\r

-      // Directly jump into the next ConfigAltResp string for another pair Guid, Name, and Path.   \r
+      // Directly jump into the next ConfigAltResp string for another pair Guid, Name, and Path.\r

       //\r
       Status = EFI_SUCCESS;\r
       goto NextConfigAltResp;\r
       //\r
       Status = EFI_SUCCESS;\r
       goto NextConfigAltResp;\r


@@ -2411,7 +2411,7 @@ InternalHiiIfrValueAction (
     PackageListLength  = 0;\r
     HiiPackageList     = NULL;\r
     Status = gHiiDatabase->ExportPackageLists (gHiiDatabase, HiiHandle, &PackageListLength, HiiPackageList);\r
     PackageListLength  = 0;\r
     HiiPackageList     = NULL;\r
     Status = gHiiDatabase->ExportPackageLists (gHiiDatabase, HiiHandle, &PackageListLength, HiiPackageList);\r

-  \r
+\r

     //\r
     // The return status should always be EFI_BUFFER_TOO_SMALL as input buffer's size is 0.\r
     //\r
     //\r
     // The return status should always be EFI_BUFFER_TOO_SMALL as input buffer's size is 0.\r
     //\r


@@ -2419,13 +2419,13 @@ InternalHiiIfrValueAction (
       Status = EFI_INVALID_PARAMETER;\r
       goto Done;\r
     }\r
       Status = EFI_INVALID_PARAMETER;\r
       goto Done;\r
     }\r

-  \r
+\r

     HiiPackageList = AllocatePool (PackageListLength);\r
     if (HiiPackageList == NULL) {\r
       Status = EFI_OUT_OF_RESOURCES;\r
       goto Done;\r
     }\r
     HiiPackageList = AllocatePool (PackageListLength);\r
     if (HiiPackageList == NULL) {\r
       Status = EFI_OUT_OF_RESOURCES;\r
       goto Done;\r
     }\r

-  \r
+\r

     //\r
     // Get PackageList on HiiHandle\r
     //\r
     //\r
     // Get PackageList on HiiHandle\r
     //\r


@@ -2433,7 +2433,7 @@ InternalHiiIfrValueAction (
     if (EFI_ERROR (Status)) {\r
       goto Done;\r
     }\r
     if (EFI_ERROR (Status)) {\r
       goto Done;\r
     }\r

-    \r
+\r

     //\r
     // 3. Call ConfigRouting GetAltCfg(ConfigRoute, <ConfigResponse>, Guid, Name, DevicePath, AltCfgId, AltCfgResp)\r
     //    Get the default configuration string according to the default ID.\r
     //\r
     // 3. Call ConfigRouting GetAltCfg(ConfigRoute, <ConfigResponse>, Guid, Name, DevicePath, AltCfgId, AltCfgResp)\r
     //    Get the default configuration string according to the default ID.\r


@@ -2447,7 +2447,7 @@ InternalHiiIfrValueAction (
                                   (ActionType == ACTION_SET_DEFAUTL_VALUE) ? &DefaultId:NULL,  // it can be NULL to get the current setting.\r
                                   &ConfigResp\r
                                 );\r
                                   (ActionType == ACTION_SET_DEFAUTL_VALUE) ? &DefaultId:NULL,  // it can be NULL to get the current setting.\r
                                   &ConfigResp\r
                                 );\r

-    \r
+\r

     //\r
     // The required setting can't be found. So, it is not required to be validated and set.\r
     //\r
     //\r
     // The required setting can't be found. So, it is not required to be validated and set.\r
     //\r


@@ -2461,7 +2461,7 @@ InternalHiiIfrValueAction (
     if (!GetElementsFromRequest (ConfigResp)) {\r
       goto NextConfigAltResp;\r
     }\r
     if (!GetElementsFromRequest (ConfigResp)) {\r
       goto NextConfigAltResp;\r
     }\r

-    \r
+\r

     //\r
     // 4. Set the default configuration information or Validate current setting by parse IFR code.\r
     //    Current Setting is in ConfigResp, will be set into buffer, then check it again.\r
     //\r
     // 4. Set the default configuration information or Validate current setting by parse IFR code.\r
     //    Current Setting is in ConfigResp, will be set into buffer, then check it again.\r


@@ -2490,7 +2490,7 @@ NextConfigAltResp:
       FreePool (HiiPackageList);\r
       HiiPackageList = NULL;\r
     }\r
       FreePool (HiiPackageList);\r
       HiiPackageList = NULL;\r
     }\r

-    \r
+\r

     if (ConfigResp != NULL) {\r
       FreePool (ConfigResp);\r
       ConfigResp = NULL;\r
     if (ConfigResp != NULL) {\r
       FreePool (ConfigResp);\r
       ConfigResp = NULL;\r


@@ -2501,10 +2501,10 @@ NextConfigAltResp:
     //\r
     FreePool (VarGuid);\r
     VarGuid = NULL;\r
     //\r
     FreePool (VarGuid);\r
     VarGuid = NULL;\r

-  \r
+\r

     FreePool (VarName);\r
     VarName = NULL;\r
     FreePool (VarName);\r
     VarName = NULL;\r

-  \r
+\r

     FreePool (DevicePath);\r
     DevicePath = NULL;\r
 \r
     FreePool (DevicePath);\r
     DevicePath = NULL;\r
 \r


@@ -2521,9 +2521,9 @@ NextConfigAltResp:
     if (*StringPtr == L'\0') {\r
       break;\r
     }\r
     if (*StringPtr == L'\0') {\r
       break;\r
     }\r

-        \r
+\r

     //\r
     //\r

-    // Construct ConfigAltHdr string  "&<ConfigHdr>&ALTCFG=\0" \r
+    // Construct ConfigAltHdr string  "&<ConfigHdr>&ALTCFG=\0"\r

     //                               | 1 | StrLen (ConfigHdr) | 8 | 1 |\r
     //\r
     MaxLen = 1 + StringPtr - StringHdr + 8 + 1;\r
     //                               | 1 | StrLen (ConfigHdr) | 8 | 1 |\r
     //\r
     MaxLen = 1 + StringPtr - StringHdr + 8 + 1;\r


@@ -2535,7 +2535,7 @@ NextConfigAltResp:
     StrCpyS (ConfigAltHdr, MaxLen, L"&");\r
     StrnCatS (ConfigAltHdr, MaxLen, StringHdr, StringPtr - StringHdr);\r
     StrCatS (ConfigAltHdr, MaxLen, L"&ALTCFG=");\r
     StrCpyS (ConfigAltHdr, MaxLen, L"&");\r
     StrnCatS (ConfigAltHdr, MaxLen, StringHdr, StringPtr - StringHdr);\r
     StrCatS (ConfigAltHdr, MaxLen, L"&ALTCFG=");\r

-    \r
+\r

     //\r
     // Skip all AltResp (AltConfigHdr ConfigBody) for the same ConfigHdr\r
     //\r
     //\r
     // Skip all AltResp (AltConfigHdr ConfigBody) for the same ConfigHdr\r
     //\r


@@ -2545,7 +2545,7 @@ NextConfigAltResp:
         break;\r
       }\r
     }\r
         break;\r
       }\r
     }\r

-    \r
+\r

     //\r
     // Free the allocated ConfigAltHdr string\r
     //\r
     //\r
     // Free the allocated ConfigAltHdr string\r
     //\r


@@ -2553,7 +2553,7 @@ NextConfigAltResp:
     if (*StringPtr == L'\0') {\r
       break;\r
     }\r
     if (*StringPtr == L'\0') {\r
       break;\r
     }\r

-    \r
+\r

     //\r
     // Find &GUID as the next ConfigHdr\r
     //\r
     //\r
     // Find &GUID as the next ConfigHdr\r
     //\r


@@ -2567,7 +2567,7 @@ NextConfigAltResp:
     //\r
     StringPtr ++;\r
   }\r
     //\r
     StringPtr ++;\r
   }\r

-  \r
+\r

 Done:\r
   if (VarGuid != NULL) {\r
     FreePool (VarGuid);\r
 Done:\r
   if (VarGuid != NULL) {\r
     FreePool (VarGuid);\r


@@ -2588,11 +2588,11 @@ Done:
   if (ConfigAltResp != NULL) {\r
     FreePool (ConfigAltResp);\r
   }\r
   if (ConfigAltResp != NULL) {\r
     FreePool (ConfigAltResp);\r
   }\r

- \r
+\r

   if (HiiPackageList != NULL) {\r
     FreePool (HiiPackageList);\r
   }\r
   if (HiiPackageList != NULL) {\r
     FreePool (HiiPackageList);\r
   }\r

-  \r
+\r

   if (EFI_ERROR (Status)) {\r
     return FALSE;\r
   }\r
   if (EFI_ERROR (Status)) {\r
     return FALSE;\r
   }\r


@@ -2605,17 +2605,17 @@ Done:
 \r
   NULL request string support depends on the ExportConfig interface of\r
   HiiConfigRouting protocol in UEFI specification.\r
 \r
   NULL request string support depends on the ExportConfig interface of\r
   HiiConfigRouting protocol in UEFI specification.\r

-  \r
-  @param  Request   A null-terminated Unicode string in \r
+\r
+  @param  Request   A null-terminated Unicode string in\r

                     <MultiConfigRequest> format. It can be NULL.\r
                     If it is NULL, all current configuration for the\r
                     entirety of the current HII database will be validated.\r
                     <MultiConfigRequest> format. It can be NULL.\r
                     If it is NULL, all current configuration for the\r
                     entirety of the current HII database will be validated.\r

-  \r
+\r

   @retval TRUE    Current configuration is valid.\r
   @retval FALSE   Current configuration is invalid.\r
 **/\r
 BOOLEAN\r
   @retval TRUE    Current configuration is valid.\r
   @retval FALSE   Current configuration is invalid.\r
 **/\r
 BOOLEAN\r

-EFIAPI                               \r
+EFIAPI\r

 HiiValidateSettings (\r
   IN CONST EFI_STRING Request  OPTIONAL\r
   )\r
 HiiValidateSettings (\r
   IN CONST EFI_STRING Request  OPTIONAL\r
   )\r


@@ -2625,17 +2625,17 @@ HiiValidateSettings (
 \r
 /**\r
   Reset the default value specified by DefaultId to the driver\r
 \r
 /**\r
   Reset the default value specified by DefaultId to the driver\r

-  configuration got by Request string. \r
+  configuration got by Request string.\r

 \r
   NULL request string support depends on the ExportConfig interface of\r
   HiiConfigRouting protocol in UEFI specification.\r
 \r
   NULL request string support depends on the ExportConfig interface of\r
   HiiConfigRouting protocol in UEFI specification.\r

-  \r
-  @param Request    A null-terminated Unicode string in \r
+\r
+  @param Request    A null-terminated Unicode string in\r

                     <MultiConfigRequest> format. It can be NULL.\r
                     If it is NULL, all configuration for the\r
                     entirety of the current HII database will be reset.\r
   @param DefaultId  Specifies the type of defaults to retrieve.\r
                     <MultiConfigRequest> format. It can be NULL.\r
                     If it is NULL, all configuration for the\r
                     entirety of the current HII database will be reset.\r
   @param DefaultId  Specifies the type of defaults to retrieve.\r

-  \r
+\r

   @retval TRUE    The default value is set successfully.\r
   @retval FALSE   The default value can't be found and set.\r
 **/\r
   @retval TRUE    The default value is set successfully.\r
   @retval FALSE   The default value can't be found and set.\r
 **/\r


@@ -2652,8 +2652,8 @@ HiiSetToDefaults (
 /**\r
   Determines if two values in config strings match.\r
 \r
 /**\r
   Determines if two values in config strings match.\r
 \r

-  Compares the substring between StartSearchString and StopSearchString in \r
-  FirstString to the substring between StartSearchString and StopSearchString \r
+  Compares the substring between StartSearchString and StopSearchString in\r
+  FirstString to the substring between StartSearchString and StopSearchString\r

   in SecondString.  If the two substrings match, then TRUE is returned.  If the\r
   two substrings do not match, then FALSE is returned.\r
 \r
   in SecondString.  If the two substrings match, then TRUE is returned.  If the\r
   two substrings do not match, then FALSE is returned.\r
 \r


@@ -2664,20 +2664,20 @@ HiiSetToDefaults (
 \r
   @param FirstString        Pointer to the first Null-terminated Unicode string.\r
   @param SecondString       Pointer to the second Null-terminated Unicode string.\r
 \r
   @param FirstString        Pointer to the first Null-terminated Unicode string.\r
   @param SecondString       Pointer to the second Null-terminated Unicode string.\r

-  @param StartSearchString  Pointer to the Null-terminated Unicode string that \r
+  @param StartSearchString  Pointer to the Null-terminated Unicode string that\r

                             marks the start of the value string to compare.\r
                             marks the start of the value string to compare.\r

-  @param StopSearchString   Pointer to the Null-terminated Unicode string that \r
+  @param StopSearchString   Pointer to the Null-terminated Unicode string that\r

                             marks the end of the value string to compare.\r
 \r
                             marks the end of the value string to compare.\r
 \r

-  @retval FALSE             StartSearchString is not present in FirstString. \r
+  @retval FALSE             StartSearchString is not present in FirstString.\r

   @retval FALSE             StartSearchString is not present in SecondString.\r
   @retval FALSE             StartSearchString is not present in SecondString.\r

-  @retval FALSE             StopSearchString is not present in FirstString. \r
+  @retval FALSE             StopSearchString is not present in FirstString.\r

   @retval FALSE             StopSearchString is not present in SecondString.\r
   @retval FALSE             StopSearchString is not present in SecondString.\r

-  @retval FALSE             The length of the substring in FirstString is not the \r
+  @retval FALSE             The length of the substring in FirstString is not the\r

                             same length as the substring in SecondString.\r
                             same length as the substring in SecondString.\r

-  @retval FALSE             The value string in FirstString does not matche the \r
+  @retval FALSE             The value string in FirstString does not matche the\r

                             value string in SecondString.\r
                             value string in SecondString.\r

-  @retval TRUE              The value string in FirstString matches the value \r
+  @retval TRUE              The value string in FirstString matches the value\r

                             string in SecondString.\r
 \r
 **/\r
                             string in SecondString.\r
 \r
 **/\r


@@ -2786,11 +2786,11 @@ HiiIsConfigHdrMatch (
   Retrieves uncommitted data from the Form Browser and converts it to a binary\r
   buffer.\r
 \r
   Retrieves uncommitted data from the Form Browser and converts it to a binary\r
   buffer.\r
 \r

-  @param[in]  VariableGuid  Pointer to an EFI_GUID structure.  This is an optional \r
+  @param[in]  VariableGuid  Pointer to an EFI_GUID structure.  This is an optional\r

                             parameter that may be NULL.\r
                             parameter that may be NULL.\r

-  @param[in]  VariableName  Pointer to a Null-terminated Unicode string.  This \r
+  @param[in]  VariableName  Pointer to a Null-terminated Unicode string.  This\r

                             is an optional parameter that may be NULL.\r
                             is an optional parameter that may be NULL.\r

-  @param[in]  BufferSize    Length in bytes of buffer to hold retrieved data. \r
+  @param[in]  BufferSize    Length in bytes of buffer to hold retrieved data.\r

   @param[out] Buffer        Buffer of data to be updated.\r
 \r
   @retval FALSE  The uncommitted data could not be retrieved.\r
   @param[out] Buffer        Buffer of data to be updated.\r
 \r
   @retval FALSE  The uncommitted data could not be retrieved.\r


@@ -2827,7 +2827,7 @@ HiiGetBrowserData (
   Size = Size + (StrLen (ResultsData) + 1) * sizeof (CHAR16);\r
   ConfigResp = AllocateZeroPool (Size);\r
   UnicodeSPrint (ConfigResp, Size, L"%s&%s", mConfigHdrTemplate, ResultsData);\r
   Size = Size + (StrLen (ResultsData) + 1) * sizeof (CHAR16);\r
   ConfigResp = AllocateZeroPool (Size);\r
   UnicodeSPrint (ConfigResp, Size, L"%s&%s", mConfigHdrTemplate, ResultsData);\r

-  \r
+\r

   //\r
   // Free the allocated buffer\r
   //\r
   //\r
   // Free the allocated buffer\r
   //\r


@@ -2872,7 +2872,7 @@ HiiGetBrowserData (
   @param[in]  RequestElement  An optional field to specify which part of the\r
                               buffer data will be send back to Browser. If NULL,\r
                               the whole buffer of data will be committed to\r
   @param[in]  RequestElement  An optional field to specify which part of the\r
                               buffer data will be send back to Browser. If NULL,\r
                               the whole buffer of data will be committed to\r

-                              Browser. \r
+                              Browser.\r

                               <RequestElement> ::= &OFFSET=<Number>&WIDTH=<Number>*\r
 \r
   @retval FALSE  The uncommitted data could not be updated.\r
                               <RequestElement> ::= &OFFSET=<Number>&WIDTH=<Number>*\r
 \r
   @retval FALSE  The uncommitted data could not be updated.\r


@@ -2901,7 +2901,7 @@ HiiSetBrowserData (
   //\r
   if (RequestElement == NULL) {\r
     //\r
   //\r
   if (RequestElement == NULL) {\r
     //\r

-    // Allocate and fill a buffer large enough to hold the <ConfigHdr> template \r
+    // Allocate and fill a buffer large enough to hold the <ConfigHdr> template\r

     // followed by "&OFFSET=0&WIDTH=WWWWWWWWWWWWWWWW" followed by a Null-terminator\r
     //\r
     Size = (StrLen (mConfigHdrTemplate) + 32 + 1) * sizeof (CHAR16);\r
     // followed by "&OFFSET=0&WIDTH=WWWWWWWWWWWWWWWW" followed by a Null-terminator\r
     //\r
     Size = (StrLen (mConfigHdrTemplate) + 32 + 1) * sizeof (CHAR16);\r


@@ -2909,7 +2909,7 @@ HiiSetBrowserData (
     UnicodeSPrint (ConfigRequest, Size, L"%s&OFFSET=0&WIDTH=%016LX", mConfigHdrTemplate, (UINT64)BufferSize);\r
   } else {\r
     //\r
     UnicodeSPrint (ConfigRequest, Size, L"%s&OFFSET=0&WIDTH=%016LX", mConfigHdrTemplate, (UINT64)BufferSize);\r
   } else {\r
     //\r

-    // Allocate and fill a buffer large enough to hold the <ConfigHdr> template \r
+    // Allocate and fill a buffer large enough to hold the <ConfigHdr> template\r

     // followed by <RequestElement> followed by a Null-terminator\r
     //\r
     Size = StrLen (mConfigHdrTemplate) * sizeof (CHAR16);\r
     // followed by <RequestElement> followed by a Null-terminator\r
     //\r
     Size = StrLen (mConfigHdrTemplate) * sizeof (CHAR16);\r


@@ -2968,7 +2968,7 @@ GLOBAL_REMOVE_IF_UNREFERENCED CONST UINT8 mHiiDefaultTypeToWidth[] = {
 };\r
 \r
 /**\r
 };\r
 \r
 /**\r

-  Allocates and returns a new OpCode Handle.  OpCode Handles must be freed with \r
+  Allocates and returns a new OpCode Handle.  OpCode Handles must be freed with\r

   HiiFreeOpCodeHandle().\r
 \r
   @retval NULL   There are not enough resources to allocate a new OpCode Handle.\r
   HiiFreeOpCodeHandle().\r
 \r
   @retval NULL   There are not enough resources to allocate a new OpCode Handle.\r


@@ -3026,7 +3026,7 @@ HiiFreeOpCodeHandle (
 \r
 /**\r
   Internal function gets the current position of opcode buffer.\r
 \r
 /**\r
   Internal function gets the current position of opcode buffer.\r

-  \r
+\r

   @param[in]  OpCodeHandle   Handle to the buffer of opcodes.\r
 \r
   @return Current position of opcode buffer.\r
   @param[in]  OpCodeHandle   Handle to the buffer of opcodes.\r
 \r
   @return Current position of opcode buffer.\r


@@ -3042,7 +3042,7 @@ InternalHiiOpCodeHandlePosition (
 \r
 /**\r
   Internal function gets the start pointer of opcode buffer.\r
 \r
 /**\r
   Internal function gets the start pointer of opcode buffer.\r

-  \r
+\r

   @param[in]  OpCodeHandle   Handle to the buffer of opcodes.\r
 \r
   @return Pointer to the opcode buffer base.\r
   @param[in]  OpCodeHandle   Handle to the buffer of opcodes.\r
 \r
   @return Pointer to the opcode buffer base.\r


@@ -3059,7 +3059,7 @@ InternalHiiOpCodeHandleBuffer (
 /**\r
   Internal function reserves the enough buffer for current opcode.\r
   When the buffer is not enough, Opcode buffer will be extended.\r
 /**\r
   Internal function reserves the enough buffer for current opcode.\r
   When the buffer is not enough, Opcode buffer will be extended.\r

-  \r
+\r

   @param[in]  OpCodeHandle   Handle to the buffer of opcodes.\r
   @param[in]  Size           Size of current opcode.\r
 \r
   @param[in]  OpCodeHandle   Handle to the buffer of opcodes.\r
   @param[in]  Size           Size of current opcode.\r
 \r


@@ -3080,7 +3080,7 @@ InternalHiiGrowOpCodeHandle (
   OpCodeBuffer = (HII_LIB_OPCODE_BUFFER *)OpCodeHandle;\r
   if (OpCodeBuffer->Position + Size > OpCodeBuffer->BufferSize) {\r
     Buffer = ReallocatePool (\r
   OpCodeBuffer = (HII_LIB_OPCODE_BUFFER *)OpCodeHandle;\r
   if (OpCodeBuffer->Position + Size > OpCodeBuffer->BufferSize) {\r
     Buffer = ReallocatePool (\r

-              OpCodeBuffer->BufferSize, \r
+              OpCodeBuffer->BufferSize,\r

               OpCodeBuffer->BufferSize + (Size + HII_LIB_OPCODE_ALLOCATION_SIZE),\r
               OpCodeBuffer->Buffer\r
               );\r
               OpCodeBuffer->BufferSize + (Size + HII_LIB_OPCODE_ALLOCATION_SIZE),\r
               OpCodeBuffer->Buffer\r
               );\r


@@ -3095,7 +3095,7 @@ InternalHiiGrowOpCodeHandle (
 \r
 /**\r
   Internal function creates opcode based on the template opcode.\r
 \r
 /**\r
   Internal function creates opcode based on the template opcode.\r

-  \r
+\r

   @param[in]  OpCodeHandle    Handle to the buffer of opcodes.\r
   @param[in]  OpCodeTemplate  Pointer to the template buffer of opcode.\r
   @param[in]  OpCode          OpCode IFR value.\r
   @param[in]  OpCodeHandle    Handle to the buffer of opcodes.\r
   @param[in]  OpCodeTemplate  Pointer to the template buffer of opcode.\r
   @param[in]  OpCode          OpCode IFR value.\r


@@ -3132,7 +3132,7 @@ InternalHiiCreateOpCodeExtended (
 \r
 /**\r
   Internal function creates opcode based on the template opcode for the normal opcode.\r
 \r
 /**\r
   Internal function creates opcode based on the template opcode for the normal opcode.\r

-  \r
+\r

   @param[in]  OpCodeHandle    Handle to the buffer of opcodes.\r
   @param[in]  OpCodeTemplate  Pointer to the template buffer of opcode.\r
   @param[in]  OpCode          OpCode IFR value.\r
   @param[in]  OpCodeHandle    Handle to the buffer of opcodes.\r
   @param[in]  OpCodeTemplate  Pointer to the template buffer of opcode.\r
   @param[in]  OpCode          OpCode IFR value.\r


@@ -3317,14 +3317,14 @@ HiiCreateDefaultOpCode (
 \r
   @param[in]  OpCodeHandle  Handle to the buffer of opcodes.\r
   @param[in]  Guid          Pointer to EFI_GUID of this guided opcode.\r
 \r
   @param[in]  OpCodeHandle  Handle to the buffer of opcodes.\r
   @param[in]  Guid          Pointer to EFI_GUID of this guided opcode.\r

-  @param[in]  GuidOpCode    Pointer to an EFI_IFR_GUID opcode.  This is an \r
+  @param[in]  GuidOpCode    Pointer to an EFI_IFR_GUID opcode.  This is an\r

                             optional parameter that may be NULL.  If this\r
                             optional parameter that may be NULL.  If this\r

-                            parameter is NULL, then the GUID extension \r
+                            parameter is NULL, then the GUID extension\r

                             region of the created opcode is filled with zeros.\r
                             region of the created opcode is filled with zeros.\r

-                            If this parameter is not NULL, then the GUID \r
-                            extension region of GuidData will be copied to \r
+                            If this parameter is not NULL, then the GUID\r
+                            extension region of GuidData will be copied to\r

                             the GUID extension region of the created opcode.\r
                             the GUID extension region of the created opcode.\r

-  @param[in]  OpCodeSize    The size, in bytes, of created opcode.  This value \r
+  @param[in]  OpCodeSize    The size, in bytes, of created opcode.  This value\r

                             must be >= sizeof(EFI_IFR_GUID).\r
 \r
   @retval NULL   There is not enough space left in Buffer to add the opcode.\r
                             must be >= sizeof(EFI_IFR_GUID).\r
 \r
   @retval NULL   There is not enough space left in Buffer to add the opcode.\r


@@ -3350,7 +3350,7 @@ HiiCreateGuidOpCode (
   CopyGuid ((EFI_GUID *)(VOID *)&OpCode.Guid, Guid);\r
 \r
   OpCodePointer = (EFI_IFR_GUID *)InternalHiiCreateOpCodeExtended (\r
   CopyGuid ((EFI_GUID *)(VOID *)&OpCode.Guid, Guid);\r
 \r
   OpCodePointer = (EFI_IFR_GUID *)InternalHiiCreateOpCodeExtended (\r

-                                    OpCodeHandle, \r
+                                    OpCodeHandle,\r

                                     &OpCode,\r
                                     EFI_IFR_GUID_OP,\r
                                     sizeof (OpCode),\r
                                     &OpCode,\r
                                     EFI_IFR_GUID_OP,\r
                                     sizeof (OpCode),\r


@@ -3444,11 +3444,11 @@ HiiCreateSubTitleOpCode (
   OpCode.Flags            = Flags;\r
 \r
   return InternalHiiCreateOpCodeExtended (\r
   OpCode.Flags            = Flags;\r
 \r
   return InternalHiiCreateOpCodeExtended (\r

-           OpCodeHandle, \r
+           OpCodeHandle,\r

            &OpCode,\r
            &OpCode,\r

-           EFI_IFR_SUBTITLE_OP, \r
-           sizeof (OpCode), \r
-           0, \r
+           EFI_IFR_SUBTITLE_OP,\r
+           sizeof (OpCode),\r
+           0,\r

            Scope\r
            );\r
 }\r
            Scope\r
            );\r
 }\r


@@ -3498,7 +3498,7 @@ HiiCreateGotoOpCode (
 /**\r
   Create EFI_IFR_REF_OP, EFI_IFR_REF2_OP, EFI_IFR_REF3_OP and EFI_IFR_REF4_OP opcode.\r
 \r
 /**\r
   Create EFI_IFR_REF_OP, EFI_IFR_REF2_OP, EFI_IFR_REF3_OP and EFI_IFR_REF4_OP opcode.\r
 \r

-  When RefDevicePath is not zero, EFI_IFR_REF4 opcode will be created. \r
+  When RefDevicePath is not zero, EFI_IFR_REF4 opcode will be created.\r

   When RefDevicePath is zero and RefFormSetId is not NULL, EFI_IFR_REF3 opcode will be created.\r
   When RefDevicePath is zero, RefFormSetId is NULL and RefQuestionId is not zero, EFI_IFR_REF2 opcode will be created.\r
   When RefDevicePath is zero, RefFormSetId is NULL and RefQuestionId is zero, EFI_IFR_REF opcode will be created.\r
   When RefDevicePath is zero and RefFormSetId is not NULL, EFI_IFR_REF3 opcode will be created.\r
   When RefDevicePath is zero, RefFormSetId is NULL and RefQuestionId is not zero, EFI_IFR_REF2 opcode will be created.\r
   When RefDevicePath is zero, RefFormSetId is NULL and RefQuestionId is zero, EFI_IFR_REF opcode will be created.\r


@@ -3512,11 +3512,11 @@ HiiCreateGotoOpCode (
   @param[in]  Help           The string ID for Help.\r
   @param[in]  QuestionFlags  The flags in Question Header\r
   @param[in]  QuestionId     Question ID.\r
   @param[in]  Help           The string ID for Help.\r
   @param[in]  QuestionFlags  The flags in Question Header\r
   @param[in]  QuestionId     Question ID.\r

-  @param[in]  RefQuestionId  The question on the form to which this link is referring. \r
+  @param[in]  RefQuestionId  The question on the form to which this link is referring.\r

                              If its value is zero, then the link refers to the top of the form.\r
                              If its value is zero, then the link refers to the top of the form.\r

-  @param[in]  RefFormSetId   The form set to which this link is referring. If its value is NULL, and RefDevicePath is \r
+  @param[in]  RefFormSetId   The form set to which this link is referring. If its value is NULL, and RefDevicePath is\r

                              zero, then the link is to the current form set.\r
                              zero, then the link is to the current form set.\r

-  @param[in]  RefDevicePath  The string identifier that specifies the string containing the text representation of \r
+  @param[in]  RefDevicePath  The string identifier that specifies the string containing the text representation of\r

                              the device path to which the form set containing the form specified by FormId.\r
                              If its value is zero, then the link refers to the current page.\r
 \r
                              the device path to which the form set containing the form specified by FormId.\r
                              If its value is zero, then the link refers to the current page.\r
 \r


@@ -4110,7 +4110,7 @@ HiiCreateTimeOpCode (
   @param[in] FormSetGuid       The optional Formset GUID.\r
   @param[in] FormId            The Form ID.\r
   @param[in] Package           The package header.\r
   @param[in] FormSetGuid       The optional Formset GUID.\r
   @param[in] FormId            The Form ID.\r
   @param[in] Package           The package header.\r

-  @param[in] OpCodeBufferStart An OpCode buffer that contains the set of IFR \r
+  @param[in] OpCodeBufferStart An OpCode buffer that contains the set of IFR\r

                                opcodes to be inserted or replaced in the form.\r
   @param[in] OpCodeBufferEnd   An OpCcode buffer that contains the IFR opcode\r
                                that marks the end of a replace operation in the form.\r
                                opcodes to be inserted or replaced in the form.\r
   @param[in] OpCodeBufferEnd   An OpCcode buffer that contains the IFR opcode\r
                                that marks the end of a replace operation in the form.\r


@@ -4157,7 +4157,7 @@ InternalHiiUpdateFormPackageData (
     CopyMem (BufferPos, IfrOpHdr, IfrOpHdr->Length);\r
     BufferPos           += IfrOpHdr->Length;\r
     UpdatePackageLength += IfrOpHdr->Length;\r
     CopyMem (BufferPos, IfrOpHdr, IfrOpHdr->Length);\r
     BufferPos           += IfrOpHdr->Length;\r
     UpdatePackageLength += IfrOpHdr->Length;\r

-    \r
+\r

     //\r
     // Find the matched FormSet and Form\r
     //\r
     //\r
     // Find the matched FormSet and Form\r
     //\r


@@ -4174,7 +4174,7 @@ InternalHiiUpdateFormPackageData (
         GetForm = FALSE;\r
       }\r
     }\r
         GetForm = FALSE;\r
       }\r
     }\r

-    \r
+\r

     //\r
     // The matched Form is found, and Update data in this form\r
     //\r
     //\r
     // The matched Form is found, and Update data in this form\r
     //\r


@@ -4203,7 +4203,7 @@ InternalHiiUpdateFormPackageData (
             Offset        += IfrOpHdr->Length;\r
             IfrOpHdr       = (EFI_IFR_OP_HEADER *) ((UINT8 *) (IfrOpHdr) + IfrOpHdr->Length);\r
           }\r
             Offset        += IfrOpHdr->Length;\r
             IfrOpHdr       = (EFI_IFR_OP_HEADER *) ((UINT8 *) (IfrOpHdr) + IfrOpHdr->Length);\r
           }\r

-          \r
+\r

           if (Offset >= PackageHeader.Length) {\r
             //\r
             // The end opcode is not found.\r
           if (Offset >= PackageHeader.Length) {\r
             //\r
             // The end opcode is not found.\r


@@ -4250,7 +4250,7 @@ InternalHiiUpdateFormPackageData (
     Offset   += IfrOpHdr->Length;\r
     IfrOpHdr = (EFI_IFR_OP_HEADER *) ((CHAR8 *) (IfrOpHdr) + IfrOpHdr->Length);\r
   }\r
     Offset   += IfrOpHdr->Length;\r
     IfrOpHdr = (EFI_IFR_OP_HEADER *) ((CHAR8 *) (IfrOpHdr) + IfrOpHdr->Length);\r
   }\r

-  \r
+\r

   if (!Updated) {\r
     //\r
     // The updated opcode buffer is not found.\r
   if (!Updated) {\r
     //\r
     // The updated opcode buffer is not found.\r


@@ -4267,26 +4267,26 @@ InternalHiiUpdateFormPackageData (
 }\r
 \r
 /**\r
 }\r
 \r
 /**\r

-  This function updates a form that has previously been registered with the HII \r
+  This function updates a form that has previously been registered with the HII\r

   Database.  This function will perform at most one update operation.\r
   Database.  This function will perform at most one update operation.\r

-    \r
-  The form to update is specified by Handle, FormSetGuid, and FormId.  Binary \r
-  comparisons of IFR opcodes are performed from the beginning of the form being \r
-  updated until an IFR opcode is found that exactly matches the first IFR opcode \r
+\r
+  The form to update is specified by Handle, FormSetGuid, and FormId.  Binary\r
+  comparisons of IFR opcodes are performed from the beginning of the form being\r
+  updated until an IFR opcode is found that exactly matches the first IFR opcode\r

   specified by StartOpCodeHandle.  The following rules are used to determine if\r
   an insert, replace, or delete operation is performed.\r
   specified by StartOpCodeHandle.  The following rules are used to determine if\r
   an insert, replace, or delete operation is performed.\r

-  \r
-  1) If no matches are found, then NULL is returned.  \r
+\r
+  1) If no matches are found, then NULL is returned.\r

   2) If a match is found, and EndOpCodeHandle is NULL, then all of the IFR opcodes\r
   2) If a match is found, and EndOpCodeHandle is NULL, then all of the IFR opcodes\r

-     from StartOpCodeHandle except the first opcode are inserted immediately after \r
+     from StartOpCodeHandle except the first opcode are inserted immediately after\r

      the matching IFR opcode in the form to be updated.\r
      the matching IFR opcode in the form to be updated.\r

-  3) If a match is found, and EndOpCodeHandle is not NULL, then a search is made \r
-     from the matching IFR opcode until an IFR opcode exactly matches the first \r
+  3) If a match is found, and EndOpCodeHandle is not NULL, then a search is made\r
+     from the matching IFR opcode until an IFR opcode exactly matches the first\r

      IFR opcode specified by EndOpCodeHandle.  If no match is found for the first\r
      IFR opcode specified by EndOpCodeHandle, then NULL is returned.  If a match\r
      IFR opcode specified by EndOpCodeHandle.  If no match is found for the first\r
      IFR opcode specified by EndOpCodeHandle, then NULL is returned.  If a match\r

-     is found, then all of the IFR opcodes between the start match and the end \r
+     is found, then all of the IFR opcodes between the start match and the end\r

      match are deleted from the form being updated and all of the IFR opcodes\r
      match are deleted from the form being updated and all of the IFR opcodes\r

-     from StartOpCodeHandle except the first opcode are inserted immediately after \r
+     from StartOpCodeHandle except the first opcode are inserted immediately after\r

      the matching start IFR opcode.  If StartOpCcodeHandle only contains one\r
      IFR instruction, then the result of this operation will delete all of the IFR\r
      opcodes between the start end matches.\r
      the matching start IFR opcode.  If StartOpCcodeHandle only contains one\r
      IFR instruction, then the result of this operation will delete all of the IFR\r
      opcodes between the start end matches.\r


@@ -4299,26 +4299,26 @@ InternalHiiUpdateFormPackageData (
                                  is an optional parameter that may be NULL.\r
                                  If it is NULL, all FormSet will be updated.\r
   @param[in]  FormId             The ID of the form to update.\r
                                  is an optional parameter that may be NULL.\r
                                  If it is NULL, all FormSet will be updated.\r
   @param[in]  FormId             The ID of the form to update.\r

-  @param[in]  StartOpCodeHandle  An OpCode Handle that contains the set of IFR \r
+  @param[in]  StartOpCodeHandle  An OpCode Handle that contains the set of IFR\r

                                  opcodes to be inserted or replaced in the form.\r
                                  opcodes to be inserted or replaced in the form.\r

-                                 The first IFR instruction in StartOpCodeHandle \r
-                                 is used to find matching IFR opcode in the \r
-                                 form. \r
+                                 The first IFR instruction in StartOpCodeHandle\r
+                                 is used to find matching IFR opcode in the\r
+                                 form.\r

   @param[in]  EndOpCodeHandle    An OpCcode Handle that contains the IFR opcode\r
                                  that marks the end of a replace operation in\r
                                  the form.  This is an optional parameter that\r
                                  may be NULL.  If it is NULL, then an the IFR\r
   @param[in]  EndOpCodeHandle    An OpCcode Handle that contains the IFR opcode\r
                                  that marks the end of a replace operation in\r
                                  the form.  This is an optional parameter that\r
                                  may be NULL.  If it is NULL, then an the IFR\r

-                                 opcodes specified by StartOpCodeHandle are \r
+                                 opcodes specified by StartOpCodeHandle are\r

                                  inserted into the form.\r
                                  inserted into the form.\r

-  \r
+\r

   @retval EFI_OUT_OF_RESOURCES   No enough memory resource is allocated.\r
   @retval EFI_NOT_FOUND          The following cases will return EFI_NOT_FOUND.\r
   @retval EFI_OUT_OF_RESOURCES   No enough memory resource is allocated.\r
   @retval EFI_NOT_FOUND          The following cases will return EFI_NOT_FOUND.\r

-                                 1) The form specified by HiiHandle, FormSetGuid, \r
+                                 1) The form specified by HiiHandle, FormSetGuid,\r

                                  and FormId could not be found in the HII Database.\r
                                  2) No IFR opcodes in the target form match the first\r
                                  IFR opcode in StartOpCodeHandle.\r
                                  and FormId could not be found in the HII Database.\r
                                  2) No IFR opcodes in the target form match the first\r
                                  IFR opcode in StartOpCodeHandle.\r

-                                 3) EndOpCOde is not NULL, and no IFR opcodes in the \r
-                                 target form following a matching start opcode match \r
+                                 3) EndOpCOde is not NULL, and no IFR opcodes in the\r
+                                 target form following a matching start opcode match\r

                                  the first IFR opcode in EndOpCodeHandle.\r
   @retval EFI_SUCCESS            The matched form is updated by StartOpcode.\r
 \r
                                  the first IFR opcode in EndOpCodeHandle.\r
   @retval EFI_SUCCESS            The matched form is updated by StartOpcode.\r
 \r


@@ -4326,7 +4326,7 @@ InternalHiiUpdateFormPackageData (
 EFI_STATUS\r
 EFIAPI\r
 HiiUpdateForm (\r
 EFI_STATUS\r
 EFIAPI\r
 HiiUpdateForm (\r

-  IN EFI_HII_HANDLE  HiiHandle,           \r
+  IN EFI_HII_HANDLE  HiiHandle,\r

   IN EFI_GUID        *FormSetGuid,        OPTIONAL\r
   IN EFI_FORM_ID     FormId,\r
   IN VOID            *StartOpCodeHandle,\r
   IN EFI_GUID        *FormSetGuid,        OPTIONAL\r
   IN EFI_FORM_ID     FormId,\r
   IN VOID            *StartOpCodeHandle,\r


@@ -4335,7 +4335,7 @@ HiiUpdateForm (
 {\r
   EFI_STATUS                   Status;\r
   EFI_HII_PACKAGE_LIST_HEADER  *HiiPackageList;\r
 {\r
   EFI_STATUS                   Status;\r
   EFI_HII_PACKAGE_LIST_HEADER  *HiiPackageList;\r

-  UINT32                       PackageListLength;  \r
+  UINT32                       PackageListLength;\r

   UINT32                       Offset;\r
   EFI_HII_PACKAGE_LIST_HEADER  *UpdatePackageList;\r
   UINTN                        BufferSize;\r
   UINT32                       Offset;\r
   EFI_HII_PACKAGE_LIST_HEADER  *UpdatePackageList;\r
   UINTN                        BufferSize;\r


@@ -4346,7 +4346,7 @@ HiiUpdateForm (
   BOOLEAN                      Updated;\r
   HII_LIB_OPCODE_BUFFER        *OpCodeBufferStart;\r
   HII_LIB_OPCODE_BUFFER        *OpCodeBufferEnd;\r
   BOOLEAN                      Updated;\r
   HII_LIB_OPCODE_BUFFER        *OpCodeBufferStart;\r
   HII_LIB_OPCODE_BUFFER        *OpCodeBufferEnd;\r

-  \r
+\r

   //\r
   // Input update data can't be NULL.\r
   //\r
   //\r
   // Input update data can't be NULL.\r
   //\r


@@ -4355,13 +4355,13 @@ HiiUpdateForm (
   UpdatePackageList = NULL;\r
   TempPackage       = NULL;\r
   HiiPackageList    = NULL;\r
   UpdatePackageList = NULL;\r
   TempPackage       = NULL;\r
   HiiPackageList    = NULL;\r

-  \r
+\r

   //\r
   // Retrieve buffer data from Opcode Handle\r
   //\r
   OpCodeBufferStart = (HII_LIB_OPCODE_BUFFER *) StartOpCodeHandle;\r
   OpCodeBufferEnd   = (HII_LIB_OPCODE_BUFFER *) EndOpCodeHandle;\r
   //\r
   // Retrieve buffer data from Opcode Handle\r
   //\r
   OpCodeBufferStart = (HII_LIB_OPCODE_BUFFER *) StartOpCodeHandle;\r
   OpCodeBufferEnd   = (HII_LIB_OPCODE_BUFFER *) EndOpCodeHandle;\r

-  \r
+\r

   //\r
   // Get the original package list\r
   //\r
   //\r
   // Get the original package list\r
   //\r


@@ -4395,7 +4395,7 @@ HiiUpdateForm (
     Status = EFI_OUT_OF_RESOURCES;\r
     goto Finish;\r
   }\r
     Status = EFI_OUT_OF_RESOURCES;\r
     goto Finish;\r
   }\r

-  \r
+\r

   //\r
   // Allocate temp buffer to store the temp updated package buffer\r
   //\r
   //\r
   // Allocate temp buffer to store the temp updated package buffer\r
   //\r


@@ -4412,7 +4412,7 @@ HiiUpdateForm (
   //\r
   CopyMem (UpdateBufferPos, HiiPackageList, sizeof (EFI_HII_PACKAGE_LIST_HEADER));\r
   UpdateBufferPos += sizeof (EFI_HII_PACKAGE_LIST_HEADER);\r
   //\r
   CopyMem (UpdateBufferPos, HiiPackageList, sizeof (EFI_HII_PACKAGE_LIST_HEADER));\r
   UpdateBufferPos += sizeof (EFI_HII_PACKAGE_LIST_HEADER);\r

-  \r
+\r

   //\r
   // Go through each package to find the matched package and update one by one\r
   //\r
   //\r
   // Go through each package to find the matched package and update one by one\r
   //\r


@@ -4435,7 +4435,7 @@ HiiUpdateForm (
       if (!EFI_ERROR(Status)) {\r
         //\r
         // Set Update Flag\r
       if (!EFI_ERROR(Status)) {\r
         //\r
         // Set Update Flag\r

-        //        \r
+        //\r

         Updated = TRUE;\r
         //\r
         // Add updated package buffer\r
         Updated = TRUE;\r
         //\r
         // Add updated package buffer\r


@@ -4451,14 +4451,14 @@ HiiUpdateForm (
     CopyMem (UpdateBufferPos, Package, PackageHeader.Length);\r
     UpdateBufferPos += PackageHeader.Length;\r
   }\r
     CopyMem (UpdateBufferPos, Package, PackageHeader.Length);\r
     UpdateBufferPos += PackageHeader.Length;\r
   }\r

-  \r
+\r

   if (Updated) {\r
     //\r
     // Update package list length\r
     //\r
     BufferSize = UpdateBufferPos - (UINT8 *) UpdatePackageList;\r
     WriteUnaligned32 (&UpdatePackageList->PackageLength, (UINT32) BufferSize);\r
   if (Updated) {\r
     //\r
     // Update package list length\r
     //\r
     BufferSize = UpdateBufferPos - (UINT8 *) UpdatePackageList;\r
     WriteUnaligned32 (&UpdatePackageList->PackageLength, (UINT32) BufferSize);\r

-    \r
+\r

     //\r
     // Update Package to show form\r
     //\r
     //\r
     // Update Package to show form\r
     //\r


@@ -4474,14 +4474,14 @@ Finish:
   if (HiiPackageList != NULL) {\r
     FreePool (HiiPackageList);\r
   }\r
   if (HiiPackageList != NULL) {\r
     FreePool (HiiPackageList);\r
   }\r

-  \r
+\r

   if (UpdatePackageList != NULL) {\r
     FreePool (UpdatePackageList);\r
   }\r
   if (UpdatePackageList != NULL) {\r
     FreePool (UpdatePackageList);\r
   }\r

-  \r
+\r

   if (TempPackage != NULL) {\r
     FreePool (TempPackage);\r
   }\r
 \r
   if (TempPackage != NULL) {\r
     FreePool (TempPackage);\r
   }\r
 \r

-  return Status; \r
+  return Status;\r

 }\r
 }\r

diff --git a/MdeModulePkg/Library/UefiHiiLib/HiiString.c b/MdeModulePkg/Library/UefiHiiLib/HiiString.c
index c6a241e6577b55139d08d199432f03ee50de481a..ae787fec59191ef5bf1e265c7c8378814b86c013 100644 (file)
--- a/MdeModulePkg/Library/UefiHiiLib/HiiString.c
+++ b/MdeModulePkg/Library/UefiHiiLib/HiiString.c
@@ -1,7 +1,7 @@
 /** @file\r
   HII Library implementation that uses DXE protocols and services.\r
 \r
 /** @file\r
   HII Library implementation that uses DXE protocols and services.\r
 \r

-  Copyright (c) 2006 - 2015, Intel Corporation. All rights reserved.<BR>\r
+  Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r

   This program and the accompanying materials\r
   are licensed and made available under the terms and conditions of the BSD License\r
   which accompanies this distribution.  The full text of the license may be found at\r
   This program and the accompanying materials\r
   are licensed and made available under the terms and conditions of the BSD License\r
   which accompanies this distribution.  The full text of the license may be found at\r


@@ -16,37 +16,37 @@
 #include "InternalHiiLib.h"\r
 \r
 /**\r
 #include "InternalHiiLib.h"\r
 \r
 /**\r

-  This function create a new string in String Package or updates an existing \r
+  This function create a new string in String Package or updates an existing\r

   string in a String Package.  If StringId is 0, then a new string is added to\r
   a String Package.  If StringId is not zero, then a string in String Package is\r
   updated.  If SupportedLanguages is NULL, then the string is added or updated\r
   for all the languages that the String Package supports.  If SupportedLanguages\r
   string in a String Package.  If StringId is 0, then a new string is added to\r
   a String Package.  If StringId is not zero, then a string in String Package is\r
   updated.  If SupportedLanguages is NULL, then the string is added or updated\r
   for all the languages that the String Package supports.  If SupportedLanguages\r

-  is not NULL, then the string is added or updated for the set of languages \r
+  is not NULL, then the string is added or updated for the set of languages\r

   specified by SupportedLanguages.\r
   specified by SupportedLanguages.\r

-    \r
+\r

   If HiiHandle is NULL, then ASSERT().\r
   If String is NULL, then ASSERT().\r
 \r
   If HiiHandle is NULL, then ASSERT().\r
   If String is NULL, then ASSERT().\r
 \r

-  @param[in]  HiiHandle           A handle that was previously registered in the \r
+  @param[in]  HiiHandle           A handle that was previously registered in the\r

                                   HII Database.\r
                                   HII Database.\r

-  @param[in]  StringId            If zero, then a new string is created in the \r
-                                  String Package associated with HiiHandle.  If \r
-                                  non-zero, then the string specified by StringId \r
-                                  is updated in the String Package  associated \r
-                                  with HiiHandle. \r
-  @param[in]  String              A pointer to the Null-terminated Unicode string \r
-                                  to add or update in the String Package associated \r
+  @param[in]  StringId            If zero, then a new string is created in the\r
+                                  String Package associated with HiiHandle.  If\r
+                                  non-zero, then the string specified by StringId\r
+                                  is updated in the String Package  associated\r
+                                  with HiiHandle.\r
+  @param[in]  String              A pointer to the Null-terminated Unicode string\r
+                                  to add or update in the String Package associated\r

                                   with HiiHandle.\r
                                   with HiiHandle.\r

-  @param[in]  SupportedLanguages  A pointer to a Null-terminated ASCII string of \r
-                                  language codes.  If this parameter is NULL, then \r
-                                  String is added or updated in the String Package \r
-                                  associated with HiiHandle for all the languages \r
-                                  that the String Package supports.  If this \r
-                                  parameter is not NULL, then then String is added \r
-                                  or updated in the String Package associated with \r
-                                  HiiHandle for the set oflanguages specified by \r
-                                  SupportedLanguages.  The format of \r
-                                  SupportedLanguages must follow the language \r
+  @param[in]  SupportedLanguages  A pointer to a Null-terminated ASCII string of\r
+                                  language codes.  If this parameter is NULL, then\r
+                                  String is added or updated in the String Package\r
+                                  associated with HiiHandle for all the languages\r
+                                  that the String Package supports.  If this\r
+                                  parameter is not NULL, then then String is added\r
+                                  or updated in the String Package associated with\r
+                                  HiiHandle for the set oflanguages specified by\r
+                                  SupportedLanguages.  The format of\r
+                                  SupportedLanguages must follow the language\r

                                   format assumed the HII Database.\r
 \r
   @retval 0      The string could not be added or updated in the String Package.\r
                                   format assumed the HII Database.\r
 \r
   @retval 0      The string could not be added or updated in the String Package.\r


@@ -106,7 +106,7 @@ HiiSetString (
     if (*Supported != 0) {\r
       *(Supported++) = '\0';\r
     }\r
     if (*Supported != 0) {\r
       *(Supported++) = '\0';\r
     }\r

-    \r
+\r

     if ((SupportedLanguages == NULL) && AsciiStrnCmp (Language, UEFI_CONFIG_LANG, AsciiStrLen (UEFI_CONFIG_LANG)) == 0) {\r
       //\r
       // Skip string package used for keyword protocol.\r
     if ((SupportedLanguages == NULL) && AsciiStrnCmp (Language, UEFI_CONFIG_LANG, AsciiStrLen (UEFI_CONFIG_LANG)) == 0) {\r
       //\r
       // Skip string package used for keyword protocol.\r


@@ -145,24 +145,24 @@ HiiSetString (
 \r
 \r
 /**\r
 \r
 \r
 /**\r

-  Retrieves a string from a string package names by GUID in a specific language.  \r
-  If the language is not specified, then a string from a string package in the \r
-  current platform  language is retrieved.  If the string can not be retrieved \r
-  using the specified language or the current platform language, then the string \r
-  is retrieved from the string package in the first language the string package \r
-  supports.  The returned string is allocated using AllocatePool().  The caller \r
+  Retrieves a string from a string package names by GUID in a specific language.\r
+  If the language is not specified, then a string from a string package in the\r
+  current platform  language is retrieved.  If the string can not be retrieved\r
+  using the specified language or the current platform language, then the string\r
+  is retrieved from the string package in the first language the string package\r
+  supports.  The returned string is allocated using AllocatePool().  The caller\r

   is responsible for freeing the allocated buffer using FreePool().\r
   is responsible for freeing the allocated buffer using FreePool().\r

-  \r
+\r

   If PackageListGuid is NULL, then ASSERT().\r
   If StringId is 0, then ASSERT.\r
 \r
   If PackageListGuid is NULL, then ASSERT().\r
   If StringId is 0, then ASSERT.\r
 \r

-  @param[in]  PackageListGuid  The GUID of a package list that was previously \r
+  @param[in]  PackageListGuid  The GUID of a package list that was previously\r

                                registered in the HII Database.\r
                                registered in the HII Database.\r

-  @param[in]  StringId         The identifier of the string to retrieved from the \r
+  @param[in]  StringId         The identifier of the string to retrieved from the\r

                                string package associated with PackageListGuid.\r
                                string package associated with PackageListGuid.\r

-  @param[in]  Language         The language of the string to retrieve.  If this \r
-                               parameter is NULL, then the current platform \r
-                               language is used.  The format of Language must \r
+  @param[in]  Language         The language of the string to retrieve.  If this\r
+                               parameter is NULL, then the current platform\r
+                               language is used.  The format of Language must\r

                                follow the language format assumed the HII Database.\r
 \r
   @retval NULL   The package list specified by PackageListGuid is not present in the\r
                                follow the language format assumed the HII Database.\r
 \r
   @retval NULL   The package list specified by PackageListGuid is not present in the\r


@@ -197,22 +197,22 @@ HiiGetPackageString (
 \r
 /**\r
   Retrieves a string from a string package in a specific language.  If the language\r
 \r
 /**\r
   Retrieves a string from a string package in a specific language.  If the language\r

-  is not specified, then a string from a string package in the current platform \r
-  language is retrieved.  If the string can not be retrieved using the specified \r
-  language or the current platform language, then the string is retrieved from \r
-  the string package in the first language the string package supports.  The \r
-  returned string is allocated using AllocatePool().  The caller is responsible \r
+  is not specified, then a string from a string package in the current platform\r
+  language is retrieved.  If the string can not be retrieved using the specified\r
+  language or the current platform language, then the string is retrieved from\r
+  the string package in the first language the string package supports.  The\r
+  returned string is allocated using AllocatePool().  The caller is responsible\r

   for freeing the allocated buffer using FreePool().\r
   for freeing the allocated buffer using FreePool().\r

-  \r
+\r

   If HiiHandle is NULL, then ASSERT().\r
   If StringId is 0, then ASSET.\r
 \r
   @param[in]  HiiHandle  A handle that was previously registered in the HII Database.\r
   If HiiHandle is NULL, then ASSERT().\r
   If StringId is 0, then ASSET.\r
 \r
   @param[in]  HiiHandle  A handle that was previously registered in the HII Database.\r

-  @param[in]  StringId   The identifier of the string to retrieved from the string \r
+  @param[in]  StringId   The identifier of the string to retrieved from the string\r

                          package associated with HiiHandle.\r
                          package associated with HiiHandle.\r

-  @param[in]  Language   The language of the string to retrieve.  If this parameter \r
-                         is NULL, then the current platform language is used.  The \r
-                         format of Language must follow the language format assumed \r
+  @param[in]  Language   The language of the string to retrieve.  If this parameter\r
+                         is NULL, then the current platform language is used.  The\r
+                         format of Language must follow the language format assumed\r

                          the HII Database.\r
 \r
   @retval NULL   The string specified by StringId is not present in the string package.\r
                          the HII Database.\r
 \r
   @retval NULL   The string specified by StringId is not present in the string package.\r


@@ -240,7 +240,7 @@ HiiGetString (
 \r
   //\r
   // Initialize all allocated buffers to NULL\r
 \r
   //\r
   // Initialize all allocated buffers to NULL\r

-  // \r
+  //\r

   SupportedLanguages = NULL;\r
   PlatformLanguage   = NULL;\r
   BestLanguage       = NULL;\r
   SupportedLanguages = NULL;\r
   PlatformLanguage   = NULL;\r
   BestLanguage       = NULL;\r


@@ -260,7 +260,7 @@ HiiGetString (
   GetEfiGlobalVariable2 (L"PlatformLang", (VOID**)&PlatformLanguage, NULL);\r
 \r
   //\r
   GetEfiGlobalVariable2 (L"PlatformLang", (VOID**)&PlatformLanguage, NULL);\r
 \r
   //\r

-  // If Languag is NULL, then set it to an empty string, so it will be \r
+  // If Languag is NULL, then set it to an empty string, so it will be\r

   // skipped by GetBestLanguage()\r
   //\r
   if (Language == NULL) {\r
   // skipped by GetBestLanguage()\r
   //\r
   if (Language == NULL) {\r


@@ -271,11 +271,11 @@ HiiGetString (
   // Get the best matching language from SupportedLanguages\r
   //\r
   BestLanguage = GetBestLanguage (\r
   // Get the best matching language from SupportedLanguages\r
   //\r
   BestLanguage = GetBestLanguage (\r

-                   SupportedLanguages, \r
+                   SupportedLanguages,\r

                    FALSE,                                             // RFC 4646 mode\r
                    FALSE,                                             // RFC 4646 mode\r

-                   Language,                                          // Highest priority \r
+                   Language,                                          // Highest priority\r

                    PlatformLanguage != NULL ? PlatformLanguage : "",  // Next highest priority\r
                    PlatformLanguage != NULL ? PlatformLanguage : "",  // Next highest priority\r

-                   SupportedLanguages,                                // Lowest priority \r
+                   SupportedLanguages,                                // Lowest priority\r

                    NULL\r
                    );\r
   if (BestLanguage == NULL) {\r
                    NULL\r
                    );\r
   if (BestLanguage == NULL) {\r


@@ -296,8 +296,8 @@ HiiGetString (
                          NULL\r
                          );\r
   //\r
                          NULL\r
                          );\r
   //\r

-  // If GetString() returns EFI_SUCCESS for a zero size, \r
-  // then there are no supported languages registered for HiiHandle.  If GetString() \r
+  // If GetString() returns EFI_SUCCESS for a zero size,\r
+  // then there are no supported languages registered for HiiHandle.  If GetString()\r

   // returns an error other than EFI_BUFFER_TOO_SMALL, then HiiHandle is not present\r
   // in the HII Database\r
   //\r
   // returns an error other than EFI_BUFFER_TOO_SMALL, then HiiHandle is not present\r
   // in the HII Database\r
   //\r

diff --git a/MdeModulePkg/Library/UefiHiiLib/InternalHiiLib.h b/MdeModulePkg/Library/UefiHiiLib/InternalHiiLib.h
index 293c22666d27dcdd37a4cef94480f5530fcfc78b..04fe909a33d2dec032ac2632a92e91382af375fa 100644 (file)
--- a/MdeModulePkg/Library/UefiHiiLib/InternalHiiLib.h
+++ b/MdeModulePkg/Library/UefiHiiLib/InternalHiiLib.h
@@ -1,14 +1,14 @@
 /** @file\r
   Internal include file for the HII Library instance.\r
 \r
 /** @file\r
   Internal include file for the HII Library instance.\r
 \r

-  Copyright (c) 2007 - 2017, Intel Corporation. All rights reserved.<BR>\r
-  This program and the accompanying materials                          \r
-  are licensed and made available under the terms and conditions of the BSD License         \r
-  which accompanies this distribution.  The full text of the license may be found at        \r
-  http://opensource.org/licenses/bsd-license.php                                            \r
-\r
-  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     \r
-  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             \r
+  Copyright (c) 2007 - 2018, Intel Corporation. All rights reserved.<BR>\r
+  This program and the accompanying materials\r
+  are licensed and made available under the terms and conditions of the BSD License\r
+  which accompanies this distribution.  The full text of the license may be found at\r
+  http://opensource.org/licenses/bsd-license.php\r
+\r
+  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
+  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r

 \r
 **/\r
 \r
 \r
 **/\r
 \r

diff --git a/MdeModulePkg/Library/UefiHiiLib/UefiHiiLib.uni b/MdeModulePkg/Library/UefiHiiLib/UefiHiiLib.uni
index 760617f7054e1b7862d3cbee25239efab0896635..1bf2a7ee53e76520b08c61251bd3b81d2795b871 100644 (file)
--- a/MdeModulePkg/Library/UefiHiiLib/UefiHiiLib.uni
+++ b/MdeModulePkg/Library/UefiHiiLib/UefiHiiLib.uni
@@ -3,13 +3,13 @@
 //\r
 // HII Library implementation using UEFI HII protocols and services.\r
 //\r
 //\r
 // HII Library implementation using UEFI HII protocols and services.\r
 //\r

-// Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.<BR>\r
+// Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r

 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r
 // which accompanies this distribution. The full text of the license may be found at\r
 // http://opensource.org/licenses/bsd-license.php\r
 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r
 // which accompanies this distribution. The full text of the license may be found at\r
 // http://opensource.org/licenses/bsd-license.php\r

-// \r
+//\r

 // THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 // WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 //\r
 // THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 // WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 //\r

diff --git a/MdeModulePkg/Library/UefiHiiServicesLib/UefiHiiServicesLib.c b/MdeModulePkg/Library/UefiHiiServicesLib/UefiHiiServicesLib.c
index bd3a12560349767cdfa5869d0abda6aa046ec6d3..20f92af0540a1bee322886ef52bbbe5041445003 100644 (file)
--- a/MdeModulePkg/Library/UefiHiiServicesLib/UefiHiiServicesLib.c
+++ b/MdeModulePkg/Library/UefiHiiServicesLib/UefiHiiServicesLib.c
@@ -1,10 +1,10 @@
 /** @file\r
 /** @file\r

-  This library retrieves pointers to the UEFI HII Protocol instances in the \r
-  library's constructor.  All of the UEFI HII related protocols are optional, \r
-  so the consumers of this library class must verify that the global variable \r
-  pointers are not NULL before use.   \r
+  This library retrieves pointers to the UEFI HII Protocol instances in the\r
+  library's constructor.  All of the UEFI HII related protocols are optional,\r
+  so the consumers of this library class must verify that the global variable\r
+  pointers are not NULL before use.\r

 \r
 \r

-  Copyright (c) 2006 - 2009, Intel Corporation. All rights reserved.<BR>\r
+  Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r

   This program and the accompanying materials\r
   are licensed and made available under the terms and conditions of the BSD License\r
   which accompanies this distribution.  The full text of the license may be found at\r
   This program and the accompanying materials\r
   are licensed and made available under the terms and conditions of the BSD License\r
   which accompanies this distribution.  The full text of the license may be found at\r


@@ -54,13 +54,13 @@ EFI_HII_CONFIG_ROUTING_PROTOCOL  *gHiiConfigRouting = NULL;
 \r
 /**\r
   The constructor function retrieves pointers to the UEFI HII protocol instances\r
 \r
 /**\r
   The constructor function retrieves pointers to the UEFI HII protocol instances\r

-    \r
-  The constructor function retrieves pointers to the four UEFI HII protocols from the \r
-  handle database.  These include the UEFI HII Font Protocol, the UEFI HII String \r
-  Protocol, the UEFI HII Image Protocol, the UEFI HII Database Protocol, and the \r
+\r
+  The constructor function retrieves pointers to the four UEFI HII protocols from the\r
+  handle database.  These include the UEFI HII Font Protocol, the UEFI HII String\r
+  Protocol, the UEFI HII Image Protocol, the UEFI HII Database Protocol, and the\r

   UEFI HII Config Routing Protocol.  This function always return EFI_SUCCESS.\r
   All of these protocols are optional if the platform does not support configuration\r
   UEFI HII Config Routing Protocol.  This function always return EFI_SUCCESS.\r
   All of these protocols are optional if the platform does not support configuration\r

-  and the UEFI HII Image Protocol and the UEFI HII Font Protocol are optional if \r
+  and the UEFI HII Image Protocol and the UEFI HII Font Protocol are optional if\r

   the platform does not support a graphical console.  As a result, the consumers\r
   of this library much check the protocol pointers againt NULL before using them,\r
   or use dependency expressions to guarantee that some of them are present before\r
   the platform does not support a graphical console.  As a result, the consumers\r
   of this library much check the protocol pointers againt NULL before using them,\r
   or use dependency expressions to guarantee that some of them are present before\r


@@ -82,30 +82,30 @@ UefiHiiServicesLibConstructor (
   EFI_STATUS Status;\r
 \r
   //\r
   EFI_STATUS Status;\r
 \r
   //\r

-  // Retrieve the pointer to the UEFI HII String Protocol \r
+  // Retrieve the pointer to the UEFI HII String Protocol\r

   //\r
   Status = gBS->LocateProtocol (&gEfiHiiStringProtocolGuid, NULL, (VOID **) &gHiiString);\r
   ASSERT_EFI_ERROR (Status);\r
 \r
   //\r
   //\r
   Status = gBS->LocateProtocol (&gEfiHiiStringProtocolGuid, NULL, (VOID **) &gHiiString);\r
   ASSERT_EFI_ERROR (Status);\r
 \r
   //\r

-  // Retrieve the pointer to the UEFI HII Database Protocol \r
+  // Retrieve the pointer to the UEFI HII Database Protocol\r

   //\r
   Status = gBS->LocateProtocol (&gEfiHiiDatabaseProtocolGuid, NULL, (VOID **) &gHiiDatabase);\r
   ASSERT_EFI_ERROR (Status);\r
 \r
   //\r
   //\r
   Status = gBS->LocateProtocol (&gEfiHiiDatabaseProtocolGuid, NULL, (VOID **) &gHiiDatabase);\r
   ASSERT_EFI_ERROR (Status);\r
 \r
   //\r

-  // Retrieve the pointer to the UEFI HII Config Routing Protocol \r
+  // Retrieve the pointer to the UEFI HII Config Routing Protocol\r

   //\r
   Status = gBS->LocateProtocol (&gEfiHiiConfigRoutingProtocolGuid, NULL, (VOID **) &gHiiConfigRouting);\r
   ASSERT_EFI_ERROR (Status);\r
 \r
   //\r
   //\r
   Status = gBS->LocateProtocol (&gEfiHiiConfigRoutingProtocolGuid, NULL, (VOID **) &gHiiConfigRouting);\r
   ASSERT_EFI_ERROR (Status);\r
 \r
   //\r

-  // Retrieve the pointer to the optional UEFI HII Font Protocol \r
+  // Retrieve the pointer to the optional UEFI HII Font Protocol\r

   //\r
   gBS->LocateProtocol (&gEfiHiiFontProtocolGuid, NULL, (VOID **) &gHiiFont);\r
 \r
   //\r
   //\r
   gBS->LocateProtocol (&gEfiHiiFontProtocolGuid, NULL, (VOID **) &gHiiFont);\r
 \r
   //\r

-  // Retrieve the pointer to the optional UEFI HII Image Protocol \r
+  // Retrieve the pointer to the optional UEFI HII Image Protocol\r

   //\r
   gBS->LocateProtocol (&gEfiHiiImageProtocolGuid, NULL, (VOID **) &gHiiImage);\r
 \r
   //\r
   gBS->LocateProtocol (&gEfiHiiImageProtocolGuid, NULL, (VOID **) &gHiiImage);\r
 \r

diff --git a/MdeModulePkg/Library/UefiHiiServicesLib/UefiHiiServicesLib.inf b/MdeModulePkg/Library/UefiHiiServicesLib/UefiHiiServicesLib.inf
index a009e9a7152cba5346ed1bb6cc2ce854b9029a1f..fba1d6620ea4f9d49b4438219f39e094272148c4 100644 (file)
--- a/MdeModulePkg/Library/UefiHiiServicesLib/UefiHiiServicesLib.inf
+++ b/MdeModulePkg/Library/UefiHiiServicesLib/UefiHiiServicesLib.inf
@@ -1,7 +1,7 @@
 ## @file\r
 # UEFI HII Services Library implementation.\r
 ## @file\r
 # UEFI HII Services Library implementation.\r

-# \r
-# Copyright (c) 2007 - 2014, Intel Corporation. All rights reserved.<BR>\r
+#\r
+# Copyright (c) 2007 - 2018, Intel Corporation. All rights reserved.<BR>\r

 #\r
 #  This program and the accompanying materials\r
 #  are licensed and made available under the terms and conditions of the BSD License\r
 #\r
 #  This program and the accompanying materials\r
 #  are licensed and made available under the terms and conditions of the BSD License\r


@@ -20,7 +20,7 @@
   FILE_GUID                      = 894DC1B6-07A3-4a9d-8CDD-333580B3D4B1\r
   MODULE_TYPE                    = UEFI_DRIVER\r
   VERSION_STRING                 = 1.0\r
   FILE_GUID                      = 894DC1B6-07A3-4a9d-8CDD-333580B3D4B1\r
   MODULE_TYPE                    = UEFI_DRIVER\r
   VERSION_STRING                 = 1.0\r

-  LIBRARY_CLASS                  = UefiHiiServicesLib|DXE_DRIVER DXE_RUNTIME_DRIVER DXE_SAL_DRIVER DXE_SMM_DRIVER UEFI_APPLICATION UEFI_DRIVER \r
+  LIBRARY_CLASS                  = UefiHiiServicesLib|DXE_DRIVER DXE_RUNTIME_DRIVER DXE_SAL_DRIVER DXE_SMM_DRIVER UEFI_APPLICATION UEFI_DRIVER\r

 \r
   CONSTRUCTOR                    = UefiHiiServicesLibConstructor\r
 \r
 \r
   CONSTRUCTOR                    = UefiHiiServicesLibConstructor\r
 \r


@@ -38,9 +38,9 @@
 [LibraryClasses]\r
   UefiBootServicesTableLib\r
   DebugLib\r
 [LibraryClasses]\r
   UefiBootServicesTableLib\r
   DebugLib\r

-  \r
+\r

 [Protocols]\r
 [Protocols]\r

-  gEfiHiiFontProtocolGuid             ## SOMETIMES_CONSUMES \r
+  gEfiHiiFontProtocolGuid             ## SOMETIMES_CONSUMES\r

   gEfiHiiStringProtocolGuid           ## CONSUMES\r
   gEfiHiiImageProtocolGuid            ## SOMETIMES_CONSUMES\r
   gEfiHiiDatabaseProtocolGuid         ## CONSUMES\r
   gEfiHiiStringProtocolGuid           ## CONSUMES\r
   gEfiHiiImageProtocolGuid            ## SOMETIMES_CONSUMES\r
   gEfiHiiDatabaseProtocolGuid         ## CONSUMES\r

diff --git a/MdeModulePkg/Library/UefiMemoryAllocationProfileLib/DxeMemoryProfileLib.c b/MdeModulePkg/Library/UefiMemoryAllocationProfileLib/DxeMemoryProfileLib.c
index 78c75fbc730b7962a816c6706bc25a1a735a8231..d4eb0a0e76d9c27f54216fff95a49493337b20d0 100644 (file)
--- a/MdeModulePkg/Library/UefiMemoryAllocationProfileLib/DxeMemoryProfileLib.c
+++ b/MdeModulePkg/Library/UefiMemoryAllocationProfileLib/DxeMemoryProfileLib.c
@@ -1,14 +1,14 @@
 /** @file\r
   Support routines for memory profile for Dxe phase drivers.\r
 \r
 /** @file\r
   Support routines for memory profile for Dxe phase drivers.\r
 \r

-  Copyright (c) 2016, Intel Corporation. All rights reserved.<BR>\r
-  This program and the accompanying materials                          \r
-  are licensed and made available under the terms and conditions of the BSD License         \r
-  which accompanies this distribution.  The full text of the license may be found at        \r
-  http://opensource.org/licenses/bsd-license.php.                                            \r
-\r
-  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     \r
-  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             \r
+  Copyright (c) 2016 - 2018, Intel Corporation. All rights reserved.<BR>\r
+  This program and the accompanying materials\r
+  are licensed and made available under the terms and conditions of the BSD License\r
+  which accompanies this distribution.  The full text of the license may be found at\r
+  http://opensource.org/licenses/bsd-license.php.\r
+\r
+  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
+  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r

 \r
 **/\r
 \r
 \r
 **/\r
 \r

diff --git a/MdeModulePkg/Library/UefiMemoryAllocationProfileLib/MemoryAllocationLib.c b/MdeModulePkg/Library/UefiMemoryAllocationProfileLib/MemoryAllocationLib.c
index cef7fc0c05d4f8b1fc3a629ff6f0bf4f5ebc5c5f..c04b59291d77307a80ca7734adbf766e08ba0d68 100644 (file)
--- a/MdeModulePkg/Library/UefiMemoryAllocationProfileLib/MemoryAllocationLib.c
+++ b/MdeModulePkg/Library/UefiMemoryAllocationProfileLib/MemoryAllocationLib.c
@@ -1,15 +1,15 @@
 /** @file\r
 /** @file\r

-  Support routines for memory allocation routines based \r
+  Support routines for memory allocation routines based\r

   on boot services for Dxe phase drivers, with memory profile support.\r
 \r
   on boot services for Dxe phase drivers, with memory profile support.\r
 \r

-  Copyright (c) 2006 - 2017, Intel Corporation. All rights reserved.<BR>\r
-  This program and the accompanying materials                          \r
-  are licensed and made available under the terms and conditions of the BSD License         \r
-  which accompanies this distribution.  The full text of the license may be found at        \r
-  http://opensource.org/licenses/bsd-license.php.                                            \r
+  Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r
+  This program and the accompanying materials\r
+  are licensed and made available under the terms and conditions of the BSD License\r
+  which accompanies this distribution.  The full text of the license may be found at\r
+  http://opensource.org/licenses/bsd-license.php.\r

 \r
 \r

-  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     \r
-  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             \r
+  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
+  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r

 \r
 **/\r
 \r
 \r
 **/\r
 \r


@@ -39,12 +39,12 @@
 **/\r
 VOID *\r
 InternalAllocatePages (\r
 **/\r
 VOID *\r
 InternalAllocatePages (\r

-  IN EFI_MEMORY_TYPE  MemoryType,  \r
+  IN EFI_MEMORY_TYPE  MemoryType,\r

   IN UINTN            Pages\r
   )\r
 {\r
   EFI_STATUS            Status;\r
   IN UINTN            Pages\r
   )\r
 {\r
   EFI_STATUS            Status;\r

-  EFI_PHYSICAL_ADDRESS  Memory; \r
+  EFI_PHYSICAL_ADDRESS  Memory;\r

 \r
   if (Pages == 0) {\r
     return NULL;\r
 \r
   if (Pages == 0) {\r
     return NULL;\r


@@ -170,11 +170,11 @@ AllocateReservedPages (
   must have been allocated on a previous call to the page allocation services of the Memory\r
   Allocation Library.  If it is not possible to free allocated pages, then this function will\r
   perform no actions.\r
   must have been allocated on a previous call to the page allocation services of the Memory\r
   Allocation Library.  If it is not possible to free allocated pages, then this function will\r
   perform no actions.\r

-  \r
+\r

   If Buffer was not allocated with a page allocation function in the Memory Allocation Library,\r
   then ASSERT().\r
   If Pages is zero, then ASSERT().\r
   If Buffer was not allocated with a page allocation function in the Memory Allocation Library,\r
   then ASSERT().\r
   If Pages is zero, then ASSERT().\r

- \r
+\r

   @param  Buffer                The pointer to the buffer of pages to free.\r
   @param  Pages                 The number of 4 KB pages to free.\r
 \r
   @param  Buffer                The pointer to the buffer of pages to free.\r
   @param  Pages                 The number of 4 KB pages to free.\r
 \r


@@ -213,7 +213,7 @@ FreePages (
 **/\r
 VOID *\r
 InternalAllocateAlignedPages (\r
 **/\r
 VOID *\r
 InternalAllocateAlignedPages (\r

-  IN EFI_MEMORY_TYPE  MemoryType,  \r
+  IN EFI_MEMORY_TYPE  MemoryType,\r

   IN UINTN            Pages,\r
   IN UINTN            Alignment\r
   )\r
   IN UINTN            Pages,\r
   IN UINTN            Alignment\r
   )\r


@@ -229,7 +229,7 @@ InternalAllocateAlignedPages (
   // Alignment must be a power of two or zero.\r
   //\r
   ASSERT ((Alignment & (Alignment - 1)) == 0);\r
   // Alignment must be a power of two or zero.\r
   //\r
   ASSERT ((Alignment & (Alignment - 1)) == 0);\r

- \r
+\r

   if (Pages == 0) {\r
     return NULL;\r
   }\r
   if (Pages == 0) {\r
     return NULL;\r
   }\r


@@ -243,7 +243,7 @@ InternalAllocateAlignedPages (
     // Make sure that Pages plus EFI_SIZE_TO_PAGES (Alignment) does not overflow.\r
     //\r
     ASSERT (RealPages > Pages);\r
     // Make sure that Pages plus EFI_SIZE_TO_PAGES (Alignment) does not overflow.\r
     //\r
     ASSERT (RealPages > Pages);\r

- \r
+\r

     Status         = gBS->AllocatePages (AllocateAnyPages, MemoryType, RealPages, &Memory);\r
     if (EFI_ERROR (Status)) {\r
       return NULL;\r
     Status         = gBS->AllocatePages (AllocateAnyPages, MemoryType, RealPages, &Memory);\r
     if (EFI_ERROR (Status)) {\r
       return NULL;\r


@@ -286,7 +286,7 @@ InternalAllocateAlignedPages (
   alignment specified by Alignment.  The allocated buffer is returned.  If Pages is 0, then NULL is\r
   returned.  If there is not enough memory at the specified alignment remaining to satisfy the\r
   request, then NULL is returned.\r
   alignment specified by Alignment.  The allocated buffer is returned.  If Pages is 0, then NULL is\r
   returned.  If there is not enough memory at the specified alignment remaining to satisfy the\r
   request, then NULL is returned.\r

-  \r
+\r

   If Alignment is not a power of two and Alignment is not zero, then ASSERT().\r
   If Pages plus EFI_SIZE_TO_PAGES (Alignment) overflows, then ASSERT().\r
 \r
   If Alignment is not a power of two and Alignment is not zero, then ASSERT().\r
   If Pages plus EFI_SIZE_TO_PAGES (Alignment) overflows, then ASSERT().\r
 \r


@@ -327,7 +327,7 @@ AllocateAlignedPages (
   alignment specified by Alignment.  The allocated buffer is returned.  If Pages is 0, then NULL is\r
   returned.  If there is not enough memory at the specified alignment remaining to satisfy the\r
   request, then NULL is returned.\r
   alignment specified by Alignment.  The allocated buffer is returned.  If Pages is 0, then NULL is\r
   returned.  If there is not enough memory at the specified alignment remaining to satisfy the\r
   request, then NULL is returned.\r

-  \r
+\r

   If Alignment is not a power of two and Alignment is not zero, then ASSERT().\r
   If Pages plus EFI_SIZE_TO_PAGES (Alignment) overflows, then ASSERT().\r
 \r
   If Alignment is not a power of two and Alignment is not zero, then ASSERT().\r
   If Pages plus EFI_SIZE_TO_PAGES (Alignment) overflows, then ASSERT().\r
 \r


@@ -368,7 +368,7 @@ AllocateAlignedRuntimePages (
   alignment specified by Alignment.  The allocated buffer is returned.  If Pages is 0, then NULL is\r
   returned.  If there is not enough memory at the specified alignment remaining to satisfy the\r
   request, then NULL is returned.\r
   alignment specified by Alignment.  The allocated buffer is returned.  If Pages is 0, then NULL is\r
   returned.  If there is not enough memory at the specified alignment remaining to satisfy the\r
   request, then NULL is returned.\r

-  \r
+\r

   If Alignment is not a power of two and Alignment is not zero, then ASSERT().\r
   If Pages plus EFI_SIZE_TO_PAGES (Alignment) overflows, then ASSERT().\r
 \r
   If Alignment is not a power of two and Alignment is not zero, then ASSERT().\r
   If Pages plus EFI_SIZE_TO_PAGES (Alignment) overflows, then ASSERT().\r
 \r


@@ -408,13 +408,13 @@ AllocateAlignedReservedPages (
 \r
   Frees the number of 4KB pages specified by Pages from the buffer specified by Buffer.  Buffer\r
   must have been allocated on a previous call to the aligned page allocation services of the Memory\r
 \r
   Frees the number of 4KB pages specified by Pages from the buffer specified by Buffer.  Buffer\r
   must have been allocated on a previous call to the aligned page allocation services of the Memory\r

-  Allocation Library.  If it is not possible to free allocated pages, then this function will \r
+  Allocation Library.  If it is not possible to free allocated pages, then this function will\r

   perform no actions.\r
   perform no actions.\r

-  \r
+\r

   If Buffer was not allocated with an aligned page allocation function in the Memory Allocation\r
   Library, then ASSERT().\r
   If Pages is zero, then ASSERT().\r
   If Buffer was not allocated with an aligned page allocation function in the Memory Allocation\r
   Library, then ASSERT().\r
   If Pages is zero, then ASSERT().\r

-  \r
+\r

   @param  Buffer                The pointer to the buffer of pages to free.\r
   @param  Pages                 The number of 4 KB pages to free.\r
 \r
   @param  Buffer                The pointer to the buffer of pages to free.\r
   @param  Pages                 The number of 4 KB pages to free.\r
 \r


@@ -448,7 +448,7 @@ FreeAlignedPages (
 **/\r
 VOID *\r
 InternalAllocatePool (\r
 **/\r
 VOID *\r
 InternalAllocatePool (\r

-  IN EFI_MEMORY_TYPE  MemoryType,  \r
+  IN EFI_MEMORY_TYPE  MemoryType,\r

   IN UINTN            AllocationSize\r
   )\r
 {\r
   IN UINTN            AllocationSize\r
   )\r
 {\r


@@ -580,9 +580,9 @@ AllocateReservedPool (
 **/\r
 VOID *\r
 InternalAllocateZeroPool (\r
 **/\r
 VOID *\r
 InternalAllocateZeroPool (\r

-  IN EFI_MEMORY_TYPE  PoolType,  \r
+  IN EFI_MEMORY_TYPE  PoolType,\r

   IN UINTN            AllocationSize\r
   IN UINTN            AllocationSize\r

-  ) \r
+  )\r

 {\r
   VOID  *Memory;\r
 \r
 {\r
   VOID  *Memory;\r
 \r


@@ -706,7 +706,7 @@ AllocateReservedZeroPool (
   allocated buffer.  If AllocationSize is 0, then a valid buffer of 0 size is returned.  If there\r
   is not enough memory remaining to satisfy the request, then NULL is returned.\r
   If Buffer is NULL, then ASSERT().\r
   allocated buffer.  If AllocationSize is 0, then a valid buffer of 0 size is returned.  If there\r
   is not enough memory remaining to satisfy the request, then NULL is returned.\r
   If Buffer is NULL, then ASSERT().\r

-  If AllocationSize is greater than (MAX_ADDRESS - Buffer + 1), then ASSERT(). \r
+  If AllocationSize is greater than (MAX_ADDRESS - Buffer + 1), then ASSERT().\r

 \r
   @param  PoolType              The type of pool to allocate.\r
   @param  AllocationSize        The number of bytes to allocate and zero.\r
 \r
   @param  PoolType              The type of pool to allocate.\r
   @param  AllocationSize        The number of bytes to allocate and zero.\r


@@ -717,10 +717,10 @@ AllocateReservedZeroPool (
 **/\r
 VOID *\r
 InternalAllocateCopyPool (\r
 **/\r
 VOID *\r
 InternalAllocateCopyPool (\r

-  IN EFI_MEMORY_TYPE  PoolType,  \r
+  IN EFI_MEMORY_TYPE  PoolType,\r

   IN UINTN            AllocationSize,\r
   IN CONST VOID       *Buffer\r
   IN UINTN            AllocationSize,\r
   IN CONST VOID       *Buffer\r

-  ) \r
+  )\r

 {\r
   VOID  *Memory;\r
 \r
 {\r
   VOID  *Memory;\r
 \r


@@ -732,7 +732,7 @@ InternalAllocateCopyPool (
      Memory = CopyMem (Memory, Buffer, AllocationSize);\r
   }\r
   return Memory;\r
      Memory = CopyMem (Memory, Buffer, AllocationSize);\r
   }\r
   return Memory;\r

-} \r
+}\r

 \r
 /**\r
   Copies a buffer to an allocated buffer of type EfiBootServicesData.\r
 \r
 /**\r
   Copies a buffer to an allocated buffer of type EfiBootServicesData.\r


@@ -741,9 +741,9 @@ InternalAllocateCopyPool (
   AllocationSize bytes from Buffer to the newly allocated buffer, and returns a pointer to the\r
   allocated buffer.  If AllocationSize is 0, then a valid buffer of 0 size is returned.  If there\r
   is not enough memory remaining to satisfy the request, then NULL is returned.\r
   AllocationSize bytes from Buffer to the newly allocated buffer, and returns a pointer to the\r
   allocated buffer.  If AllocationSize is 0, then a valid buffer of 0 size is returned.  If there\r
   is not enough memory remaining to satisfy the request, then NULL is returned.\r

-  \r
+\r

   If Buffer is NULL, then ASSERT().\r
   If Buffer is NULL, then ASSERT().\r

-  If AllocationSize is greater than (MAX_ADDRESS - Buffer + 1), then ASSERT(). \r
+  If AllocationSize is greater than (MAX_ADDRESS - Buffer + 1), then ASSERT().\r

 \r
   @param  AllocationSize        The number of bytes to allocate and zero.\r
   @param  Buffer                The buffer to copy to the allocated buffer.\r
 \r
   @param  AllocationSize        The number of bytes to allocate and zero.\r
   @param  Buffer                The buffer to copy to the allocated buffer.\r


@@ -781,9 +781,9 @@ AllocateCopyPool (
   AllocationSize bytes from Buffer to the newly allocated buffer, and returns a pointer to the\r
   allocated buffer.  If AllocationSize is 0, then a valid buffer of 0 size is returned.  If there\r
   is not enough memory remaining to satisfy the request, then NULL is returned.\r
   AllocationSize bytes from Buffer to the newly allocated buffer, and returns a pointer to the\r
   allocated buffer.  If AllocationSize is 0, then a valid buffer of 0 size is returned.  If there\r
   is not enough memory remaining to satisfy the request, then NULL is returned.\r

-  \r
+\r

   If Buffer is NULL, then ASSERT().\r
   If Buffer is NULL, then ASSERT().\r

-  If AllocationSize is greater than (MAX_ADDRESS - Buffer + 1), then ASSERT(). \r
+  If AllocationSize is greater than (MAX_ADDRESS - Buffer + 1), then ASSERT().\r

 \r
   @param  AllocationSize        The number of bytes to allocate and zero.\r
   @param  Buffer                The buffer to copy to the allocated buffer.\r
 \r
   @param  AllocationSize        The number of bytes to allocate and zero.\r
   @param  Buffer                The buffer to copy to the allocated buffer.\r


@@ -821,9 +821,9 @@ AllocateRuntimeCopyPool (
   AllocationSize bytes from Buffer to the newly allocated buffer, and returns a pointer to the\r
   allocated buffer.  If AllocationSize is 0, then a valid buffer of 0 size is returned.  If there\r
   is not enough memory remaining to satisfy the request, then NULL is returned.\r
   AllocationSize bytes from Buffer to the newly allocated buffer, and returns a pointer to the\r
   allocated buffer.  If AllocationSize is 0, then a valid buffer of 0 size is returned.  If there\r
   is not enough memory remaining to satisfy the request, then NULL is returned.\r

-  \r
+\r

   If Buffer is NULL, then ASSERT().\r
   If Buffer is NULL, then ASSERT().\r

-  If AllocationSize is greater than (MAX_ADDRESS - Buffer + 1), then ASSERT(). \r
+  If AllocationSize is greater than (MAX_ADDRESS - Buffer + 1), then ASSERT().\r

 \r
   @param  AllocationSize        The number of bytes to allocate and zero.\r
   @param  Buffer                The buffer to copy to the allocated buffer.\r
 \r
   @param  AllocationSize        The number of bytes to allocate and zero.\r
   @param  Buffer                The buffer to copy to the allocated buffer.\r


@@ -858,19 +858,19 @@ AllocateReservedCopyPool (
   Reallocates a buffer of a specified memory type.\r
 \r
   Allocates and zeros the number bytes specified by NewSize from memory of the type\r
   Reallocates a buffer of a specified memory type.\r
 \r
   Allocates and zeros the number bytes specified by NewSize from memory of the type\r

-  specified by PoolType.  If OldBuffer is not NULL, then the smaller of OldSize and \r
-  NewSize bytes are copied from OldBuffer to the newly allocated buffer, and \r
-  OldBuffer is freed.  A pointer to the newly allocated buffer is returned.  \r
-  If NewSize is 0, then a valid buffer of 0 size is  returned.  If there is not \r
+  specified by PoolType.  If OldBuffer is not NULL, then the smaller of OldSize and\r
+  NewSize bytes are copied from OldBuffer to the newly allocated buffer, and\r
+  OldBuffer is freed.  A pointer to the newly allocated buffer is returned.\r
+  If NewSize is 0, then a valid buffer of 0 size is  returned.  If there is not\r

   enough memory remaining to satisfy the request, then NULL is returned.\r
   enough memory remaining to satisfy the request, then NULL is returned.\r

-  \r
+\r

   If the allocation of the new buffer is successful and the smaller of NewSize and OldSize\r
   is greater than (MAX_ADDRESS - OldBuffer + 1), then ASSERT().\r
 \r
   @param  PoolType       The type of pool to allocate.\r
   @param  OldSize        The size, in bytes, of OldBuffer.\r
   @param  NewSize        The size, in bytes, of the buffer to reallocate.\r
   If the allocation of the new buffer is successful and the smaller of NewSize and OldSize\r
   is greater than (MAX_ADDRESS - OldBuffer + 1), then ASSERT().\r
 \r
   @param  PoolType       The type of pool to allocate.\r
   @param  OldSize        The size, in bytes, of OldBuffer.\r
   @param  NewSize        The size, in bytes, of the buffer to reallocate.\r

-  @param  OldBuffer      The buffer to copy to the allocated buffer.  This is an optional \r
+  @param  OldBuffer      The buffer to copy to the allocated buffer.  This is an optional\r

                          parameter that may be NULL.\r
 \r
   @return A pointer to the allocated buffer or NULL if allocation fails.\r
                          parameter that may be NULL.\r
 \r
   @return A pointer to the allocated buffer or NULL if allocation fails.\r


@@ -878,7 +878,7 @@ AllocateReservedCopyPool (
 **/\r
 VOID *\r
 InternalReallocatePool (\r
 **/\r
 VOID *\r
 InternalReallocatePool (\r

-  IN EFI_MEMORY_TYPE  PoolType,  \r
+  IN EFI_MEMORY_TYPE  PoolType,\r

   IN UINTN            OldSize,\r
   IN UINTN            NewSize,\r
   IN VOID             *OldBuffer  OPTIONAL\r
   IN UINTN            OldSize,\r
   IN UINTN            NewSize,\r
   IN VOID             *OldBuffer  OPTIONAL\r


@@ -898,18 +898,18 @@ InternalReallocatePool (
   Reallocates a buffer of type EfiBootServicesData.\r
 \r
   Allocates and zeros the number bytes specified by NewSize from memory of type\r
   Reallocates a buffer of type EfiBootServicesData.\r
 \r
   Allocates and zeros the number bytes specified by NewSize from memory of type\r

-  EfiBootServicesData.  If OldBuffer is not NULL, then the smaller of OldSize and \r
-  NewSize bytes are copied from OldBuffer to the newly allocated buffer, and \r
-  OldBuffer is freed.  A pointer to the newly allocated buffer is returned.  \r
-  If NewSize is 0, then a valid buffer of 0 size is  returned.  If there is not \r
+  EfiBootServicesData.  If OldBuffer is not NULL, then the smaller of OldSize and\r
+  NewSize bytes are copied from OldBuffer to the newly allocated buffer, and\r
+  OldBuffer is freed.  A pointer to the newly allocated buffer is returned.\r
+  If NewSize is 0, then a valid buffer of 0 size is  returned.  If there is not\r

   enough memory remaining to satisfy the request, then NULL is returned.\r
   enough memory remaining to satisfy the request, then NULL is returned.\r

-  \r
+\r

   If the allocation of the new buffer is successful and the smaller of NewSize and OldSize\r
   is greater than (MAX_ADDRESS - OldBuffer + 1), then ASSERT().\r
 \r
   @param  OldSize        The size, in bytes, of OldBuffer.\r
   @param  NewSize        The size, in bytes, of the buffer to reallocate.\r
   If the allocation of the new buffer is successful and the smaller of NewSize and OldSize\r
   is greater than (MAX_ADDRESS - OldBuffer + 1), then ASSERT().\r
 \r
   @param  OldSize        The size, in bytes, of OldBuffer.\r
   @param  NewSize        The size, in bytes, of the buffer to reallocate.\r

-  @param  OldBuffer      The buffer to copy to the allocated buffer.  This is an optional \r
+  @param  OldBuffer      The buffer to copy to the allocated buffer.  This is an optional\r

                          parameter that may be NULL.\r
 \r
   @return A pointer to the allocated buffer or NULL if allocation fails.\r
                          parameter that may be NULL.\r
 \r
   @return A pointer to the allocated buffer or NULL if allocation fails.\r


@@ -943,10 +943,10 @@ ReallocatePool (
   Reallocates a buffer of type EfiRuntimeServicesData.\r
 \r
   Allocates and zeros the number bytes specified by NewSize from memory of type\r
   Reallocates a buffer of type EfiRuntimeServicesData.\r
 \r
   Allocates and zeros the number bytes specified by NewSize from memory of type\r

-  EfiRuntimeServicesData.  If OldBuffer is not NULL, then the smaller of OldSize and \r
-  NewSize bytes are copied from OldBuffer to the newly allocated buffer, and \r
-  OldBuffer is freed.  A pointer to the newly allocated buffer is returned.  \r
-  If NewSize is 0, then a valid buffer of 0 size is  returned.  If there is not \r
+  EfiRuntimeServicesData.  If OldBuffer is not NULL, then the smaller of OldSize and\r
+  NewSize bytes are copied from OldBuffer to the newly allocated buffer, and\r
+  OldBuffer is freed.  A pointer to the newly allocated buffer is returned.\r
+  If NewSize is 0, then a valid buffer of 0 size is  returned.  If there is not\r

   enough memory remaining to satisfy the request, then NULL is returned.\r
 \r
   If the allocation of the new buffer is successful and the smaller of NewSize and OldSize\r
   enough memory remaining to satisfy the request, then NULL is returned.\r
 \r
   If the allocation of the new buffer is successful and the smaller of NewSize and OldSize\r


@@ -954,7 +954,7 @@ ReallocatePool (
 \r
   @param  OldSize        The size, in bytes, of OldBuffer.\r
   @param  NewSize        The size, in bytes, of the buffer to reallocate.\r
 \r
   @param  OldSize        The size, in bytes, of OldBuffer.\r
   @param  NewSize        The size, in bytes, of the buffer to reallocate.\r

-  @param  OldBuffer      The buffer to copy to the allocated buffer.  This is an optional \r
+  @param  OldBuffer      The buffer to copy to the allocated buffer.  This is an optional\r

                          parameter that may be NULL.\r
 \r
   @return A pointer to the allocated buffer or NULL if allocation fails.\r
                          parameter that may be NULL.\r
 \r
   @return A pointer to the allocated buffer or NULL if allocation fails.\r


@@ -988,10 +988,10 @@ ReallocateRuntimePool (
   Reallocates a buffer of type EfiReservedMemoryType.\r
 \r
   Allocates and zeros the number bytes specified by NewSize from memory of type\r
   Reallocates a buffer of type EfiReservedMemoryType.\r
 \r
   Allocates and zeros the number bytes specified by NewSize from memory of type\r

-  EfiReservedMemoryType.  If OldBuffer is not NULL, then the smaller of OldSize and \r
-  NewSize bytes are copied from OldBuffer to the newly allocated buffer, and \r
-  OldBuffer is freed.  A pointer to the newly allocated buffer is returned.  \r
-  If NewSize is 0, then a valid buffer of 0 size is  returned.  If there is not \r
+  EfiReservedMemoryType.  If OldBuffer is not NULL, then the smaller of OldSize and\r
+  NewSize bytes are copied from OldBuffer to the newly allocated buffer, and\r
+  OldBuffer is freed.  A pointer to the newly allocated buffer is returned.\r
+  If NewSize is 0, then a valid buffer of 0 size is  returned.  If there is not\r

   enough memory remaining to satisfy the request, then NULL is returned.\r
 \r
   If the allocation of the new buffer is successful and the smaller of NewSize and OldSize\r
   enough memory remaining to satisfy the request, then NULL is returned.\r
 \r
   If the allocation of the new buffer is successful and the smaller of NewSize and OldSize\r


@@ -999,7 +999,7 @@ ReallocateRuntimePool (
 \r
   @param  OldSize        The size, in bytes, of OldBuffer.\r
   @param  NewSize        The size, in bytes, of the buffer to reallocate.\r
 \r
   @param  OldSize        The size, in bytes, of OldBuffer.\r
   @param  NewSize        The size, in bytes, of the buffer to reallocate.\r

-  @param  OldBuffer      The buffer to copy to the allocated buffer.  This is an optional \r
+  @param  OldBuffer      The buffer to copy to the allocated buffer.  This is an optional\r

                          parameter that may be NULL.\r
 \r
   @return A pointer to the allocated buffer or NULL if allocation fails.\r
                          parameter that may be NULL.\r
 \r
   @return A pointer to the allocated buffer or NULL if allocation fails.\r


@@ -1036,7 +1036,7 @@ ReallocateReservedPool (
   Frees the buffer specified by Buffer.  Buffer must have been allocated on a previous call to the\r
   pool allocation services of the Memory Allocation Library.  If it is not possible to free pool\r
   resources, then this function will perform no actions.\r
   Frees the buffer specified by Buffer.  Buffer must have been allocated on a previous call to the\r
   pool allocation services of the Memory Allocation Library.  If it is not possible to free pool\r
   resources, then this function will perform no actions.\r

-  \r
+\r

   If Buffer was not allocated with a pool allocation function in the Memory Allocation Library,\r
   then ASSERT().\r
 \r
   If Buffer was not allocated with a pool allocation function in the Memory Allocation Library,\r
   then ASSERT().\r
 \r

diff --git a/MdeModulePkg/Library/UefiMemoryAllocationProfileLib/UefiMemoryAllocationProfileLib.inf b/MdeModulePkg/Library/UefiMemoryAllocationProfileLib/UefiMemoryAllocationProfileLib.inf
index 21b544cc10a8c6f770a5b90c9ba701c61d0a3ffb..c4954efb04ad657ac5b4d40ac07bff79d19a27db 100644 (file)
--- a/MdeModulePkg/Library/UefiMemoryAllocationProfileLib/UefiMemoryAllocationProfileLib.inf
+++ b/MdeModulePkg/Library/UefiMemoryAllocationProfileLib/UefiMemoryAllocationProfileLib.inf
@@ -1,5 +1,5 @@
 ## @file\r
 ## @file\r

-# Instance of Memory Allocation Library using EFI Boot Services, \r
+# Instance of Memory Allocation Library using EFI Boot Services,\r

 #  with memory profile support.\r
 #\r
 # Memory Allocation Library that uses EFI Boot Services to allocate\r
 #  with memory profile support.\r
 #\r
 # Memory Allocation Library that uses EFI Boot Services to allocate\r


@@ -8,7 +8,7 @@
 # The implementation of this instance is copied from UefiMemoryAllocationLib\r
 # in MdePkg and updated to support both MemoryAllocationLib and MemoryProfileLib.\r
 #\r
 # The implementation of this instance is copied from UefiMemoryAllocationLib\r
 # in MdePkg and updated to support both MemoryAllocationLib and MemoryProfileLib.\r
 #\r

-# Copyright (c) 2007 - 2016, Intel Corporation. All rights reserved.<BR>\r
+# Copyright (c) 2007 - 2018, Intel Corporation. All rights reserved.<BR>\r

 #\r
 #  This program and the accompanying materials\r
 #  are licensed and made available under the terms and conditions of the BSD License\r
 #\r
 #  This program and the accompanying materials\r
 #  are licensed and made available under the terms and conditions of the BSD License\r

diff --git a/MdeModulePkg/Library/VarCheckPcdLib/VarCheckPcdStructure.h b/MdeModulePkg/Library/VarCheckPcdLib/VarCheckPcdStructure.h
index 8180bc5cfd5b90a2e9a9af565b8e7705c318e6e2..190ab720b3f36894523ffa109b4775b69c259446 100644 (file)
--- a/MdeModulePkg/Library/VarCheckPcdLib/VarCheckPcdStructure.h
+++ b/MdeModulePkg/Library/VarCheckPcdLib/VarCheckPcdStructure.h
@@ -1,7 +1,7 @@
 /** @file\r
   Internal structure for Var Check Pcd.\r
 \r
 /** @file\r
   Internal structure for Var Check Pcd.\r
 \r

-Copyright (c) 2015, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2015 - 2018, Intel Corporation. All rights reserved.<BR>\r

 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r


@@ -73,4 +73,4 @@ typedef struct {
 \r
 #pragma pack ()\r
 \r
 \r
 #pragma pack ()\r
 \r

-#endif
\ No newline at end of file
+#endif\r

diff --git a/MdeModulePkg/Logo/LogoExtra.uni b/MdeModulePkg/Logo/LogoExtra.uni
index ec22a4d5ff3fa006ee06d78de49ccb9bc69addef..aada312aec49dea7ec75551ac80cca185610d112 100644 (file)
--- a/MdeModulePkg/Logo/LogoExtra.uni
+++ b/MdeModulePkg/Logo/LogoExtra.uni
@@ -1,7 +1,7 @@
 // /** @file\r
 // Logo Localized Strings and Content\r
 //\r
 // /** @file\r
 // Logo Localized Strings and Content\r
 //\r

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

 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r
 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r


@@ -12,8 +12,8 @@
 //\r
 // **/\r
 \r
 //\r
 // **/\r
 \r

-#string STR_PROPERTIES_MODULE_NAME \r
-#language en-US \r
+#string STR_PROPERTIES_MODULE_NAME\r
+#language en-US\r

 "Logo Image File"\r
 \r
 \r
 "Logo Image File"\r
 \r
 \r

diff --git a/MdeModulePkg/MdeModulePkg.dec b/MdeModulePkg/MdeModulePkg.dec
index f3d26475df85898184bd36a4df34dc1a30a776e5..6a6d9660edc2c80e382522e9d0a5879b8837e7df 100644 (file)
--- a/MdeModulePkg/MdeModulePkg.dec
+++ b/MdeModulePkg/MdeModulePkg.dec
@@ -1906,7 +1906,7 @@
   gEfiMdeModulePkgTokenSpaceGuid.PcdAcpiS3Enable|TRUE|BOOLEAN|0x01100000\r
 \r
   ## Specify memory size for boot script executor stack usage in S3 phase.\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdAcpiS3Enable|TRUE|BOOLEAN|0x01100000\r
 \r
   ## Specify memory size for boot script executor stack usage in S3 phase.\r

-  #  The default size 32K. When changing the value make sure the memory size is large enough \r
+  #  The default size 32K. When changing the value make sure the memory size is large enough\r

   #  to meet boot script executor requirement in the S3 phase.\r
   # @Prompt Reserved S3 Boot Script Stack ACPI Memory Size\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdS3BootScriptStackSize|0x8000|UINT32|0x02000000\r
   #  to meet boot script executor requirement in the S3 phase.\r
   # @Prompt Reserved S3 Boot Script Stack ACPI Memory Size\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdS3BootScriptStackSize|0x8000|UINT32|0x02000000\r

diff --git a/MdeModulePkg/MdeModulePkg.dsc b/MdeModulePkg/MdeModulePkg.dsc
index 09b0f9f13dc9617fc4185baaacc3774de25e5a18..bb7744894a421fa1545ee5aa6f6257256e3ae8ab 100644 (file)
--- a/MdeModulePkg/MdeModulePkg.dsc
+++ b/MdeModulePkg/MdeModulePkg.dsc
@@ -86,8 +86,8 @@
   # Misc\r
   #\r
   DebugLib|MdePkg/Library/BaseDebugLibNull/BaseDebugLibNull.inf\r
   # Misc\r
   #\r
   DebugLib|MdePkg/Library/BaseDebugLibNull/BaseDebugLibNull.inf\r

-  DebugPrintErrorLevelLib|MdePkg/Library/BaseDebugPrintErrorLevelLib/BaseDebugPrintErrorLevelLib.inf  \r
-  ReportStatusCodeLib|MdePkg/Library/BaseReportStatusCodeLibNull/BaseReportStatusCodeLibNull.inf  \r
+  DebugPrintErrorLevelLib|MdePkg/Library/BaseDebugPrintErrorLevelLib/BaseDebugPrintErrorLevelLib.inf\r
+  ReportStatusCodeLib|MdePkg/Library/BaseReportStatusCodeLibNull/BaseReportStatusCodeLibNull.inf\r

   PeCoffExtraActionLib|MdePkg/Library/BasePeCoffExtraActionLibNull/BasePeCoffExtraActionLibNull.inf\r
   PerformanceLib|MdePkg/Library/BasePerformanceLibNull/BasePerformanceLibNull.inf\r
   DebugAgentLib|MdeModulePkg/Library/DebugAgentLibNull/DebugAgentLibNull.inf\r
   PeCoffExtraActionLib|MdePkg/Library/BasePeCoffExtraActionLibNull/BasePeCoffExtraActionLibNull.inf\r
   PerformanceLib|MdePkg/Library/BasePerformanceLibNull/BasePerformanceLibNull.inf\r
   DebugAgentLib|MdeModulePkg/Library/DebugAgentLibNull/DebugAgentLibNull.inf\r


@@ -146,7 +146,7 @@
   HobLib|MdePkg/Library/DxeHobLib/DxeHobLib.inf\r
   MemoryAllocationLib|MdeModulePkg/Library/PiSmmCoreMemoryAllocationLib/PiSmmCoreMemoryAllocationLib.inf\r
   SmmServicesTableLib|MdeModulePkg/Library/PiSmmCoreSmmServicesTableLib/PiSmmCoreSmmServicesTableLib.inf\r
   HobLib|MdePkg/Library/DxeHobLib/DxeHobLib.inf\r
   MemoryAllocationLib|MdeModulePkg/Library/PiSmmCoreMemoryAllocationLib/PiSmmCoreMemoryAllocationLib.inf\r
   SmmServicesTableLib|MdeModulePkg/Library/PiSmmCoreSmmServicesTableLib/PiSmmCoreSmmServicesTableLib.inf\r

-  SmmCorePlatformHookLib|MdeModulePkg/Library/SmmCorePlatformHookLibNull/SmmCorePlatformHookLibNull.inf  \r
+  SmmCorePlatformHookLib|MdeModulePkg/Library/SmmCorePlatformHookLibNull/SmmCorePlatformHookLibNull.inf\r

   SmmMemLib|MdePkg/Library/SmmMemLib/SmmMemLib.inf\r
 \r
 [LibraryClasses.common.DXE_SMM_DRIVER]\r
   SmmMemLib|MdePkg/Library/SmmMemLib/SmmMemLib.inf\r
 \r
 [LibraryClasses.common.DXE_SMM_DRIVER]\r


@@ -430,7 +430,7 @@
   MdeModulePkg/Universal/FvSimpleFileSystemDxe/FvSimpleFileSystemDxe.inf\r
   MdeModulePkg/Universal/EsrtDxe/EsrtDxe.inf\r
   MdeModulePkg/Universal/EsrtFmpDxe/EsrtFmpDxe.inf\r
   MdeModulePkg/Universal/FvSimpleFileSystemDxe/FvSimpleFileSystemDxe.inf\r
   MdeModulePkg/Universal/EsrtDxe/EsrtDxe.inf\r
   MdeModulePkg/Universal/EsrtFmpDxe/EsrtFmpDxe.inf\r

-  \r
+\r

   MdeModulePkg/Universal/PropertiesTableAttributesDxe/PropertiesTableAttributesDxe.inf\r
   MdeModulePkg/Universal/FileExplorerDxe/FileExplorerDxe.inf  {\r
     <LibraryClasses>\r
   MdeModulePkg/Universal/PropertiesTableAttributesDxe/PropertiesTableAttributesDxe.inf\r
   MdeModulePkg/Universal/FileExplorerDxe/FileExplorerDxe.inf  {\r
     <LibraryClasses>\r


@@ -461,7 +461,7 @@
 \r
 [Components.IA32, Components.X64, Components.Ebc]\r
   MdeModulePkg/Universal/Variable/EmuRuntimeDxe/EmuVariableRuntimeDxe.inf\r
 \r
 [Components.IA32, Components.X64, Components.Ebc]\r
   MdeModulePkg/Universal/Variable/EmuRuntimeDxe/EmuVariableRuntimeDxe.inf\r

-  \r
+\r

 [Components.IA32, Components.X64]\r
   MdeModulePkg/Application/SmiHandlerProfileInfo/SmiHandlerProfileInfo.inf\r
   MdeModulePkg/Core/PiSmmCore/PiSmmIpl.inf\r
 [Components.IA32, Components.X64]\r
   MdeModulePkg/Application/SmiHandlerProfileInfo/SmiHandlerProfileInfo.inf\r
   MdeModulePkg/Core/PiSmmCore/PiSmmIpl.inf\r

diff --git a/MdeModulePkg/MdeModulePkgExtra.uni b/MdeModulePkg/MdeModulePkgExtra.uni
index 82efdaf6589f6071390a2dd9d37aa4b79c4583b2..428954fc1cba62917caa72e610859bcda660752b 100644 (file)
--- a/MdeModulePkg/MdeModulePkgExtra.uni
+++ b/MdeModulePkg/MdeModulePkgExtra.uni
@@ -1,7 +1,7 @@
 // /** @file\r
 // MdeModule Package Localized Strings and Content.\r
 //\r
 // /** @file\r
 // MdeModule Package Localized Strings and Content.\r
 //\r

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

 //\r
 // This program and the accompanying materials are licensed and made available under\r
 // the terms and conditions of the BSD License that accompanies this distribution.\r
 //\r
 // This program and the accompanying materials are licensed and made available under\r
 // the terms and conditions of the BSD License that accompanies this distribution.\r


@@ -13,7 +13,7 @@
 //\r
 // **/\r
 \r
 //\r
 // **/\r
 \r

-#string STR_PROPERTIES_PACKAGE_NAME \r
-#language en-US \r
+#string STR_PROPERTIES_PACKAGE_NAME\r
+#language en-US\r

 "MdeModule package"\r
 \r
 "MdeModule package"\r
 \r

diff --git a/MdeModulePkg/Universal/Acpi/AcpiPlatformDxe/AcpiPlatform.c b/MdeModulePkg/Universal/Acpi/AcpiPlatformDxe/AcpiPlatform.c
index 8f335bde0d4692292a68daeff70d4b418eb9c0b0..c6238fd38efcc5533ce6f987c2cfdd3e2fd59835 100644 (file)
--- a/MdeModulePkg/Universal/Acpi/AcpiPlatformDxe/AcpiPlatform.c
+++ b/MdeModulePkg/Universal/Acpi/AcpiPlatformDxe/AcpiPlatform.c
@@ -10,7 +10,7 @@
   THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
   WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 \r
   THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
   WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 \r

-**/ \r
+**/\r

 \r
 #include <PiDxe.h>\r
 \r
 \r
 #include <PiDxe.h>\r
 \r

diff --git a/MdeModulePkg/Universal/Acpi/AcpiPlatformDxe/AcpiPlatform.uni b/MdeModulePkg/Universal/Acpi/AcpiPlatformDxe/AcpiPlatform.uni
index 68b3e48e2003a54c039b5a4d4722af598845b2db..f5aa4f4bb91038ba897aac99917b642bd38e12dc 100644 (file)
--- a/MdeModulePkg/Universal/Acpi/AcpiPlatformDxe/AcpiPlatform.uni
+++ b/MdeModulePkg/Universal/Acpi/AcpiPlatformDxe/AcpiPlatform.uni
@@ -3,13 +3,13 @@
 //\r
 // Sample ACPI Platform Driver\r
 //\r
 //\r
 // Sample ACPI Platform Driver\r
 //\r

-// Copyright (c) 2008 - 2014, Intel Corporation. All rights reserved.<BR>\r
+// Copyright (c) 2008 - 2018, Intel Corporation. All rights reserved.<BR>\r

 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r
 // which accompanies this distribution.  The full text of the license may be found at\r
 // http://opensource.org/licenses/bsd-license.php\r
 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r
 // which accompanies this distribution.  The full text of the license may be found at\r
 // http://opensource.org/licenses/bsd-license.php\r

-// \r
+//\r

 // THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 // WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 //\r
 // THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 // WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 //\r

diff --git a/MdeModulePkg/Universal/Acpi/AcpiPlatformDxe/AcpiPlatformDxe.inf b/MdeModulePkg/Universal/Acpi/AcpiPlatformDxe/AcpiPlatformDxe.inf
index 34b1600171d50fdc5df7f98e3a1086d2f99b38dd..f4860cdc0b91c05a908ab8e6ccb637dd57ed188e 100644 (file)
--- a/MdeModulePkg/Universal/Acpi/AcpiPlatformDxe/AcpiPlatformDxe.inf
+++ b/MdeModulePkg/Universal/Acpi/AcpiPlatformDxe/AcpiPlatformDxe.inf
@@ -1,15 +1,15 @@
 ## @file\r
 #  Sample ACPI Platform Driver\r
 #\r
 ## @file\r
 #  Sample ACPI Platform Driver\r
 #\r

-#  Copyright (c) 2008 - 2014, Intel Corporation. All rights reserved.<BR>\r
+#  Copyright (c) 2008 - 2018, Intel Corporation. All rights reserved.<BR>\r

 #  This program and the accompanying materials\r
 #  are licensed and made available under the terms and conditions of the BSD License\r
 #  which accompanies this distribution.  The full text of the license may be found at\r
 #  http://opensource.org/licenses/bsd-license.php\r
 #  This program and the accompanying materials\r
 #  are licensed and made available under the terms and conditions of the BSD License\r
 #  which accompanies this distribution.  The full text of the license may be found at\r
 #  http://opensource.org/licenses/bsd-license.php\r

-#  \r
+#\r

 #  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 #  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 #  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 #  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r

-#  \r
+#\r

 ##\r
 \r
 [Defines]\r
 ##\r
 \r
 [Defines]\r

diff --git a/MdeModulePkg/Universal/Acpi/AcpiPlatformDxe/AcpiPlatformExtra.uni b/MdeModulePkg/Universal/Acpi/AcpiPlatformDxe/AcpiPlatformExtra.uni
index e976c59983e3ea3cd6d28eebcb623115fa50f9de..9e8d6ea5d0b7366bfbbd3e790e5f0b00b4b12290 100644 (file)
--- a/MdeModulePkg/Universal/Acpi/AcpiPlatformDxe/AcpiPlatformExtra.uni
+++ b/MdeModulePkg/Universal/Acpi/AcpiPlatformDxe/AcpiPlatformExtra.uni
@@ -1,7 +1,7 @@
 // /** @file\r
 // AcpiPlatform Localized Strings and Content\r
 //\r
 // /** @file\r
 // AcpiPlatform Localized Strings and Content\r
 //\r

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

 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r
 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r


@@ -13,8 +13,8 @@
 //\r
 // **/\r
 \r
 //\r
 // **/\r
 \r

-#string STR_PROPERTIES_MODULE_NAME \r
-#language en-US \r
+#string STR_PROPERTIES_MODULE_NAME\r
+#language en-US\r

 "ACPI Platform Sample DXE Driver"\r
 \r
 \r
 "ACPI Platform Sample DXE Driver"\r
 \r
 \r

diff --git a/MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiSdt.c b/MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiSdt.c
index 2b3bb356250a9246b7942463a523aa0dc008777f..aae529ea0a66671ab81346e24ca43b78c8faf6a3 100644 (file)
--- a/MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiSdt.c
+++ b/MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiSdt.c
@@ -1,7 +1,7 @@
 /** @file\r
   ACPI Sdt Protocol Driver\r
 \r
 /** @file\r
   ACPI Sdt Protocol Driver\r
 \r

-  Copyright (c) 2010 - 2016, Intel Corporation. All rights reserved. <BR>\r
+  Copyright (c) 2010 - 2018, Intel Corporation. All rights reserved. <BR>\r

   This program and the accompanying materials\r
   are licensed and made available under the terms and conditions of the BSD License\r
   which accompanies this distribution.  The full text of the license may be found at\r
   This program and the accompanying materials\r
   are licensed and made available under the terms and conditions of the BSD License\r
   which accompanies this distribution.  The full text of the license may be found at\r


@@ -196,7 +196,7 @@ SdtNotifyAcpiList (
 \r
 /**\r
   Returns a requested ACPI table.\r
 \r
 /**\r
   Returns a requested ACPI table.\r

-  \r
+\r

   The GetAcpiTable() function returns a pointer to a buffer containing the ACPI table associated\r
   with the Index that was input. The following structures are not considered elements in the list of\r
   ACPI tables:\r
   The GetAcpiTable() function returns a pointer to a buffer containing the ACPI table associated\r
   with the Index that was input. The following structures are not considered elements in the list of\r
   ACPI tables:\r


@@ -206,19 +206,19 @@ SdtNotifyAcpiList (
   Version is updated with a bit map containing all the versions of ACPI of which the table is a\r
   member. For tables installed via the EFI_ACPI_TABLE_PROTOCOL.InstallAcpiTable() interface,\r
   the function returns the value of EFI_ACPI_STD_PROTOCOL.AcpiVersion.\r
   Version is updated with a bit map containing all the versions of ACPI of which the table is a\r
   member. For tables installed via the EFI_ACPI_TABLE_PROTOCOL.InstallAcpiTable() interface,\r
   the function returns the value of EFI_ACPI_STD_PROTOCOL.AcpiVersion.\r

-  \r
+\r

   @param[in]    Index       The zero-based index of the table to retrieve.\r
   @param[out]   Table       Pointer for returning the table buffer.\r
   @param[out]   Version     On return, updated with the ACPI versions to which this table belongs. Type\r
                             EFI_ACPI_TABLE_VERSION is defined in "Related Definitions" in the\r
   @param[in]    Index       The zero-based index of the table to retrieve.\r
   @param[out]   Table       Pointer for returning the table buffer.\r
   @param[out]   Version     On return, updated with the ACPI versions to which this table belongs. Type\r
                             EFI_ACPI_TABLE_VERSION is defined in "Related Definitions" in the\r

-                            EFI_ACPI_SDT_PROTOCOL.    \r
+                            EFI_ACPI_SDT_PROTOCOL.\r

   @param[out]   TableKey    On return, points to the table key for the specified ACPI system definition table.\r
                             This is identical to the table key used in the EFI_ACPI_TABLE_PROTOCOL.\r
                             The TableKey can be passed to EFI_ACPI_TABLE_PROTOCOL.UninstallAcpiTable()\r
                             to uninstall the table.\r
   @retval EFI_SUCCESS       The function completed successfully.\r
   @param[out]   TableKey    On return, points to the table key for the specified ACPI system definition table.\r
                             This is identical to the table key used in the EFI_ACPI_TABLE_PROTOCOL.\r
                             The TableKey can be passed to EFI_ACPI_TABLE_PROTOCOL.UninstallAcpiTable()\r
                             to uninstall the table.\r
   @retval EFI_SUCCESS       The function completed successfully.\r

-  @retval EFI_NOT_FOUND     The requested index is too large and a table was not found.                                  \r
-**/  \r
+  @retval EFI_NOT_FOUND     The requested index is too large and a table was not found.\r
+**/\r

 EFI_STATUS\r
 EFIAPI\r
 GetAcpiTable2 (\r
 EFI_STATUS\r
 EFIAPI\r
 GetAcpiTable2 (\r


@@ -278,9 +278,9 @@ GetAcpiTable2 (
 \r
 /**\r
   Register a callback when an ACPI table is installed.\r
 \r
 /**\r
   Register a callback when an ACPI table is installed.\r

-  \r
+\r

   This function registers a function which will be called whenever a new ACPI table is installed.\r
   This function registers a function which will be called whenever a new ACPI table is installed.\r

-  \r
+\r

   @param[in]  Notification               Points to the callback function to be registered\r
 **/\r
 VOID\r
   @param[in]  Notification               Points to the callback function to be registered\r
 **/\r
 VOID\r


@@ -318,13 +318,13 @@ SdtRegisterNotify (
 \r
 /**\r
   Unregister a callback when an ACPI table is installed.\r
 \r
 /**\r
   Unregister a callback when an ACPI table is installed.\r

-  \r
+\r

   This function unregisters a function which will be called whenever a new ACPI table is installed.\r
   This function unregisters a function which will be called whenever a new ACPI table is installed.\r

-  \r
+\r

   @param[in]  Notification               Points to the callback function to be unregistered.\r
   @param[in]  Notification               Points to the callback function to be unregistered.\r

-  \r
+\r

   @retval EFI_SUCCESS           Callback successfully unregistered.\r
   @retval EFI_SUCCESS           Callback successfully unregistered.\r

-  @retval EFI_INVALID_PARAMETER Notification does not match a known registration function.                        \r
+  @retval EFI_INVALID_PARAMETER Notification does not match a known registration function.\r

 **/\r
 EFI_STATUS\r
 SdtUnregisterNotify (\r
 **/\r
 EFI_STATUS\r
 SdtUnregisterNotify (\r


@@ -371,17 +371,17 @@ SdtUnregisterNotify (
 \r
 /**\r
   Register or unregister a callback when an ACPI table is installed.\r
 \r
 /**\r
   Register or unregister a callback when an ACPI table is installed.\r

-  \r
+\r

   This function registers or unregisters a function which will be called whenever a new ACPI table is\r
   installed.\r
   This function registers or unregisters a function which will be called whenever a new ACPI table is\r
   installed.\r

-  \r
+\r

   @param[in]    Register        If TRUE, then the specified function will be registered. If FALSE, then the specified\r
                                 function will be unregistered.\r
   @param[in]    Notification    Points to the callback function to be registered or unregistered.\r
   @param[in]    Register        If TRUE, then the specified function will be registered. If FALSE, then the specified\r
                                 function will be unregistered.\r
   @param[in]    Notification    Points to the callback function to be registered or unregistered.\r

-  \r
+\r

   @retval EFI_SUCCESS           Callback successfully registered or unregistered.\r
   @retval EFI_INVALID_PARAMETER Notification is NULL\r
   @retval EFI_SUCCESS           Callback successfully registered or unregistered.\r
   @retval EFI_INVALID_PARAMETER Notification is NULL\r

-  @retval EFI_INVALID_PARAMETER Register is FALSE and Notification does not match a known registration function.                        \r
+  @retval EFI_INVALID_PARAMETER Register is FALSE and Notification does not match a known registration function.\r

 **/\r
 EFI_STATUS\r
 EFIAPI\r
 **/\r
 EFI_STATUS\r
 EFIAPI\r


@@ -413,12 +413,12 @@ RegisterNotify (
 \r
 /**\r
   Create a handle for the first ACPI opcode in an ACPI system description table.\r
 \r
 /**\r
   Create a handle for the first ACPI opcode in an ACPI system description table.\r

-  \r
+\r

   @param[in]    TableKey    The table key for the ACPI table, as returned by GetTable().\r
   @param[out]   Handle      On return, points to the newly created ACPI handle.\r
 \r
   @retval EFI_SUCCESS       Handle created successfully.\r
   @param[in]    TableKey    The table key for the ACPI table, as returned by GetTable().\r
   @param[out]   Handle      On return, points to the newly created ACPI handle.\r
 \r
   @retval EFI_SUCCESS       Handle created successfully.\r

-  @retval EFI_NOT_FOUND     TableKey does not refer to a valid ACPI table.  \r
+  @retval EFI_NOT_FOUND     TableKey does not refer to a valid ACPI table.\r

 **/\r
 EFI_STATUS\r
 SdtOpenSdtTable (\r
 **/\r
 EFI_STATUS\r
 SdtOpenSdtTable (\r


@@ -466,12 +466,12 @@ SdtOpenSdtTable (
 \r
 /**\r
   Create a handle for the first ACPI opcode in an ACPI system description table.\r
 \r
 /**\r
   Create a handle for the first ACPI opcode in an ACPI system description table.\r

-  \r
+\r

   @param[in]    TableKey    The table key for the ACPI table, as returned by GetTable().\r
   @param[out]   Handle      On return, points to the newly created ACPI handle.\r
 \r
   @retval EFI_SUCCESS       Handle created successfully.\r
   @param[in]    TableKey    The table key for the ACPI table, as returned by GetTable().\r
   @param[out]   Handle      On return, points to the newly created ACPI handle.\r
 \r
   @retval EFI_SUCCESS       Handle created successfully.\r

-  @retval EFI_NOT_FOUND     TableKey does not refer to a valid ACPI table.  \r
+  @retval EFI_NOT_FOUND     TableKey does not refer to a valid ACPI table.\r

 **/\r
 EFI_STATUS\r
 EFIAPI\r
 **/\r
 EFI_STATUS\r
 EFIAPI\r


@@ -489,21 +489,21 @@ OpenSdt (
 \r
 /**\r
   Create a handle from an ACPI opcode\r
 \r
 /**\r
   Create a handle from an ACPI opcode\r

-  \r
+\r

   @param[in]  Buffer                 Points to the ACPI opcode.\r
   @param[in]  BufferSize             Max buffer size.\r
   @param[out] Handle                 Upon return, holds the handle.\r
   @param[in]  Buffer                 Points to the ACPI opcode.\r
   @param[in]  BufferSize             Max buffer size.\r
   @param[out] Handle                 Upon return, holds the handle.\r

-  \r
+\r

   @retval   EFI_SUCCESS             Success\r
   @retval   EFI_INVALID_PARAMETER   Buffer is NULL or Handle is NULL or Buffer points to an\r
                                     invalid opcode.\r
   @retval   EFI_SUCCESS             Success\r
   @retval   EFI_INVALID_PARAMETER   Buffer is NULL or Handle is NULL or Buffer points to an\r
                                     invalid opcode.\r

-  \r
+\r

 **/\r
 EFI_STATUS\r
 SdtOpenEx (\r
   IN    VOID            *Buffer,\r
   IN    UINTN           BufferSize,\r
 **/\r
 EFI_STATUS\r
 SdtOpenEx (\r
   IN    VOID            *Buffer,\r
   IN    UINTN           BufferSize,\r

-  OUT   EFI_ACPI_HANDLE *Handle \r
+  OUT   EFI_ACPI_HANDLE *Handle\r

   )\r
 {\r
   AML_BYTE_ENCODING   *AmlByteEncoding;\r
   )\r
 {\r
   AML_BYTE_ENCODING   *AmlByteEncoding;\r


@@ -526,7 +526,7 @@ SdtOpenEx (
   //\r
   AmlHandle = AllocatePool (sizeof(*AmlHandle));\r
   ASSERT (AmlHandle != NULL);\r
   //\r
   AmlHandle = AllocatePool (sizeof(*AmlHandle));\r
   ASSERT (AmlHandle != NULL);\r

-  \r
+\r

   AmlHandle->Signature       = EFI_AML_HANDLE_SIGNATURE;\r
   AmlHandle->Buffer          = Buffer;\r
   AmlHandle->AmlByteEncoding = AmlByteEncoding;\r
   AmlHandle->Signature       = EFI_AML_HANDLE_SIGNATURE;\r
   AmlHandle->Buffer          = Buffer;\r
   AmlHandle->AmlByteEncoding = AmlByteEncoding;\r


@@ -545,20 +545,20 @@ SdtOpenEx (
 \r
 /**\r
   Create a handle from an ACPI opcode\r
 \r
 /**\r
   Create a handle from an ACPI opcode\r

-  \r
+\r

   @param[in]  Buffer                 Points to the ACPI opcode.\r
   @param[out] Handle                 Upon return, holds the handle.\r
   @param[in]  Buffer                 Points to the ACPI opcode.\r
   @param[out] Handle                 Upon return, holds the handle.\r

-  \r
+\r

   @retval   EFI_SUCCESS             Success\r
   @retval   EFI_INVALID_PARAMETER   Buffer is NULL or Handle is NULL or Buffer points to an\r
                                     invalid opcode.\r
   @retval   EFI_SUCCESS             Success\r
   @retval   EFI_INVALID_PARAMETER   Buffer is NULL or Handle is NULL or Buffer points to an\r
                                     invalid opcode.\r

-  \r
+\r

 **/\r
 EFI_STATUS\r
 EFIAPI\r
 Open (\r
   IN    VOID            *Buffer,\r
 **/\r
 EFI_STATUS\r
 EFIAPI\r
 Open (\r
   IN    VOID            *Buffer,\r

-  OUT   EFI_ACPI_HANDLE *Handle \r
+  OUT   EFI_ACPI_HANDLE *Handle\r

   )\r
 {\r
   EFI_STATUS          Status;\r
   )\r
 {\r
   EFI_STATUS          Status;\r


@@ -583,11 +583,11 @@ Open (
 \r
 /**\r
   Close an ACPI handle.\r
 \r
 /**\r
   Close an ACPI handle.\r

-  \r
+\r

   @param[in] Handle Returns the handle.\r
   @param[in] Handle Returns the handle.\r

-  \r
+\r

   @retval EFI_SUCCESS           Success\r
   @retval EFI_SUCCESS           Success\r

-  @retval EFI_INVALID_PARAMETER Handle is NULL or does not refer to a valid ACPI object.  \r
+  @retval EFI_INVALID_PARAMETER Handle is NULL or does not refer to a valid ACPI object.\r

 **/\r
 EFI_STATUS\r
 EFIAPI\r
 **/\r
 EFI_STATUS\r
 EFIAPI\r


@@ -628,7 +628,7 @@ Close (
 \r
 /**\r
   Retrieve information about an ACPI object.\r
 \r
 /**\r
   Retrieve information about an ACPI object.\r

-  \r
+\r

   @param[in]    Handle      ACPI object handle.\r
   @param[in]    Index       Index of the data to retrieve from the object. In general, indexes read from left-to-right\r
                             in the ACPI encoding, with index 0 always being the ACPI opcode.\r
   @param[in]    Handle      ACPI object handle.\r
   @param[in]    Index       Index of the data to retrieve from the object. In general, indexes read from left-to-right\r
                             in the ACPI encoding, with index 0 always being the ACPI opcode.\r


@@ -636,7 +636,7 @@ Close (
                             for the specified index.\r
   @param[out]   Data        Upon return, points to the pointer to the data.\r
   @param[out]   DataSize    Upon return, points to the size of Data.\r
                             for the specified index.\r
   @param[out]   Data        Upon return, points to the pointer to the data.\r
   @param[out]   DataSize    Upon return, points to the size of Data.\r

-  \r
+\r

   @retval       EFI_SUCCESS           Success.\r
   @retval       EFI_INVALID_PARAMETER Handle is NULL or does not refer to a valid ACPI object.\r
 **/\r
   @retval       EFI_SUCCESS           Success.\r
   @retval       EFI_INVALID_PARAMETER Handle is NULL or does not refer to a valid ACPI object.\r
 **/\r


@@ -692,7 +692,7 @@ GetOption (
 \r
 /**\r
   Change information about an ACPI object.\r
 \r
 /**\r
   Change information about an ACPI object.\r

-  \r
+\r

   @param[in]  Handle    ACPI object handle.\r
   @param[in]  Index     Index of the data to retrieve from the object. In general, indexes read from left-to-right\r
                         in the ACPI encoding, with index 0 always being the ACPI opcode.\r
   @param[in]  Handle    ACPI object handle.\r
   @param[in]  Index     Index of the data to retrieve from the object. In general, indexes read from left-to-right\r
                         in the ACPI encoding, with index 0 always being the ACPI opcode.\r


@@ -769,14 +769,14 @@ SetOption (
 \r
 /**\r
   Return the child ACPI objects.\r
 \r
 /**\r
   Return the child ACPI objects.\r

-  \r
+\r

   @param[in]        ParentHandle    Parent handle.\r
   @param[in, out]   Handle          On entry, points to the previously returned handle or NULL to start with the first\r
                                     handle. On return, points to the next returned ACPI handle or NULL if there are no\r
                                     child objects.\r
 \r
   @retval EFI_SUCCESS               Success\r
   @param[in]        ParentHandle    Parent handle.\r
   @param[in, out]   Handle          On entry, points to the previously returned handle or NULL to start with the first\r
                                     handle. On return, points to the next returned ACPI handle or NULL if there are no\r
                                     child objects.\r
 \r
   @retval EFI_SUCCESS               Success\r

-  @retval EFI_INVALID_PARAMETER     ParentHandle is NULL or does not refer to a valid ACPI object.                                \r
+  @retval EFI_INVALID_PARAMETER     ParentHandle is NULL or does not refer to a valid ACPI object.\r

 **/\r
 EFI_STATUS\r
 EFIAPI\r
 **/\r
 EFI_STATUS\r
 EFIAPI\r


@@ -834,14 +834,14 @@ GetChild (
 \r
 /**\r
   Returns the handle of the ACPI object representing the specified ACPI path\r
 \r
 /**\r
   Returns the handle of the ACPI object representing the specified ACPI path\r

-  \r
+\r

   @param[in]    HandleIn    Points to the handle of the object representing the starting point for the path search.\r
   @param[in]    AmlPath     Points to the AML path.\r
   @param[out]   HandleOut   On return, points to the ACPI object which represents AcpiPath, relative to\r
                             HandleIn.\r
   @param[in]    HandleIn    Points to the handle of the object representing the starting point for the path search.\r
   @param[in]    AmlPath     Points to the AML path.\r
   @param[out]   HandleOut   On return, points to the ACPI object which represents AcpiPath, relative to\r
                             HandleIn.\r

-                            \r
+\r

   @retval EFI_SUCCESS           Success\r
   @retval EFI_SUCCESS           Success\r

-  @retval EFI_INVALID_PARAMETER HandleIn is NULL or does not refer to a valid ACPI object.                            \r
+  @retval EFI_INVALID_PARAMETER HandleIn is NULL or does not refer to a valid ACPI object.\r

 **/\r
 EFI_STATUS\r
 SdtFindPathFromNonRoot (\r
 **/\r
 EFI_STATUS\r
 SdtFindPathFromNonRoot (\r


@@ -873,9 +873,9 @@ SdtFindPathFromNonRoot (
 \r
 /**\r
   Duplicate AML handle.\r
 \r
 /**\r
   Duplicate AML handle.\r

-  \r
+\r

   @param[in]    AmlHandle   Handle to be duplicated.\r
   @param[in]    AmlHandle   Handle to be duplicated.\r

-                            \r
+\r

   @return Duplicated AML handle.\r
 **/\r
 EFI_AML_HANDLE *\r
   @return Duplicated AML handle.\r
 **/\r
 EFI_AML_HANDLE *\r


@@ -894,14 +894,14 @@ SdtDuplicateHandle (
 \r
 /**\r
   Returns the handle of the ACPI object representing the specified ACPI path\r
 \r
 /**\r
   Returns the handle of the ACPI object representing the specified ACPI path\r

-  \r
+\r

   @param[in]    HandleIn    Points to the handle of the object representing the starting point for the path search.\r
   @param[in]    AmlPath     Points to the AML path.\r
   @param[out]   HandleOut   On return, points to the ACPI object which represents AcpiPath, relative to\r
                             HandleIn.\r
   @param[in]    HandleIn    Points to the handle of the object representing the starting point for the path search.\r
   @param[in]    AmlPath     Points to the AML path.\r
   @param[out]   HandleOut   On return, points to the ACPI object which represents AcpiPath, relative to\r
                             HandleIn.\r

-                            \r
+\r

   @retval EFI_SUCCESS           Success\r
   @retval EFI_SUCCESS           Success\r

-  @retval EFI_INVALID_PARAMETER HandleIn is NULL or does not refer to a valid ACPI object.                            \r
+  @retval EFI_INVALID_PARAMETER HandleIn is NULL or does not refer to a valid ACPI object.\r

 **/\r
 EFI_STATUS\r
 SdtFindPathFromRoot (\r
 **/\r
 EFI_STATUS\r
 SdtFindPathFromRoot (\r


@@ -977,14 +977,14 @@ SdtFindPathFromRoot (
 \r
 /**\r
   Returns the handle of the ACPI object representing the specified ACPI path\r
 \r
 /**\r
   Returns the handle of the ACPI object representing the specified ACPI path\r

-  \r
+\r

   @param[in]    HandleIn    Points to the handle of the object representing the starting point for the path search.\r
   @param[in]    AcpiPath    Points to the ACPI path, which conforms to the ACPI encoded path format.\r
   @param[out]   HandleOut   On return, points to the ACPI object which represents AcpiPath, relative to\r
                             HandleIn.\r
   @param[in]    HandleIn    Points to the handle of the object representing the starting point for the path search.\r
   @param[in]    AcpiPath    Points to the ACPI path, which conforms to the ACPI encoded path format.\r
   @param[out]   HandleOut   On return, points to the ACPI object which represents AcpiPath, relative to\r
                             HandleIn.\r

-                            \r
+\r

   @retval EFI_SUCCESS           Success\r
   @retval EFI_SUCCESS           Success\r

-  @retval EFI_INVALID_PARAMETER HandleIn is NULL or does not refer to a valid ACPI object.                            \r
+  @retval EFI_INVALID_PARAMETER HandleIn is NULL or does not refer to a valid ACPI object.\r

 **/\r
 EFI_STATUS\r
 EFIAPI\r
 **/\r
 EFI_STATUS\r
 EFIAPI\r


@@ -1006,7 +1006,7 @@ FindPath (
   }\r
 \r
   AmlHandle = (EFI_AML_HANDLE *)HandleIn;\r
   }\r
 \r
   AmlHandle = (EFI_AML_HANDLE *)HandleIn;\r

-  \r
+\r

   //\r
   // Convert ASL path to AML path\r
   //\r
   //\r
   // Convert ASL path to AML path\r
   //\r

diff --git a/MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiSdt.h b/MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiSdt.h
index f11bdee9ac9dbb2e5b5451ea7172ba790494b84f..9e39c22e23c165a74af0e5710330788629fdad19 100644 (file)
--- a/MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiSdt.h
+++ b/MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiSdt.h
@@ -1,7 +1,7 @@
 /** @file\r
   ACPI Sdt Protocol Driver\r
 \r
 /** @file\r
   ACPI Sdt Protocol Driver\r
 \r

-  Copyright (c) 2010 - 2015, Intel Corporation. All rights reserved. <BR>\r
+  Copyright (c) 2010 - 2018, Intel Corporation. All rights reserved. <BR>\r

   This program and the accompanying materials\r
   are licensed and made available under the terms and conditions of the BSD License\r
   which accompanies this distribution.  The full text of the license may be found at\r
   This program and the accompanying materials\r
   are licensed and made available under the terms and conditions of the BSD License\r
   which accompanies this distribution.  The full text of the license may be found at\r


@@ -130,7 +130,7 @@ typedef UINT32 AML_OP_ATTRIBUTE;
 #define AML_HAS_CHILD_OBJ        0x4     // it is ACPI attribute - if OpCode has Child Object.\r
 #define AML_IN_NAMESPACE         0x10000 // It is UEFI SDT attribute - if OpCode will be in NameSpace\r
                                          // NOTE; Not all OBJECT will be in NameSpace\r
 #define AML_HAS_CHILD_OBJ        0x4     // it is ACPI attribute - if OpCode has Child Object.\r
 #define AML_IN_NAMESPACE         0x10000 // It is UEFI SDT attribute - if OpCode will be in NameSpace\r
                                          // NOTE; Not all OBJECT will be in NameSpace\r

-                                         // For example, BankField | CreateBitField | CreateByteField | CreateDWordField | \r
+                                         // For example, BankField | CreateBitField | CreateByteField | CreateDWordField |\r

                                          //   CreateField | CreateQWordField | CreateWordField | Field | IndexField.\r
 \r
 struct _AML_BYTE_ENCODING {\r
                                          //   CreateField | CreateQWordField | CreateWordField | Field | IndexField.\r
 \r
 struct _AML_BYTE_ENCODING {\r


@@ -147,7 +147,7 @@ struct _AML_BYTE_ENCODING {
 \r
 /**\r
   Returns a requested ACPI table.\r
 \r
 /**\r
   Returns a requested ACPI table.\r

-  \r
+\r

   The GetAcpiTable() function returns a pointer to a buffer containing the ACPI table associated\r
   with the Index that was input. The following structures are not considered elements in the list of\r
   ACPI tables:\r
   The GetAcpiTable() function returns a pointer to a buffer containing the ACPI table associated\r
   with the Index that was input. The following structures are not considered elements in the list of\r
   ACPI tables:\r


@@ -157,20 +157,20 @@ struct _AML_BYTE_ENCODING {
   Version is updated with a bit map containing all the versions of ACPI of which the table is a\r
   member. For tables installed via the EFI_ACPI_TABLE_PROTOCOL.InstallAcpiTable() interface,\r
   the function returns the value of EFI_ACPI_STD_PROTOCOL.AcpiVersion.\r
   Version is updated with a bit map containing all the versions of ACPI of which the table is a\r
   member. For tables installed via the EFI_ACPI_TABLE_PROTOCOL.InstallAcpiTable() interface,\r
   the function returns the value of EFI_ACPI_STD_PROTOCOL.AcpiVersion.\r

-  \r
+\r

   @param[in]    Index       The zero-based index of the table to retrieve.\r
   @param[out]   Table       Pointer for returning the table buffer.\r
   @param[out]   Version     On return, updated with the ACPI versions to which this table belongs. Type\r
                             EFI_ACPI_TABLE_VERSION is defined in "Related Definitions" in the\r
   @param[in]    Index       The zero-based index of the table to retrieve.\r
   @param[out]   Table       Pointer for returning the table buffer.\r
   @param[out]   Version     On return, updated with the ACPI versions to which this table belongs. Type\r
                             EFI_ACPI_TABLE_VERSION is defined in "Related Definitions" in the\r

-                            EFI_ACPI_SDT_PROTOCOL.    \r
+                            EFI_ACPI_SDT_PROTOCOL.\r

   @param[out]   TableKey    On return, points to the table key for the specified ACPI system definition table.\r
                             This is identical to the table key used in the EFI_ACPI_TABLE_PROTOCOL.\r
                             The TableKey can be passed to EFI_ACPI_TABLE_PROTOCOL.UninstallAcpiTable()\r
                             to uninstall the table.\r
   @param[out]   TableKey    On return, points to the table key for the specified ACPI system definition table.\r
                             This is identical to the table key used in the EFI_ACPI_TABLE_PROTOCOL.\r
                             The TableKey can be passed to EFI_ACPI_TABLE_PROTOCOL.UninstallAcpiTable()\r
                             to uninstall the table.\r

-                            \r
+\r

   @retval EFI_SUCCESS       The function completed successfully.\r
   @retval EFI_SUCCESS       The function completed successfully.\r

-  @retval EFI_NOT_FOUND     The requested index is too large and a table was not found.                                  \r
-**/  \r
+  @retval EFI_NOT_FOUND     The requested index is too large and a table was not found.\r
+**/\r

 EFI_STATUS\r
 EFIAPI\r
 GetAcpiTable2 (\r
 EFI_STATUS\r
 EFIAPI\r
 GetAcpiTable2 (\r


@@ -182,17 +182,17 @@ GetAcpiTable2 (
 \r
 /**\r
   Register or unregister a callback when an ACPI table is installed.\r
 \r
 /**\r
   Register or unregister a callback when an ACPI table is installed.\r

-  \r
+\r

   This function registers or unregisters a function which will be called whenever a new ACPI table is\r
   installed.\r
   This function registers or unregisters a function which will be called whenever a new ACPI table is\r
   installed.\r

-  \r
+\r

   @param[in]    Register        If TRUE, then the specified function will be registered. If FALSE, then the specified\r
                                 function will be unregistered.\r
   @param[in]    Notification    Points to the callback function to be registered or unregistered.\r
   @param[in]    Register        If TRUE, then the specified function will be registered. If FALSE, then the specified\r
                                 function will be unregistered.\r
   @param[in]    Notification    Points to the callback function to be registered or unregistered.\r

-  \r
+\r

   @retval EFI_SUCCESS           Callback successfully registered or unregistered.\r
   @retval EFI_INVALID_PARAMETER Notification is NULL\r
   @retval EFI_SUCCESS           Callback successfully registered or unregistered.\r
   @retval EFI_INVALID_PARAMETER Notification is NULL\r

-  @retval EFI_INVALID_PARAMETER Register is FALSE and Notification does not match a known registration function.                        \r
+  @retval EFI_INVALID_PARAMETER Register is FALSE and Notification does not match a known registration function.\r

 **/\r
 EFI_STATUS\r
 EFIAPI\r
 **/\r
 EFI_STATUS\r
 EFIAPI\r


@@ -203,12 +203,12 @@ RegisterNotify (
 \r
 /**\r
   Create a handle for the first ACPI opcode in an ACPI system description table.\r
 \r
 /**\r
   Create a handle for the first ACPI opcode in an ACPI system description table.\r

-  \r
+\r

   @param[in]    TableKey    The table key for the ACPI table, as returned by GetTable().\r
   @param[out]   Handle      On return, points to the newly created ACPI handle.\r
 \r
   @retval EFI_SUCCESS       Handle created successfully.\r
   @param[in]    TableKey    The table key for the ACPI table, as returned by GetTable().\r
   @param[out]   Handle      On return, points to the newly created ACPI handle.\r
 \r
   @retval EFI_SUCCESS       Handle created successfully.\r

-  @retval EFI_NOT_FOUND     TableKey does not refer to a valid ACPI table.  \r
+  @retval EFI_NOT_FOUND     TableKey does not refer to a valid ACPI table.\r

 **/\r
 EFI_STATUS\r
 EFIAPI\r
 **/\r
 EFI_STATUS\r
 EFIAPI\r


@@ -219,29 +219,29 @@ OpenSdt (
 \r
 /**\r
   Create a handle from an ACPI opcode\r
 \r
 /**\r
   Create a handle from an ACPI opcode\r

-  \r
+\r

   @param[in]  Buffer                 Points to the ACPI opcode.\r
   @param[out] Handle                 Upon return, holds the handle.\r
   @param[in]  Buffer                 Points to the ACPI opcode.\r
   @param[out] Handle                 Upon return, holds the handle.\r

-  \r
+\r

   @retval   EFI_SUCCESS             Success\r
   @retval   EFI_INVALID_PARAMETER   Buffer is NULL or Handle is NULL or Buffer points to an\r
                                     invalid opcode.\r
   @retval   EFI_SUCCESS             Success\r
   @retval   EFI_INVALID_PARAMETER   Buffer is NULL or Handle is NULL or Buffer points to an\r
                                     invalid opcode.\r

-  \r
+\r

 **/\r
 EFI_STATUS\r
 EFIAPI\r
 Open (\r
   IN    VOID            *Buffer,\r
 **/\r
 EFI_STATUS\r
 EFIAPI\r
 Open (\r
   IN    VOID            *Buffer,\r

-  OUT   EFI_ACPI_HANDLE *Handle \r
+  OUT   EFI_ACPI_HANDLE *Handle\r

   );\r
 \r
 /**\r
   Close an ACPI handle.\r
   );\r
 \r
 /**\r
   Close an ACPI handle.\r

-  \r
+\r

   @param[in] Handle Returns the handle.\r
   @param[in] Handle Returns the handle.\r

-  \r
+\r

   @retval EFI_SUCCESS           Success\r
   @retval EFI_SUCCESS           Success\r

-  @retval EFI_INVALID_PARAMETER Handle is NULL or does not refer to a valid ACPI object.  \r
+  @retval EFI_INVALID_PARAMETER Handle is NULL or does not refer to a valid ACPI object.\r

 **/\r
 EFI_STATUS\r
 EFIAPI\r
 **/\r
 EFI_STATUS\r
 EFIAPI\r


@@ -251,7 +251,7 @@ Close (
 \r
 /**\r
   Retrieve information about an ACPI object.\r
 \r
 /**\r
   Retrieve information about an ACPI object.\r

-  \r
+\r

   @param[in]    Handle      ACPI object handle.\r
   @param[in]    Index       Index of the data to retrieve from the object. In general, indexes read from left-to-right\r
                             in the ACPI encoding, with index 0 always being the ACPI opcode.\r
   @param[in]    Handle      ACPI object handle.\r
   @param[in]    Index       Index of the data to retrieve from the object. In general, indexes read from left-to-right\r
                             in the ACPI encoding, with index 0 always being the ACPI opcode.\r


@@ -259,7 +259,7 @@ Close (
                             for the specified index.\r
   @param[out]   Data        Upon return, points to the pointer to the data.\r
   @param[out]   DataSize    Upon return, points to the size of Data.\r
                             for the specified index.\r
   @param[out]   Data        Upon return, points to the pointer to the data.\r
   @param[out]   DataSize    Upon return, points to the size of Data.\r

-  \r
+\r

   @retval       EFI_SUCCESS           Success.\r
   @retval       EFI_INVALID_PARAMETER Handle is NULL or does not refer to a valid ACPI object.\r
 **/\r
   @retval       EFI_SUCCESS           Success.\r
   @retval       EFI_INVALID_PARAMETER Handle is NULL or does not refer to a valid ACPI object.\r
 **/\r


@@ -275,7 +275,7 @@ GetOption (
 \r
 /**\r
   Change information about an ACPI object.\r
 \r
 /**\r
   Change information about an ACPI object.\r

-  \r
+\r

   @param[in]  Handle    ACPI object handle.\r
   @param[in]  Index     Index of the data to retrieve from the object. In general, indexes read from left-to-right\r
                         in the ACPI encoding, with index 0 always being the ACPI opcode.\r
   @param[in]  Handle    ACPI object handle.\r
   @param[in]  Index     Index of the data to retrieve from the object. In general, indexes read from left-to-right\r
                         in the ACPI encoding, with index 0 always being the ACPI opcode.\r


@@ -299,14 +299,14 @@ SetOption (
 \r
 /**\r
   Return the child ACPI objects.\r
 \r
 /**\r
   Return the child ACPI objects.\r

-  \r
+\r

   @param[in]        ParentHandle    Parent handle.\r
   @param[in, out]   Handle          On entry, points to the previously returned handle or NULL to start with the first\r
                                     handle. On return, points to the next returned ACPI handle or NULL if there are no\r
                                     child objects.\r
 \r
   @retval EFI_SUCCESS               Success\r
   @param[in]        ParentHandle    Parent handle.\r
   @param[in, out]   Handle          On entry, points to the previously returned handle or NULL to start with the first\r
                                     handle. On return, points to the next returned ACPI handle or NULL if there are no\r
                                     child objects.\r
 \r
   @retval EFI_SUCCESS               Success\r

-  @retval EFI_INVALID_PARAMETER     ParentHandle is NULL or does not refer to a valid ACPI object.                                \r
+  @retval EFI_INVALID_PARAMETER     ParentHandle is NULL or does not refer to a valid ACPI object.\r

 **/\r
 EFI_STATUS\r
 EFIAPI\r
 **/\r
 EFI_STATUS\r
 EFIAPI\r


@@ -317,14 +317,14 @@ GetChild (
 \r
 /**\r
   Returns the handle of the ACPI object representing the specified ACPI path\r
 \r
 /**\r
   Returns the handle of the ACPI object representing the specified ACPI path\r

-  \r
+\r

   @param[in]    HandleIn    Points to the handle of the object representing the starting point for the path search.\r
   @param[in]    AcpiPath    Points to the ACPI path, which conforms to the ACPI encoded path format.\r
   @param[out]   HandleOut   On return, points to the ACPI object which represents AcpiPath, relative to\r
                             HandleIn.\r
   @param[in]    HandleIn    Points to the handle of the object representing the starting point for the path search.\r
   @param[in]    AcpiPath    Points to the ACPI path, which conforms to the ACPI encoded path format.\r
   @param[out]   HandleOut   On return, points to the ACPI object which represents AcpiPath, relative to\r
                             HandleIn.\r

-                            \r
+\r

   @retval EFI_SUCCESS           Success\r
   @retval EFI_SUCCESS           Success\r

-  @retval EFI_INVALID_PARAMETER HandleIn is NULL or does not refer to a valid ACPI object.                            \r
+  @retval EFI_INVALID_PARAMETER HandleIn is NULL or does not refer to a valid ACPI object.\r

 **/\r
 EFI_STATUS\r
 EFIAPI\r
 **/\r
 EFI_STATUS\r
 EFIAPI\r


@@ -340,21 +340,21 @@ FindPath (
 \r
 /**\r
   Create a handle from an ACPI opcode\r
 \r
 /**\r
   Create a handle from an ACPI opcode\r

-  \r
+\r

   @param[in]  Buffer                 Points to the ACPI opcode.\r
   @param[in]  BufferSize             Max buffer size.\r
   @param[out] Handle                 Upon return, holds the handle.\r
   @param[in]  Buffer                 Points to the ACPI opcode.\r
   @param[in]  BufferSize             Max buffer size.\r
   @param[out] Handle                 Upon return, holds the handle.\r

-  \r
+\r

   @retval   EFI_SUCCESS             Success\r
   @retval   EFI_INVALID_PARAMETER   Buffer is NULL or Handle is NULL or Buffer points to an\r
                                     invalid opcode.\r
   @retval   EFI_SUCCESS             Success\r
   @retval   EFI_INVALID_PARAMETER   Buffer is NULL or Handle is NULL or Buffer points to an\r
                                     invalid opcode.\r

-  \r
+\r

 **/\r
 EFI_STATUS\r
 SdtOpenEx (\r
   IN    VOID            *Buffer,\r
   IN    UINTN           BufferSize,\r
 **/\r
 EFI_STATUS\r
 SdtOpenEx (\r
   IN    VOID            *Buffer,\r
   IN    UINTN           BufferSize,\r

-  OUT   EFI_ACPI_HANDLE *Handle \r
+  OUT   EFI_ACPI_HANDLE *Handle\r

   );\r
 \r
 //\r
   );\r
 \r
 //\r


@@ -365,8 +365,8 @@ SdtOpenEx (
   Get AML NameString size.\r
 \r
   @param[in]    Buffer     AML NameString.\r
   Get AML NameString size.\r
 \r
   @param[in]    Buffer     AML NameString.\r

-  @param[out]   BufferSize AML NameString size \r
-  \r
+  @param[out]   BufferSize AML NameString size\r
+\r

   @retval       EFI_SUCCESS           Success.\r
   @retval       EFI_INVALID_PARAMETER Buffer does not refer to a valid AML NameString.\r
 **/\r
   @retval       EFI_SUCCESS           Success.\r
   @retval       EFI_INVALID_PARAMETER Buffer does not refer to a valid AML NameString.\r
 **/\r


@@ -416,11 +416,11 @@ AmlSearchByOpByte (
 \r
 /**\r
   Return object size.\r
 \r
 /**\r
   Return object size.\r

-  \r
+\r

   @param[in]    AmlByteEncoding      AML Byte Encoding.\r
   @param[in]    Buffer               AML object buffer.\r
   @param[in]    MaxBufferSize        AML object buffer MAX size. The parser can not parse any data exceed this region.\r
   @param[in]    AmlByteEncoding      AML Byte Encoding.\r
   @param[in]    Buffer               AML object buffer.\r
   @param[in]    MaxBufferSize        AML object buffer MAX size. The parser can not parse any data exceed this region.\r

-  \r
+\r

   @return       Size of the object.\r
 **/\r
 UINTN\r
   @return       Size of the object.\r
 **/\r
 UINTN\r


@@ -432,9 +432,9 @@ AmlGetObjectSize (
 \r
 /**\r
   Return object name.\r
 \r
 /**\r
   Return object name.\r

-  \r
+\r

   @param[in]    AmlHandle            AML handle.\r
   @param[in]    AmlHandle            AML handle.\r

-  \r
+\r

   @return       Name of the object.\r
 **/\r
 CHAR8 *\r
   @return       Name of the object.\r
 **/\r
 CHAR8 *\r


@@ -444,7 +444,7 @@ AmlGetObjectName (
 \r
 /**\r
   Retrieve information according to AmlHandle\r
 \r
 /**\r
   Retrieve information according to AmlHandle\r

-  \r
+\r

   @param[in]    AmlHandle            AML handle.\r
   @param[in]    Index                Index of the data to retrieve from the object. In general, indexes read from left-to-right\r
                                      in the ACPI encoding, with index 0 always being the ACPI opcode.\r
   @param[in]    AmlHandle            AML handle.\r
   @param[in]    Index                Index of the data to retrieve from the object. In general, indexes read from left-to-right\r
                                      in the ACPI encoding, with index 0 always being the ACPI opcode.\r


@@ -452,7 +452,7 @@ AmlGetObjectName (
                                      for the specified index.\r
   @param[out]   Data                 Upon return, points to the pointer to the data.\r
   @param[out]   DataSize             Upon return, points to the size of Data.\r
                                      for the specified index.\r
   @param[out]   Data                 Upon return, points to the pointer to the data.\r
   @param[out]   DataSize             Upon return, points to the size of Data.\r

-  \r
+\r

   @retval       EFI_SUCCESS           Success.\r
   @retval       EFI_INVALID_PARAMETER AmlHandle does not refer to a valid ACPI object.\r
 **/\r
   @retval       EFI_SUCCESS           Success.\r
   @retval       EFI_INVALID_PARAMETER AmlHandle does not refer to a valid ACPI object.\r
 **/\r


@@ -467,10 +467,10 @@ AmlParseOptionHandleCommon (
 \r
 /**\r
   Return offset of last option.\r
 \r
 /**\r
   Return offset of last option.\r

-  \r
+\r

   @param[in]    AmlHandle            AML Handle.\r
   @param[out]   Buffer               Upon return, points to the offset after last option.\r
   @param[in]    AmlHandle            AML Handle.\r
   @param[out]   Buffer               Upon return, points to the offset after last option.\r

-  \r
+\r

   @retval       EFI_SUCCESS           Success.\r
   @retval       EFI_INVALID_PARAMETER AmlHandle does not refer to a valid ACPI object.\r
 **/\r
   @retval       EFI_SUCCESS           Success.\r
   @retval       EFI_INVALID_PARAMETER AmlHandle does not refer to a valid ACPI object.\r
 **/\r


@@ -482,14 +482,14 @@ AmlGetOffsetAfterLastOption (
 \r
 /**\r
   Return the child ACPI objects from Root Handle.\r
 \r
 /**\r
   Return the child ACPI objects from Root Handle.\r

-  \r
+\r

   @param[in]        AmlParentHandle Parent handle. It is Root Handle.\r
   @param[in]        AmlHandle       The previously returned handle or NULL to start with the first handle.\r
   @param[out]       Buffer          On return, points to the next returned ACPI handle or NULL if there are no\r
                                     child objects.\r
 \r
   @retval EFI_SUCCESS               Success\r
   @param[in]        AmlParentHandle Parent handle. It is Root Handle.\r
   @param[in]        AmlHandle       The previously returned handle or NULL to start with the first handle.\r
   @param[out]       Buffer          On return, points to the next returned ACPI handle or NULL if there are no\r
                                     child objects.\r
 \r
   @retval EFI_SUCCESS               Success\r

-  @retval EFI_INVALID_PARAMETER     ParentHandle is NULL or does not refer to a valid ACPI object.                                \r
+  @retval EFI_INVALID_PARAMETER     ParentHandle is NULL or does not refer to a valid ACPI object.\r

 **/\r
 EFI_STATUS\r
 AmlGetChildFromRoot (\r
 **/\r
 EFI_STATUS\r
 AmlGetChildFromRoot (\r


@@ -500,14 +500,14 @@ AmlGetChildFromRoot (
 \r
 /**\r
   Return the child ACPI objects from Non-Root Handle.\r
 \r
 /**\r
   Return the child ACPI objects from Non-Root Handle.\r

-  \r
+\r

   @param[in]        AmlParentHandle Parent handle. It is Non-Root Handle.\r
   @param[in]        AmlHandle       The previously returned handle or NULL to start with the first handle.\r
   @param[out]       Buffer          On return, points to the next returned ACPI handle or NULL if there are no\r
                                     child objects.\r
 \r
   @retval EFI_SUCCESS               Success\r
   @param[in]        AmlParentHandle Parent handle. It is Non-Root Handle.\r
   @param[in]        AmlHandle       The previously returned handle or NULL to start with the first handle.\r
   @param[out]       Buffer          On return, points to the next returned ACPI handle or NULL if there are no\r
                                     child objects.\r
 \r
   @retval EFI_SUCCESS               Success\r

-  @retval EFI_INVALID_PARAMETER     ParentHandle is NULL or does not refer to a valid ACPI object.                                \r
+  @retval EFI_INVALID_PARAMETER     ParentHandle is NULL or does not refer to a valid ACPI object.\r

 **/\r
 EFI_STATUS\r
 AmlGetChildFromNonRoot (\r
 **/\r
 EFI_STATUS\r
 AmlGetChildFromNonRoot (\r


@@ -531,16 +531,16 @@ AmlNameFromAslName (
 \r
 /**\r
   Returns the handle of the ACPI object representing the specified ACPI AML path\r
 \r
 /**\r
   Returns the handle of the ACPI object representing the specified ACPI AML path\r

-  \r
+\r

   @param[in]    AmlHandle   Points to the handle of the object representing the starting point for the path search.\r
   @param[in]    AmlPath     Points to the ACPI AML path.\r
   @param[out]   Buffer      On return, points to the ACPI object which represents AcpiPath, relative to\r
                             HandleIn.\r
   @param[in]    FromRoot    TRUE means to find AML path from \ (Root) Node.\r
                             FALSE means to find AML path from this Node (The HandleIn).\r
   @param[in]    AmlHandle   Points to the handle of the object representing the starting point for the path search.\r
   @param[in]    AmlPath     Points to the ACPI AML path.\r
   @param[out]   Buffer      On return, points to the ACPI object which represents AcpiPath, relative to\r
                             HandleIn.\r
   @param[in]    FromRoot    TRUE means to find AML path from \ (Root) Node.\r
                             FALSE means to find AML path from this Node (The HandleIn).\r

-                            \r
+\r

   @retval EFI_SUCCESS           Success\r
   @retval EFI_SUCCESS           Success\r

-  @retval EFI_INVALID_PARAMETER HandleIn does not refer to a valid ACPI object.                            \r
+  @retval EFI_INVALID_PARAMETER HandleIn does not refer to a valid ACPI object.\r

 **/\r
 EFI_STATUS\r
 AmlFindPath (\r
 **/\r
 EFI_STATUS\r
 AmlFindPath (\r


@@ -574,7 +574,7 @@ AmlPrintNameSeg (
   Check if it is AML Root name\r
 \r
   @param[in]    Buffer AML path.\r
   Check if it is AML Root name\r
 \r
   @param[in]    Buffer AML path.\r

-  \r
+\r

   @retval       TRUE  AML path is root.\r
   @retval       FALSE AML path is not root.\r
 **/\r
   @retval       TRUE  AML path is root.\r
   @retval       FALSE AML path is not root.\r
 **/\r

diff --git a/MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiTable.h b/MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiTable.h
index d6d81ae04d4fd95e1859788a9659b367ce8144ab..a2b419d45a4197f57afd1abe091cae2d6bcd5e99 100644 (file)
--- a/MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiTable.h
+++ b/MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiTable.h
@@ -1,7 +1,7 @@
 /** @file\r
   ACPI Table Protocol Driver\r
 \r
 /** @file\r
   ACPI Table Protocol Driver\r
 \r

-  Copyright (c) 2006 - 2016, Intel Corporation. All rights reserved.<BR>\r
+  Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r

   This program and the accompanying materials\r
   are licensed and made available under the terms and conditions of the BSD License\r
   which accompanies this distribution.  The full text of the license may be found at\r
   This program and the accompanying materials\r
   are licensed and made available under the terms and conditions of the BSD License\r
   which accompanies this distribution.  The full text of the license may be found at\r


@@ -150,14 +150,14 @@ AcpiTableAcpiTableConstructor (
 \r
 /**\r
   Entry point of the ACPI table driver.\r
 \r
 /**\r
   Entry point of the ACPI table driver.\r

-  Creates and initializes an instance of the ACPI Table \r
+  Creates and initializes an instance of the ACPI Table\r

   Protocol and installs it on a new handle.\r
 \r
   @param  ImageHandle   A handle for the image that is initializing this driver\r
   @param  SystemTable   A pointer to the EFI system table\r
 \r
   @return EFI_SUCCESS           Driver initialized successfully\r
   Protocol and installs it on a new handle.\r
 \r
   @param  ImageHandle   A handle for the image that is initializing this driver\r
   @param  SystemTable   A pointer to the EFI system table\r
 \r
   @return EFI_SUCCESS           Driver initialized successfully\r

-  @return EFI_LOAD_ERROR        Failed to Initialize or has been loaded \r
+  @return EFI_LOAD_ERROR        Failed to Initialize or has been loaded\r

   @return EFI_OUT_OF_RESOURCES  Could not allocate needed resources\r
 \r
 **/\r
   @return EFI_OUT_OF_RESOURCES  Could not allocate needed resources\r
 \r
 **/\r


@@ -176,7 +176,7 @@ InitializeAcpiTableDxe (
 \r
   @param[in]  Handle      Table to find.\r
   @param[in]  TableList   Table list to search\r
 \r
   @param[in]  Handle      Table to find.\r
   @param[in]  TableList   Table list to search\r

-  @param[out] Table       Pointer to table found. \r
+  @param[out] Table       Pointer to table found.\r

 \r
   @retval EFI_SUCCESS              The function completed successfully.\r
   @retval EFI_NOT_FOUND            No table found matching the handle specified.\r
 \r
   @retval EFI_SUCCESS              The function completed successfully.\r
   @retval EFI_NOT_FOUND            No table found matching the handle specified.\r

diff --git a/MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiTableDxe.inf b/MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiTableDxe.inf
index ffb8d08f985b161a8e5381ad6a664f098a468c7d..32c66785d5523d12981ba2769c2b6a5e8887c34d 100644 (file)
--- a/MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiTableDxe.inf
+++ b/MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiTableDxe.inf
@@ -1,16 +1,16 @@
 ## @file\r
 #  ACPI Table Protocol Driver\r
 #\r
 ## @file\r
 #  ACPI Table Protocol Driver\r
 #\r

-#  This driver initializes ACPI tables (Rsdp, Rsdt and Xsdt) and produces UEFI/PI \r
+#  This driver initializes ACPI tables (Rsdp, Rsdt and Xsdt) and produces UEFI/PI\r

 #  services to install/uninstall/manage ACPI tables.\r
 #\r
 #  services to install/uninstall/manage ACPI tables.\r
 #\r

-#  Copyright (c) 2006 - 2016, Intel Corporation. All rights reserved.<BR>\r
+#  Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r

 #  Copyright (c) 2016, Linaro Ltd. All rights reserved.<BR>\r
 #  This program and the accompanying materials are\r
 #  licensed and made available under the terms and conditions of the BSD License\r
 #  which accompanies this distribution.  The full text of the license may be found at\r
 #  http://opensource.org/licenses/bsd-license.php\r
 #  Copyright (c) 2016, Linaro Ltd. All rights reserved.<BR>\r
 #  This program and the accompanying materials are\r
 #  licensed and made available under the terms and conditions of the BSD License\r
 #  which accompanies this distribution.  The full text of the license may be found at\r
 #  http://opensource.org/licenses/bsd-license.php\r

-#  \r
+#\r

 #  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 #  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 #\r
 #  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 #  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 #\r

diff --git a/MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiTableDxe.uni b/MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiTableDxe.uni
index b8d82f30fe95e703338206a3566a7cdcf07e926c..60fbc2f986d4715df10cddb443dfc748ba66769b 100644 (file)
--- a/MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiTableDxe.uni
+++ b/MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiTableDxe.uni
@@ -1,13 +1,13 @@
 // /** @file\r
 // AcpiTableDxe Module Localized Abstract and Description Content\r
 //\r
 // /** @file\r
 // AcpiTableDxe Module Localized Abstract and Description Content\r
 //\r

-// Copyright (c) 2012 - 2016, Intel Corporation. All rights reserved.<BR>\r
+// Copyright (c) 2012 - 2018, Intel Corporation. All rights reserved.<BR>\r

 //\r
 // This program and the accompanying materials are\r
 // licensed and made available under the terms and conditions of the BSD License\r
 // which accompanies this distribution.  The full text of the license may be found at\r
 // http://opensource.org/licenses/bsd-license.php\r
 //\r
 // This program and the accompanying materials are\r
 // licensed and made available under the terms and conditions of the BSD License\r
 // which accompanies this distribution.  The full text of the license may be found at\r
 // http://opensource.org/licenses/bsd-license.php\r

-// \r
+//\r

 // THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 // WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 //\r
 // THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 // WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 //\r

diff --git a/MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiTableDxeExtra.uni b/MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiTableDxeExtra.uni
index ea2b025a9de8a5f5c7676d5eb7ae1288f15451a9..ebd6aa5a90463150c8ad20e0c181df4760fc5b81 100644 (file)
--- a/MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiTableDxeExtra.uni
+++ b/MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiTableDxeExtra.uni
@@ -1,7 +1,7 @@
 // /** @file\r
 // AcpiTableDxe Localized Strings and Content\r
 //\r
 // /** @file\r
 // AcpiTableDxe Localized Strings and Content\r
 //\r

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

 //\r
 // This program and the accompanying materials are\r
 // licensed and made available under the terms and conditions of the BSD License\r
 //\r
 // This program and the accompanying materials are\r
 // licensed and made available under the terms and conditions of the BSD License\r


@@ -13,8 +13,8 @@
 //\r
 // **/\r
 \r
 //\r
 // **/\r
 \r

-#string STR_PROPERTIES_MODULE_NAME \r
-#language en-US \r
+#string STR_PROPERTIES_MODULE_NAME\r
+#language en-US\r

 "ACPI Table DXE Driver"\r
 \r
 \r
 "ACPI Table DXE Driver"\r
 \r
 \r

diff --git a/MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiTableProtocol.c b/MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiTableProtocol.c
index 05340f80db0d8a0f4088dd5554d0287a392751d1..429ff5744f89193af82c5b87ca4d36a4414f3a64 100644 (file)
--- a/MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiTableProtocol.c
+++ b/MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiTableProtocol.c
@@ -1,7 +1,7 @@
 /** @file\r
   ACPI Table Protocol Implementation\r
 \r
 /** @file\r
   ACPI Table Protocol Implementation\r
 \r

-  Copyright (c) 2006 - 2016, Intel Corporation. All rights reserved.<BR>\r
+  Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r

   Copyright (c) 2016, Linaro Ltd. All rights reserved.<BR>\r
   This program and the accompanying materials\r
   are licensed and made available under the terms and conditions of the BSD License\r
   Copyright (c) 2016, Linaro Ltd. All rights reserved.<BR>\r
   This program and the accompanying materials\r
   are licensed and made available under the terms and conditions of the BSD License\r


@@ -18,9 +18,9 @@
 //\r
 #include "AcpiTable.h"\r
 //\r
 //\r
 #include "AcpiTable.h"\r
 //\r

-// The maximum number of tables that pre-allocated. \r
+// The maximum number of tables that pre-allocated.\r

 //\r
 //\r

-UINTN         mEfiAcpiMaxNumTables = EFI_ACPI_MAX_NUM_TABLES; \r
+UINTN         mEfiAcpiMaxNumTables = EFI_ACPI_MAX_NUM_TABLES;\r

 \r
 //\r
 // Allocation strategy to use for AllocatePages ().\r
 \r
 //\r
 // Allocation strategy to use for AllocatePages ().\r


@@ -196,7 +196,7 @@ PublishTables (
   @param  TableKey             Reurns a key to refer to the ACPI table.\r
 \r
   @return EFI_SUCCESS            The table was successfully inserted.\r
   @param  TableKey             Reurns a key to refer to the ACPI table.\r
 \r
   @return EFI_SUCCESS            The table was successfully inserted.\r

-  @return EFI_INVALID_PARAMETER  Either AcpiTableBuffer is NULL, TableKey is NULL, or AcpiTableBufferSize \r
+  @return EFI_INVALID_PARAMETER  Either AcpiTableBuffer is NULL, TableKey is NULL, or AcpiTableBufferSize\r

                                  and the size field embedded in the ACPI table pointed to by AcpiTableBuffer\r
                                  are not in sync.\r
   @return EFI_OUT_OF_RESOURCES   Insufficient resources exist to complete the request.\r
                                  and the size field embedded in the ACPI table pointed to by AcpiTableBuffer\r
                                  are not in sync.\r
   @return EFI_OUT_OF_RESOURCES   Insufficient resources exist to complete the request.\r


@@ -253,7 +253,7 @@ InstallAcpiTable (
                );\r
   }\r
   FreePool (AcpiTableBufferConst);\r
                );\r
   }\r
   FreePool (AcpiTableBufferConst);\r

-  \r
+\r

   //\r
   // Add a new table successfully, notify registed callback\r
   //\r
   //\r
   // Add a new table successfully, notify registed callback\r
   //\r


@@ -342,8 +342,8 @@ ReallocateAcpiTableBuffer (
   EFI_ACPI_TABLE_INSTANCE  TempPrivateData;\r
   EFI_STATUS               Status;\r
   UINT64                   CurrentData;\r
   EFI_ACPI_TABLE_INSTANCE  TempPrivateData;\r
   EFI_STATUS               Status;\r
   UINT64                   CurrentData;\r

-   \r
-  CopyMem (&TempPrivateData, AcpiTableInstance, sizeof (EFI_ACPI_TABLE_INSTANCE)); \r
+\r
+  CopyMem (&TempPrivateData, AcpiTableInstance, sizeof (EFI_ACPI_TABLE_INSTANCE));\r

   //\r
   // Enlarge the max table number from mEfiAcpiMaxNumTables to mEfiAcpiMaxNumTables + EFI_ACPI_MAX_NUM_TABLES\r
   //\r
   //\r
   // Enlarge the max table number from mEfiAcpiMaxNumTables to mEfiAcpiMaxNumTables + EFI_ACPI_MAX_NUM_TABLES\r
   //\r


@@ -384,7 +384,7 @@ ReallocateAcpiTableBuffer (
 \r
   Pointer = (UINT8 *) (UINTN) PageAddress;\r
   ZeroMem (Pointer, TotalSize);\r
 \r
   Pointer = (UINT8 *) (UINTN) PageAddress;\r
   ZeroMem (Pointer, TotalSize);\r

-  \r
+\r

   AcpiTableInstance->Rsdt1 = (EFI_ACPI_DESCRIPTION_HEADER *) Pointer;\r
   if ((PcdGet32 (PcdAcpiExposedTableVersions) & EFI_ACPI_TABLE_VERSION_1_0B) != 0) {\r
     Pointer += (sizeof (EFI_ACPI_DESCRIPTION_HEADER) + NewMaxTableNumber * sizeof (UINT32));\r
   AcpiTableInstance->Rsdt1 = (EFI_ACPI_DESCRIPTION_HEADER *) Pointer;\r
   if ((PcdGet32 (PcdAcpiExposedTableVersions) & EFI_ACPI_TABLE_VERSION_1_0B) != 0) {\r
     Pointer += (sizeof (EFI_ACPI_DESCRIPTION_HEADER) + NewMaxTableNumber * sizeof (UINT32));\r


@@ -404,14 +404,14 @@ ReallocateAcpiTableBuffer (
   CopyMem (&AcpiTableInstance->Rsdp3->XsdtAddress, &CurrentData, sizeof (UINT64));\r
 \r
   //\r
   CopyMem (&AcpiTableInstance->Rsdp3->XsdtAddress, &CurrentData, sizeof (UINT64));\r
 \r
   //\r

-  // copy the original Rsdt1, Rsdt3 and Xsdt structure to new buffer \r
+  // copy the original Rsdt1, Rsdt3 and Xsdt structure to new buffer\r

   //\r
   if ((PcdGet32 (PcdAcpiExposedTableVersions) & EFI_ACPI_TABLE_VERSION_1_0B) != 0) {\r
   //\r
   if ((PcdGet32 (PcdAcpiExposedTableVersions) & EFI_ACPI_TABLE_VERSION_1_0B) != 0) {\r

-    CopyMem (AcpiTableInstance->Rsdt1, TempPrivateData.Rsdt1, (sizeof (EFI_ACPI_DESCRIPTION_HEADER) + mEfiAcpiMaxNumTables * sizeof (UINT32))); \r
-    CopyMem (AcpiTableInstance->Rsdt3, TempPrivateData.Rsdt3, (sizeof (EFI_ACPI_DESCRIPTION_HEADER) + mEfiAcpiMaxNumTables * sizeof (UINT32))); \r
+    CopyMem (AcpiTableInstance->Rsdt1, TempPrivateData.Rsdt1, (sizeof (EFI_ACPI_DESCRIPTION_HEADER) + mEfiAcpiMaxNumTables * sizeof (UINT32)));\r
+    CopyMem (AcpiTableInstance->Rsdt3, TempPrivateData.Rsdt3, (sizeof (EFI_ACPI_DESCRIPTION_HEADER) + mEfiAcpiMaxNumTables * sizeof (UINT32)));\r

   }\r
   CopyMem (AcpiTableInstance->Xsdt, TempPrivateData.Xsdt, (sizeof (EFI_ACPI_DESCRIPTION_HEADER) + mEfiAcpiMaxNumTables * sizeof (UINT64)));\r
   }\r
   CopyMem (AcpiTableInstance->Xsdt, TempPrivateData.Xsdt, (sizeof (EFI_ACPI_DESCRIPTION_HEADER) + mEfiAcpiMaxNumTables * sizeof (UINT64)));\r

-  \r
+\r

   //\r
   // Calculate orignal ACPI table buffer size\r
   //\r
   //\r
   // Calculate orignal ACPI table buffer size\r
   //\r


@@ -426,10 +426,10 @@ ReallocateAcpiTableBuffer (
   }\r
 \r
   gBS->FreePages ((EFI_PHYSICAL_ADDRESS)(UINTN)TempPrivateData.Rsdt1, EFI_SIZE_TO_PAGES (TotalSize));\r
   }\r
 \r
   gBS->FreePages ((EFI_PHYSICAL_ADDRESS)(UINTN)TempPrivateData.Rsdt1, EFI_SIZE_TO_PAGES (TotalSize));\r

-  \r
+\r

   //\r
   // Update the Max ACPI table number\r
   //\r
   // Update the Max ACPI table number\r

-  // \r
+  //\r

   mEfiAcpiMaxNumTables = NewMaxTableNumber;\r
   return EFI_SUCCESS;\r
 }\r
   mEfiAcpiMaxNumTables = NewMaxTableNumber;\r
   return EFI_SUCCESS;\r
 }\r


@@ -508,7 +508,7 @@ AddTableToList (
   //\r
   // Allocation memory type depends on the type of the table\r
   //\r
   //\r
   // Allocation memory type depends on the type of the table\r
   //\r

-  if ((CurrentTableSignature == EFI_ACPI_2_0_FIRMWARE_ACPI_CONTROL_STRUCTURE_SIGNATURE) || \r
+  if ((CurrentTableSignature == EFI_ACPI_2_0_FIRMWARE_ACPI_CONTROL_STRUCTURE_SIGNATURE) ||\r

       (CurrentTableSignature == EFI_ACPI_4_0_UEFI_ACPI_DATA_TABLE_SIGNATURE)) {\r
     //\r
     // Allocate memory for the FACS.  This structure must be aligned\r
       (CurrentTableSignature == EFI_ACPI_4_0_UEFI_ACPI_DATA_TABLE_SIGNATURE)) {\r
     //\r
     // Allocate memory for the FACS.  This structure must be aligned\r


@@ -634,7 +634,7 @@ AddTableToList (
 \r
       //\r
       // Update pointers in FADT.  If tables don't exist this will put NULL pointers there.\r
 \r
       //\r
       // Update pointers in FADT.  If tables don't exist this will put NULL pointers there.\r

-      // Note: If the FIRMWARE_CTRL is non-zero, then X_FIRMWARE_CTRL must be zero, and \r
+      // Note: If the FIRMWARE_CTRL is non-zero, then X_FIRMWARE_CTRL must be zero, and\r

       // vice-versa.\r
       //\r
       if ((UINT64)(UINTN)AcpiTableInstance->Facs3 < BASE_4GB) {\r
       // vice-versa.\r
       //\r
       if ((UINT64)(UINTN)AcpiTableInstance->Facs3 < BASE_4GB) {\r


@@ -682,7 +682,7 @@ AddTableToList (
         &AcpiTableInstance->Fadt3->Header.OemId,\r
         6\r
         );\r
         &AcpiTableInstance->Fadt3->Header.OemId,\r
         6\r
         );\r

-      \r
+\r

       if ((PcdGet32 (PcdAcpiExposedTableVersions) & EFI_ACPI_TABLE_VERSION_1_0B) != 0) {\r
         //\r
         // RSDT OEM information is updated to match FADT OEM information.\r
       if ((PcdGet32 (PcdAcpiExposedTableVersions) & EFI_ACPI_TABLE_VERSION_1_0B) != 0) {\r
         //\r
         // RSDT OEM information is updated to match FADT OEM information.\r


@@ -714,7 +714,7 @@ AddTableToList (
         sizeof (UINT64)\r
         );\r
       AcpiTableInstance->Xsdt->OemRevision = AcpiTableInstance->Fadt3->Header.OemRevision;\r
         sizeof (UINT64)\r
         );\r
       AcpiTableInstance->Xsdt->OemRevision = AcpiTableInstance->Fadt3->Header.OemRevision;\r

-    }    \r
+    }\r

     //\r
     // Checksum the table\r
     //\r
     //\r
     // Checksum the table\r
     //\r


@@ -782,7 +782,7 @@ AddTableToList (
       //\r
       if (AcpiTableInstance->Fadt3 != NULL) {\r
         //\r
       //\r
       if (AcpiTableInstance->Fadt3 != NULL) {\r
         //\r

-        // Note: If the FIRMWARE_CTRL is non-zero, then X_FIRMWARE_CTRL must be zero, and \r
+        // Note: If the FIRMWARE_CTRL is non-zero, then X_FIRMWARE_CTRL must be zero, and\r

         // vice-versa.\r
         //\r
         if ((UINT64)(UINTN)AcpiTableInstance->Facs3 < BASE_4GB) {\r
         // vice-versa.\r
         //\r
         if ((UINT64)(UINTN)AcpiTableInstance->Facs3 < BASE_4GB) {\r


@@ -854,7 +854,7 @@ AddTableToList (
           );\r
       }\r
     }\r
           );\r
       }\r
     }\r

-    \r
+\r

     if ((Version & ACPI_TABLE_VERSION_GTE_2_0) != 0) {\r
       //\r
       // Save a pointer to the table\r
     if ((Version & ACPI_TABLE_VERSION_GTE_2_0) != 0) {\r
       //\r
       // Save a pointer to the table\r


@@ -900,7 +900,7 @@ AddTableToList (
           Checksum)\r
           );\r
       }\r
           Checksum)\r
           );\r
       }\r

-    }        \r
+    }\r

     //\r
     // Checksum the table\r
     //\r
     //\r
     // Checksum the table\r
     //\r


@@ -1050,7 +1050,7 @@ AddTableToList (
 \r
   @param  Handle      Table to find.\r
   @param  TableList   Table list to search\r
 \r
   @param  Handle      Table to find.\r
   @param  TableList   Table list to search\r

-  @param  Table       Pointer to table found. \r
+  @param  Table       Pointer to table found.\r

 \r
   @return EFI_SUCCESS    The function completed successfully.\r
   @return EFI_NOT_FOUND  No table found matching the handle specified.\r
 \r
   @return EFI_SUCCESS    The function completed successfully.\r
   @return EFI_NOT_FOUND  No table found matching the handle specified.\r


@@ -1100,7 +1100,7 @@ FindTableByHandle (
   For Acpi 1.0 tables, pass in the Rsdt.\r
   For Acpi 2.0 tables, pass in both Rsdt and Xsdt.\r
 \r
   For Acpi 1.0 tables, pass in the Rsdt.\r
   For Acpi 2.0 tables, pass in both Rsdt and Xsdt.\r
 \r

-  @param  Table                 Pointer to table found. \r
+  @param  Table                 Pointer to table found.\r

   @param  NumberOfTableEntries  Current number of table entries in the RSDT/XSDT\r
   @param  Rsdt                  Pointer to the RSDT to remove from\r
   @param  Xsdt                  Pointer to the Xsdt to remove from\r
   @param  NumberOfTableEntries  Current number of table entries in the RSDT/XSDT\r
   @param  Rsdt                  Pointer to the RSDT to remove from\r
   @param  Xsdt                  Pointer to the Xsdt to remove from\r


@@ -1320,7 +1320,7 @@ DeleteTable (
       // Remove this version from the table\r
       //\r
       Table->Version = Table->Version &~(Version & ACPI_TABLE_VERSION_GTE_2_0);\r
       // Remove this version from the table\r
       //\r
       Table->Version = Table->Version &~(Version & ACPI_TABLE_VERSION_GTE_2_0);\r

-      \r
+\r

       //\r
       // Remove from Rsdt and Xsdt.  We don't care about the return value\r
       // because it is acceptable for the table to not exist in Rsdt/Xsdt.\r
       //\r
       // Remove from Rsdt and Xsdt.  We don't care about the return value\r
       // because it is acceptable for the table to not exist in Rsdt/Xsdt.\r


@@ -1334,7 +1334,7 @@ DeleteTable (
           AcpiTableInstance->Xsdt\r
           );\r
       }\r
           AcpiTableInstance->Xsdt\r
           );\r
       }\r

-    }    \r
+    }\r

     //\r
     // Free the table, clean up any dependent tables and our private data pointers.\r
     //\r
     //\r
     // Free the table, clean up any dependent tables and our private data pointers.\r
     //\r


@@ -1392,7 +1392,7 @@ DeleteTable (
             Checksum)\r
             );\r
         }\r
             Checksum)\r
             );\r
         }\r

-      }    \r
+      }\r

       break;\r
 \r
     case EFI_ACPI_3_0_DIFFERENTIATED_SYSTEM_DESCRIPTION_TABLE_SIGNATURE:\r
       break;\r
 \r
     case EFI_ACPI_3_0_DIFFERENTIATED_SYSTEM_DESCRIPTION_TABLE_SIGNATURE:\r


@@ -1417,7 +1417,7 @@ DeleteTable (
         }\r
       }\r
 \r
         }\r
       }\r
 \r

-      \r
+\r

       if ((Version & ACPI_TABLE_VERSION_GTE_2_0) != 0) {\r
         AcpiTableInstance->Dsdt3 = NULL;\r
 \r
       if ((Version & ACPI_TABLE_VERSION_GTE_2_0) != 0) {\r
         AcpiTableInstance->Dsdt3 = NULL;\r
 \r


@@ -1640,7 +1640,7 @@ ChecksumCommonTables (
     OFFSET_OF (EFI_ACPI_DESCRIPTION_HEADER,\r
     Checksum)\r
     );\r
     OFFSET_OF (EFI_ACPI_DESCRIPTION_HEADER,\r
     Checksum)\r
     );\r

-  \r
+\r

   return EFI_SUCCESS;\r
 }\r
 \r
   return EFI_SUCCESS;\r
 }\r
 \r

diff --git a/MdeModulePkg/Universal/Acpi/AcpiTableDxe/Aml.c b/MdeModulePkg/Universal/Acpi/AcpiTableDxe/Aml.c
index 30f71bdda45c25f2f264251cdb4f1d0208a76a67..6ff11d8b0b8a01087404f5c58146406b9ecb3fb4 100644 (file)
--- a/MdeModulePkg/Universal/Acpi/AcpiTableDxe/Aml.c
+++ b/MdeModulePkg/Universal/Acpi/AcpiTableDxe/Aml.c
@@ -1,7 +1,7 @@
 /** @file\r
   ACPI Sdt Protocol Driver\r
 \r
 /** @file\r
   ACPI Sdt Protocol Driver\r
 \r

-  Copyright (c) 2010 - 2014, Intel Corporation. All rights reserved. <BR>\r
+  Copyright (c) 2010 - 2018, Intel Corporation. All rights reserved. <BR>\r

   This program and the accompanying materials\r
   are licensed and made available under the terms and conditions of the BSD License\r
   which accompanies this distribution.  The full text of the license may be found at\r
   This program and the accompanying materials\r
   are licensed and made available under the terms and conditions of the BSD License\r
   which accompanies this distribution.  The full text of the license may be found at\r


@@ -209,7 +209,7 @@ AmlSearchByOpByte (
       return &mAmlByteEncoding[Index];\r
     }\r
   }\r
       return &mAmlByteEncoding[Index];\r
     }\r
   }\r

-  \r
+\r

   return NULL;\r
 }\r
 \r
   return NULL;\r
 }\r
 \r


@@ -250,7 +250,7 @@ AmlGetPkgLength (
   UINT8             ByteCount;\r
   UINTN             RealLength;\r
   UINTN             Offset;\r
   UINT8             ByteCount;\r
   UINTN             RealLength;\r
   UINTN             Offset;\r

-  \r
+\r

   //\r
   // <bit 7-6: ByteData count that follows (0-3)>\r
   // <bit 5-4: Only used if PkgLength < 63>\r
   //\r
   // <bit 7-6: ByteData count that follows (0-3)>\r
   // <bit 5-4: Only used if PkgLength < 63>\r


@@ -265,8 +265,8 @@ AmlGetPkgLength (
   // package length value. The next ByteData will become the next least significant 8 bits\r
   // of the resulting value and so on, up to 3 ByteData bytes. Thus, the maximum package\r
   // length is 2**28.\r
   // package length value. The next ByteData will become the next least significant 8 bits\r
   // of the resulting value and so on, up to 3 ByteData bytes. Thus, the maximum package\r
   // length is 2**28.\r

-  // \r
-  \r
+  //\r
+\r

   LeadByte = *Buffer;\r
   ByteCount = (UINT8)((LeadByte >> 6) & 0x03);\r
   Offset = ByteCount + 1;\r
   LeadByte = *Buffer;\r
   ByteCount = (UINT8)((LeadByte >> 6) & 0x03);\r
   Offset = ByteCount + 1;\r


@@ -295,7 +295,7 @@ AmlGetPkgLength (
     ASSERT (0);\r
     break;\r
   }\r
     ASSERT (0);\r
     break;\r
   }\r

-  \r
+\r

   *PkgLength = RealLength;\r
   return Offset;\r
 }\r
   *PkgLength = RealLength;\r
   return Offset;\r
 }\r

diff --git a/MdeModulePkg/Universal/Acpi/AcpiTableDxe/AmlChild.c b/MdeModulePkg/Universal/Acpi/AcpiTableDxe/AmlChild.c
index c7e8af96d3d5f38fa540baddebf95836279f0e8b..28d820461fe4810e0ceb4548743252fe566186aa 100644 (file)
--- a/MdeModulePkg/Universal/Acpi/AcpiTableDxe/AmlChild.c
+++ b/MdeModulePkg/Universal/Acpi/AcpiTableDxe/AmlChild.c
@@ -1,7 +1,7 @@
 /** @file\r
   ACPI Sdt Protocol Driver\r
 \r
 /** @file\r
   ACPI Sdt Protocol Driver\r
 \r

-  Copyright (c) 2010 - 2014, Intel Corporation. All rights reserved. <BR>\r
+  Copyright (c) 2010 - 2018, Intel Corporation. All rights reserved. <BR>\r

   This program and the accompanying materials\r
   are licensed and made available under the terms and conditions of the BSD License\r
   which accompanies this distribution.  The full text of the license may be found at\r
   This program and the accompanying materials\r
   are licensed and made available under the terms and conditions of the BSD License\r
   which accompanies this distribution.  The full text of the license may be found at\r


@@ -16,14 +16,14 @@
 \r
 /**\r
   Return the child objects buffer from AML Handle's buffer.\r
 \r
 /**\r
   Return the child objects buffer from AML Handle's buffer.\r

-  \r
+\r

   @param[in]        AmlParentHandle Parent handle.\r
   @param[in]        CurrentBuffer   The current child buffer.\r
   @param[out]       Buffer          On return, points to the next returned child buffer or NULL if there are no\r
                                     child buffer.\r
 \r
   @retval EFI_SUCCESS               Success\r
   @param[in]        AmlParentHandle Parent handle.\r
   @param[in]        CurrentBuffer   The current child buffer.\r
   @param[out]       Buffer          On return, points to the next returned child buffer or NULL if there are no\r
                                     child buffer.\r
 \r
   @retval EFI_SUCCESS               Success\r

-  @retval EFI_INVALID_PARAMETER     AmlParentHandle does not refer to a valid ACPI object.                                \r
+  @retval EFI_INVALID_PARAMETER     AmlParentHandle does not refer to a valid ACPI object.\r

 **/\r
 EFI_STATUS\r
 AmlGetChildFromObjectBuffer (\r
 **/\r
 EFI_STATUS\r
 AmlGetChildFromObjectBuffer (\r


@@ -72,14 +72,14 @@ AmlGetChildFromObjectBuffer (
 \r
 /**\r
   Return the child ACPI objects from Root Handle.\r
 \r
 /**\r
   Return the child ACPI objects from Root Handle.\r

-  \r
+\r

   @param[in]        AmlParentHandle Parent handle. It is Root Handle.\r
   @param[in]        AmlHandle       The previously returned handle or NULL to start with the first handle.\r
   @param[out]       Buffer          On return, points to the next returned ACPI handle or NULL if there are no\r
                                     child objects.\r
 \r
   @retval EFI_SUCCESS               Success\r
   @param[in]        AmlParentHandle Parent handle. It is Root Handle.\r
   @param[in]        AmlHandle       The previously returned handle or NULL to start with the first handle.\r
   @param[out]       Buffer          On return, points to the next returned ACPI handle or NULL if there are no\r
                                     child objects.\r
 \r
   @retval EFI_SUCCESS               Success\r

-  @retval EFI_INVALID_PARAMETER     ParentHandle is NULL or does not refer to a valid ACPI object.                                \r
+  @retval EFI_INVALID_PARAMETER     ParentHandle is NULL or does not refer to a valid ACPI object.\r

 **/\r
 EFI_STATUS\r
 AmlGetChildFromRoot (\r
 **/\r
 EFI_STATUS\r
 AmlGetChildFromRoot (\r


@@ -104,14 +104,14 @@ AmlGetChildFromRoot (
 \r
 /**\r
   Return the child objects buffer from AML Handle's option list.\r
 \r
 /**\r
   Return the child objects buffer from AML Handle's option list.\r

-  \r
+\r

   @param[in]        AmlParentHandle Parent handle.\r
   @param[in]        AmlHandle       The current child handle.\r
   @param[out]       Buffer          On return, points to the next returned child buffer or NULL if there are no\r
                                     child buffer.\r
 \r
   @retval EFI_SUCCESS               Success\r
   @param[in]        AmlParentHandle Parent handle.\r
   @param[in]        AmlHandle       The current child handle.\r
   @param[out]       Buffer          On return, points to the next returned child buffer or NULL if there are no\r
                                     child buffer.\r
 \r
   @retval EFI_SUCCESS               Success\r

-  @retval EFI_INVALID_PARAMETER     AmlParentHandle does not refer to a valid ACPI object.                                \r
+  @retval EFI_INVALID_PARAMETER     AmlParentHandle does not refer to a valid ACPI object.\r

 **/\r
 EFI_STATUS\r
 AmlGetChildFromOptionList (\r
 **/\r
 EFI_STATUS\r
 AmlGetChildFromOptionList (\r


@@ -170,14 +170,14 @@ AmlGetChildFromOptionList (
 \r
 /**\r
   Return the child objects buffer from AML Handle's object child list.\r
 \r
 /**\r
   Return the child objects buffer from AML Handle's object child list.\r

-  \r
+\r

   @param[in]        AmlParentHandle Parent handle.\r
   @param[in]        AmlHandle       The current child handle.\r
   @param[out]       Buffer          On return, points to the next returned child buffer or NULL if there are no\r
                                     child buffer.\r
 \r
   @retval EFI_SUCCESS               Success\r
   @param[in]        AmlParentHandle Parent handle.\r
   @param[in]        AmlHandle       The current child handle.\r
   @param[out]       Buffer          On return, points to the next returned child buffer or NULL if there are no\r
                                     child buffer.\r
 \r
   @retval EFI_SUCCESS               Success\r

-  @retval EFI_INVALID_PARAMETER     AmlParentHandle does not refer to a valid ACPI object.                                \r
+  @retval EFI_INVALID_PARAMETER     AmlParentHandle does not refer to a valid ACPI object.\r

 **/\r
 EFI_STATUS\r
 AmlGetChildFromObjectChildList (\r
 **/\r
 EFI_STATUS\r
 AmlGetChildFromObjectChildList (\r


@@ -237,14 +237,14 @@ AmlGetChildFromObjectChildList (
 \r
 /**\r
   Return the child ACPI objects from Non-Root Handle.\r
 \r
 /**\r
   Return the child ACPI objects from Non-Root Handle.\r

-  \r
+\r

   @param[in]        AmlParentHandle Parent handle. It is Non-Root Handle.\r
   @param[in]        AmlHandle       The previously returned handle or NULL to start with the first handle.\r
   @param[out]       Buffer          On return, points to the next returned ACPI handle or NULL if there are no\r
                                     child objects.\r
 \r
   @retval EFI_SUCCESS               Success\r
   @param[in]        AmlParentHandle Parent handle. It is Non-Root Handle.\r
   @param[in]        AmlHandle       The previously returned handle or NULL to start with the first handle.\r
   @param[out]       Buffer          On return, points to the next returned ACPI handle or NULL if there are no\r
                                     child objects.\r
 \r
   @retval EFI_SUCCESS               Success\r

-  @retval EFI_INVALID_PARAMETER     ParentHandle is NULL or does not refer to a valid ACPI object.                                \r
+  @retval EFI_INVALID_PARAMETER     ParentHandle is NULL or does not refer to a valid ACPI object.\r

 **/\r
 EFI_STATUS\r
 AmlGetChildFromNonRoot (\r
 **/\r
 EFI_STATUS\r
 AmlGetChildFromNonRoot (\r

diff --git a/MdeModulePkg/Universal/Acpi/AcpiTableDxe/AmlNamespace.c b/MdeModulePkg/Universal/Acpi/AcpiTableDxe/AmlNamespace.c
index 03b7394c4d0d432aa32d12a641fd5bd78cafed53..d1372d7613370b268d171e2e61a132ac61359e27 100644 (file)
--- a/MdeModulePkg/Universal/Acpi/AcpiTableDxe/AmlNamespace.c
+++ b/MdeModulePkg/Universal/Acpi/AcpiTableDxe/AmlNamespace.c
@@ -1,7 +1,7 @@
 /** @file\r
   ACPI Sdt Protocol Driver\r
 \r
 /** @file\r
   ACPI Sdt Protocol Driver\r
 \r

-  Copyright (c) 2010 - 2014, Intel Corporation. All rights reserved. <BR>\r
+  Copyright (c) 2010 - 2018, Intel Corporation. All rights reserved. <BR>\r

   This program and the accompanying materials\r
   are licensed and made available under the terms and conditions of the BSD License\r
   which accompanies this distribution.  The full text of the license may be found at\r
   This program and the accompanying materials\r
   are licensed and made available under the terms and conditions of the BSD License\r
   which accompanies this distribution.  The full text of the license may be found at\r


@@ -16,11 +16,11 @@
 \r
 /**\r
   Construct node list according to the AML handle.\r
 \r
 /**\r
   Construct node list according to the AML handle.\r

-  \r
+\r

   @param[in]    AmlHandle            AML handle.\r
   @param[in]    AmlRootNodeList      AML root node list.\r
   @param[in]    AmlParentNodeList    AML parent node list.\r
   @param[in]    AmlHandle            AML handle.\r
   @param[in]    AmlRootNodeList      AML root node list.\r
   @param[in]    AmlParentNodeList    AML parent node list.\r

-  \r
+\r

   @retval       EFI_SUCCESS           Success.\r
   @retval       EFI_INVALID_PARAMETER AML handle does not refer to a valid ACPI object.\r
 **/\r
   @retval       EFI_SUCCESS           Success.\r
   @retval       EFI_INVALID_PARAMETER AML handle does not refer to a valid ACPI object.\r
 **/\r


@@ -33,11 +33,11 @@ AmlConstructNodeList (
 \r
 /**\r
   Create AML Node.\r
 \r
 /**\r
   Create AML Node.\r

-  \r
+\r

   @param[in]    NameSeg              AML NameSeg.\r
   @param[in]    Parent               AML parent node list.\r
   @param[in]    AmlByteEncoding      AML Byte Encoding.\r
   @param[in]    NameSeg              AML NameSeg.\r
   @param[in]    Parent               AML parent node list.\r
   @param[in]    AmlByteEncoding      AML Byte Encoding.\r

-  \r
+\r

   @return       AML Node.\r
 **/\r
 EFI_AML_NODE_LIST *\r
   @return       AML Node.\r
 **/\r
 EFI_AML_NODE_LIST *\r


@@ -66,11 +66,11 @@ AmlCreateNode (
 \r
 /**\r
   Find the AML NameSeg in the children of AmlParentNodeList.\r
 \r
 /**\r
   Find the AML NameSeg in the children of AmlParentNodeList.\r

-  \r
+\r

   @param[in]    NameSeg              AML NameSeg.\r
   @param[in]    AmlParentNodeList    AML parent node list.\r
   @param[in]    Create               TRUE means to create node if not found.\r
   @param[in]    NameSeg              AML NameSeg.\r
   @param[in]    AmlParentNodeList    AML parent node list.\r
   @param[in]    Create               TRUE means to create node if not found.\r

-  \r
+\r

   @return       AmlChildNode whoes name is same as NameSeg.\r
 **/\r
 EFI_AML_NODE_LIST *\r
   @return       AmlChildNode whoes name is same as NameSeg.\r
 **/\r
 EFI_AML_NODE_LIST *\r


@@ -120,12 +120,12 @@ AmlFindNodeInThis (
 \r
 /**\r
   Find the AML NameString in the children of AmlParentNodeList or AmlRootNodeList.\r
 \r
 /**\r
   Find the AML NameString in the children of AmlParentNodeList or AmlRootNodeList.\r

-  \r
+\r

   @param[in]    NameString           AML NameString.\r
   @param[in]    AmlRootNodeList      AML root node list.\r
   @param[in]    AmlParentNodeList    AML parent node list.\r
   @param[in]    Create               TRUE means to create node if not found.\r
   @param[in]    NameString           AML NameString.\r
   @param[in]    AmlRootNodeList      AML root node list.\r
   @param[in]    AmlParentNodeList    AML parent node list.\r
   @param[in]    Create               TRUE means to create node if not found.\r

-  \r
+\r

   @return       AmlChildNode whoes name is same as NameSeg.\r
 **/\r
 EFI_AML_NODE_LIST *\r
   @return       AmlChildNode whoes name is same as NameSeg.\r
 **/\r
 EFI_AML_NODE_LIST *\r


@@ -166,7 +166,7 @@ AmlFindNodeInTheTree (
   } else {\r
     AmlCurrentNodeList = AmlParentNodeList;\r
   }\r
   } else {\r
     AmlCurrentNodeList = AmlParentNodeList;\r
   }\r

-  \r
+\r

   //\r
   // Handle name segment\r
   //\r
   //\r
   // Handle name segment\r
   //\r


@@ -206,13 +206,13 @@ AmlFindNodeInTheTree (
 \r
 /**\r
   Insert the NameString to the AmlNodeList.\r
 \r
 /**\r
   Insert the NameString to the AmlNodeList.\r

-  \r
+\r

   @param[in]    NameString           AML NameString.\r
   @param[in]    Buffer               Buffer for the Node.\r
   @param[in]    Size                 Size for the Node.\r
   @param[in]    AmlRootNodeList      AML root node list.\r
   @param[in]    AmlParentNodeList    AML parent node list.\r
   @param[in]    NameString           AML NameString.\r
   @param[in]    Buffer               Buffer for the Node.\r
   @param[in]    Size                 Size for the Node.\r
   @param[in]    AmlRootNodeList      AML root node list.\r
   @param[in]    AmlParentNodeList    AML parent node list.\r

-  \r
+\r

   @return       AmlChildNode whoes name is NameString.\r
 **/\r
 EFI_AML_NODE_LIST *\r
   @return       AmlChildNode whoes name is NameString.\r
 **/\r
 EFI_AML_NODE_LIST *\r


@@ -278,11 +278,11 @@ AmlInsertNodeToTree (
 \r
 /**\r
   Construct child node list according to the AML handle.\r
 \r
 /**\r
   Construct child node list according to the AML handle.\r

-  \r
+\r

   @param[in]    AmlHandle            AML handle.\r
   @param[in]    AmlRootNodeList      AML root node list.\r
   @param[in]    AmlParentNodeList    AML parent node list.\r
   @param[in]    AmlHandle            AML handle.\r
   @param[in]    AmlRootNodeList      AML root node list.\r
   @param[in]    AmlParentNodeList    AML parent node list.\r

-  \r
+\r

   @retval       EFI_SUCCESS           Success.\r
   @retval       EFI_INVALID_PARAMETER AML handle does not refer to a valid ACPI object.\r
 **/\r
   @retval       EFI_SUCCESS           Success.\r
   @retval       EFI_INVALID_PARAMETER AML handle does not refer to a valid ACPI object.\r
 **/\r


@@ -369,11 +369,11 @@ AmlConstructNodeListForChild (
 \r
 /**\r
   Construct node list according to the AML handle.\r
 \r
 /**\r
   Construct node list according to the AML handle.\r

-  \r
+\r

   @param[in]    AmlHandle            AML handle.\r
   @param[in]    AmlRootNodeList      AML root node list.\r
   @param[in]    AmlParentNodeList    AML parent node list.\r
   @param[in]    AmlHandle            AML handle.\r
   @param[in]    AmlRootNodeList      AML root node list.\r
   @param[in]    AmlParentNodeList    AML parent node list.\r

-  \r
+\r

   @retval       EFI_SUCCESS           Success.\r
   @retval       EFI_INVALID_PARAMETER AML handle does not refer to a valid ACPI object.\r
 **/\r
   @retval       EFI_SUCCESS           Success.\r
   @retval       EFI_INVALID_PARAMETER AML handle does not refer to a valid ACPI object.\r
 **/\r


@@ -420,7 +420,7 @@ AmlConstructNodeList (
 \r
 /**\r
   Destruct node list\r
 \r
 /**\r
   Destruct node list\r

-  \r
+\r

   @param[in]    AmlParentNodeList    AML parent node list.\r
 **/\r
 VOID\r
   @param[in]    AmlParentNodeList    AML parent node list.\r
 **/\r
 VOID\r


@@ -465,7 +465,7 @@ AmlDestructNodeList (
 \r
 /**\r
   Dump node list\r
 \r
 /**\r
   Dump node list\r

-  \r
+\r

   @param[in]    AmlParentNodeList    AML parent node list.\r
   @param[in]    Level                Output debug level.\r
 **/\r
   @param[in]    AmlParentNodeList    AML parent node list.\r
   @param[in]    Level                Output debug level.\r
 **/\r


@@ -502,16 +502,16 @@ AmlDumpNodeInfo (
 \r
 /**\r
   Returns the handle of the ACPI object representing the specified ACPI AML path\r
 \r
 /**\r
   Returns the handle of the ACPI object representing the specified ACPI AML path\r

-  \r
+\r

   @param[in]    AmlHandle   Points to the handle of the object representing the starting point for the path search.\r
   @param[in]    AmlPath     Points to the ACPI AML path.\r
   @param[out]   Buffer      On return, points to the ACPI object which represents AcpiPath, relative to\r
                             HandleIn.\r
   @param[in]    FromRoot    TRUE means to find AML path from \ (Root) Node.\r
                             FALSE means to find AML path from this Node (The HandleIn).\r
   @param[in]    AmlHandle   Points to the handle of the object representing the starting point for the path search.\r
   @param[in]    AmlPath     Points to the ACPI AML path.\r
   @param[out]   Buffer      On return, points to the ACPI object which represents AcpiPath, relative to\r
                             HandleIn.\r
   @param[in]    FromRoot    TRUE means to find AML path from \ (Root) Node.\r
                             FALSE means to find AML path from this Node (The HandleIn).\r

-                            \r
+\r

   @retval EFI_SUCCESS           Success\r
   @retval EFI_SUCCESS           Success\r

-  @retval EFI_INVALID_PARAMETER HandleIn does not refer to a valid ACPI object.                            \r
+  @retval EFI_INVALID_PARAMETER HandleIn does not refer to a valid ACPI object.\r

 **/\r
 EFI_STATUS\r
 AmlFindPath (\r
 **/\r
 EFI_STATUS\r
 AmlFindPath (\r

diff --git a/MdeModulePkg/Universal/Acpi/AcpiTableDxe/AmlOption.c b/MdeModulePkg/Universal/Acpi/AcpiTableDxe/AmlOption.c
index f4cad10af66268d5693c152aaff5126b7ee9f92a..79aefa52210109ceffe6a6327a647c5161d81a48 100644 (file)
--- a/MdeModulePkg/Universal/Acpi/AcpiTableDxe/AmlOption.c
+++ b/MdeModulePkg/Universal/Acpi/AcpiTableDxe/AmlOption.c
@@ -1,7 +1,7 @@
 /** @file\r
   ACPI Sdt Protocol Driver\r
 \r
 /** @file\r
   ACPI Sdt Protocol Driver\r
 \r

-  Copyright (c) 2010, Intel Corporation. All rights reserved. <BR>\r
+  Copyright (c) 2010 - 2018, Intel Corporation. All rights reserved. <BR>\r

   This program and the accompanying materials\r
   are licensed and made available under the terms and conditions of the BSD License\r
   which accompanies this distribution.  The full text of the license may be found at\r
   This program and the accompanying materials\r
   are licensed and made available under the terms and conditions of the BSD License\r
   which accompanies this distribution.  The full text of the license may be found at\r


@@ -16,7 +16,7 @@
 \r
 /**\r
   Retrieve option term according to AmlByteEncoding and Buffer.\r
 \r
 /**\r
   Retrieve option term according to AmlByteEncoding and Buffer.\r

-  \r
+\r

   @param[in]    AmlByteEncoding      AML Byte Encoding.\r
   @param[in]    Buffer               AML buffer.\r
   @param[in]    MaxBufferSize        AML buffer MAX size. The parser can not parse any data exceed this region.\r
   @param[in]    AmlByteEncoding      AML Byte Encoding.\r
   @param[in]    Buffer               AML buffer.\r
   @param[in]    MaxBufferSize        AML buffer MAX size. The parser can not parse any data exceed this region.\r


@@ -25,7 +25,7 @@
                                      for the specified index.\r
   @param[out]   Data                 Upon return, points to the pointer to the data.\r
   @param[out]   DataSize             Upon return, points to the size of Data.\r
                                      for the specified index.\r
   @param[out]   Data                 Upon return, points to the pointer to the data.\r
   @param[out]   DataSize             Upon return, points to the size of Data.\r

-  \r
+\r

   @retval       EFI_SUCCESS           Success.\r
   @retval       EFI_INVALID_PARAMETER Buffer does not refer to a valid ACPI object.\r
 **/\r
   @retval       EFI_SUCCESS           Success.\r
   @retval       EFI_INVALID_PARAMETER Buffer does not refer to a valid ACPI object.\r
 **/\r


@@ -125,7 +125,7 @@ AmlParseOptionTerm (
 \r
 /**\r
   Retrieve information according to AmlByteEncoding and Buffer.\r
 \r
 /**\r
   Retrieve information according to AmlByteEncoding and Buffer.\r

-  \r
+\r

   @param[in]    AmlByteEncoding      AML Byte Encoding.\r
   @param[in]    Buffer               AML buffer.\r
   @param[in]    MaxBufferSize        AML buffer MAX size. The parser can not parse any data exceed this region.\r
   @param[in]    AmlByteEncoding      AML Byte Encoding.\r
   @param[in]    Buffer               AML buffer.\r
   @param[in]    MaxBufferSize        AML buffer MAX size. The parser can not parse any data exceed this region.\r


@@ -135,7 +135,7 @@ AmlParseOptionTerm (
                                      for the specified index.\r
   @param[out]   Data                 Upon return, points to the pointer to the data.\r
   @param[out]   DataSize             Upon return, points to the size of Data.\r
                                      for the specified index.\r
   @param[out]   Data                 Upon return, points to the pointer to the data.\r
   @param[out]   DataSize             Upon return, points to the size of Data.\r

-  \r
+\r

   @retval       EFI_SUCCESS           Success.\r
   @retval       EFI_INVALID_PARAMETER Buffer does not refer to a valid ACPI object.\r
 **/\r
   @retval       EFI_SUCCESS           Success.\r
   @retval       EFI_INVALID_PARAMETER Buffer does not refer to a valid ACPI object.\r
 **/\r


@@ -286,11 +286,11 @@ AmlParseOptionCommon (
 \r
 /**\r
   Return object size.\r
 \r
 /**\r
   Return object size.\r

-  \r
+\r

   @param[in]    AmlByteEncoding      AML Byte Encoding.\r
   @param[in]    Buffer               AML object buffer.\r
   @param[in]    MaxBufferSize        AML object buffer MAX size. The parser can not parse any data exceed this region.\r
   @param[in]    AmlByteEncoding      AML Byte Encoding.\r
   @param[in]    Buffer               AML object buffer.\r
   @param[in]    MaxBufferSize        AML object buffer MAX size. The parser can not parse any data exceed this region.\r

-  \r
+\r

   @return       Size of the object.\r
 **/\r
 UINTN\r
   @return       Size of the object.\r
 **/\r
 UINTN\r


@@ -321,9 +321,9 @@ AmlGetObjectSize (
 \r
 /**\r
   Return object name.\r
 \r
 /**\r
   Return object name.\r

-  \r
+\r

   @param[in]    AmlHandle            AML handle.\r
   @param[in]    AmlHandle            AML handle.\r

-  \r
+\r

   @return       Name of the object.\r
 **/\r
 CHAR8 *\r
   @return       Name of the object.\r
 **/\r
 CHAR8 *\r


@@ -374,10 +374,10 @@ AmlGetObjectName (
 \r
 /**\r
   Return offset of last option.\r
 \r
 /**\r
   Return offset of last option.\r

-  \r
+\r

   @param[in]    AmlHandle            AML Handle.\r
   @param[out]   Buffer               Upon return, points to the offset after last option.\r
   @param[in]    AmlHandle            AML Handle.\r
   @param[out]   Buffer               Upon return, points to the offset after last option.\r

-  \r
+\r

   @retval       EFI_SUCCESS           Success.\r
   @retval       EFI_INVALID_PARAMETER AmlHandle does not refer to a valid ACPI object.\r
 **/\r
   @retval       EFI_SUCCESS           Success.\r
   @retval       EFI_INVALID_PARAMETER AmlHandle does not refer to a valid ACPI object.\r
 **/\r


@@ -419,7 +419,7 @@ AmlGetOffsetAfterLastOption (
 \r
 /**\r
   Retrieve information according to AmlHandle\r
 \r
 /**\r
   Retrieve information according to AmlHandle\r

-  \r
+\r

   @param[in]    AmlHandle            AML handle.\r
   @param[in]    Index                Index of the data to retrieve from the object. In general, indexes read from left-to-right\r
                                      in the ACPI encoding, with index 0 always being the ACPI opcode.\r
   @param[in]    AmlHandle            AML handle.\r
   @param[in]    Index                Index of the data to retrieve from the object. In general, indexes read from left-to-right\r
                                      in the ACPI encoding, with index 0 always being the ACPI opcode.\r


@@ -427,7 +427,7 @@ AmlGetOffsetAfterLastOption (
                                      for the specified index.\r
   @param[out]   Data                 Upon return, points to the pointer to the data.\r
   @param[out]   DataSize             Upon return, points to the size of Data.\r
                                      for the specified index.\r
   @param[out]   Data                 Upon return, points to the pointer to the data.\r
   @param[out]   DataSize             Upon return, points to the size of Data.\r

-  \r
+\r

   @retval       EFI_SUCCESS           Success.\r
   @retval       EFI_INVALID_PARAMETER AmlHandle does not refer to a valid ACPI object.\r
 **/\r
   @retval       EFI_SUCCESS           Success.\r
   @retval       EFI_INVALID_PARAMETER AmlHandle does not refer to a valid ACPI object.\r
 **/\r

diff --git a/MdeModulePkg/Universal/Acpi/AcpiTableDxe/AmlString.c b/MdeModulePkg/Universal/Acpi/AcpiTableDxe/AmlString.c
index 9f47b48835852fd1cb337de958e820e03bbcccdd..3f0ce72c81e06f18b0bdeccec3a6d42debf42d50 100644 (file)
--- a/MdeModulePkg/Universal/Acpi/AcpiTableDxe/AmlString.c
+++ b/MdeModulePkg/Universal/Acpi/AcpiTableDxe/AmlString.c
@@ -1,7 +1,7 @@
 /** @file\r
   ACPI Sdt Protocol Driver\r
 \r
 /** @file\r
   ACPI Sdt Protocol Driver\r
 \r

-  Copyright (c) 2010 - 2011, Intel Corporation. All rights reserved. <BR>\r
+  Copyright (c) 2010 - 2018, Intel Corporation. All rights reserved. <BR>\r

   This program and the accompanying materials\r
   are licensed and made available under the terms and conditions of the BSD License\r
   which accompanies this distribution.  The full text of the license may be found at\r
   This program and the accompanying materials\r
   are licensed and made available under the terms and conditions of the BSD License\r
   which accompanies this distribution.  The full text of the license may be found at\r


@@ -18,7 +18,7 @@
   Check if it is AML Root name\r
 \r
   @param[in]    Buffer AML path.\r
   Check if it is AML Root name\r
 \r
   @param[in]    Buffer AML path.\r

-  \r
+\r

   @retval       TRUE  AML path is root.\r
   @retval       FALSE AML path is not root.\r
 **/\r
   @retval       TRUE  AML path is root.\r
   @retval       FALSE AML path is not root.\r
 **/\r


@@ -38,7 +38,7 @@ AmlIsRootPath (
   Check if it is AML LeadName.\r
 \r
   @param[in]    Ch   Char.\r
   Check if it is AML LeadName.\r
 \r
   @param[in]    Ch   Char.\r

-  \r
+\r

   @retval       TRUE  Char is AML LeadName.\r
   @retval       FALSE Char is not AML LeadName.\r
 **/\r
   @retval       TRUE  Char is AML LeadName.\r
   @retval       FALSE Char is not AML LeadName.\r
 **/\r


@@ -58,7 +58,7 @@ AmlIsLeadName (
   Check if it is AML Name.\r
 \r
   @param[in]    Ch   Char.\r
   Check if it is AML Name.\r
 \r
   @param[in]    Ch   Char.\r

-  \r
+\r

   @retval       TRUE  Char is AML Name.\r
   @retval       FALSE Char is not AML Name.\r
 **/\r
   @retval       TRUE  Char is AML Name.\r
   @retval       FALSE Char is not AML Name.\r
 **/\r


@@ -78,7 +78,7 @@ AmlIsName (
   Return is buffer is AML NameSeg.\r
 \r
   @param[in]    Buffer     AML NameSement.\r
   Return is buffer is AML NameSeg.\r
 \r
   @param[in]    Buffer     AML NameSement.\r

-  \r
+\r

   @retval       TRUE       It is AML NameSegment.\r
   @retval       FALSE      It is not AML NameSegment.\r
 **/\r
   @retval       TRUE       It is AML NameSegment.\r
   @retval       FALSE      It is not AML NameSegment.\r
 **/\r


@@ -103,8 +103,8 @@ AmlIsNameSeg (
   Get AML NameString size.\r
 \r
   @param[in]    Buffer     AML NameString.\r
   Get AML NameString size.\r
 \r
   @param[in]    Buffer     AML NameString.\r

-  @param[out]   BufferSize AML NameString size \r
-  \r
+  @param[out]   BufferSize AML NameString size\r
+\r

   @retval       EFI_SUCCESS           Success.\r
   @retval       EFI_INVALID_PARAMETER Buffer does not refer to a valid AML NameString.\r
 **/\r
   @retval       EFI_SUCCESS           Success.\r
   @retval       EFI_INVALID_PARAMETER Buffer does not refer to a valid AML NameString.\r
 **/\r


@@ -183,7 +183,7 @@ AmlGetNameStringSize (
   Check if it is ASL LeadName.\r
 \r
   @param[in]    Ch   Char.\r
   Check if it is ASL LeadName.\r
 \r
   @param[in]    Ch   Char.\r

-  \r
+\r

   @retval       TRUE  Char is ASL LeadName.\r
   @retval       FALSE Char is not ASL LeadName.\r
 **/\r
   @retval       TRUE  Char is ASL LeadName.\r
   @retval       FALSE Char is not ASL LeadName.\r
 **/\r


@@ -203,7 +203,7 @@ AmlIsAslLeadName (
   Check if it is ASL Name.\r
 \r
   @param[in]    Ch   Char.\r
   Check if it is ASL Name.\r
 \r
   @param[in]    Ch   Char.\r

-  \r
+\r

   @retval       TRUE  Char is ASL Name.\r
   @retval       FALSE Char is not ASL Name.\r
 **/\r
   @retval       TRUE  Char is ASL Name.\r
   @retval       FALSE Char is not ASL Name.\r
 **/\r


@@ -223,7 +223,7 @@ AmlIsAslName (
   Get ASL NameString size.\r
 \r
   @param[in]    Buffer   ASL NameString.\r
   Get ASL NameString size.\r
 \r
   @param[in]    Buffer   ASL NameString.\r

-  \r
+\r

   @return       ASL NameString size.\r
 **/\r
 UINTN\r
   @return       ASL NameString size.\r
 **/\r
 UINTN\r


@@ -237,7 +237,7 @@ AmlGetAslNameSegLength (
   if (*Buffer == 0) {\r
     return 0;\r
   }\r
   if (*Buffer == 0) {\r
     return 0;\r
   }\r

-  \r
+\r

   Length = 0;\r
   //\r
   // 1st\r
   Length = 0;\r
   //\r
   // 1st\r


@@ -275,7 +275,7 @@ AmlGetAslNameSegLength (
   @param[out]   Root     On return, points to Root char number.\r
   @param[out]   Parent   On return, points to Parent char number.\r
   @param[out]   SegCount On return, points to Segment count.\r
   @param[out]   Root     On return, points to Root char number.\r
   @param[out]   Parent   On return, points to Parent char number.\r
   @param[out]   SegCount On return, points to Segment count.\r

-  \r
+\r

   @return       ASL NameString size.\r
 **/\r
 UINTN\r
   @return       ASL NameString size.\r
 **/\r
 UINTN\r


@@ -532,7 +532,7 @@ AmlPrintNameString (
     //\r
     SegCount = 1;\r
   }\r
     //\r
     SegCount = 1;\r
   }\r

-  \r
+\r

   AmlPrintNameSeg (Buffer);\r
   Buffer += AML_NAME_SEG_SIZE;\r
   for (Index = 0; Index < SegCount - 1; Index++) {\r
   AmlPrintNameSeg (Buffer);\r
   Buffer += AML_NAME_SEG_SIZE;\r
   for (Index = 0; Index < SegCount - 1; Index++) {\r

diff --git a/MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResourceTableDxe.inf b/MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResourceTableDxe.inf
index bc1c10e981628004ba22c1ab5b5ee5a9801ad1dc..080a939cc0ebfadc799bb770b9d277e419e9cf71 100644 (file)
--- a/MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResourceTableDxe.inf
+++ b/MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResourceTableDxe.inf
@@ -7,10 +7,10 @@
 #  are licensed and made available under the terms and conditions of the BSD License\r
 #  which accompanies this distribution.  The full text of the license may be found at\r
 #  http://opensource.org/licenses/bsd-license.php\r
 #  are licensed and made available under the terms and conditions of the BSD License\r
 #  which accompanies this distribution.  The full text of the license may be found at\r
 #  http://opensource.org/licenses/bsd-license.php\r

-#  \r
+#\r

 #  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 #  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 #  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 #  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r

-#  \r
+#\r

 ##\r
 \r
 [Defines]\r
 ##\r
 \r
 [Defines]\r

diff --git a/MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResourceTableDxe.uni b/MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResourceTableDxe.uni
index cda6ae1f60b61e27f079ad13cf4046a04ab62fe1..20ab0fbf78015e0832248b13761ccf5fb31af6a6 100644 (file)
--- a/MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResourceTableDxe.uni
+++ b/MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResourceTableDxe.uni
@@ -3,13 +3,13 @@
 //\r
 // This module installs the ACPI Boot Graphics Resource Table (BGRT).\r
 //\r
 //\r
 // This module installs the ACPI Boot Graphics Resource Table (BGRT).\r
 //\r

-// Copyright (c) 2011 - 2014, Intel Corporation. All rights reserved.<BR>\r
+// Copyright (c) 2011 - 2018, Intel Corporation. All rights reserved.<BR>\r

 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r
 // which accompanies this distribution.  The full text of the license may be found at\r
 // http://opensource.org/licenses/bsd-license.php\r
 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r
 // which accompanies this distribution.  The full text of the license may be found at\r
 // http://opensource.org/licenses/bsd-license.php\r

-// \r
+//\r

 // THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 // WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 //\r
 // THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 // WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 //\r

diff --git a/MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResourceTableDxeExtra.uni b/MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResourceTableDxeExtra.uni
index a64b85725de9114aaed0cdac7add4500447f70ff..0c48e6b440990650c91ff48ca99c09049291d740 100644 (file)
--- a/MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResourceTableDxeExtra.uni
+++ b/MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResourceTableDxeExtra.uni
@@ -1,7 +1,7 @@
 // /** @file\r
 // BootGraphicsResourceTableDxe Localized Strings and Content\r
 //\r
 // /** @file\r
 // BootGraphicsResourceTableDxe Localized Strings and Content\r
 //\r

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

 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r
 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r


@@ -13,8 +13,8 @@
 //\r
 // **/\r
 \r
 //\r
 // **/\r
 \r

-#string STR_PROPERTIES_MODULE_NAME \r
-#language en-US \r
+#string STR_PROPERTIES_MODULE_NAME\r
+#language en-US\r

 "ACPI Boot Graphics Resource Table DXE Driver"\r
 \r
 \r
 "ACPI Boot Graphics Resource Table DXE Driver"\r
 \r
 \r

diff --git a/MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/BootScriptExecutorDxe.inf b/MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/BootScriptExecutorDxe.inf
index 0dc329ced60260c79ef393d02e9a814a5dd775b6..ecde9bf4b5c52ae470f75b342e66ac6fa25c6591 100644 (file)
--- a/MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/BootScriptExecutorDxe.inf
+++ b/MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/BootScriptExecutorDxe.inf
@@ -38,11 +38,11 @@
   ScriptExecute.c\r
 \r
 [Sources.X64]\r
   ScriptExecute.c\r
 \r
 [Sources.X64]\r

-  X64/SetIdtEntry.c  \r
+  X64/SetIdtEntry.c\r

   X64/S3Asm.nasm\r
   X64/S3Asm.nasm\r

-  \r
+\r

 [Sources.Ia32]\r
 [Sources.Ia32]\r

-  IA32/SetIdtEntry.c   \r
+  IA32/SetIdtEntry.c\r

   IA32/S3Asm.nasm\r
 \r
 [Packages]\r
   IA32/S3Asm.nasm\r
 \r
 [Packages]\r

diff --git a/MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/BootScriptExecutorDxe.uni b/MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/BootScriptExecutorDxe.uni
index f362a02b566edb8662085f855b1caac83f2a98b3..a111b9c4d8b0c5aa25314173745309d64a9495d2 100644 (file)
--- a/MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/BootScriptExecutorDxe.uni
+++ b/MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/BootScriptExecutorDxe.uni
@@ -4,13 +4,13 @@
 // This is a standalone Boot Script Executor. Standalone means it does not\r
 // depends on any PEI or DXE service.\r
 //\r
 // This is a standalone Boot Script Executor. Standalone means it does not\r
 // depends on any PEI or DXE service.\r
 //\r

-// Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.<BR>\r
+// Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r

 //\r
 // This program and the accompanying materials are\r
 // licensed and made available under the terms and conditions of the BSD License\r
 // which accompanies this distribution.  The full text of the license may be found at\r
 // http://opensource.org/licenses/bsd-license.php\r
 //\r
 // This program and the accompanying materials are\r
 // licensed and made available under the terms and conditions of the BSD License\r
 // which accompanies this distribution.  The full text of the license may be found at\r
 // http://opensource.org/licenses/bsd-license.php\r

-// \r
+//\r

 // THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 // WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 //\r
 // THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 // WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 //\r

diff --git a/MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/BootScriptExecutorDxeExtra.uni b/MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/BootScriptExecutorDxeExtra.uni
index 3fd8ad68ef415a61c01a3e7b7f37b0e6204e0a8b..7e40a8ac2a570ee867c08654867131310cfc269f 100644 (file)
--- a/MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/BootScriptExecutorDxeExtra.uni
+++ b/MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/BootScriptExecutorDxeExtra.uni
@@ -1,7 +1,7 @@
 // /** @file\r
 // BootScriptExecutorDxe Localized Strings and Content\r
 //\r
 // /** @file\r
 // BootScriptExecutorDxe Localized Strings and Content\r
 //\r

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

 //\r
 // This program and the accompanying materials are\r
 // licensed and made available under the terms and conditions of the BSD License\r
 //\r
 // This program and the accompanying materials are\r
 // licensed and made available under the terms and conditions of the BSD License\r


@@ -13,8 +13,8 @@
 //\r
 // **/\r
 \r
 //\r
 // **/\r
 \r

-#string STR_PROPERTIES_MODULE_NAME \r
-#language en-US \r
+#string STR_PROPERTIES_MODULE_NAME\r
+#language en-US\r

 "Boot Script Execution DXE Driver"\r
 \r
 \r
 "Boot Script Execution DXE Driver"\r
 \r
 \r

diff --git a/MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/ScriptExecute.c b/MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/ScriptExecute.c
index 263a282188340c6c24ba68041a85ca8fa7fb6b53..e76abb7b7b1619e8d99b6b01edbd06c15f7b53db 100644 (file)
--- a/MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/ScriptExecute.c
+++ b/MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/ScriptExecute.c
@@ -4,7 +4,7 @@
   This driver is dispatched by Dxe core and the driver will reload itself to ACPI reserved memory\r
   in the entry point. The functionality is to interpret and restore the S3 boot script\r
 \r
   This driver is dispatched by Dxe core and the driver will reload itself to ACPI reserved memory\r
   in the entry point. The functionality is to interpret and restore the S3 boot script\r
 \r

-Copyright (c) 2006 - 2017, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r

 Copyright (c) 2017, AMD Incorporated. All rights reserved.<BR>\r
 \r
 This program and the accompanying materials\r
 Copyright (c) 2017, AMD Incorporated. All rights reserved.<BR>\r
 \r
 This program and the accompanying materials\r


@@ -72,12 +72,12 @@ S3BootScriptExecutorEntryFunction (
   // for that parameter.\r
   //\r
   Status = S3BootScriptExecute ();\r
   // for that parameter.\r
   //\r
   Status = S3BootScriptExecute ();\r

-  \r
+\r

   //\r
   // If invalid script table or opcode in S3 boot script table.\r
   //\r
   ASSERT_EFI_ERROR (Status);\r
   //\r
   // If invalid script table or opcode in S3 boot script table.\r
   //\r
   ASSERT_EFI_ERROR (Status);\r

-  \r
+\r

   if (EFI_ERROR (Status)) {\r
     CpuDeadLoop ();\r
     return Status;\r
   if (EFI_ERROR (Status)) {\r
     CpuDeadLoop ();\r
     return Status;\r


@@ -95,7 +95,7 @@ S3BootScriptExecutorEntryFunction (
   //\r
   if (PeiS3ResumeState != 0) {\r
     //\r
   //\r
   if (PeiS3ResumeState != 0) {\r
     //\r

-    // Need report status back to S3ResumePeim. \r
+    // Need report status back to S3ResumePeim.\r

     // If boot script execution is failed, S3ResumePeim wil report the error status code.\r
     //\r
     PeiS3ResumeState->ReturnStatus = (UINT64)(UINTN)Status;\r
     // If boot script execution is failed, S3ResumePeim wil report the error status code.\r
     //\r
     PeiS3ResumeState->ReturnStatus = (UINT64)(UINTN)Status;\r


@@ -145,7 +145,7 @@ S3BootScriptExecutorEntryFunction (
     CpuDeadLoop();\r
     return EFI_UNSUPPORTED;\r
   }\r
     CpuDeadLoop();\r
     return EFI_UNSUPPORTED;\r
   }\r

-  \r
+\r

   //\r
   // S3ResumePeim does not provide a way to jump back to itself, so resume to OS here directly\r
   //\r
   //\r
   // S3ResumePeim does not provide a way to jump back to itself, so resume to OS here directly\r
   //\r


@@ -254,9 +254,9 @@ RegisterMemoryProfileImage (
 /**\r
   This is the Event notification function to reload BootScriptExecutor image\r
   to RESERVED mem and save it to LockBox.\r
 /**\r
   This is the Event notification function to reload BootScriptExecutor image\r
   to RESERVED mem and save it to LockBox.\r

-  \r
+\r

   @param    Event   Pointer to this event\r
   @param    Event   Pointer to this event\r

-  @param    Context Event handler private data \r
+  @param    Context Event handler private data\r

  **/\r
 VOID\r
 EFIAPI\r
  **/\r
 VOID\r
 EFIAPI\r

diff --git a/MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/ScriptExecute.h b/MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/ScriptExecute.h
index 94deae87e6a955389af8f01a61699f5fce9c5c97..4ae07a0f5f162b25f08dd3b1038895c0b3f08d21 100644 (file)
--- a/MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/ScriptExecute.h
+++ b/MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/ScriptExecute.h
@@ -1,10 +1,10 @@
 /** @file\r
   The header file for Boot Script Executer module.\r
 /** @file\r
   The header file for Boot Script Executer module.\r

-  \r
-  This driver is dispatched by Dxe core and the driver will reload itself to ACPI reserved memory \r
-  in the entry point. The functionality is to interpret and restore the S3 boot script \r
-  \r
-Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.<BR>\r
+\r
+  This driver is dispatched by Dxe core and the driver will reload itself to ACPI reserved memory\r
+  in the entry point. The functionality is to interpret and restore the S3 boot script\r
+\r
+Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r

 Copyright (c) 2017, AMD Incorporated. All rights reserved.<BR>\r
 \r
 This program and the accompanying materials\r
 Copyright (c) 2017, AMD Incorporated. All rights reserved.<BR>\r
 \r
 This program and the accompanying materials\r


@@ -51,9 +51,9 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 \r
 /**\r
   a ASM function to transfer control to OS.\r
 \r
 /**\r
   a ASM function to transfer control to OS.\r

-  \r
+\r

   @param  S3WakingVector  The S3 waking up vector saved in ACPI Facs table\r
   @param  S3WakingVector  The S3 waking up vector saved in ACPI Facs table\r

-  @param  AcpiLowMemoryBase a buffer under 1M which could be used during the transfer             \r
+  @param  AcpiLowMemoryBase a buffer under 1M which could be used during the transfer\r

 **/\r
 VOID\r
 AsmTransferControl (\r
 **/\r
 VOID\r
 AsmTransferControl (\r


@@ -62,9 +62,9 @@ AsmTransferControl (
   );\r
 /**\r
   a 32bit ASM function to transfer control to OS.\r
   );\r
 /**\r
   a 32bit ASM function to transfer control to OS.\r

-  \r
+\r

   @param  S3WakingVector  The S3 waking up vector saved in ACPI Facs table\r
   @param  S3WakingVector  The S3 waking up vector saved in ACPI Facs table\r

-  @param  AcpiLowMemoryBase a buffer under 1M which could be used during the transfer             \r
+  @param  AcpiLowMemoryBase a buffer under 1M which could be used during the transfer\r

 **/\r
 VOID\r
 AsmTransferControl32 (\r
 **/\r
 VOID\r
 AsmTransferControl32 (\r


@@ -79,13 +79,13 @@ AsmTransferControl16 (
   VOID\r
   );\r
 /**\r
   VOID\r
   );\r
 /**\r

-  Set a IDT entry for interrupt vector 3 for debug purpose.  \r
-  \r
-  @param  AcpiS3Context  a pointer to a structure of ACPI_S3_CONTEXT  \r
-              \r
+  Set a IDT entry for interrupt vector 3 for debug purpose.\r
+\r
+  @param  AcpiS3Context  a pointer to a structure of ACPI_S3_CONTEXT\r
+\r

 **/\r
 VOID\r
 **/\r
 VOID\r

-SetIdtEntry ( \r
+SetIdtEntry (\r

   IN ACPI_S3_CONTEXT     *AcpiS3Context\r
   );\r
 \r
   IN ACPI_S3_CONTEXT     *AcpiS3Context\r
   );\r
 \r

diff --git a/MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/X64/SetIdtEntry.c b/MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/X64/SetIdtEntry.c
index 70eecf57620485c5a25c7146e7d06bd21e97cad6..1c6bb47b6010abdca99dd1013caa8b6d277af926 100644 (file)
--- a/MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/X64/SetIdtEntry.c
+++ b/MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/X64/SetIdtEntry.c
@@ -3,7 +3,7 @@
 \r
   Set a IDT entry for interrupt vector 3 for debug purpose for x64 platform\r
 \r
 \r
   Set a IDT entry for interrupt vector 3 for debug purpose for x64 platform\r
 \r

-Copyright (c) 2006 - 2017, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r

 Copyright (c) 2017, AMD Incorporated. All rights reserved.<BR>\r
 \r
 \r
 Copyright (c) 2017, AMD Incorporated. All rights reserved.<BR>\r
 \r
 \r


@@ -218,7 +218,7 @@ AcquirePage (
 \r
 /**\r
   The page fault handler that on-demand read >4G memory/MMIO.\r
 \r
 /**\r
   The page fault handler that on-demand read >4G memory/MMIO.\r

-  \r
+\r

   @retval TRUE     The page fault is correctly handled.\r
   @retval FALSE    The page fault is not handled and is passed through to original handler.\r
 \r
   @retval TRUE     The page fault is correctly handled.\r
   @retval FALSE    The page fault is not handled and is passed through to original handler.\r
 \r

diff --git a/MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTableDxe/FirmwarePerformanceDxe.c b/MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTableDxe/FirmwarePerformanceDxe.c
index ded817f3730118f20a8be312c40eabd7a1dc8f73..3d8e83250e658c4dea8e4f507e9a4923cea8cc3e 100644 (file)
--- a/MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTableDxe/FirmwarePerformanceDxe.c
+++ b/MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTableDxe/FirmwarePerformanceDxe.c
@@ -2,7 +2,7 @@
   This module install ACPI Firmware Performance Data Table (FPDT).\r
 \r
   This module register report status code listener to collect performance data\r
   This module install ACPI Firmware Performance Data Table (FPDT).\r
 \r
   This module register report status code listener to collect performance data\r

-  for Firmware Basic Boot Performance Record and other boot performance records, \r
+  for Firmware Basic Boot Performance Record and other boot performance records,\r

   and install FPDT to ACPI table.\r
 \r
   Copyright (c) 2011 - 2018, Intel Corporation. All rights reserved.<BR>\r
   and install FPDT to ACPI table.\r
 \r
   Copyright (c) 2011 - 2018, Intel Corporation. All rights reserved.<BR>\r


@@ -438,7 +438,7 @@ FpdtStatusCodeListenerDxe (
   if ((CodeType & EFI_STATUS_CODE_TYPE_MASK) != EFI_PROGRESS_CODE) {\r
     return EFI_UNSUPPORTED;\r
   }\r
   if ((CodeType & EFI_STATUS_CODE_TYPE_MASK) != EFI_PROGRESS_CODE) {\r
     return EFI_UNSUPPORTED;\r
   }\r

-  \r
+\r

   if (Value == (EFI_SOFTWARE_DXE_CORE | EFI_SW_DXE_CORE_PC_HANDOFF_TO_NEXT)) {\r
     //\r
     // DxeCore ReportStatusCode Enable so that the capability can be supported.\r
   if (Value == (EFI_SOFTWARE_DXE_CORE | EFI_SW_DXE_CORE_PC_HANDOFF_TO_NEXT)) {\r
     //\r
     // DxeCore ReportStatusCode Enable so that the capability can be supported.\r


@@ -552,7 +552,7 @@ FpdtExitBootServicesEventNotify (
 {\r
   if (!mDxeCoreReportStatusCodeEnable) {\r
     //\r
 {\r
   if (!mDxeCoreReportStatusCodeEnable) {\r
     //\r

-    // When DxeCore Report Status Code is disabled, \r
+    // When DxeCore Report Status Code is disabled,\r

     // Unregister boot time report status code listener at ExitBootService Event.\r
     //\r
     mRscHandlerProtocol->Unregister (FpdtStatusCodeListenerDxe);\r
     // Unregister boot time report status code listener at ExitBootService Event.\r
     //\r
     mRscHandlerProtocol->Unregister (FpdtStatusCodeListenerDxe);\r

diff --git a/MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTableDxe/FirmwarePerformanceDxe.inf b/MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTableDxe/FirmwarePerformanceDxe.inf
index 3d2dd6eb732f05e2192bf5f157788698a4cbcfac..843cda70213f5c0f5a47edb4b14b663a30c1cd4f 100644 (file)
--- a/MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTableDxe/FirmwarePerformanceDxe.inf
+++ b/MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTableDxe/FirmwarePerformanceDxe.inf
@@ -2,7 +2,7 @@
 #  This module installs ACPI Firmware Performance Data Table (FPDT).\r
 #\r
 #  This module registers report status code listener to collect performance data\r
 #  This module installs ACPI Firmware Performance Data Table (FPDT).\r
 #\r
 #  This module registers report status code listener to collect performance data\r

-#  for Firmware Basic Boot Performance Record and other boot performance records, \r
+#  for Firmware Basic Boot Performance Record and other boot performance records,\r

 #  and install FPDT to ACPI table.\r
 #\r
 #  Copyright (c) 2011 - 2018, Intel Corporation. All rights reserved.<BR>\r
 #  and install FPDT to ACPI table.\r
 #\r
 #  Copyright (c) 2011 - 2018, Intel Corporation. All rights reserved.<BR>\r


@@ -10,7 +10,7 @@
 #  are licensed and made available under the terms and conditions of the BSD License\r
 #  which accompanies this distribution.  The full text of the license may be found at\r
 #  http://opensource.org/licenses/bsd-license.php\r
 #  are licensed and made available under the terms and conditions of the BSD License\r
 #  which accompanies this distribution.  The full text of the license may be found at\r
 #  http://opensource.org/licenses/bsd-license.php\r

-#  \r
+#\r

 #  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 #  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 #\r
 #  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 #  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 #\r

diff --git a/MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTableDxe/FirmwarePerformanceDxe.uni b/MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTableDxe/FirmwarePerformanceDxe.uni
index e35fa48e7db74647ed1d369f48c7976fc391ccbc..4173125173c102b90a648cdda59d0585755f48f1 100644 (file)
--- a/MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTableDxe/FirmwarePerformanceDxe.uni
+++ b/MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTableDxe/FirmwarePerformanceDxe.uni
@@ -5,13 +5,13 @@
 // for Firmware Basic Boot Performance Record and other boot performance records,\r
 // and install FPDT to ACPI table.\r
 //\r
 // for Firmware Basic Boot Performance Record and other boot performance records,\r
 // and install FPDT to ACPI table.\r
 //\r

-// Copyright (c) 2011 - 2014, Intel Corporation. All rights reserved.<BR>\r
+// Copyright (c) 2011 - 2018, Intel Corporation. All rights reserved.<BR>\r

 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r
 // which accompanies this distribution.  The full text of the license may be found at\r
 // http://opensource.org/licenses/bsd-license.php\r
 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r
 // which accompanies this distribution.  The full text of the license may be found at\r
 // http://opensource.org/licenses/bsd-license.php\r

-// \r
+//\r

 // THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 // WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 //\r
 // THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 // WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 //\r

diff --git a/MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTableDxe/FirmwarePerformanceDxeExtra.uni b/MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTableDxe/FirmwarePerformanceDxeExtra.uni
index 5a6d683a2e19ac04c8fd115fc6d64981ac1b38f4..2cacc83d601c59f443a55557e01c27ac956c7b52 100644 (file)
--- a/MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTableDxe/FirmwarePerformanceDxeExtra.uni
+++ b/MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTableDxe/FirmwarePerformanceDxeExtra.uni
@@ -1,7 +1,7 @@
 // /** @file\r
 // FirmwarePerformanceDxe Localized Strings and Content\r
 //\r
 // /** @file\r
 // FirmwarePerformanceDxe Localized Strings and Content\r
 //\r

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

 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r
 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r


@@ -13,8 +13,8 @@
 //\r
 // **/\r
 \r
 //\r
 // **/\r
 \r

-#string STR_PROPERTIES_MODULE_NAME \r
-#language en-US \r
+#string STR_PROPERTIES_MODULE_NAME\r
+#language en-US\r

 "ACPI Firmware Performance DXE Driver"\r
 \r
 \r
 "ACPI Firmware Performance DXE Driver"\r
 \r
 \r

diff --git a/MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTablePei/FirmwarePerformancePei.inf b/MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTablePei/FirmwarePerformancePei.inf
index a6ce5e64940075e9ad18c4a1f0b99eb21bdf7993..1b69e49cf9efffcef2f52e579e39c29cc84ae5f4 100644 (file)
--- a/MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTablePei/FirmwarePerformancePei.inf
+++ b/MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTablePei/FirmwarePerformancePei.inf
@@ -11,7 +11,7 @@
 #  are licensed and made available under the terms and conditions of the BSD License\r
 #  which accompanies this distribution.  The full text of the license may be found at\r
 #  http://opensource.org/licenses/bsd-license.php\r
 #  are licensed and made available under the terms and conditions of the BSD License\r
 #  which accompanies this distribution.  The full text of the license may be found at\r
 #  http://opensource.org/licenses/bsd-license.php\r

-#  \r
+#\r

 #  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 #  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 #\r
 #  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 #  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 #\r

diff --git a/MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTablePei/FirmwarePerformancePei.uni b/MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTablePei/FirmwarePerformancePei.uni
index 3ae182c7d65e9d64fbe291867c9510332b9b4d9d..4eb031b53c0d8306ce87bec1e4cceb999f1bba48 100644 (file)
--- a/MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTablePei/FirmwarePerformancePei.uni
+++ b/MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTablePei/FirmwarePerformancePei.uni
@@ -2,17 +2,17 @@
 // Firmware Performance Pei Module.\r
 //\r
 // In S3 resume boot mode, it updates S3 Resume Performance Record in ACPI Firmware Performance Data Table.\r
 // Firmware Performance Pei Module.\r
 //\r
 // In S3 resume boot mode, it updates S3 Resume Performance Record in ACPI Firmware Performance Data Table.\r

-// \r
+//\r

 // This module register report status code listener to collect performance data\r
 // for S3 Resume Performance Record on S3 resume boot path.\r
 //\r
 // This module register report status code listener to collect performance data\r
 // for S3 Resume Performance Record on S3 resume boot path.\r
 //\r

-// Copyright (c) 2011 - 2017, Intel Corporation. All rights reserved.<BR>\r
+// Copyright (c) 2011 - 2018, Intel Corporation. All rights reserved.<BR>\r

 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r
 // which accompanies this distribution.  The full text of the license may be found at\r
 // http://opensource.org/licenses/bsd-license.php\r
 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r
 // which accompanies this distribution.  The full text of the license may be found at\r
 // http://opensource.org/licenses/bsd-license.php\r

-// \r
+//\r

 // THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 // WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 //\r
 // THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 // WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 //\r

diff --git a/MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTablePei/FirmwarePerformancePeiExtra.uni b/MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTablePei/FirmwarePerformancePeiExtra.uni
index 06029482cb51b8d8540b4d4d8ad1ec7623465b60..a4e8f9c585816a5f7c7860c48818e73c0bd8a116 100644 (file)
--- a/MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTablePei/FirmwarePerformancePeiExtra.uni
+++ b/MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTablePei/FirmwarePerformancePeiExtra.uni
@@ -1,7 +1,7 @@
 // /** @file\r
 // FirmwarePerformancePei Localized Strings and Content\r
 //\r
 // /** @file\r
 // FirmwarePerformancePei Localized Strings and Content\r
 //\r

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

 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r
 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r


@@ -13,8 +13,8 @@
 //\r
 // **/\r
 \r
 //\r
 // **/\r
 \r

-#string STR_PROPERTIES_MODULE_NAME \r
-#language en-US \r
+#string STR_PROPERTIES_MODULE_NAME\r
+#language en-US\r

 "Firmware Performance PEI Module"\r
 \r
 \r
 "Firmware Performance PEI Module"\r
 \r
 \r

diff --git a/MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTableSmm/FirmwarePerformanceSmm.c b/MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTableSmm/FirmwarePerformanceSmm.c
index b011ec1103011fefcff3cebd0cf9920aeb74d32b..711272e073952a1e60af26656b138f7111b90d9c 100644 (file)
--- a/MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTableSmm/FirmwarePerformanceSmm.c
+++ b/MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTableSmm/FirmwarePerformanceSmm.c
@@ -11,7 +11,7 @@
 \r
   FpdtSmiHandler() will receive untrusted input and do basic validation.\r
 \r
 \r
   FpdtSmiHandler() will receive untrusted input and do basic validation.\r
 \r

-  Copyright (c) 2011 - 2016, Intel Corporation. All rights reserved.<BR>\r
+  Copyright (c) 2011 - 2018, Intel Corporation. All rights reserved.<BR>\r

   This program and the accompanying materials\r
   are licensed and made available under the terms and conditions of the BSD License\r
   which accompanies this distribution.  The full text of the license may be found at\r
   This program and the accompanying materials\r
   are licensed and made available under the terms and conditions of the BSD License\r
   which accompanies this distribution.  The full text of the license may be found at\r


@@ -90,7 +90,7 @@ FpdtStatusCodeListenerSmm (
   if ((CodeType & EFI_STATUS_CODE_TYPE_MASK) != EFI_PROGRESS_CODE) {\r
     return EFI_UNSUPPORTED;\r
   }\r
   if ((CodeType & EFI_STATUS_CODE_TYPE_MASK) != EFI_PROGRESS_CODE) {\r
     return EFI_UNSUPPORTED;\r
   }\r

-  \r
+\r

   //\r
   // Collect one or more Boot records in boot time\r
   //\r
   //\r
   // Collect one or more Boot records in boot time\r
   //\r


@@ -163,7 +163,7 @@ FpdtStatusCodeListenerSmm (
 /**\r
   Communication service SMI Handler entry.\r
 \r
 /**\r
   Communication service SMI Handler entry.\r
 \r

-  This SMI handler provides services for report SMM boot records. \r
+  This SMI handler provides services for report SMM boot records.\r

 \r
   Caution: This function may receive untrusted input.\r
   Communicate buffer and buffer size are external input, so this function will do basic validation.\r
 \r
   Caution: This function may receive untrusted input.\r
   Communicate buffer and buffer size are external input, so this function will do basic validation.\r


@@ -175,11 +175,11 @@ FpdtStatusCodeListenerSmm (
                                  be conveyed from a non-SMM environment into an SMM environment.\r
   @param[in, out] CommBufferSize The size of the CommBuffer.\r
 \r
                                  be conveyed from a non-SMM environment into an SMM environment.\r
   @param[in, out] CommBufferSize The size of the CommBuffer.\r
 \r

-  @retval EFI_SUCCESS                         The interrupt was handled and quiesced. No other handlers \r
+  @retval EFI_SUCCESS                         The interrupt was handled and quiesced. No other handlers\r

                                               should still be called.\r
                                               should still be called.\r

-  @retval EFI_WARN_INTERRUPT_SOURCE_QUIESCED  The interrupt has been quiesced but other handlers should \r
+  @retval EFI_WARN_INTERRUPT_SOURCE_QUIESCED  The interrupt has been quiesced but other handlers should\r

                                               still be called.\r
                                               still be called.\r

-  @retval EFI_WARN_INTERRUPT_SOURCE_PENDING   The interrupt is still pending and other handlers should still \r
+  @retval EFI_WARN_INTERRUPT_SOURCE_PENDING   The interrupt is still pending and other handlers should still\r

                                               be called.\r
   @retval EFI_INTERRUPT_PENDING               The interrupt could not be quiesced.\r
 \r
                                               be called.\r
   @retval EFI_INTERRUPT_PENDING               The interrupt could not be quiesced.\r
 \r


@@ -212,7 +212,7 @@ FpdtSmiHandler (
   if(TempCommBufferSize < sizeof (SMM_BOOT_RECORD_COMMUNICATE)) {\r
     return EFI_SUCCESS;\r
   }\r
   if(TempCommBufferSize < sizeof (SMM_BOOT_RECORD_COMMUNICATE)) {\r
     return EFI_SUCCESS;\r
   }\r

-  \r
+\r

   if (!SmmIsBufferOutsideSmmValid ((UINTN)CommBuffer, TempCommBufferSize)) {\r
     DEBUG ((EFI_D_ERROR, "FpdtSmiHandler: SMM communication data buffer in SMRAM or overflow!\n"));\r
     return EFI_SUCCESS;\r
   if (!SmmIsBufferOutsideSmmValid ((UINTN)CommBuffer, TempCommBufferSize)) {\r
     DEBUG ((EFI_D_ERROR, "FpdtSmiHandler: SMM communication data buffer in SMRAM or overflow!\n"));\r
     return EFI_SUCCESS;\r


@@ -242,7 +242,7 @@ FpdtSmiHandler (
         Status = EFI_INVALID_PARAMETER;\r
         break;\r
       }\r
         Status = EFI_INVALID_PARAMETER;\r
         break;\r
       }\r

-      \r
+\r

       //\r
       // Sanity check\r
       //\r
       //\r
       // Sanity check\r
       //\r


@@ -255,10 +255,10 @@ FpdtSmiHandler (
         Status = EFI_ACCESS_DENIED;\r
         break;\r
       }\r
         Status = EFI_ACCESS_DENIED;\r
         break;\r
       }\r

-      \r
+\r

       CopyMem (\r
       CopyMem (\r

-       (UINT8*)BootRecordData, \r
-       mBootRecordBuffer + BootRecordOffset, \r
+       (UINT8*)BootRecordData,\r
+       mBootRecordBuffer + BootRecordOffset,\r

        BootRecordSize\r
        );\r
       break;\r
        BootRecordSize\r
        );\r
       break;\r


@@ -268,7 +268,7 @@ FpdtSmiHandler (
   }\r
 \r
   SmmCommData->ReturnStatus = Status;\r
   }\r
 \r
   SmmCommData->ReturnStatus = Status;\r

-  \r
+\r

   return EFI_SUCCESS;\r
 }\r
 \r
   return EFI_SUCCESS;\r
 }\r
 \r


@@ -295,8 +295,8 @@ FirmwarePerformanceSmmEntryPoint (
   //\r
   // Initialize spin lock\r
   //\r
   //\r
   // Initialize spin lock\r
   //\r

-  InitializeSpinLock (&mSmmFpdtLock); \r
-   \r
+  InitializeSpinLock (&mSmmFpdtLock);\r
+\r

   //\r
   // Get SMM Report Status Code Handler Protocol.\r
   //\r
   //\r
   // Get SMM Report Status Code Handler Protocol.\r
   //\r

diff --git a/MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTableSmm/FirmwarePerformanceSmm.inf b/MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTableSmm/FirmwarePerformanceSmm.inf
index cae01110d13e5abea9b65abd5f642993916c9bc7..67cd1367975466351aec32028229aa68c0e1ae4f 100644 (file)
--- a/MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTableSmm/FirmwarePerformanceSmm.inf
+++ b/MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTableSmm/FirmwarePerformanceSmm.inf
@@ -4,12 +4,12 @@
 #  This module registers report status code listener to collect performance data\r
 #  for SMM boot performance records and S3 Suspend Performance Record.\r
 #\r
 #  This module registers report status code listener to collect performance data\r
 #  for SMM boot performance records and S3 Suspend Performance Record.\r
 #\r

-#  Copyright (c) 2011 - 2015, Intel Corporation. All rights reserved.<BR>\r
+#  Copyright (c) 2011 - 2018, Intel Corporation. All rights reserved.<BR>\r

 #  This program and the accompanying materials\r
 #  are licensed and made available under the terms and conditions of the BSD License\r
 #  which accompanies this distribution.  The full text of the license may be found at\r
 #  http://opensource.org/licenses/bsd-license.php\r
 #  This program and the accompanying materials\r
 #  are licensed and made available under the terms and conditions of the BSD License\r
 #  which accompanies this distribution.  The full text of the license may be found at\r
 #  http://opensource.org/licenses/bsd-license.php\r

-#  \r
+#\r

 #  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 #  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 #\r
 #  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 #  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 #\r

diff --git a/MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTableSmm/FirmwarePerformanceSmm.uni b/MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTableSmm/FirmwarePerformanceSmm.uni
index 94f3b8e0fdc9af775297a2b839499e502023cdf7..8c55fffa3cbb4bebd2bbd39bcd079b5bb586c01f 100644 (file)
--- a/MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTableSmm/FirmwarePerformanceSmm.uni
+++ b/MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTableSmm/FirmwarePerformanceSmm.uni
@@ -4,13 +4,13 @@
 // This module registers report status code listener to collect performance data\r
 // for SMM boot performance records and S3 Suspend Performance Record.\r
 //\r
 // This module registers report status code listener to collect performance data\r
 // for SMM boot performance records and S3 Suspend Performance Record.\r
 //\r

-// Copyright (c) 2011 - 2014, Intel Corporation. All rights reserved.<BR>\r
+// Copyright (c) 2011 - 2018, Intel Corporation. All rights reserved.<BR>\r

 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r
 // which accompanies this distribution.  The full text of the license may be found at\r
 // http://opensource.org/licenses/bsd-license.php\r
 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r
 // which accompanies this distribution.  The full text of the license may be found at\r
 // http://opensource.org/licenses/bsd-license.php\r

-// \r
+//\r

 // THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 // WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 //\r
 // THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 // WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 //\r

diff --git a/MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTableSmm/FirmwarePerformanceSmmExtra.uni b/MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTableSmm/FirmwarePerformanceSmmExtra.uni
index d96e87f04f6814e5393f1203dcb314ef24ea2948..59cb8c724100f61bc769baced98c6c86c663f394 100644 (file)
--- a/MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTableSmm/FirmwarePerformanceSmmExtra.uni
+++ b/MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTableSmm/FirmwarePerformanceSmmExtra.uni
@@ -1,7 +1,7 @@
 // /** @file\r
 // FirmwarePerformanceSmm Localized Strings and Content\r
 //\r
 // /** @file\r
 // FirmwarePerformanceSmm Localized Strings and Content\r
 //\r

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

 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r
 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r


@@ -13,8 +13,8 @@
 //\r
 // **/\r
 \r
 //\r
 // **/\r
 \r

-#string STR_PROPERTIES_MODULE_NAME \r
-#language en-US \r
+#string STR_PROPERTIES_MODULE_NAME\r
+#language en-US\r

 "SMM Firmware Performance Driver"\r
 \r
 \r
 "SMM Firmware Performance Driver"\r
 \r
 \r

diff --git a/MdeModulePkg/Universal/Acpi/S3SaveStateDxe/AcpiS3ContextSave.c b/MdeModulePkg/Universal/Acpi/S3SaveStateDxe/AcpiS3ContextSave.c
index 3c05558b23fdf440af7fb74644efecd13769d3aa..3f99023f110f633cddfd4b23f3e6a28763ca64c1 100644 (file)
--- a/MdeModulePkg/Universal/Acpi/S3SaveStateDxe/AcpiS3ContextSave.c
+++ b/MdeModulePkg/Universal/Acpi/S3SaveStateDxe/AcpiS3ContextSave.c
@@ -1,7 +1,7 @@
 /** @file\r
   This is the implementation to save ACPI S3 Context.\r
 \r
 /** @file\r
   This is the implementation to save ACPI S3 Context.\r
 \r

-Copyright (c) 2006 - 2017, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r

 \r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions\r
 \r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions\r


@@ -43,7 +43,7 @@ EFI_GUID              mAcpiS3IdtrProfileGuid = {
 \r
   @param  MemoryType   Memory type of memory to allocate.\r
   @param  Size         Size of memory to allocate.\r
 \r
   @param  MemoryType   Memory type of memory to allocate.\r
   @param  Size         Size of memory to allocate.\r

-  \r
+\r

   @return Allocated address for output.\r
 \r
 **/\r
   @return Allocated address for output.\r
 \r
 **/\r


@@ -101,7 +101,7 @@ ScanTableInRSDT (
   }\r
 \r
   EntryCount = (Rsdt->Length - sizeof (EFI_ACPI_DESCRIPTION_HEADER)) / sizeof(UINT32);\r
   }\r
 \r
   EntryCount = (Rsdt->Length - sizeof (EFI_ACPI_DESCRIPTION_HEADER)) / sizeof(UINT32);\r

-  \r
+\r

   EntryPtr = (UINT32 *)(Rsdt + 1);\r
   for (Index = 0; Index < EntryCount; Index ++, EntryPtr ++) {\r
     Table = (EFI_ACPI_DESCRIPTION_HEADER *)((UINTN)(*EntryPtr));\r
   EntryPtr = (UINT32 *)(Rsdt + 1);\r
   for (Index = 0; Index < EntryCount; Index ++, EntryPtr ++) {\r
     Table = (EFI_ACPI_DESCRIPTION_HEADER *)((UINTN)(*EntryPtr));\r


@@ -109,7 +109,7 @@ ScanTableInRSDT (
       return Table;\r
     }\r
   }\r
       return Table;\r
     }\r
   }\r

-  \r
+\r

   return NULL;\r
 }\r
 \r
   return NULL;\r
 }\r
 \r


@@ -140,7 +140,7 @@ ScanTableInXSDT (
   }\r
 \r
   EntryCount = (Xsdt->Length - sizeof (EFI_ACPI_DESCRIPTION_HEADER)) / sizeof(UINT64);\r
   }\r
 \r
   EntryCount = (Xsdt->Length - sizeof (EFI_ACPI_DESCRIPTION_HEADER)) / sizeof(UINT64);\r

-  \r
+\r

   BasePtr = (UINTN)(Xsdt + 1);\r
   for (Index = 0; Index < EntryCount; Index ++) {\r
     CopyMem (&EntryPtr, (VOID *)(BasePtr + Index * sizeof(UINT64)), sizeof(UINT64));\r
   BasePtr = (UINTN)(Xsdt + 1);\r
   for (Index = 0; Index < EntryCount; Index ++) {\r
     CopyMem (&EntryPtr, (VOID *)(BasePtr + Index * sizeof(UINT64)), sizeof(UINT64));\r


@@ -149,7 +149,7 @@ ScanTableInXSDT (
       return Table;\r
     }\r
   }\r
       return Table;\r
     }\r
   }\r

-  \r
+\r

   return NULL;\r
 }\r
 \r
   return NULL;\r
 }\r
 \r


@@ -157,7 +157,7 @@ ScanTableInXSDT (
   To find Facs in FADT.\r
 \r
   @param Fadt   FADT table pointer\r
   To find Facs in FADT.\r
 \r
   @param Fadt   FADT table pointer\r

-  \r
+\r

   @return  Facs table pointer.\r
 **/\r
 EFI_ACPI_2_0_FIRMWARE_ACPI_CONTROL_STRUCTURE  *\r
   @return  Facs table pointer.\r
 **/\r
 EFI_ACPI_2_0_FIRMWARE_ACPI_CONTROL_STRUCTURE  *\r


@@ -187,12 +187,12 @@ FindAcpiFacsFromFadt (
 \r
 /**\r
   To find Facs in Acpi tables.\r
 \r
 /**\r
   To find Facs in Acpi tables.\r

- \r
-  To find Firmware ACPI control strutcure in Acpi Tables since the S3 waking vector is stored \r
+\r
+  To find Firmware ACPI control strutcure in Acpi Tables since the S3 waking vector is stored\r

   in the table.\r
 \r
   @param AcpiTableGuid   The guid used to find ACPI table in UEFI ConfigurationTable.\r
   in the table.\r
 \r
   @param AcpiTableGuid   The guid used to find ACPI table in UEFI ConfigurationTable.\r

-  \r
+\r

   @return  Facs table pointer.\r
 **/\r
 EFI_ACPI_2_0_FIRMWARE_ACPI_CONTROL_STRUCTURE  *\r
   @return  Facs table pointer.\r
 **/\r
 EFI_ACPI_2_0_FIRMWARE_ACPI_CONTROL_STRUCTURE  *\r


@@ -256,10 +256,10 @@ FindAcpiFacsTableByAcpiGuid (
 \r
 /**\r
   To find Facs in Acpi tables.\r
 \r
 /**\r
   To find Facs in Acpi tables.\r

- \r
-  To find Firmware ACPI control strutcure in Acpi Tables since the S3 waking vector is stored \r
+\r
+  To find Firmware ACPI control strutcure in Acpi Tables since the S3 waking vector is stored\r

   in the table.\r
   in the table.\r

-  \r
+\r

   @return  Facs table pointer.\r
 **/\r
 EFI_ACPI_2_0_FIRMWARE_ACPI_CONTROL_STRUCTURE  *\r
   @return  Facs table pointer.\r
 **/\r
 EFI_ACPI_2_0_FIRMWARE_ACPI_CONTROL_STRUCTURE  *\r


@@ -315,20 +315,20 @@ IsLongModeWakingVectorSupport (
 \r
   @param[in] LongModeWakingVectorSupport    Support long mode waking vector or not.\r
 \r
 \r
   @param[in] LongModeWakingVectorSupport    Support long mode waking vector or not.\r
 \r

-  If BootScriptExector driver will run in 64-bit mode, this function will establish the 1:1 \r
+  If BootScriptExector driver will run in 64-bit mode, this function will establish the 1:1\r

   virtual to physical mapping page table when long mode waking vector is supported, otherwise\r
   create 4G page table when long mode waking vector is not supported and let PF handler to\r
   handle > 4G request.\r
   virtual to physical mapping page table when long mode waking vector is supported, otherwise\r
   create 4G page table when long mode waking vector is not supported and let PF handler to\r
   handle > 4G request.\r

-  If BootScriptExector driver will not run in 64-bit mode, this function will do nothing. \r
-  \r
-  @return Page table base address. \r
+  If BootScriptExector driver will not run in 64-bit mode, this function will do nothing.\r
+\r
+  @return Page table base address.\r

 \r
 **/\r
 EFI_PHYSICAL_ADDRESS\r
 S3AllocatePageTablesBuffer (\r
   IN BOOLEAN    LongModeWakingVectorSupport\r
   )\r
 \r
 **/\r
 EFI_PHYSICAL_ADDRESS\r
 S3AllocatePageTablesBuffer (\r
   IN BOOLEAN    LongModeWakingVectorSupport\r
   )\r

-{  \r
+{\r

   if (FeaturePcdGet (PcdDxeIplSwitchToLongMode)) {\r
     UINTN                                         ExtraPageTablePages;\r
     UINT32                                        RegEax;\r
   if (FeaturePcdGet (PcdDxeIplSwitchToLongMode)) {\r
     UINTN                                         ExtraPageTablePages;\r
     UINT32                                        RegEax;\r


@@ -419,7 +419,7 @@ S3AllocatePageTablesBuffer (
     //\r
     // If DXE is running 32-bit mode, no need to establish page table.\r
     //\r
     //\r
     // If DXE is running 32-bit mode, no need to establish page table.\r
     //\r

-    return  (EFI_PHYSICAL_ADDRESS) 0;  \r
+    return  (EFI_PHYSICAL_ADDRESS) 0;\r

   }\r
 }\r
 \r
   }\r
 }\r
 \r

diff --git a/MdeModulePkg/Universal/Acpi/S3SaveStateDxe/InternalS3SaveState.h b/MdeModulePkg/Universal/Acpi/S3SaveStateDxe/InternalS3SaveState.h
index 2cc638abbcb31eab5f89ae5272c902673f7381ed..19600085f1b25247a1959c2ecefa46ec62466f96 100644 (file)
--- a/MdeModulePkg/Universal/Acpi/S3SaveStateDxe/InternalS3SaveState.h
+++ b/MdeModulePkg/Universal/Acpi/S3SaveStateDxe/InternalS3SaveState.h
@@ -1,7 +1,7 @@
 /** @file\r
   Internal header file for S3 Boot Script Saver state driver.\r
 \r
 /** @file\r
   Internal header file for S3 Boot Script Saver state driver.\r
 \r

-  Copyright (c) 2006 - 2016, Intel Corporation. All rights reserved.<BR>\r
+  Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r

 \r
   This program and the accompanying materials\r
   are licensed and made available under the terms and conditions\r
 \r
   This program and the accompanying materials\r
   are licensed and made available under the terms and conditions\r


@@ -48,25 +48,25 @@ AcpiS3ContextSaveOnEndOfDxe (
   Adds a record into S3 boot script table.\r
 \r
   This function is used to store a boot script record into a given boot\r
   Adds a record into S3 boot script table.\r
 \r
   This function is used to store a boot script record into a given boot\r

-  script table. If the table specified by TableName is nonexistent in the \r
-  system, a new table will automatically be created and then the script record \r
-  will be added into the new table. This function is responsible for allocating \r
+  script table. If the table specified by TableName is nonexistent in the\r
+  system, a new table will automatically be created and then the script record\r
+  will be added into the new table. This function is responsible for allocating\r

   necessary memory for the script.\r
 \r
   necessary memory for the script.\r
 \r

-  This function has a variable parameter list. The exact parameter list depends on \r
-  the OpCode that is passed into the function. If an unsupported OpCode or illegal \r
+  This function has a variable parameter list. The exact parameter list depends on\r
+  the OpCode that is passed into the function. If an unsupported OpCode or illegal\r

   parameter list is passed in, this function returns EFI_INVALID_PARAMETER.\r
   If there are not enough resources available for storing more scripts, this function returns\r
   EFI_OUT_OF_RESOURCES.\r
 \r
   @param  This                  A pointer to the EFI_S3_SAVE_STATE_PROTOCOL instance.\r
   @param  OpCode                The operation code (opcode) number.\r
   parameter list is passed in, this function returns EFI_INVALID_PARAMETER.\r
   If there are not enough resources available for storing more scripts, this function returns\r
   EFI_OUT_OF_RESOURCES.\r
 \r
   @param  This                  A pointer to the EFI_S3_SAVE_STATE_PROTOCOL instance.\r
   @param  OpCode                The operation code (opcode) number.\r

-  @param  ...                   Argument list that is specific to each opcode. \r
+  @param  ...                   Argument list that is specific to each opcode.\r

 \r
   @retval EFI_SUCCESS           The operation succeeded. A record was added into the\r
                                 specified script table.\r
   @retval EFI_INVALID_PARAMETER The parameter is illegal or the given boot script is not supported.\r
 \r
   @retval EFI_SUCCESS           The operation succeeded. A record was added into the\r
                                 specified script table.\r
   @retval EFI_INVALID_PARAMETER The parameter is illegal or the given boot script is not supported.\r

-                                If the opcode is unknow or not supported because of the PCD \r
+                                If the opcode is unknow or not supported because of the PCD\r

                                 Feature Flags.\r
   @retval EFI_OUT_OF_RESOURCES  There is insufficient memory to store the boot script.\r
 \r
                                 Feature Flags.\r
   @retval EFI_OUT_OF_RESOURCES  There is insufficient memory to store the boot script.\r
 \r


@@ -98,7 +98,7 @@ BootScriptWrite (
                                 inserted, either before or after, depending on BeforeOrAfter. On exit, specifies\r
                                 the position of the inserted opcode in the boot script table.\r
   @param  OpCode                The operation code (opcode) number.\r
                                 inserted, either before or after, depending on BeforeOrAfter. On exit, specifies\r
                                 the position of the inserted opcode in the boot script table.\r
   @param  OpCode                The operation code (opcode) number.\r

-  @param  ...                   Argument list that is specific to each opcode. \r
+  @param  ...                   Argument list that is specific to each opcode.\r

 \r
   @retval EFI_SUCCESS           The operation succeeded. A record was added into the\r
                                 specified script table.\r
 \r
   @retval EFI_SUCCESS           The operation succeeded. A record was added into the\r
                                 specified script table.\r


@@ -139,7 +139,7 @@ BootScriptInsert (
 \r
   @retval EFI_SUCCESS           The label already exists or was inserted.\r
   @retval EFI_INVALID_PARAMETER The Opcode is an invalid opcode value or the Position is not a valid position in the boot script table..\r
 \r
   @retval EFI_SUCCESS           The label already exists or was inserted.\r
   @retval EFI_INVALID_PARAMETER The Opcode is an invalid opcode value or the Position is not a valid position in the boot script table..\r

-  \r
+\r

 **/\r
 EFI_STATUS\r
 EFIAPI\r
 **/\r
 EFI_STATUS\r
 EFIAPI\r


@@ -152,27 +152,27 @@ BootScriptLabel (
   );\r
 /**\r
   Compare two positions in the boot script table and return their relative position.\r
   );\r
 /**\r
   Compare two positions in the boot script table and return their relative position.\r

-  \r
+\r

   This function compares two positions in the boot script table and returns their relative positions. If\r
   Position1 is before Position2, then -1 is returned. If Position1 is equal to Position2,\r
   then 0 is returned. If Position1 is after Position2, then 1 is returned.\r
   This function compares two positions in the boot script table and returns their relative positions. If\r
   Position1 is before Position2, then -1 is returned. If Position1 is equal to Position2,\r
   then 0 is returned. If Position1 is after Position2, then 1 is returned.\r

-  \r
+\r

   @param  This                  A pointer to the EFI_S3_SAVE_STATE_PROTOCOL instance.\r
   @param  Position1             The positions in the boot script table to compare\r
   @param  Position2             The positions in the boot script table to compare\r
   @param  RelativePosition      On return, points to the result of the comparison\r
 \r
   @param  This                  A pointer to the EFI_S3_SAVE_STATE_PROTOCOL instance.\r
   @param  Position1             The positions in the boot script table to compare\r
   @param  Position2             The positions in the boot script table to compare\r
   @param  RelativePosition      On return, points to the result of the comparison\r
 \r

-  @retval EFI_SUCCESS           The operation succeeded. \r
+  @retval EFI_SUCCESS           The operation succeeded.\r

   @retval EFI_INVALID_PARAMETER The Position1 or Position2 is not a valid position in the boot script table.\r
 \r
 **/\r
 EFI_STATUS\r
   @retval EFI_INVALID_PARAMETER The Position1 or Position2 is not a valid position in the boot script table.\r
 \r
 **/\r
 EFI_STATUS\r

-EFIAPI \r
+EFIAPI\r

 BootScriptCompare (\r
   IN CONST EFI_S3_SAVE_STATE_PROTOCOL      *This,\r
   IN       EFI_S3_BOOT_SCRIPT_POSITION      Position1,\r
   IN       EFI_S3_BOOT_SCRIPT_POSITION      Position2,\r
   OUT      UINTN                           *RelativePosition\r
   );\r
 BootScriptCompare (\r
   IN CONST EFI_S3_SAVE_STATE_PROTOCOL      *This,\r
   IN       EFI_S3_BOOT_SCRIPT_POSITION      Position1,\r
   IN       EFI_S3_BOOT_SCRIPT_POSITION      Position2,\r
   OUT      UINTN                           *RelativePosition\r
   );\r

-  \r
+\r

 #endif //_INTERNAL_S3_SAVE_STATE_H_\r
 #endif //_INTERNAL_S3_SAVE_STATE_H_\r

diff --git a/MdeModulePkg/Universal/Acpi/S3SaveStateDxe/S3SaveState.c b/MdeModulePkg/Universal/Acpi/S3SaveStateDxe/S3SaveState.c
index d73005156cc6e172a1e6ff35c892d4218bb1759f..274f3be12c753f59481980bc76def082990b8e9d 100644 (file)
--- a/MdeModulePkg/Universal/Acpi/S3SaveStateDxe/S3SaveState.c
+++ b/MdeModulePkg/Universal/Acpi/S3SaveStateDxe/S3SaveState.c
@@ -1,7 +1,7 @@
 /** @file\r
   Implementation for S3 Boot Script Saver state driver.\r
 \r
 /** @file\r
   Implementation for S3 Boot Script Saver state driver.\r
 \r

-  Copyright (c) 2006 - 2017, Intel Corporation. All rights reserved.<BR>\r
+  Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r

 \r
   This program and the accompanying materials\r
   are licensed and made available under the terms and conditions\r
 \r
   This program and the accompanying materials\r
   are licensed and made available under the terms and conditions\r


@@ -46,7 +46,7 @@ BootScriptWriteIoWrite (
   Address     = VA_ARG (Marker, UINT64);\r
   Count       = VA_ARG (Marker, UINTN);\r
   Buffer      = VA_ARG (Marker, UINT8 *);\r
   Address     = VA_ARG (Marker, UINT64);\r
   Count       = VA_ARG (Marker, UINTN);\r
   Buffer      = VA_ARG (Marker, UINT8 *);\r

-  \r
+\r

   return S3BootScriptSaveIoWrite (Width, Address, Count, Buffer);\r
 }\r
 /**\r
   return S3BootScriptSaveIoWrite (Width, Address, Count, Buffer);\r
 }\r
 /**\r


@@ -68,12 +68,12 @@ BootScriptWriteIoReadWrite (
   UINT64                Address;\r
   UINT8                 *Data;\r
   UINT8                 *DataMask;\r
   UINT64                Address;\r
   UINT8                 *Data;\r
   UINT8                 *DataMask;\r

- \r
+\r

   Width       = VA_ARG (Marker, S3_BOOT_SCRIPT_LIB_WIDTH);\r
   Address     = VA_ARG (Marker, UINT64);\r
   Data        = VA_ARG (Marker, UINT8 *);\r
   DataMask    = VA_ARG (Marker, UINT8 *);\r
   Width       = VA_ARG (Marker, S3_BOOT_SCRIPT_LIB_WIDTH);\r
   Address     = VA_ARG (Marker, UINT64);\r
   Data        = VA_ARG (Marker, UINT8 *);\r
   DataMask    = VA_ARG (Marker, UINT8 *);\r

-  \r
+\r

   return S3BootScriptSaveIoReadWrite (Width, Address, Data, DataMask);\r
 }\r
 \r
   return S3BootScriptSaveIoReadWrite (Width, Address, Data, DataMask);\r
 }\r
 \r


@@ -96,7 +96,7 @@ BootScriptWriteMemWrite (
   UINT64                Address;\r
   UINTN                 Count;\r
   UINT8                 *Buffer;\r
   UINT64                Address;\r
   UINTN                 Count;\r
   UINT8                 *Buffer;\r

- \r
+\r

   Width       = VA_ARG (Marker, S3_BOOT_SCRIPT_LIB_WIDTH);\r
   Address     = VA_ARG (Marker, UINT64);\r
   Count       = VA_ARG (Marker, UINTN);\r
   Width       = VA_ARG (Marker, S3_BOOT_SCRIPT_LIB_WIDTH);\r
   Address     = VA_ARG (Marker, UINT64);\r
   Count       = VA_ARG (Marker, UINTN);\r


@@ -124,7 +124,7 @@ BootScriptWriteMemReadWrite (
   UINT64                Address;\r
   UINT8                 *Data;\r
   UINT8                 *DataMask;\r
   UINT64                Address;\r
   UINT8                 *Data;\r
   UINT8                 *DataMask;\r

-  \r
+\r

   Width       = VA_ARG (Marker, S3_BOOT_SCRIPT_LIB_WIDTH);\r
   Address     = VA_ARG (Marker, UINT64);\r
   Data        = VA_ARG (Marker, UINT8 *);\r
   Width       = VA_ARG (Marker, S3_BOOT_SCRIPT_LIB_WIDTH);\r
   Address     = VA_ARG (Marker, UINT64);\r
   Data        = VA_ARG (Marker, UINT8 *);\r


@@ -238,13 +238,13 @@ BootScriptWritePciCfg2ReadWrite (
   UINT64                Address;\r
   UINT8                 *Data;\r
   UINT8                 *DataMask;\r
   UINT64                Address;\r
   UINT8                 *Data;\r
   UINT8                 *DataMask;\r

- \r
+\r

   Width       = VA_ARG (Marker, S3_BOOT_SCRIPT_LIB_WIDTH);\r
   Segment     = VA_ARG (Marker, UINT16);\r
   Address     = VA_ARG (Marker, UINT64);\r
   Data        = VA_ARG (Marker, UINT8 *);\r
   DataMask    = VA_ARG (Marker, UINT8 *);\r
   Width       = VA_ARG (Marker, S3_BOOT_SCRIPT_LIB_WIDTH);\r
   Segment     = VA_ARG (Marker, UINT16);\r
   Address     = VA_ARG (Marker, UINT64);\r
   Data        = VA_ARG (Marker, UINT8 *);\r
   DataMask    = VA_ARG (Marker, UINT8 *);\r

- \r
+\r

   return S3BootScriptSavePciCfg2ReadWrite (Width, Segment, Address, Data, DataMask);\r
 }\r
 /**\r
   return S3BootScriptSavePciCfg2ReadWrite (Width, Segment, Address, Data, DataMask);\r
 }\r
 /**\r


@@ -269,15 +269,15 @@ BootScriptWriteSmbusExecute (
   VOID                     *Buffer;\r
   UINTN                    *DataSize;\r
   UINTN                     SmBusAddress;\r
   VOID                     *Buffer;\r
   UINTN                    *DataSize;\r
   UINTN                     SmBusAddress;\r

-  \r
+\r

   SlaveAddress.SmbusDeviceAddress = VA_ARG (Marker, UINTN);\r
   Command                         = VA_ARG (Marker, EFI_SMBUS_DEVICE_COMMAND);\r
   Operation                       = VA_ARG (Marker, EFI_SMBUS_OPERATION);\r
   PecCheck                        = VA_ARG (Marker, BOOLEAN);\r
   SmBusAddress                    = SMBUS_LIB_ADDRESS (SlaveAddress.SmbusDeviceAddress,Command,0,PecCheck);\r
   SlaveAddress.SmbusDeviceAddress = VA_ARG (Marker, UINTN);\r
   Command                         = VA_ARG (Marker, EFI_SMBUS_DEVICE_COMMAND);\r
   Operation                       = VA_ARG (Marker, EFI_SMBUS_OPERATION);\r
   PecCheck                        = VA_ARG (Marker, BOOLEAN);\r
   SmBusAddress                    = SMBUS_LIB_ADDRESS (SlaveAddress.SmbusDeviceAddress,Command,0,PecCheck);\r

-  DataSize                        = VA_ARG (Marker, UINTN *);    \r
+  DataSize                        = VA_ARG (Marker, UINTN *);\r

   Buffer                          = VA_ARG (Marker, VOID *);\r
   Buffer                          = VA_ARG (Marker, VOID *);\r

- \r
+\r

   return S3BootScriptSaveSmbusExecute (SmBusAddress, Operation, DataSize, Buffer);\r
 }\r
 /**\r
   return S3BootScriptSaveSmbusExecute (SmBusAddress, Operation, DataSize, Buffer);\r
 }\r
 /**\r


@@ -303,7 +303,7 @@ BootScriptWriteStall (
 }\r
 \r
 /**\r
 }\r
 \r
 /**\r

-  Internal function to add Save jmp address according to DISPATCH_OPCODE. \r
+  Internal function to add Save jmp address according to DISPATCH_OPCODE.\r

   We ignore "Context" parameter\r
 \r
   @param  Marker                The variable argument list to get the opcode\r
   We ignore "Context" parameter\r
 \r
   @param  Marker                The variable argument list to get the opcode\r


@@ -325,8 +325,8 @@ BootScriptWriteDispatch (
 }\r
 \r
 /**\r
 }\r
 \r
 /**\r

-  Internal function to add memory pool operation to the table. \r
- \r
+  Internal function to add memory pool operation to the table.\r
+\r

   @param  Marker                The variable argument list to get the opcode\r
                                 and associated attributes.\r
 \r
   @param  Marker                The variable argument list to get the opcode\r
                                 and associated attributes.\r
 \r


@@ -339,18 +339,18 @@ BootScriptWriteMemPoll (
   IN VA_LIST                       Marker\r
   )\r
 {\r
   IN VA_LIST                       Marker\r
   )\r
 {\r

-  S3_BOOT_SCRIPT_LIB_WIDTH   Width;                                    \r
-  UINT64                     Address;                                    \r
-  VOID                      *Data;                                    \r
-  VOID                      *DataMask;                                  \r
+  S3_BOOT_SCRIPT_LIB_WIDTH   Width;\r
+  UINT64                     Address;\r
+  VOID                      *Data;\r
+  VOID                      *DataMask;\r

   UINT64                    Delay;\r
   UINT64                    LoopTimes;\r
   UINT32                    Remainder;\r
 \r
   UINT64                    Delay;\r
   UINT64                    LoopTimes;\r
   UINT32                    Remainder;\r
 \r

-  Width    = VA_ARG (Marker, S3_BOOT_SCRIPT_LIB_WIDTH);                  \r
-  Address  = VA_ARG (Marker, UINT64);                                    \r
-  Data     = VA_ARG (Marker, VOID *);                                    \r
-  DataMask = VA_ARG (Marker, VOID *);                                    \r
+  Width    = VA_ARG (Marker, S3_BOOT_SCRIPT_LIB_WIDTH);\r
+  Address  = VA_ARG (Marker, UINT64);\r
+  Data     = VA_ARG (Marker, VOID *);\r
+  DataMask = VA_ARG (Marker, VOID *);\r

   Delay    = VA_ARG (Marker, UINT64);\r
   //\r
   // According to the spec, the interval between 2 polls is 100ns,\r
   Delay    = VA_ARG (Marker, UINT64);\r
   //\r
   // According to the spec, the interval between 2 polls is 100ns,\r


@@ -375,7 +375,7 @@ BootScriptWriteMemPoll (
 }\r
 \r
 /**\r
 }\r
 \r
 /**\r

-  Internal function to add Save jmp address according to DISPATCH_OPCODE2. \r
+  Internal function to add Save jmp address according to DISPATCH_OPCODE2.\r

   The "Context" parameter is not ignored.\r
 \r
   @param  Marker                The variable argument list to get the opcode\r
   The "Context" parameter is not ignored.\r
 \r
   @param  Marker                The variable argument list to get the opcode\r


@@ -391,7 +391,7 @@ BootScriptWriteDispatch2 (
   )\r
 {\r
   VOID                  *EntryPoint;\r
   )\r
 {\r
   VOID                  *EntryPoint;\r

-  VOID                  *Context;  \r
+  VOID                  *Context;\r

 \r
   EntryPoint = (VOID*)(UINTN)VA_ARG (Marker, EFI_PHYSICAL_ADDRESS);\r
   Context    = (VOID*)(UINTN)VA_ARG (Marker, EFI_PHYSICAL_ADDRESS);\r
 \r
   EntryPoint = (VOID*)(UINTN)VA_ARG (Marker, EFI_PHYSICAL_ADDRESS);\r
   Context    = (VOID*)(UINTN)VA_ARG (Marker, EFI_PHYSICAL_ADDRESS);\r


@@ -414,7 +414,7 @@ BootScriptWriteInformation (
   )\r
 {\r
   UINT32                InformationLength;\r
   )\r
 {\r
   UINT32                InformationLength;\r

-  EFI_PHYSICAL_ADDRESS  Information;  \r
+  EFI_PHYSICAL_ADDRESS  Information;\r

 \r
   InformationLength = VA_ARG (Marker, UINT32);\r
   Information = VA_ARG (Marker, EFI_PHYSICAL_ADDRESS);\r
 \r
   InformationLength = VA_ARG (Marker, UINT32);\r
   Information = VA_ARG (Marker, EFI_PHYSICAL_ADDRESS);\r


@@ -435,17 +435,17 @@ BootScriptWriteIoPoll (
   )\r
 {\r
    S3_BOOT_SCRIPT_LIB_WIDTH     Width;\r
   )\r
 {\r
    S3_BOOT_SCRIPT_LIB_WIDTH     Width;\r

-   UINT64                     Address;    \r
-   VOID                      *Data;    \r
-   VOID                      *DataMask;   \r
-   UINT64                     Delay;   \r
-   \r
-   Width    = VA_ARG (Marker, S3_BOOT_SCRIPT_LIB_WIDTH);  \r
-   Address  = VA_ARG (Marker, UINT64);                    \r
-   Data     = VA_ARG (Marker, VOID *);                   \r
-   DataMask = VA_ARG (Marker, VOID *);                   \r
-   Delay    = (UINT64)VA_ARG (Marker, UINT64);             \r
-   \r
+   UINT64                     Address;\r
+   VOID                      *Data;\r
+   VOID                      *DataMask;\r
+   UINT64                     Delay;\r
+\r
+   Width    = VA_ARG (Marker, S3_BOOT_SCRIPT_LIB_WIDTH);\r
+   Address  = VA_ARG (Marker, UINT64);\r
+   Data     = VA_ARG (Marker, VOID *);\r
+   DataMask = VA_ARG (Marker, VOID *);\r
+   Delay    = (UINT64)VA_ARG (Marker, UINT64);\r
+\r

    return S3BootScriptSaveIoPoll (Width, Address, Data, DataMask, Delay);\r
 }\r
 /**\r
    return S3BootScriptSaveIoPoll (Width, Address, Data, DataMask, Delay);\r
 }\r
 /**\r


@@ -469,13 +469,13 @@ BootScriptWritePciConfigPoll (
    VOID                      *DataMask;\r
    UINT64                     Delay;\r
 \r
    VOID                      *DataMask;\r
    UINT64                     Delay;\r
 \r

-   \r
-   Width    = VA_ARG (Marker, S3_BOOT_SCRIPT_LIB_WIDTH);  \r
-   Address  = VA_ARG (Marker, UINT64);                    \r
-   Data     = VA_ARG (Marker, VOID *);                   \r
-   DataMask = VA_ARG (Marker, VOID *);                   \r
-   Delay    = (UINT64)VA_ARG (Marker, UINT64);             \r
-   \r
+\r
+   Width    = VA_ARG (Marker, S3_BOOT_SCRIPT_LIB_WIDTH);\r
+   Address  = VA_ARG (Marker, UINT64);\r
+   Data     = VA_ARG (Marker, VOID *);\r
+   DataMask = VA_ARG (Marker, VOID *);\r
+   Delay    = (UINT64)VA_ARG (Marker, UINT64);\r
+\r

    return S3BootScriptSavePciPoll (Width, Address, Data, DataMask, Delay);\r
 }\r
 /**\r
    return S3BootScriptSavePciPoll (Width, Address, Data, DataMask, Delay);\r
 }\r
 /**\r


@@ -499,14 +499,14 @@ BootScriptWritePciConfig2Poll (
    VOID                         *Data;\r
    VOID                         *DataMask;\r
    UINT64                        Delay;\r
    VOID                         *Data;\r
    VOID                         *DataMask;\r
    UINT64                        Delay;\r

-  \r
-   Width    = VA_ARG (Marker, S3_BOOT_SCRIPT_LIB_WIDTH);  \r
-   Segment  = VA_ARG (Marker, UINT16);      \r
-   Address  = VA_ARG (Marker, UINT64);                    \r
-   Data     = VA_ARG (Marker, VOID *);                   \r
-   DataMask = VA_ARG (Marker, VOID *);                   \r
-   Delay    = (UINT64)VA_ARG (Marker, UINT64);             \r
-   \r
+\r
+   Width    = VA_ARG (Marker, S3_BOOT_SCRIPT_LIB_WIDTH);\r
+   Segment  = VA_ARG (Marker, UINT16);\r
+   Address  = VA_ARG (Marker, UINT64);\r
+   Data     = VA_ARG (Marker, VOID *);\r
+   DataMask = VA_ARG (Marker, VOID *);\r
+   Delay    = (UINT64)VA_ARG (Marker, UINT64);\r
+\r

    return S3BootScriptSavePci2Poll (Width, Segment, Address, Data, DataMask, Delay);\r
 }\r
 \r
    return S3BootScriptSavePci2Poll (Width, Segment, Address, Data, DataMask, Delay);\r
 }\r
 \r


@@ -515,25 +515,25 @@ BootScriptWritePciConfig2Poll (
   Adds a record into S3 boot script table.\r
 \r
   This function is used to store a boot script record into a given boot\r
   Adds a record into S3 boot script table.\r
 \r
   This function is used to store a boot script record into a given boot\r

-  script table. If the table specified by TableName is nonexistent in the \r
-  system, a new table will automatically be created and then the script record \r
-  will be added into the new table. This function is responsible for allocating \r
+  script table. If the table specified by TableName is nonexistent in the\r
+  system, a new table will automatically be created and then the script record\r
+  will be added into the new table. This function is responsible for allocating\r

   necessary memory for the script.\r
 \r
   necessary memory for the script.\r
 \r

-  This function has a variable parameter list. The exact parameter list depends on \r
-  the OpCode that is passed into the function. If an unsupported OpCode or illegal \r
+  This function has a variable parameter list. The exact parameter list depends on\r
+  the OpCode that is passed into the function. If an unsupported OpCode or illegal\r

   parameter list is passed in, this function returns EFI_INVALID_PARAMETER.\r
   If there are not enough resources available for storing more scripts, this function returns\r
   EFI_OUT_OF_RESOURCES.\r
 \r
   @param  This                  A pointer to the EFI_S3_SAVE_STATE_PROTOCOL instance.\r
   @param  OpCode                The operation code (opcode) number.\r
   parameter list is passed in, this function returns EFI_INVALID_PARAMETER.\r
   If there are not enough resources available for storing more scripts, this function returns\r
   EFI_OUT_OF_RESOURCES.\r
 \r
   @param  This                  A pointer to the EFI_S3_SAVE_STATE_PROTOCOL instance.\r
   @param  OpCode                The operation code (opcode) number.\r

-  @param  ...                   Argument list that is specific to each opcode. \r
-                                \r
+  @param  ...                   Argument list that is specific to each opcode.\r
+\r

   @retval EFI_SUCCESS           The operation succeeded. A record was added into the\r
                                 specified script table.\r
   @retval EFI_INVALID_PARAMETER The parameter is illegal or the given boot script is not supported.\r
   @retval EFI_SUCCESS           The operation succeeded. A record was added into the\r
                                 specified script table.\r
   @retval EFI_INVALID_PARAMETER The parameter is illegal or the given boot script is not supported.\r

-                                If the opcode is unknow or not supported because of the PCD \r
+                                If the opcode is unknow or not supported because of the PCD\r

                                 Feature Flags.\r
   @retval EFI_OUT_OF_RESOURCES  There is insufficient memory to store the boot script.\r
 \r
                                 Feature Flags.\r
   @retval EFI_OUT_OF_RESOURCES  There is insufficient memory to store the boot script.\r
 \r


@@ -547,7 +547,7 @@ BootScriptWrite (
   )\r
 {\r
   EFI_STATUS                Status;\r
   )\r
 {\r
   EFI_STATUS                Status;\r

-  VA_LIST                   Marker;  \r
+  VA_LIST                   Marker;\r

   //\r
   // Build script according to opcode\r
   //\r
   //\r
   // Build script according to opcode\r
   //\r


@@ -568,7 +568,7 @@ BootScriptWrite (
   case EFI_BOOT_SCRIPT_MEM_WRITE_OPCODE:\r
     VA_START (Marker, OpCode);\r
     Status = BootScriptWriteMemWrite (Marker);\r
   case EFI_BOOT_SCRIPT_MEM_WRITE_OPCODE:\r
     VA_START (Marker, OpCode);\r
     Status = BootScriptWriteMemWrite (Marker);\r

-    VA_END (Marker); \r
+    VA_END (Marker);\r

     break;\r
 \r
   case EFI_BOOT_SCRIPT_MEM_READ_WRITE_OPCODE:\r
     break;\r
 \r
   case EFI_BOOT_SCRIPT_MEM_READ_WRITE_OPCODE:\r


@@ -599,7 +599,7 @@ BootScriptWrite (
     VA_START (Marker, OpCode);\r
     Status = BootScriptWriteStall (Marker);\r
     VA_END (Marker);\r
     VA_START (Marker, OpCode);\r
     Status = BootScriptWriteStall (Marker);\r
     VA_END (Marker);\r

-  \r
+\r

     break;\r
 \r
   case EFI_BOOT_SCRIPT_DISPATCH_OPCODE:\r
     break;\r
 \r
   case EFI_BOOT_SCRIPT_DISPATCH_OPCODE:\r


@@ -638,23 +638,23 @@ BootScriptWrite (
     VA_END (Marker);\r
     break;\r
 \r
     VA_END (Marker);\r
     break;\r
 \r

-  case EFI_BOOT_SCRIPT_IO_POLL_OPCODE:  \r
+  case EFI_BOOT_SCRIPT_IO_POLL_OPCODE:\r

     VA_START (Marker, OpCode);\r
     Status = BootScriptWriteIoPoll (Marker);\r
     VA_END (Marker);\r
     VA_START (Marker, OpCode);\r
     Status = BootScriptWriteIoPoll (Marker);\r
     VA_END (Marker);\r

-    break;    \r
-  \r
-  case EFI_BOOT_SCRIPT_PCI_CONFIG_POLL_OPCODE: \r
+    break;\r
+\r
+  case EFI_BOOT_SCRIPT_PCI_CONFIG_POLL_OPCODE:\r

     VA_START (Marker, OpCode);\r
     Status = BootScriptWritePciConfigPoll (Marker);\r
     VA_END (Marker);\r
     VA_START (Marker, OpCode);\r
     Status = BootScriptWritePciConfigPoll (Marker);\r
     VA_END (Marker);\r

-    break;    \r
-  \r
+    break;\r
+\r

   case EFI_BOOT_SCRIPT_PCI_CONFIG2_POLL_OPCODE:\r
     VA_START (Marker, OpCode);\r
     Status = BootScriptWritePciConfig2Poll (Marker);\r
     VA_END (Marker);\r
   case EFI_BOOT_SCRIPT_PCI_CONFIG2_POLL_OPCODE:\r
     VA_START (Marker, OpCode);\r
     Status = BootScriptWritePciConfig2Poll (Marker);\r
     VA_END (Marker);\r

-    break;    \r
+    break;\r

 \r
   default:\r
     Status = EFI_INVALID_PARAMETER;\r
 \r
   default:\r
     Status = EFI_INVALID_PARAMETER;\r


@@ -683,7 +683,7 @@ BootScriptWrite (
                                 inserted, either before or after, depending on BeforeOrAfter. On exit, specifies\r
                                 the position of the inserted opcode in the boot script table.\r
   @param  OpCode                The operation code (opcode) number.\r
                                 inserted, either before or after, depending on BeforeOrAfter. On exit, specifies\r
                                 the position of the inserted opcode in the boot script table.\r
   @param  OpCode                The operation code (opcode) number.\r

-  @param  ...                   Argument list that is specific to each opcode. \r
+  @param  ...                   Argument list that is specific to each opcode.\r

 \r
   @retval EFI_SUCCESS           The operation succeeded. A record was added into the\r
                                 specified script table.\r
 \r
   @retval EFI_SUCCESS           The operation succeeded. A record was added into the\r
                                 specified script table.\r


@@ -702,7 +702,7 @@ BootScriptInsert (
   )\r
 {\r
   EFI_STATUS                Status;\r
   )\r
 {\r
   EFI_STATUS                Status;\r

-  VA_LIST                   Marker;  \r
+  VA_LIST                   Marker;\r

   //\r
   // Build script according to opcode\r
   //\r
   //\r
   // Build script according to opcode\r
   //\r


@@ -723,7 +723,7 @@ BootScriptInsert (
   case EFI_BOOT_SCRIPT_MEM_WRITE_OPCODE:\r
     VA_START (Marker, OpCode);\r
     Status = BootScriptWriteMemWrite (Marker);\r
   case EFI_BOOT_SCRIPT_MEM_WRITE_OPCODE:\r
     VA_START (Marker, OpCode);\r
     Status = BootScriptWriteMemWrite (Marker);\r

-    VA_END (Marker); \r
+    VA_END (Marker);\r

     break;\r
 \r
   case EFI_BOOT_SCRIPT_MEM_READ_WRITE_OPCODE:\r
     break;\r
 \r
   case EFI_BOOT_SCRIPT_MEM_READ_WRITE_OPCODE:\r


@@ -754,7 +754,7 @@ BootScriptInsert (
     VA_START (Marker, OpCode);\r
     Status = BootScriptWriteStall (Marker);\r
     VA_END (Marker);\r
     VA_START (Marker, OpCode);\r
     Status = BootScriptWriteStall (Marker);\r
     VA_END (Marker);\r

-  \r
+\r

     break;\r
 \r
   case EFI_BOOT_SCRIPT_DISPATCH_OPCODE:\r
     break;\r
 \r
   case EFI_BOOT_SCRIPT_DISPATCH_OPCODE:\r


@@ -792,30 +792,30 @@ BootScriptInsert (
     Status = BootScriptWritePciCfg2ReadWrite (Marker);\r
     VA_END (Marker);\r
     break;\r
     Status = BootScriptWritePciCfg2ReadWrite (Marker);\r
     VA_END (Marker);\r
     break;\r

-    \r
-  case EFI_BOOT_SCRIPT_IO_POLL_OPCODE:  \r
+\r
+  case EFI_BOOT_SCRIPT_IO_POLL_OPCODE:\r

     VA_START (Marker, OpCode);\r
     Status = BootScriptWriteIoPoll (Marker);\r
     VA_END (Marker);\r
     VA_START (Marker, OpCode);\r
     Status = BootScriptWriteIoPoll (Marker);\r
     VA_END (Marker);\r

-    break;    \r
-  \r
-  case EFI_BOOT_SCRIPT_PCI_CONFIG_POLL_OPCODE: \r
+    break;\r
+\r
+  case EFI_BOOT_SCRIPT_PCI_CONFIG_POLL_OPCODE:\r

     VA_START (Marker, OpCode);\r
     Status = BootScriptWritePciConfigPoll (Marker);\r
     VA_END (Marker);\r
     VA_START (Marker, OpCode);\r
     Status = BootScriptWritePciConfigPoll (Marker);\r
     VA_END (Marker);\r

-    break;    \r
-  \r
+    break;\r
+\r

   case EFI_BOOT_SCRIPT_PCI_CONFIG2_POLL_OPCODE:\r
     VA_START (Marker, OpCode);\r
     Status = BootScriptWritePciConfig2Poll (Marker);\r
     VA_END (Marker);\r
   case EFI_BOOT_SCRIPT_PCI_CONFIG2_POLL_OPCODE:\r
     VA_START (Marker, OpCode);\r
     Status = BootScriptWritePciConfig2Poll (Marker);\r
     VA_END (Marker);\r

-    break;    \r
+    break;\r

 \r
   default:\r
     Status = EFI_INVALID_PARAMETER;\r
     break;\r
   }\r
 \r
   default:\r
     Status = EFI_INVALID_PARAMETER;\r
     break;\r
   }\r

-  \r
+\r

   if (!EFI_ERROR (Status)) {\r
    Status = S3BootScriptMoveLastOpcode (BeforeOrAfter, Position);\r
   }\r
   if (!EFI_ERROR (Status)) {\r
    Status = S3BootScriptMoveLastOpcode (BeforeOrAfter, Position);\r
   }\r


@@ -846,7 +846,7 @@ BootScriptInsert (
   @retval EFI_SUCCESS           The label already exists or was inserted.\r
   @retval EFI_INVALID_PARAMETER The Label is NULL or points to an empty string.\r
   @retval EFI_INVALID_PARAMETER The Position is not a valid position in the boot script table.\r
   @retval EFI_SUCCESS           The label already exists or was inserted.\r
   @retval EFI_INVALID_PARAMETER The Label is NULL or points to an empty string.\r
   @retval EFI_INVALID_PARAMETER The Position is not a valid position in the boot script table.\r

-  \r
+\r

 **/\r
 EFI_STATUS\r
 EFIAPI\r
 **/\r
 EFI_STATUS\r
 EFIAPI\r


@@ -858,27 +858,27 @@ BootScriptLabel (
   IN CONST CHAR8                                *Label\r
   )\r
 {\r
   IN CONST CHAR8                                *Label\r
   )\r
 {\r

-       return S3BootScriptLabel (BeforeOrAfter, CreateIfNotFound, Position, Label);\r
+  return S3BootScriptLabel (BeforeOrAfter, CreateIfNotFound, Position, Label);\r

 }\r
 /**\r
   Compare two positions in the boot script table and return their relative position.\r
 }\r
 /**\r
   Compare two positions in the boot script table and return their relative position.\r

-  \r
+\r

   This function compares two positions in the boot script table and returns their relative positions. If\r
   Position1 is before Position2, then -1 is returned. If Position1 is equal to Position2,\r
   then 0 is returned. If Position1 is after Position2, then 1 is returned.\r
   This function compares two positions in the boot script table and returns their relative positions. If\r
   Position1 is before Position2, then -1 is returned. If Position1 is equal to Position2,\r
   then 0 is returned. If Position1 is after Position2, then 1 is returned.\r

-  \r
+\r

   @param  This                  A pointer to the EFI_S3_SAVE_STATE_PROTOCOL instance.\r
   @param  Position1             The positions in the boot script table to compare\r
   @param  Position2             The positions in the boot script table to compare\r
   @param  RelativePosition      On return, points to the result of the comparison\r
 \r
   @param  This                  A pointer to the EFI_S3_SAVE_STATE_PROTOCOL instance.\r
   @param  Position1             The positions in the boot script table to compare\r
   @param  Position2             The positions in the boot script table to compare\r
   @param  RelativePosition      On return, points to the result of the comparison\r
 \r

-  @retval EFI_SUCCESS           The operation succeeded. \r
+  @retval EFI_SUCCESS           The operation succeeded.\r

   @retval EFI_INVALID_PARAMETER The Position1 or Position2 is not a valid position in the boot script table.\r
   @retval EFI_INVALID_PARAMETER The RelativePosition is NULL.\r
 \r
 **/\r
 EFI_STATUS\r
   @retval EFI_INVALID_PARAMETER The Position1 or Position2 is not a valid position in the boot script table.\r
   @retval EFI_INVALID_PARAMETER The RelativePosition is NULL.\r
 \r
 **/\r
 EFI_STATUS\r

-EFIAPI \r
+EFIAPI\r

 BootScriptCompare (\r
   IN CONST EFI_S3_SAVE_STATE_PROTOCOL      *This,\r
   IN       EFI_S3_BOOT_SCRIPT_POSITION      Position1,\r
 BootScriptCompare (\r
   IN CONST EFI_S3_SAVE_STATE_PROTOCOL      *This,\r
   IN       EFI_S3_BOOT_SCRIPT_POSITION      Position1,\r


@@ -886,7 +886,7 @@ BootScriptCompare (
   OUT      UINTN                           *RelativePosition\r
   )\r
 {\r
   OUT      UINTN                           *RelativePosition\r
   )\r
 {\r

-       return S3BootScriptCompare (Position1, Position2, RelativePosition);\r
+  return S3BootScriptCompare (Position1, Position2, RelativePosition);\r

 }\r
 /**\r
   This routine is entry point of ScriptSave driver.\r
 }\r
 /**\r
   This routine is entry point of ScriptSave driver.\r

diff --git a/MdeModulePkg/Universal/Acpi/S3SaveStateDxe/S3SaveStateDxe.inf b/MdeModulePkg/Universal/Acpi/S3SaveStateDxe/S3SaveStateDxe.inf
index 05e98f40cdd83ae1b26c7426b87e3a584533b346..a4184212bb82fd9d551c89125624cdc043bb228f 100644 (file)
--- a/MdeModulePkg/Universal/Acpi/S3SaveStateDxe/S3SaveStateDxe.inf
+++ b/MdeModulePkg/Universal/Acpi/S3SaveStateDxe/S3SaveStateDxe.inf
@@ -3,7 +3,7 @@
 #\r
 # It will install S3 Save State protocol to store or record various IO operations to be replayed during an S3 resume.\r
 #\r
 #\r
 # It will install S3 Save State protocol to store or record various IO operations to be replayed during an S3 resume.\r
 #\r

-# Copyright (c) 2009 - 2016, Intel Corporation. All rights reserved.<BR>\r
+# Copyright (c) 2009 - 2018, Intel Corporation. All rights reserved.<BR>\r

 #\r
 # This program and the accompanying materials are\r
 # licensed and made available under the terms and conditions of the BSD License\r
 #\r
 # This program and the accompanying materials are\r
 # licensed and made available under the terms and conditions of the BSD License\r


@@ -74,4 +74,4 @@
   TRUE\r
 \r
 [UserExtensions.TianoCore."ExtraFiles"]\r
   TRUE\r
 \r
 [UserExtensions.TianoCore."ExtraFiles"]\r

-  S3SaveStateDxeExtra.uni
\ No newline at end of file
+  S3SaveStateDxeExtra.uni\r

diff --git a/MdeModulePkg/Universal/Acpi/S3SaveStateDxe/S3SaveStateDxe.uni b/MdeModulePkg/Universal/Acpi/S3SaveStateDxe/S3SaveStateDxe.uni
index 312803e69c19463cdff4cdf922ae16712c508d52..579cce2a8d675d549f6c839d54b641483e80db69 100644 (file)
--- a/MdeModulePkg/Universal/Acpi/S3SaveStateDxe/S3SaveStateDxe.uni
+++ b/MdeModulePkg/Universal/Acpi/S3SaveStateDxe/S3SaveStateDxe.uni
@@ -3,13 +3,13 @@
 //\r
 // It will install S3 Save State protocol to store or record various IO operations to be replayed during an S3 resume.\r
 //\r
 //\r
 // It will install S3 Save State protocol to store or record various IO operations to be replayed during an S3 resume.\r
 //\r

-// Copyright (c) 2009 - 2014, Intel Corporation. All rights reserved.<BR>\r
+// Copyright (c) 2009 - 2018, Intel Corporation. All rights reserved.<BR>\r

 //\r
 // This program and the accompanying materials are\r
 // licensed and made available under the terms and conditions of the BSD License\r
 // which accompanies this distribution.  The full text of the license may be found at\r
 // http://opensource.org/licenses/bsd-license.php\r
 //\r
 // This program and the accompanying materials are\r
 // licensed and made available under the terms and conditions of the BSD License\r
 // which accompanies this distribution.  The full text of the license may be found at\r
 // http://opensource.org/licenses/bsd-license.php\r

-// \r
+//\r

 // THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 // WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 //\r
 // THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 // WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 //\r

diff --git a/MdeModulePkg/Universal/Acpi/S3SaveStateDxe/S3SaveStateDxeExtra.uni b/MdeModulePkg/Universal/Acpi/S3SaveStateDxe/S3SaveStateDxeExtra.uni
index c648ff8ae7087cd820b5b40bcc0a8722111f8419..20728e12e8f1338f7cad352c5ce3181a3f29152d 100644 (file)
--- a/MdeModulePkg/Universal/Acpi/S3SaveStateDxe/S3SaveStateDxeExtra.uni
+++ b/MdeModulePkg/Universal/Acpi/S3SaveStateDxe/S3SaveStateDxeExtra.uni
@@ -1,7 +1,7 @@
 // /** @file\r
 // S3SaveStateDxe Localized Strings and Content\r
 //\r
 // /** @file\r
 // S3SaveStateDxe Localized Strings and Content\r
 //\r

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

 //\r
 // This program and the accompanying materials are\r
 // licensed and made available under the terms and conditions of the BSD License\r
 //\r
 // This program and the accompanying materials are\r
 // licensed and made available under the terms and conditions of the BSD License\r


@@ -13,8 +13,8 @@
 //\r
 // **/\r
 \r
 //\r
 // **/\r
 \r

-#string STR_PROPERTIES_MODULE_NAME \r
-#language en-US \r
+#string STR_PROPERTIES_MODULE_NAME\r
+#language en-US\r

 "S3 Save State DXE Driver"\r
 \r
 \r
 "S3 Save State DXE Driver"\r
 \r
 \r

diff --git a/MdeModulePkg/Universal/Acpi/SmmS3SaveState/InternalSmmSaveState.h b/MdeModulePkg/Universal/Acpi/SmmS3SaveState/InternalSmmSaveState.h
index d6263fd727bd7f4a1432a3f8f292bc9ded532650..51cf9db4aa2eadfea665282ec989d74917e14300 100644 (file)
--- a/MdeModulePkg/Universal/Acpi/SmmS3SaveState/InternalSmmSaveState.h
+++ b/MdeModulePkg/Universal/Acpi/SmmS3SaveState/InternalSmmSaveState.h
@@ -1,7 +1,7 @@
 /** @file\r
   Internal header file for SMM S3 Boot Script Saver state driver.\r
 \r
 /** @file\r
   Internal header file for SMM S3 Boot Script Saver state driver.\r
 \r

-  Copyright (c) 2006 - 2010, Intel Corporation. All rights reserved.<BR>\r
+  Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r

 \r
   This program and the accompanying materials\r
   are licensed and made available under the terms and conditions\r
 \r
   This program and the accompanying materials\r
   are licensed and made available under the terms and conditions\r


@@ -31,25 +31,25 @@
   Adds a record into S3 boot script table.\r
 \r
   This function is used to store a boot script record into a given boot\r
   Adds a record into S3 boot script table.\r
 \r
   This function is used to store a boot script record into a given boot\r

-  script table. If the table specified by TableName is nonexistent in the \r
-  system, a new table will automatically be created and then the script record \r
-  will be added into the new table. This function is responsible for allocating \r
+  script table. If the table specified by TableName is nonexistent in the\r
+  system, a new table will automatically be created and then the script record\r
+  will be added into the new table. This function is responsible for allocating\r

   necessary memory for the script.\r
 \r
   necessary memory for the script.\r
 \r

-  This function has a variable parameter list. The exact parameter list depends on \r
-  the OpCode that is passed into the function. If an unsupported OpCode or illegal \r
+  This function has a variable parameter list. The exact parameter list depends on\r
+  the OpCode that is passed into the function. If an unsupported OpCode or illegal\r

   parameter list is passed in, this function returns EFI_INVALID_PARAMETER.\r
   If there are not enough resources available for storing more scripts, this function returns\r
   EFI_OUT_OF_RESOURCES.\r
 \r
   @param  This                  A pointer to the EFI_S3_SAVE_STATE_PROTOCOL instance.\r
   @param  OpCode                The operation code (opcode) number.\r
   parameter list is passed in, this function returns EFI_INVALID_PARAMETER.\r
   If there are not enough resources available for storing more scripts, this function returns\r
   EFI_OUT_OF_RESOURCES.\r
 \r
   @param  This                  A pointer to the EFI_S3_SAVE_STATE_PROTOCOL instance.\r
   @param  OpCode                The operation code (opcode) number.\r

-  @param  ...                   Argument list that is specific to each opcode. \r
+  @param  ...                   Argument list that is specific to each opcode.\r

 \r
   @retval EFI_SUCCESS           The operation succeeded. A record was added into the\r
                                 specified script table.\r
   @retval EFI_INVALID_PARAMETER The parameter is illegal or the given boot script is not supported.\r
 \r
   @retval EFI_SUCCESS           The operation succeeded. A record was added into the\r
                                 specified script table.\r
   @retval EFI_INVALID_PARAMETER The parameter is illegal or the given boot script is not supported.\r

-                                If the opcode is unknow or not supported because of the PCD \r
+                                If the opcode is unknow or not supported because of the PCD\r

                                 Feature Flags.\r
   @retval EFI_OUT_OF_RESOURCES  There is insufficient memory to store the boot script.\r
 \r
                                 Feature Flags.\r
   @retval EFI_OUT_OF_RESOURCES  There is insufficient memory to store the boot script.\r
 \r


@@ -81,7 +81,7 @@ BootScriptWrite (
                                 inserted, either before or after, depending on BeforeOrAfter. On exit, specifies\r
                                 the position of the inserted opcode in the boot script table.\r
   @param  OpCode                The operation code (opcode) number.\r
                                 inserted, either before or after, depending on BeforeOrAfter. On exit, specifies\r
                                 the position of the inserted opcode in the boot script table.\r
   @param  OpCode                The operation code (opcode) number.\r

-  @param  ...                   Argument list that is specific to each opcode. \r
+  @param  ...                   Argument list that is specific to each opcode.\r

 \r
   @retval EFI_SUCCESS           The operation succeeded. A record was added into the\r
                                 specified script table.\r
 \r
   @retval EFI_SUCCESS           The operation succeeded. A record was added into the\r
                                 specified script table.\r


@@ -122,7 +122,7 @@ BootScriptInsert (
 \r
   @retval EFI_SUCCESS           The label already exists or was inserted.\r
   @retval EFI_INVALID_PARAMETER The Opcode is an invalid opcode value or the Position is not a valid position in the boot script table..\r
 \r
   @retval EFI_SUCCESS           The label already exists or was inserted.\r
   @retval EFI_INVALID_PARAMETER The Opcode is an invalid opcode value or the Position is not a valid position in the boot script table..\r

-  \r
+\r

 **/\r
 EFI_STATUS\r
 EFIAPI\r
 **/\r
 EFI_STATUS\r
 EFIAPI\r


@@ -135,27 +135,27 @@ BootScriptLabel (
   );\r
 /**\r
   Compare two positions in the boot script table and return their relative position.\r
   );\r
 /**\r
   Compare two positions in the boot script table and return their relative position.\r

-  \r
+\r

   This function compares two positions in the boot script table and returns their relative positions. If\r
   Position1 is before Position2, then -1 is returned. If Position1 is equal to Position2,\r
   then 0 is returned. If Position1 is after Position2, then 1 is returned.\r
   This function compares two positions in the boot script table and returns their relative positions. If\r
   Position1 is before Position2, then -1 is returned. If Position1 is equal to Position2,\r
   then 0 is returned. If Position1 is after Position2, then 1 is returned.\r

-  \r
+\r

   @param  This                  A pointer to the EFI_S3_SAVE_STATE_PROTOCOL instance.\r
   @param  Position1             The positions in the boot script table to compare\r
   @param  Position2             The positions in the boot script table to compare\r
   @param  RelativePosition      On return, points to the result of the comparison\r
 \r
   @param  This                  A pointer to the EFI_S3_SAVE_STATE_PROTOCOL instance.\r
   @param  Position1             The positions in the boot script table to compare\r
   @param  Position2             The positions in the boot script table to compare\r
   @param  RelativePosition      On return, points to the result of the comparison\r
 \r

-  @retval EFI_SUCCESS           The operation succeeded. \r
+  @retval EFI_SUCCESS           The operation succeeded.\r

   @retval EFI_INVALID_PARAMETER The Position1 or Position2 is not a valid position in the boot script table.\r
 \r
 **/\r
 EFI_STATUS\r
   @retval EFI_INVALID_PARAMETER The Position1 or Position2 is not a valid position in the boot script table.\r
 \r
 **/\r
 EFI_STATUS\r

-EFIAPI \r
+EFIAPI\r

 BootScriptCompare (\r
   IN CONST EFI_S3_SAVE_STATE_PROTOCOL      *This,\r
   IN       EFI_S3_BOOT_SCRIPT_POSITION      Position1,\r
   IN       EFI_S3_BOOT_SCRIPT_POSITION      Position2,\r
   OUT      UINTN                           *RelativePosition\r
   );\r
 BootScriptCompare (\r
   IN CONST EFI_S3_SAVE_STATE_PROTOCOL      *This,\r
   IN       EFI_S3_BOOT_SCRIPT_POSITION      Position1,\r
   IN       EFI_S3_BOOT_SCRIPT_POSITION      Position2,\r
   OUT      UINTN                           *RelativePosition\r
   );\r

-  \r
+\r

 #endif //_INTERNAL_SMM_S3_SAVE_STATE_H_\r
 #endif //_INTERNAL_SMM_S3_SAVE_STATE_H_\r

diff --git a/MdeModulePkg/Universal/Acpi/SmmS3SaveState/SmmS3SaveState.c b/MdeModulePkg/Universal/Acpi/SmmS3SaveState/SmmS3SaveState.c
index f397db37fdc055c67e1171b9fcd2cfd325cbd437..c1d29b5d3ad5276728234dc214796571f349687c 100644 (file)
--- a/MdeModulePkg/Universal/Acpi/SmmS3SaveState/SmmS3SaveState.c
+++ b/MdeModulePkg/Universal/Acpi/SmmS3SaveState/SmmS3SaveState.c
@@ -1,7 +1,7 @@
 /** @file\r
   Implementation for S3 SMM Boot Script Saver state driver.\r
 \r
 /** @file\r
   Implementation for S3 SMM Boot Script Saver state driver.\r
 \r

-  Copyright (c) 2010 - 2017, Intel Corporation. All rights reserved.<BR>\r
+  Copyright (c) 2010 - 2018, Intel Corporation. All rights reserved.<BR>\r

 \r
   This program and the accompanying materials\r
   are licensed and made available under the terms and conditions\r
 \r
   This program and the accompanying materials\r
   are licensed and made available under the terms and conditions\r


@@ -45,7 +45,7 @@ BootScriptWriteIoWrite (
   Address     = VA_ARG (Marker, UINT64);\r
   Count       = VA_ARG (Marker, UINTN);\r
   Buffer      = VA_ARG (Marker, UINT8 *);\r
   Address     = VA_ARG (Marker, UINT64);\r
   Count       = VA_ARG (Marker, UINTN);\r
   Buffer      = VA_ARG (Marker, UINT8 *);\r

-  \r
+\r

   return S3BootScriptSaveIoWrite (Width, Address, Count, Buffer);\r
 }\r
 /**\r
   return S3BootScriptSaveIoWrite (Width, Address, Count, Buffer);\r
 }\r
 /**\r


@@ -67,12 +67,12 @@ BootScriptWriteIoReadWrite (
   UINT64                Address;\r
   UINT8                 *Data;\r
   UINT8                 *DataMask;\r
   UINT64                Address;\r
   UINT8                 *Data;\r
   UINT8                 *DataMask;\r

- \r
+\r

   Width       = VA_ARG (Marker, S3_BOOT_SCRIPT_LIB_WIDTH);\r
   Address     = VA_ARG (Marker, UINT64);\r
   Data        = VA_ARG (Marker, UINT8 *);\r
   DataMask    = VA_ARG (Marker, UINT8 *);\r
   Width       = VA_ARG (Marker, S3_BOOT_SCRIPT_LIB_WIDTH);\r
   Address     = VA_ARG (Marker, UINT64);\r
   Data        = VA_ARG (Marker, UINT8 *);\r
   DataMask    = VA_ARG (Marker, UINT8 *);\r

-  \r
+\r

   return S3BootScriptSaveIoReadWrite (Width, Address, Data, DataMask);\r
 }\r
 \r
   return S3BootScriptSaveIoReadWrite (Width, Address, Data, DataMask);\r
 }\r
 \r


@@ -95,7 +95,7 @@ BootScriptWriteMemWrite (
   UINT64                Address;\r
   UINTN                 Count;\r
   UINT8                 *Buffer;\r
   UINT64                Address;\r
   UINTN                 Count;\r
   UINT8                 *Buffer;\r

- \r
+\r

   Width       = VA_ARG (Marker, S3_BOOT_SCRIPT_LIB_WIDTH);\r
   Address     = VA_ARG (Marker, UINT64);\r
   Count       = VA_ARG (Marker, UINTN);\r
   Width       = VA_ARG (Marker, S3_BOOT_SCRIPT_LIB_WIDTH);\r
   Address     = VA_ARG (Marker, UINT64);\r
   Count       = VA_ARG (Marker, UINTN);\r


@@ -123,7 +123,7 @@ BootScriptWriteMemReadWrite (
   UINT64                Address;\r
   UINT8                 *Data;\r
   UINT8                 *DataMask;\r
   UINT64                Address;\r
   UINT8                 *Data;\r
   UINT8                 *DataMask;\r

-  \r
+\r

   Width       = VA_ARG (Marker, S3_BOOT_SCRIPT_LIB_WIDTH);\r
   Address     = VA_ARG (Marker, UINT64);\r
   Data        = VA_ARG (Marker, UINT8 *);\r
   Width       = VA_ARG (Marker, S3_BOOT_SCRIPT_LIB_WIDTH);\r
   Address     = VA_ARG (Marker, UINT64);\r
   Data        = VA_ARG (Marker, UINT8 *);\r


@@ -237,13 +237,13 @@ BootScriptWritePciCfg2ReadWrite (
   UINT64                Address;\r
   UINT8                 *Data;\r
   UINT8                 *DataMask;\r
   UINT64                Address;\r
   UINT8                 *Data;\r
   UINT8                 *DataMask;\r

- \r
+\r

   Width       = VA_ARG (Marker, S3_BOOT_SCRIPT_LIB_WIDTH);\r
   Segment     = VA_ARG (Marker, UINT16);\r
   Address     = VA_ARG (Marker, UINT64);\r
   Data        = VA_ARG (Marker, UINT8 *);\r
   DataMask    = VA_ARG (Marker, UINT8 *);\r
   Width       = VA_ARG (Marker, S3_BOOT_SCRIPT_LIB_WIDTH);\r
   Segment     = VA_ARG (Marker, UINT16);\r
   Address     = VA_ARG (Marker, UINT64);\r
   Data        = VA_ARG (Marker, UINT8 *);\r
   DataMask    = VA_ARG (Marker, UINT8 *);\r

- \r
+\r

   return S3BootScriptSavePciCfg2ReadWrite (Width, Segment, Address, Data, DataMask);\r
 }\r
 /**\r
   return S3BootScriptSavePciCfg2ReadWrite (Width, Segment, Address, Data, DataMask);\r
 }\r
 /**\r


@@ -268,15 +268,15 @@ BootScriptWriteSmbusExecute (
   VOID                     *Buffer;\r
   UINTN                    *DataSize;\r
   UINTN                     SmBusAddress;\r
   VOID                     *Buffer;\r
   UINTN                    *DataSize;\r
   UINTN                     SmBusAddress;\r

-  \r
+\r

   SlaveAddress.SmbusDeviceAddress = VA_ARG (Marker, UINTN);\r
   Command                         = VA_ARG (Marker, EFI_SMBUS_DEVICE_COMMAND);\r
   Operation                       = VA_ARG (Marker, EFI_SMBUS_OPERATION);\r
   PecCheck                        = VA_ARG (Marker, BOOLEAN);\r
   SmBusAddress                    = SMBUS_LIB_ADDRESS (SlaveAddress.SmbusDeviceAddress,Command,0,PecCheck);\r
   SlaveAddress.SmbusDeviceAddress = VA_ARG (Marker, UINTN);\r
   Command                         = VA_ARG (Marker, EFI_SMBUS_DEVICE_COMMAND);\r
   Operation                       = VA_ARG (Marker, EFI_SMBUS_OPERATION);\r
   PecCheck                        = VA_ARG (Marker, BOOLEAN);\r
   SmBusAddress                    = SMBUS_LIB_ADDRESS (SlaveAddress.SmbusDeviceAddress,Command,0,PecCheck);\r

-  DataSize                        = VA_ARG (Marker, UINTN *);    \r
+  DataSize                        = VA_ARG (Marker, UINTN *);\r

   Buffer                          = VA_ARG (Marker, VOID *);\r
   Buffer                          = VA_ARG (Marker, VOID *);\r

- \r
+\r

   return S3BootScriptSaveSmbusExecute (SmBusAddress, Operation, DataSize, Buffer);\r
 }\r
 /**\r
   return S3BootScriptSaveSmbusExecute (SmBusAddress, Operation, DataSize, Buffer);\r
 }\r
 /**\r


@@ -302,7 +302,7 @@ BootScriptWriteStall (
 }\r
 \r
 /**\r
 }\r
 \r
 /**\r

-  Internal function to add Save jmp address according to DISPATCH_OPCODE. \r
+  Internal function to add Save jmp address according to DISPATCH_OPCODE.\r

   We ignore "Context" parameter\r
 \r
   @param  Marker                The variable argument list to get the opcode\r
   We ignore "Context" parameter\r
 \r
   @param  Marker                The variable argument list to get the opcode\r


@@ -324,8 +324,8 @@ BootScriptWriteDispatch (
 }\r
 \r
 /**\r
 }\r
 \r
 /**\r

-  Internal function to add memory pool operation to the table. \r
- \r
+  Internal function to add memory pool operation to the table.\r
+\r

   @param  Marker                The variable argument list to get the opcode\r
                                 and associated attributes.\r
 \r
   @param  Marker                The variable argument list to get the opcode\r
                                 and associated attributes.\r
 \r


@@ -338,18 +338,18 @@ BootScriptWriteMemPoll (
   IN VA_LIST                       Marker\r
   )\r
 {\r
   IN VA_LIST                       Marker\r
   )\r
 {\r

-  S3_BOOT_SCRIPT_LIB_WIDTH   Width;                                   \r
-  UINT64                     Address;                                    \r
-  VOID                      *Data;                                       \r
-  VOID                      *DataMask;                                   \r
+  S3_BOOT_SCRIPT_LIB_WIDTH   Width;\r
+  UINT64                     Address;\r
+  VOID                      *Data;\r
+  VOID                      *DataMask;\r

   UINT64                     Delay;\r
   UINT64                     LoopTimes;\r
   UINT32                     Remainder;\r
 \r
   UINT64                     Delay;\r
   UINT64                     LoopTimes;\r
   UINT32                     Remainder;\r
 \r

-  Width    = VA_ARG (Marker, S3_BOOT_SCRIPT_LIB_WIDTH);                  \r
-  Address  = VA_ARG (Marker, UINT64);                                    \r
-  Data     = VA_ARG (Marker, VOID *);                                    \r
-  DataMask = VA_ARG (Marker, VOID *);                                    \r
+  Width    = VA_ARG (Marker, S3_BOOT_SCRIPT_LIB_WIDTH);\r
+  Address  = VA_ARG (Marker, UINT64);\r
+  Data     = VA_ARG (Marker, VOID *);\r
+  DataMask = VA_ARG (Marker, VOID *);\r

   Delay    = VA_ARG (Marker, UINT64);\r
   //\r
   // According to the spec, the interval between 2 polls is 100ns,\r
   Delay    = VA_ARG (Marker, UINT64);\r
   //\r
   // According to the spec, the interval between 2 polls is 100ns,\r


@@ -369,12 +369,12 @@ BootScriptWriteMemPoll (
     //\r
     LoopTimes +=1;\r
   }\r
     //\r
     LoopTimes +=1;\r
   }\r

-  return S3BootScriptSaveMemPoll (Width, Address, DataMask, Data, 1, LoopTimes); \r
+  return S3BootScriptSaveMemPoll (Width, Address, DataMask, Data, 1, LoopTimes);\r

 \r
 }\r
 \r
 /**\r
 \r
 }\r
 \r
 /**\r

-  Internal function to add Save jmp address according to DISPATCH_OPCODE2. \r
+  Internal function to add Save jmp address according to DISPATCH_OPCODE2.\r

   The "Context" parameter is not ignored.\r
 \r
   @param  Marker                The variable argument list to get the opcode\r
   The "Context" parameter is not ignored.\r
 \r
   @param  Marker                The variable argument list to get the opcode\r


@@ -390,7 +390,7 @@ BootScriptWriteDispatch2 (
   )\r
 {\r
   VOID                  *EntryPoint;\r
   )\r
 {\r
   VOID                  *EntryPoint;\r

-  VOID                  *Context;  \r
+  VOID                  *Context;\r

 \r
   EntryPoint = (VOID*)(UINTN)VA_ARG (Marker, EFI_PHYSICAL_ADDRESS);\r
   Context    = (VOID*)(UINTN)VA_ARG (Marker, EFI_PHYSICAL_ADDRESS);\r
 \r
   EntryPoint = (VOID*)(UINTN)VA_ARG (Marker, EFI_PHYSICAL_ADDRESS);\r
   Context    = (VOID*)(UINTN)VA_ARG (Marker, EFI_PHYSICAL_ADDRESS);\r


@@ -413,7 +413,7 @@ BootScriptWriteInformation (
   )\r
 {\r
   UINT32                InformationLength;\r
   )\r
 {\r
   UINT32                InformationLength;\r

-  EFI_PHYSICAL_ADDRESS  Information;  \r
+  EFI_PHYSICAL_ADDRESS  Information;\r

 \r
   InformationLength = VA_ARG (Marker, UINT32);\r
   Information = VA_ARG (Marker, EFI_PHYSICAL_ADDRESS);\r
 \r
   InformationLength = VA_ARG (Marker, UINT32);\r
   Information = VA_ARG (Marker, EFI_PHYSICAL_ADDRESS);\r


@@ -433,18 +433,18 @@ BootScriptWriteIoPoll (
   IN VA_LIST                       Marker\r
   )\r
 {\r
   IN VA_LIST                       Marker\r
   )\r
 {\r

-   S3_BOOT_SCRIPT_LIB_WIDTH     Width;  \r
-   UINT64                     Address;    \r
-   VOID                      *Data;       \r
-   VOID                      *DataMask;   \r
-   UINT64                     Delay;       \r
-   \r
-   Width    = VA_ARG (Marker, S3_BOOT_SCRIPT_LIB_WIDTH);  \r
-   Address  = VA_ARG (Marker, UINT64);                    \r
-   Data     = VA_ARG (Marker, VOID *);                   \r
-   DataMask = VA_ARG (Marker, VOID *);                   \r
-   Delay    = (UINT64)VA_ARG (Marker, UINT64);             \r
-   \r
+   S3_BOOT_SCRIPT_LIB_WIDTH     Width;\r
+   UINT64                     Address;\r
+   VOID                      *Data;\r
+   VOID                      *DataMask;\r
+   UINT64                     Delay;\r
+\r
+   Width    = VA_ARG (Marker, S3_BOOT_SCRIPT_LIB_WIDTH);\r
+   Address  = VA_ARG (Marker, UINT64);\r
+   Data     = VA_ARG (Marker, VOID *);\r
+   DataMask = VA_ARG (Marker, VOID *);\r
+   Delay    = (UINT64)VA_ARG (Marker, UINT64);\r
+\r

    return S3BootScriptSaveIoPoll (Width, Address, Data, DataMask, Delay);\r
 }\r
 /**\r
    return S3BootScriptSaveIoPoll (Width, Address, Data, DataMask, Delay);\r
 }\r
 /**\r


@@ -468,13 +468,13 @@ BootScriptWritePciConfigPoll (
    VOID                      *DataMask;\r
    UINT64                     Delay;\r
 \r
    VOID                      *DataMask;\r
    UINT64                     Delay;\r
 \r

-   \r
-   Width    = VA_ARG (Marker, S3_BOOT_SCRIPT_LIB_WIDTH);  \r
-   Address  = VA_ARG (Marker, UINT64);                    \r
-   Data     = VA_ARG (Marker, VOID *);                   \r
-   DataMask = VA_ARG (Marker, VOID *);                   \r
-   Delay    = (UINT64)VA_ARG (Marker, UINT64);             \r
-   \r
+\r
+   Width    = VA_ARG (Marker, S3_BOOT_SCRIPT_LIB_WIDTH);\r
+   Address  = VA_ARG (Marker, UINT64);\r
+   Data     = VA_ARG (Marker, VOID *);\r
+   DataMask = VA_ARG (Marker, VOID *);\r
+   Delay    = (UINT64)VA_ARG (Marker, UINT64);\r
+\r

    return S3BootScriptSavePciPoll (Width, Address, Data, DataMask, Delay);\r
 }\r
 /**\r
    return S3BootScriptSavePciPoll (Width, Address, Data, DataMask, Delay);\r
 }\r
 /**\r


@@ -498,14 +498,14 @@ BootScriptWritePciConfig2Poll (
    VOID                         *Data;\r
    VOID                         *DataMask;\r
    UINT64                        Delay;\r
    VOID                         *Data;\r
    VOID                         *DataMask;\r
    UINT64                        Delay;\r

-  \r
-   Width    = VA_ARG (Marker, S3_BOOT_SCRIPT_LIB_WIDTH);  \r
-   Segment  = VA_ARG (Marker, UINT16);      \r
-   Address  = VA_ARG (Marker, UINT64);                    \r
-   Data     = VA_ARG (Marker, VOID *);                   \r
-   DataMask = VA_ARG (Marker, VOID *);                   \r
-   Delay    = (UINT64)VA_ARG (Marker, UINT64);             \r
-   \r
+\r
+   Width    = VA_ARG (Marker, S3_BOOT_SCRIPT_LIB_WIDTH);\r
+   Segment  = VA_ARG (Marker, UINT16);\r
+   Address  = VA_ARG (Marker, UINT64);\r
+   Data     = VA_ARG (Marker, VOID *);\r
+   DataMask = VA_ARG (Marker, VOID *);\r
+   Delay    = (UINT64)VA_ARG (Marker, UINT64);\r
+\r

    return S3BootScriptSavePci2Poll (Width, Segment, Address, Data, DataMask, Delay);\r
 }\r
 \r
    return S3BootScriptSavePci2Poll (Width, Segment, Address, Data, DataMask, Delay);\r
 }\r
 \r


@@ -513,25 +513,25 @@ BootScriptWritePciConfig2Poll (
   Adds a record into S3 boot script table.\r
 \r
   This function is used to store a boot script record into a given boot\r
   Adds a record into S3 boot script table.\r
 \r
   This function is used to store a boot script record into a given boot\r

-  script table. If the table specified by TableName is nonexistent in the \r
-  system, a new table will automatically be created and then the script record \r
-  will be added into the new table. This function is responsible for allocating \r
+  script table. If the table specified by TableName is nonexistent in the\r
+  system, a new table will automatically be created and then the script record\r
+  will be added into the new table. This function is responsible for allocating\r

   necessary memory for the script.\r
 \r
   necessary memory for the script.\r
 \r

-  This function has a variable parameter list. The exact parameter list depends on \r
-  the OpCode that is passed into the function. If an unsupported OpCode or illegal \r
+  This function has a variable parameter list. The exact parameter list depends on\r
+  the OpCode that is passed into the function. If an unsupported OpCode or illegal\r

   parameter list is passed in, this function returns EFI_INVALID_PARAMETER.\r
   If there are not enough resources available for storing more scripts, this function returns\r
   EFI_OUT_OF_RESOURCES.\r
 \r
   @param  This                  A pointer to the EFI_S3_SAVE_STATE_PROTOCOL instance.\r
   @param  OpCode                The operation code (opcode) number.\r
   parameter list is passed in, this function returns EFI_INVALID_PARAMETER.\r
   If there are not enough resources available for storing more scripts, this function returns\r
   EFI_OUT_OF_RESOURCES.\r
 \r
   @param  This                  A pointer to the EFI_S3_SAVE_STATE_PROTOCOL instance.\r
   @param  OpCode                The operation code (opcode) number.\r

-  @param  ...                   Argument list that is specific to each opcode. \r
-  \r
+  @param  ...                   Argument list that is specific to each opcode.\r
+\r

   @retval EFI_SUCCESS           The operation succeeded. A record was added into the\r
                                 specified script table.\r
   @retval EFI_INVALID_PARAMETER The parameter is illegal or the given boot script is not supported.\r
   @retval EFI_SUCCESS           The operation succeeded. A record was added into the\r
                                 specified script table.\r
   @retval EFI_INVALID_PARAMETER The parameter is illegal or the given boot script is not supported.\r

-                                If the opcode is unknow or not supported because of the PCD \r
+                                If the opcode is unknow or not supported because of the PCD\r

                                 Feature Flags.\r
   @retval EFI_OUT_OF_RESOURCES  There is insufficient memory to store the boot script.\r
 \r
                                 Feature Flags.\r
   @retval EFI_OUT_OF_RESOURCES  There is insufficient memory to store the boot script.\r
 \r


@@ -545,7 +545,7 @@ BootScriptWrite (
   )\r
 {\r
   EFI_STATUS                Status;\r
   )\r
 {\r
   EFI_STATUS                Status;\r

-  VA_LIST                   Marker;  \r
+  VA_LIST                   Marker;\r

   //\r
   // Build script according to opcode\r
   //\r
   //\r
   // Build script according to opcode\r
   //\r


@@ -566,7 +566,7 @@ BootScriptWrite (
   case EFI_BOOT_SCRIPT_MEM_WRITE_OPCODE:\r
     VA_START (Marker, OpCode);\r
     Status = BootScriptWriteMemWrite (Marker);\r
   case EFI_BOOT_SCRIPT_MEM_WRITE_OPCODE:\r
     VA_START (Marker, OpCode);\r
     Status = BootScriptWriteMemWrite (Marker);\r

-    VA_END (Marker); \r
+    VA_END (Marker);\r

     break;\r
 \r
   case EFI_BOOT_SCRIPT_MEM_READ_WRITE_OPCODE:\r
     break;\r
 \r
   case EFI_BOOT_SCRIPT_MEM_READ_WRITE_OPCODE:\r


@@ -597,7 +597,7 @@ BootScriptWrite (
     VA_START (Marker, OpCode);\r
     Status = BootScriptWriteStall (Marker);\r
     VA_END (Marker);\r
     VA_START (Marker, OpCode);\r
     Status = BootScriptWriteStall (Marker);\r
     VA_END (Marker);\r

-  \r
+\r

     break;\r
 \r
   case EFI_BOOT_SCRIPT_DISPATCH_OPCODE:\r
     break;\r
 \r
   case EFI_BOOT_SCRIPT_DISPATCH_OPCODE:\r


@@ -636,23 +636,23 @@ BootScriptWrite (
     VA_END (Marker);\r
     break;\r
 \r
     VA_END (Marker);\r
     break;\r
 \r

-  case EFI_BOOT_SCRIPT_IO_POLL_OPCODE:  \r
+  case EFI_BOOT_SCRIPT_IO_POLL_OPCODE:\r

     VA_START (Marker, OpCode);\r
     Status = BootScriptWriteIoPoll (Marker);\r
     VA_END (Marker);\r
     VA_START (Marker, OpCode);\r
     Status = BootScriptWriteIoPoll (Marker);\r
     VA_END (Marker);\r

-    break;    \r
-  \r
-  case EFI_BOOT_SCRIPT_PCI_CONFIG_POLL_OPCODE: \r
+    break;\r
+\r
+  case EFI_BOOT_SCRIPT_PCI_CONFIG_POLL_OPCODE:\r

     VA_START (Marker, OpCode);\r
     Status = BootScriptWritePciConfigPoll (Marker);\r
     VA_END (Marker);\r
     VA_START (Marker, OpCode);\r
     Status = BootScriptWritePciConfigPoll (Marker);\r
     VA_END (Marker);\r

-    break;    \r
-  \r
+    break;\r
+\r

   case EFI_BOOT_SCRIPT_PCI_CONFIG2_POLL_OPCODE:\r
     VA_START (Marker, OpCode);\r
     Status = BootScriptWritePciConfig2Poll (Marker);\r
     VA_END (Marker);\r
   case EFI_BOOT_SCRIPT_PCI_CONFIG2_POLL_OPCODE:\r
     VA_START (Marker, OpCode);\r
     Status = BootScriptWritePciConfig2Poll (Marker);\r
     VA_END (Marker);\r

-    break;    \r
+    break;\r

 \r
   default:\r
     Status = EFI_INVALID_PARAMETER;\r
 \r
   default:\r
     Status = EFI_INVALID_PARAMETER;\r


@@ -681,7 +681,7 @@ BootScriptWrite (
                                 inserted, either before or after, depending on BeforeOrAfter. On exit, specifies\r
                                 the position of the inserted opcode in the boot script table.\r
   @param  OpCode                The operation code (opcode) number.\r
                                 inserted, either before or after, depending on BeforeOrAfter. On exit, specifies\r
                                 the position of the inserted opcode in the boot script table.\r
   @param  OpCode                The operation code (opcode) number.\r

-  @param  ...                   Argument list that is specific to each opcode. \r
+  @param  ...                   Argument list that is specific to each opcode.\r

 \r
   @retval EFI_SUCCESS           The operation succeeded. A record was added into the\r
                                 specified script table.\r
 \r
   @retval EFI_SUCCESS           The operation succeeded. A record was added into the\r
                                 specified script table.\r


@@ -700,7 +700,7 @@ BootScriptInsert (
   )\r
 {\r
   EFI_STATUS                Status;\r
   )\r
 {\r
   EFI_STATUS                Status;\r

-  VA_LIST                   Marker;  \r
+  VA_LIST                   Marker;\r

   //\r
   // Build script according to opcode\r
   //\r
   //\r
   // Build script according to opcode\r
   //\r


@@ -721,7 +721,7 @@ BootScriptInsert (
   case EFI_BOOT_SCRIPT_MEM_WRITE_OPCODE:\r
     VA_START (Marker, OpCode);\r
     Status = BootScriptWriteMemWrite (Marker);\r
   case EFI_BOOT_SCRIPT_MEM_WRITE_OPCODE:\r
     VA_START (Marker, OpCode);\r
     Status = BootScriptWriteMemWrite (Marker);\r

-    VA_END (Marker); \r
+    VA_END (Marker);\r

     break;\r
 \r
   case EFI_BOOT_SCRIPT_MEM_READ_WRITE_OPCODE:\r
     break;\r
 \r
   case EFI_BOOT_SCRIPT_MEM_READ_WRITE_OPCODE:\r


@@ -752,7 +752,7 @@ BootScriptInsert (
     VA_START (Marker, OpCode);\r
     Status = BootScriptWriteStall (Marker);\r
     VA_END (Marker);\r
     VA_START (Marker, OpCode);\r
     Status = BootScriptWriteStall (Marker);\r
     VA_END (Marker);\r

-  \r
+\r

     break;\r
 \r
   case EFI_BOOT_SCRIPT_DISPATCH_OPCODE:\r
     break;\r
 \r
   case EFI_BOOT_SCRIPT_DISPATCH_OPCODE:\r


@@ -790,30 +790,30 @@ BootScriptInsert (
     Status = BootScriptWritePciCfg2ReadWrite (Marker);\r
     VA_END (Marker);\r
     break;\r
     Status = BootScriptWritePciCfg2ReadWrite (Marker);\r
     VA_END (Marker);\r
     break;\r

-    \r
-  case EFI_BOOT_SCRIPT_IO_POLL_OPCODE:  \r
+\r
+  case EFI_BOOT_SCRIPT_IO_POLL_OPCODE:\r

     VA_START (Marker, OpCode);\r
     Status = BootScriptWriteIoPoll (Marker);\r
     VA_END (Marker);\r
     VA_START (Marker, OpCode);\r
     Status = BootScriptWriteIoPoll (Marker);\r
     VA_END (Marker);\r

-    break;    \r
-  \r
-  case EFI_BOOT_SCRIPT_PCI_CONFIG_POLL_OPCODE: \r
+    break;\r
+\r
+  case EFI_BOOT_SCRIPT_PCI_CONFIG_POLL_OPCODE:\r

     VA_START (Marker, OpCode);\r
     Status = BootScriptWritePciConfigPoll (Marker);\r
     VA_END (Marker);\r
     VA_START (Marker, OpCode);\r
     Status = BootScriptWritePciConfigPoll (Marker);\r
     VA_END (Marker);\r

-    break;    \r
-  \r
+    break;\r
+\r

   case EFI_BOOT_SCRIPT_PCI_CONFIG2_POLL_OPCODE:\r
     VA_START (Marker, OpCode);\r
     Status = BootScriptWritePciConfig2Poll (Marker);\r
     VA_END (Marker);\r
   case EFI_BOOT_SCRIPT_PCI_CONFIG2_POLL_OPCODE:\r
     VA_START (Marker, OpCode);\r
     Status = BootScriptWritePciConfig2Poll (Marker);\r
     VA_END (Marker);\r

-    break;    \r
+    break;\r

 \r
   default:\r
     Status = EFI_INVALID_PARAMETER;\r
     break;\r
   }\r
 \r
   default:\r
     Status = EFI_INVALID_PARAMETER;\r
     break;\r
   }\r

-  \r
+\r

   if (!EFI_ERROR (Status)) {\r
    Status = S3BootScriptMoveLastOpcode (BeforeOrAfter, Position);\r
   }\r
   if (!EFI_ERROR (Status)) {\r
    Status = S3BootScriptMoveLastOpcode (BeforeOrAfter, Position);\r
   }\r


@@ -844,7 +844,7 @@ BootScriptInsert (
   @retval EFI_SUCCESS           The label already exists or was inserted.\r
   @retval EFI_INVALID_PARAMETER The Label is NULL or points to an empty string.\r
   @retval EFI_INVALID_PARAMETER The Position is not a valid position in the boot script table.\r
   @retval EFI_SUCCESS           The label already exists or was inserted.\r
   @retval EFI_INVALID_PARAMETER The Label is NULL or points to an empty string.\r
   @retval EFI_INVALID_PARAMETER The Position is not a valid position in the boot script table.\r

-  \r
+\r

 **/\r
 EFI_STATUS\r
 EFIAPI\r
 **/\r
 EFI_STATUS\r
 EFIAPI\r


@@ -856,27 +856,27 @@ BootScriptLabel (
   IN CONST CHAR8                                *Label\r
   )\r
 {\r
   IN CONST CHAR8                                *Label\r
   )\r
 {\r

-       return S3BootScriptLabel (BeforeOrAfter, CreateIfNotFound, Position, Label);\r
+  return S3BootScriptLabel (BeforeOrAfter, CreateIfNotFound, Position, Label);\r

 }\r
 /**\r
   Compare two positions in the boot script table and return their relative position.\r
 }\r
 /**\r
   Compare two positions in the boot script table and return their relative position.\r

-  \r
+\r

   This function compares two positions in the boot script table and returns their relative positions. If\r
   Position1 is before Position2, then -1 is returned. If Position1 is equal to Position2,\r
   then 0 is returned. If Position1 is after Position2, then 1 is returned.\r
   This function compares two positions in the boot script table and returns their relative positions. If\r
   Position1 is before Position2, then -1 is returned. If Position1 is equal to Position2,\r
   then 0 is returned. If Position1 is after Position2, then 1 is returned.\r

-  \r
+\r

   @param  This                  A pointer to the EFI_S3_SAVE_STATE_PROTOCOL instance.\r
   @param  Position1             The positions in the boot script table to compare\r
   @param  Position2             The positions in the boot script table to compare\r
   @param  RelativePosition      On return, points to the result of the comparison\r
 \r
   @param  This                  A pointer to the EFI_S3_SAVE_STATE_PROTOCOL instance.\r
   @param  Position1             The positions in the boot script table to compare\r
   @param  Position2             The positions in the boot script table to compare\r
   @param  RelativePosition      On return, points to the result of the comparison\r
 \r

-  @retval EFI_SUCCESS           The operation succeeded. \r
+  @retval EFI_SUCCESS           The operation succeeded.\r

   @retval EFI_INVALID_PARAMETER The Position1 or Position2 is not a valid position in the boot script table.\r
   @retval EFI_INVALID_PARAMETER The RelativePosition is NULL.\r
 \r
 **/\r
 EFI_STATUS\r
   @retval EFI_INVALID_PARAMETER The Position1 or Position2 is not a valid position in the boot script table.\r
   @retval EFI_INVALID_PARAMETER The RelativePosition is NULL.\r
 \r
 **/\r
 EFI_STATUS\r

-EFIAPI \r
+EFIAPI\r

 BootScriptCompare (\r
   IN CONST EFI_S3_SAVE_STATE_PROTOCOL      *This,\r
   IN       EFI_S3_BOOT_SCRIPT_POSITION      Position1,\r
 BootScriptCompare (\r
   IN CONST EFI_S3_SAVE_STATE_PROTOCOL      *This,\r
   IN       EFI_S3_BOOT_SCRIPT_POSITION      Position1,\r


@@ -884,7 +884,7 @@ BootScriptCompare (
   OUT      UINTN                           *RelativePosition\r
   )\r
 {\r
   OUT      UINTN                           *RelativePosition\r
   )\r
 {\r

-       return S3BootScriptCompare (Position1, Position2, RelativePosition);\r
+  return S3BootScriptCompare (Position1, Position2, RelativePosition);\r

 }\r
 /**\r
   This routine is entry point of ScriptSave driver.\r
 }\r
 /**\r
   This routine is entry point of ScriptSave driver.\r

diff --git a/MdeModulePkg/Universal/Acpi/SmmS3SaveState/SmmS3SaveState.inf b/MdeModulePkg/Universal/Acpi/SmmS3SaveState/SmmS3SaveState.inf
index f1f264ec43b51f5018459e91b6387e08901ff4fb..0742da60ca896446863e9a74692b6461d459214e 100644 (file)
--- a/MdeModulePkg/Universal/Acpi/SmmS3SaveState/SmmS3SaveState.inf
+++ b/MdeModulePkg/Universal/Acpi/SmmS3SaveState/SmmS3SaveState.inf
@@ -3,7 +3,7 @@
 #\r
 # It will install S3 SMM Save State protocol to store or record various IO operations to be replayed during an S3 resume.\r
 #\r
 #\r
 # It will install S3 SMM Save State protocol to store or record various IO operations to be replayed during an S3 resume.\r
 #\r

-# Copyright (c) 2009 - 2016, Intel Corporation. All rights reserved.<BR>\r
+# Copyright (c) 2009 - 2018, Intel Corporation. All rights reserved.<BR>\r

 #\r
 # This program and the accompanying materials are\r
 # licensed and made available under the terms and conditions of the BSD License\r
 #\r
 # This program and the accompanying materials are\r
 # licensed and made available under the terms and conditions of the BSD License\r


@@ -23,7 +23,7 @@
   MODULE_TYPE                    = DXE_SMM_DRIVER\r
   VERSION_STRING                 = 1.0\r
   PI_SPECIFICATION_VERSION       = 0x0001000A\r
   MODULE_TYPE                    = DXE_SMM_DRIVER\r
   VERSION_STRING                 = 1.0\r
   PI_SPECIFICATION_VERSION       = 0x0001000A\r

-  \r
+\r

   ENTRY_POINT                    = InitializeSmmS3SaveState\r
 \r
 #\r
   ENTRY_POINT                    = InitializeSmmS3SaveState\r
 \r
 #\r

diff --git a/MdeModulePkg/Universal/Acpi/SmmS3SaveState/SmmS3SaveState.uni b/MdeModulePkg/Universal/Acpi/SmmS3SaveState/SmmS3SaveState.uni
index 6fbf2973339c5a82881dda22ec3a3b8f30dde495..9d8431edb9e5d000404b2c76a12c55688ef067e9 100644 (file)
--- a/MdeModulePkg/Universal/Acpi/SmmS3SaveState/SmmS3SaveState.uni
+++ b/MdeModulePkg/Universal/Acpi/SmmS3SaveState/SmmS3SaveState.uni
@@ -3,13 +3,13 @@
 //\r
 // It will install S3 SMM Save State protocol to store or record various IO operations to be replayed during an S3 resume.\r
 //\r
 //\r
 // It will install S3 SMM Save State protocol to store or record various IO operations to be replayed during an S3 resume.\r
 //\r

-// Copyright (c) 2009 - 2014, Intel Corporation. All rights reserved.<BR>\r
+// Copyright (c) 2009 - 2018, Intel Corporation. All rights reserved.<BR>\r

 //\r
 // This program and the accompanying materials are\r
 // licensed and made available under the terms and conditions of the BSD License\r
 // which accompanies this distribution.  The full text of the license may be found at\r
 // http://opensource.org/licenses/bsd-license.php\r
 //\r
 // This program and the accompanying materials are\r
 // licensed and made available under the terms and conditions of the BSD License\r
 // which accompanies this distribution.  The full text of the license may be found at\r
 // http://opensource.org/licenses/bsd-license.php\r

-// \r
+//\r

 // THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 // WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 //\r
 // THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 // WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 //\r

diff --git a/MdeModulePkg/Universal/Acpi/SmmS3SaveState/SmmS3SaveStateExtra.uni b/MdeModulePkg/Universal/Acpi/SmmS3SaveState/SmmS3SaveStateExtra.uni
index 531138b8b61d2827116cc5333bc0e3f9cfdef733..676241c7e7c6bdc6f0ef1d8a870be39b9ec1d6f6 100644 (file)
--- a/MdeModulePkg/Universal/Acpi/SmmS3SaveState/SmmS3SaveStateExtra.uni
+++ b/MdeModulePkg/Universal/Acpi/SmmS3SaveState/SmmS3SaveStateExtra.uni
@@ -1,7 +1,7 @@
 // /** @file\r
 // SmmS3SaveState Localized Strings and Content\r
 //\r
 // /** @file\r
 // SmmS3SaveState Localized Strings and Content\r
 //\r

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

 //\r
 // This program and the accompanying materials are\r
 // licensed and made available under the terms and conditions of the BSD License\r
 //\r
 // This program and the accompanying materials are\r
 // licensed and made available under the terms and conditions of the BSD License\r


@@ -13,8 +13,8 @@
 //\r
 // **/\r
 \r
 //\r
 // **/\r
 \r

-#string STR_PROPERTIES_MODULE_NAME \r
-#language en-US \r
+#string STR_PROPERTIES_MODULE_NAME\r
+#language en-US\r

 "SMM S3 Save State Driver"\r
 \r
 \r
 "SMM S3 Save State Driver"\r
 \r
 \r

diff --git a/MdeModulePkg/Universal/BdsDxe/Bds.h b/MdeModulePkg/Universal/BdsDxe/Bds.h
index 63d961fd2017885880a2cc6fb3c11a5e2e72f9b5..6c250dd57788c42538799f0b72e8e963eecd877f 100644 (file)
--- a/MdeModulePkg/Universal/BdsDxe/Bds.h
+++ b/MdeModulePkg/Universal/BdsDxe/Bds.h
@@ -78,14 +78,14 @@ BdsEntry (
                                  then EFI_INVALID_PARAMETER is returned.\r
   @param  VendorGuid             A unique identifier for the vendor.\r
   @param  Attributes             Attributes bitmask to set for the variable.\r
                                  then EFI_INVALID_PARAMETER is returned.\r
   @param  VendorGuid             A unique identifier for the vendor.\r
   @param  Attributes             Attributes bitmask to set for the variable.\r

-  @param  DataSize               The size in bytes of the Data buffer. Unless the EFI_VARIABLE_APPEND_WRITE, \r
+  @param  DataSize               The size in bytes of the Data buffer. Unless the EFI_VARIABLE_APPEND_WRITE,\r

                                  or EFI_VARIABLE_TIME_BASED_AUTHENTICATED_WRITE_ACCESS attribute is set, a size of zero\r
                                  or EFI_VARIABLE_TIME_BASED_AUTHENTICATED_WRITE_ACCESS attribute is set, a size of zero\r

-                                 causes the variable to be deleted. When the EFI_VARIABLE_APPEND_WRITE attribute is \r
-                                 set, then a SetVariable() call with a DataSize of zero will not cause any change to \r
-                                 the variable value (the timestamp associated with the variable may be updated however \r
-                                 even if no new data value is provided,see the description of the \r
-                                 EFI_VARIABLE_AUTHENTICATION_2 descriptor below. In this case the DataSize will not \r
-                                 be zero since the EFI_VARIABLE_AUTHENTICATION_2 descriptor will be populated). \r
+                                 causes the variable to be deleted. When the EFI_VARIABLE_APPEND_WRITE attribute is\r
+                                 set, then a SetVariable() call with a DataSize of zero will not cause any change to\r
+                                 the variable value (the timestamp associated with the variable may be updated however\r
+                                 even if no new data value is provided,see the description of the\r
+                                 EFI_VARIABLE_AUTHENTICATION_2 descriptor below. In this case the DataSize will not\r
+                                 be zero since the EFI_VARIABLE_AUTHENTICATION_2 descriptor will be populated).\r

   @param  Data                   The contents for the variable.\r
 \r
   @retval EFI_SUCCESS            The firmware has successfully stored the variable and its data as\r
   @param  Data                   The contents for the variable.\r
 \r
   @retval EFI_SUCCESS            The firmware has successfully stored the variable and its data as\r

diff --git a/MdeModulePkg/Universal/BdsDxe/BdsDxe.inf b/MdeModulePkg/Universal/BdsDxe/BdsDxe.inf
index eb78d061762067ca1b0ebf76cb4d66927855862b..7e644aa99595631e1a5e787f8a18113e6a0d07b5 100644 (file)
--- a/MdeModulePkg/Universal/BdsDxe/BdsDxe.inf
+++ b/MdeModulePkg/Universal/BdsDxe/BdsDxe.inf
@@ -1,10 +1,10 @@
 ## @file\r
 #  BdsDxe module is core driver for BDS phase.\r
 #\r
 ## @file\r
 #  BdsDxe module is core driver for BDS phase.\r
 #\r

-#  When DxeCore dispatching all DXE driver, this module will produce architecture protocol \r
+#  When DxeCore dispatching all DXE driver, this module will produce architecture protocol\r

 #  gEfiBdsArchProtocolGuid. After DxeCore finish dispatching, DxeCore will invoke Entry\r
 #  interface of protocol gEfiBdsArchProtocolGuid, then BDS phase is entered.\r
 #  gEfiBdsArchProtocolGuid. After DxeCore finish dispatching, DxeCore will invoke Entry\r
 #  interface of protocol gEfiBdsArchProtocolGuid, then BDS phase is entered.\r

-#  \r
+#\r

 #  Copyright (c) 2008 - 2018, Intel Corporation. All rights reserved.<BR>\r
 #  This program and the accompanying materials\r
 #  are licensed and made available under the terms and conditions of the BSD License\r
 #  Copyright (c) 2008 - 2018, Intel Corporation. All rights reserved.<BR>\r
 #  This program and the accompanying materials\r
 #  are licensed and made available under the terms and conditions of the BSD License\r


@@ -22,7 +22,7 @@
   MODULE_UNI_FILE                = BdsDxe.uni\r
   FILE_GUID                      = 6D33944A-EC75-4855-A54D-809C75241F6C\r
   MODULE_TYPE                    = DXE_DRIVER\r
   MODULE_UNI_FILE                = BdsDxe.uni\r
   FILE_GUID                      = 6D33944A-EC75-4855-A54D-809C75241F6C\r
   MODULE_TYPE                    = DXE_DRIVER\r

-  VERSION_STRING                 = 1.0 \r
+  VERSION_STRING                 = 1.0\r

   ENTRY_POINT                    = BdsInitialize\r
 \r
 #\r
   ENTRY_POINT                    = BdsInitialize\r
 \r
 #\r

diff --git a/MdeModulePkg/Universal/BdsDxe/BdsDxe.uni b/MdeModulePkg/Universal/BdsDxe/BdsDxe.uni
index 6f2758b0178dc36462ac9f388b9946f09a7b6227..69b48f87f127911207e9c336367c3cbc88fcfa35 100644 (file)
--- a/MdeModulePkg/Universal/BdsDxe/BdsDxe.uni
+++ b/MdeModulePkg/Universal/BdsDxe/BdsDxe.uni
@@ -5,12 +5,12 @@
 // gEfiBdsArchProtocolGuid. After DxeCore finish dispatching, DxeCore will invoke Entry\r
 // interface of protocol gEfiBdsArchProtocolGuid, then BDS phase is entered.\r
 //\r
 // gEfiBdsArchProtocolGuid. After DxeCore finish dispatching, DxeCore will invoke Entry\r
 // interface of protocol gEfiBdsArchProtocolGuid, then BDS phase is entered.\r
 //\r

-// Copyright (c) 2015, Intel Corporation. All rights reserved.<BR>\r
+// Copyright (c) 2015 - 2018, Intel Corporation. All rights reserved.<BR>\r

 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r
 // which accompanies this distribution.  The full text of the license may be found at\r
 // http://opensource.org/licenses/bsd-license.php\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r
 // which accompanies this distribution.  The full text of the license may be found at\r
 // http://opensource.org/licenses/bsd-license.php\r

-// \r
+//\r

 // THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 // WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 //\r
 // THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 // WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 //\r

diff --git a/MdeModulePkg/Universal/BdsDxe/BdsDxeExtra.uni b/MdeModulePkg/Universal/BdsDxe/BdsDxeExtra.uni
index e3f1fe82b7988032518ce7b8b058dbf721e75a7b..4201f4647801c3e561f02434c6589d53747ce81b 100644 (file)
--- a/MdeModulePkg/Universal/BdsDxe/BdsDxeExtra.uni
+++ b/MdeModulePkg/Universal/BdsDxe/BdsDxeExtra.uni
@@ -1,7 +1,7 @@
 // /** @file\r
 // BdsDxe Localized Strings and Content\r
 //\r
 // /** @file\r
 // BdsDxe Localized Strings and Content\r
 //\r

-// Copyright (c) 2015, Intel Corporation. All rights reserved.<BR>\r
+// Copyright (c) 2015 - 2018, Intel Corporation. All rights reserved.<BR>\r

 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r
 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r


@@ -13,8 +13,8 @@
 //\r
 // **/\r
 \r
 //\r
 // **/\r
 \r

-#string STR_PROPERTIES_MODULE_NAME \r
-#language en-US \r
+#string STR_PROPERTIES_MODULE_NAME\r
+#language en-US\r

 "Boot Device Selection Core DXE Driver"\r
 \r
 \r
 "Boot Device Selection Core DXE Driver"\r
 \r
 \r

diff --git a/MdeModulePkg/Universal/BdsDxe/BdsEntry.c b/MdeModulePkg/Universal/BdsDxe/BdsEntry.c
index acb25abfcd486aa3c4f6fbc8ea52dddd7ac7e608..49e403e18104b7da3e34272eebc48356d6947bd1 100644 (file)
--- a/MdeModulePkg/Universal/BdsDxe/BdsEntry.c
+++ b/MdeModulePkg/Universal/BdsDxe/BdsEntry.c
@@ -293,9 +293,9 @@ BdsReadKeys (
   }\r
 \r
   while (gST->ConIn != NULL) {\r
   }\r
 \r
   while (gST->ConIn != NULL) {\r

-    \r
+\r

     Status = gST->ConIn->ReadKeyStroke (gST->ConIn, &Key);\r
     Status = gST->ConIn->ReadKeyStroke (gST->ConIn, &Key);\r

-    \r
+\r

     if (EFI_ERROR (Status)) {\r
       //\r
       // No more keys.\r
     if (EFI_ERROR (Status)) {\r
       //\r
       // No more keys.\r


@@ -488,10 +488,10 @@ ProcessLoadOptions (
 \r
 /**\r
 \r
 \r
 /**\r
 \r

-  Validate input console variable data. \r
+  Validate input console variable data.\r

 \r
   If found the device path is not a valid device path, remove the variable.\r
 \r
   If found the device path is not a valid device path, remove the variable.\r

-  \r
+\r

   @param VariableName             Input console variable name.\r
 \r
 **/\r
   @param VariableName             Input console variable name.\r
 \r
 **/\r


@@ -505,7 +505,7 @@ BdsFormalizeConsoleVariable (
   EFI_STATUS                Status;\r
 \r
   GetEfiGlobalVariable2 (VariableName, (VOID **) &DevicePath, &VariableSize);\r
   EFI_STATUS                Status;\r
 \r
   GetEfiGlobalVariable2 (VariableName, (VOID **) &DevicePath, &VariableSize);\r

-  if ((DevicePath != NULL) && !IsDevicePathValid (DevicePath, VariableSize)) { \r
+  if ((DevicePath != NULL) && !IsDevicePathValid (DevicePath, VariableSize)) {\r

     Status = gRT->SetVariable (\r
                     VariableName,\r
                     &gEfiGlobalVariableGuid,\r
     Status = gRT->SetVariable (\r
                     VariableName,\r
                     &gEfiGlobalVariableGuid,\r


@@ -525,17 +525,17 @@ BdsFormalizeConsoleVariable (
 }\r
 \r
 /**\r
 }\r
 \r
 /**\r

-  Formalize OsIndication related variables. \r
-  \r
-  For OsIndicationsSupported, Create a BS/RT/UINT64 variable to report caps \r
+  Formalize OsIndication related variables.\r
+\r
+  For OsIndicationsSupported, Create a BS/RT/UINT64 variable to report caps\r

   Delete OsIndications variable if it is not NV/BS/RT UINT64.\r
   Delete OsIndications variable if it is not NV/BS/RT UINT64.\r

-  \r
+\r

   Item 3 is used to solve case when OS corrupts OsIndications. Here simply delete this NV variable.\r
 \r
   Create a boot option for BootManagerMenu if it hasn't been created yet\r
 \r
 **/\r
   Item 3 is used to solve case when OS corrupts OsIndications. Here simply delete this NV variable.\r
 \r
   Create a boot option for BootManagerMenu if it hasn't been created yet\r
 \r
 **/\r

-VOID \r
+VOID\r

 BdsFormalizeOSIndicationVariable (\r
   VOID\r
   )\r
 BdsFormalizeOSIndicationVariable (\r
   VOID\r
   )\r


@@ -613,10 +613,10 @@ BdsFormalizeOSIndicationVariable (
 \r
 /**\r
 \r
 \r
 /**\r
 \r

-  Validate variables. \r
+  Validate variables.\r

 \r
 **/\r
 \r
 **/\r

-VOID \r
+VOID\r

 BdsFormalizeEfiGlobalVariable (\r
   VOID\r
   )\r
 BdsFormalizeEfiGlobalVariable (\r
   VOID\r
   )\r


@@ -884,7 +884,7 @@ BdsEntry (
   // Possible things that can be done in PlatformBootManagerBeforeConsole:\r
   // > Update console variable: 1. include hot-plug devices; 2. Clear ConIn and add SOL for AMT\r
   // > Register new Driver#### or Boot####\r
   // Possible things that can be done in PlatformBootManagerBeforeConsole:\r
   // > Update console variable: 1. include hot-plug devices; 2. Clear ConIn and add SOL for AMT\r
   // > Register new Driver#### or Boot####\r

-  // > Register new Key####: e.g.: F12 \r
+  // > Register new Key####: e.g.: F12\r

   // > Signal ReadyToLock event\r
   // > Authentication action: 1. connect Auth devices; 2. Identify auto logon user.\r
   //\r
   // > Signal ReadyToLock event\r
   // > Authentication action: 1. connect Auth devices; 2. Identify auto logon user.\r
   //\r


@@ -929,7 +929,7 @@ BdsEntry (
   // > Connect certain devices\r
   // > Dispatch aditional option roms\r
   // > Special boot: e.g.: USB boot, enter UI\r
   // > Connect certain devices\r
   // > Dispatch aditional option roms\r
   // > Special boot: e.g.: USB boot, enter UI\r

-  // \r
+  //\r

   PERF_INMODULE_BEGIN("PlatformBootManagerAfterConsole");\r
   PlatformBootManagerAfterConsole ();\r
   PERF_INMODULE_END("PlatformBootManagerAfterConsole");\r
   PERF_INMODULE_BEGIN("PlatformBootManagerAfterConsole");\r
   PlatformBootManagerAfterConsole ();\r
   PERF_INMODULE_END("PlatformBootManagerAfterConsole");\r


@@ -981,7 +981,7 @@ BdsEntry (
   PlatformRecovery = (BOOLEAN) ((OsIndication & EFI_OS_INDICATIONS_START_PLATFORM_RECOVERY) != 0);\r
   //\r
   // Clear EFI_OS_INDICATIONS_BOOT_TO_FW_UI to acknowledge OS\r
   PlatformRecovery = (BOOLEAN) ((OsIndication & EFI_OS_INDICATIONS_START_PLATFORM_RECOVERY) != 0);\r
   //\r
   // Clear EFI_OS_INDICATIONS_BOOT_TO_FW_UI to acknowledge OS\r

-  // \r
+  //\r

   if (BootFwUi || PlatformRecovery) {\r
     OsIndication &= ~((UINT64) (EFI_OS_INDICATIONS_BOOT_TO_FW_UI | EFI_OS_INDICATIONS_START_PLATFORM_RECOVERY));\r
     Status = gRT->SetVariable (\r
   if (BootFwUi || PlatformRecovery) {\r
     OsIndication &= ~((UINT64) (EFI_OS_INDICATIONS_BOOT_TO_FW_UI | EFI_OS_INDICATIONS_START_PLATFORM_RECOVERY));\r
     Status = gRT->SetVariable (\r


@@ -1059,7 +1059,7 @@ BdsEntry (
       if (!EFI_ERROR (Status)) {\r
         EfiBootManagerBoot (&LoadOption);\r
         EfiBootManagerFreeLoadOption (&LoadOption);\r
       if (!EFI_ERROR (Status)) {\r
         EfiBootManagerBoot (&LoadOption);\r
         EfiBootManagerFreeLoadOption (&LoadOption);\r

-        if ((LoadOption.Status == EFI_SUCCESS) && \r
+        if ((LoadOption.Status == EFI_SUCCESS) &&\r

             (BootManagerMenuStatus != EFI_NOT_FOUND) &&\r
             (LoadOption.OptionNumber != BootManagerMenu.OptionNumber)) {\r
           //\r
             (BootManagerMenuStatus != EFI_NOT_FOUND) &&\r
             (LoadOption.OptionNumber != BootManagerMenu.OptionNumber)) {\r
           //\r


@@ -1107,14 +1107,14 @@ BdsEntry (
                                  then EFI_INVALID_PARAMETER is returned.\r
   @param  VendorGuid             A unique identifier for the vendor.\r
   @param  Attributes             Attributes bitmask to set for the variable.\r
                                  then EFI_INVALID_PARAMETER is returned.\r
   @param  VendorGuid             A unique identifier for the vendor.\r
   @param  Attributes             Attributes bitmask to set for the variable.\r

-  @param  DataSize               The size in bytes of the Data buffer. Unless the EFI_VARIABLE_APPEND_WRITE, \r
+  @param  DataSize               The size in bytes of the Data buffer. Unless the EFI_VARIABLE_APPEND_WRITE,\r

                                  or EFI_VARIABLE_TIME_BASED_AUTHENTICATED_WRITE_ACCESS attribute is set, a size of zero\r
                                  or EFI_VARIABLE_TIME_BASED_AUTHENTICATED_WRITE_ACCESS attribute is set, a size of zero\r

-                                 causes the variable to be deleted. When the EFI_VARIABLE_APPEND_WRITE attribute is \r
-                                 set, then a SetVariable() call with a DataSize of zero will not cause any change to \r
-                                 the variable value (the timestamp associated with the variable may be updated however \r
-                                 even if no new data value is provided,see the description of the \r
-                                 EFI_VARIABLE_AUTHENTICATION_2 descriptor below. In this case the DataSize will not \r
-                                 be zero since the EFI_VARIABLE_AUTHENTICATION_2 descriptor will be populated). \r
+                                 causes the variable to be deleted. When the EFI_VARIABLE_APPEND_WRITE attribute is\r
+                                 set, then a SetVariable() call with a DataSize of zero will not cause any change to\r
+                                 the variable value (the timestamp associated with the variable may be updated however\r
+                                 even if no new data value is provided,see the description of the\r
+                                 EFI_VARIABLE_AUTHENTICATION_2 descriptor below. In this case the DataSize will not\r
+                                 be zero since the EFI_VARIABLE_AUTHENTICATION_2 descriptor will be populated).\r

   @param  Data                   The contents for the variable.\r
 \r
   @retval EFI_SUCCESS            The firmware has successfully stored the variable and its data as\r
   @param  Data                   The contents for the variable.\r
 \r
   @retval EFI_SUCCESS            The firmware has successfully stored the variable and its data as\r

diff --git a/MdeModulePkg/Universal/BdsDxe/HwErrRecSupport.c b/MdeModulePkg/Universal/BdsDxe/HwErrRecSupport.c
index 87e39c3c8d6dcf7bff2cebc80379d5c588cacfa8..94c72cf984a32cb0acf8ba58be1306e456059db0 100644 (file)
--- a/MdeModulePkg/Universal/BdsDxe/HwErrRecSupport.c
+++ b/MdeModulePkg/Universal/BdsDxe/HwErrRecSupport.c
@@ -2,7 +2,7 @@
   Set the level of support for Hardware Error Record Persistence that is\r
   implemented by the platform.\r
 \r
   Set the level of support for Hardware Error Record Persistence that is\r
   implemented by the platform.\r
 \r

-Copyright (c) 2007 - 2015, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2007 - 2018, Intel Corporation. All rights reserved.<BR>\r

 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r


@@ -28,9 +28,9 @@ InitializeHwErrRecSupport (
 {\r
   EFI_STATUS    Status;\r
   UINT16        HardwareErrorRecordLevel;\r
 {\r
   EFI_STATUS    Status;\r
   UINT16        HardwareErrorRecordLevel;\r

-  \r
+\r

   HardwareErrorRecordLevel = PcdGet16 (PcdHardwareErrorRecordLevel);\r
   HardwareErrorRecordLevel = PcdGet16 (PcdHardwareErrorRecordLevel);\r

-  \r
+\r

   if (HardwareErrorRecordLevel != 0) {\r
     //\r
     // If level value equal 0, no need set to 0 to variable area because UEFI specification\r
   if (HardwareErrorRecordLevel != 0) {\r
     //\r
     // If level value equal 0, no need set to 0 to variable area because UEFI specification\r

diff --git a/MdeModulePkg/Universal/BdsDxe/Language.c b/MdeModulePkg/Universal/BdsDxe/Language.c
index 09127316fb20c2a5e42893bb89537cf2a734ab1b..3e6022f840a7003d58ef6f083759e92687c0abe7 100644 (file)
--- a/MdeModulePkg/Universal/BdsDxe/Language.c
+++ b/MdeModulePkg/Universal/BdsDxe/Language.c
@@ -1,7 +1,7 @@
 /** @file\r
   Language settings\r
 \r
 /** @file\r
   Language settings\r
 \r

-Copyright (c) 2004 - 2015, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2004 - 2018, Intel Corporation. All rights reserved.<BR>\r

 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r


@@ -47,7 +47,7 @@ IsLangInSupportedLangCodes(
   IN  CHAR8            *SupportedLang,\r
   IN  CHAR8            *Lang,\r
   IN  BOOLEAN          Iso639Language\r
   IN  CHAR8            *SupportedLang,\r
   IN  CHAR8            *Lang,\r
   IN  BOOLEAN          Iso639Language\r

-  ) \r
+  )\r

 {\r
   UINTN    Index;\r
   UINTN    CompareLength;\r
 {\r
   UINTN    Index;\r
   UINTN    CompareLength;\r


@@ -79,8 +79,8 @@ IsLangInSupportedLangCodes(
       // Determine the length of the next language code in SupportedLang\r
       //\r
       for (CompareLength = 0; SupportedLang[CompareLength] != '\0' && SupportedLang[CompareLength] != ';'; CompareLength++);\r
       // Determine the length of the next language code in SupportedLang\r
       //\r
       for (CompareLength = 0; SupportedLang[CompareLength] != '\0' && SupportedLang[CompareLength] != ';'; CompareLength++);\r

-      \r
-      if ((CompareLength == LanguageLength) && \r
+\r
+      if ((CompareLength == LanguageLength) &&\r

           (AsciiStrnCmp (Lang, SupportedLang, CompareLength) == 0)) {\r
         //\r
         // Successfully find the Lang string in SupportedLang string.\r
           (AsciiStrnCmp (Lang, SupportedLang, CompareLength) == 0)) {\r
         //\r
         // Successfully find the Lang string in SupportedLang string.\r


@@ -108,7 +108,7 @@ VOID
 InitializeLangVariable (\r
   IN CHAR16     *LangName,\r
   IN CHAR8      *SupportedLang,\r
 InitializeLangVariable (\r
   IN CHAR16     *LangName,\r
   IN CHAR8      *SupportedLang,\r

-  IN CHAR8      *DefaultLang,     \r
+  IN CHAR8      *DefaultLang,\r

   IN BOOLEAN    Iso639Language\r
   )\r
 {\r
   IN BOOLEAN    Iso639Language\r
   )\r
 {\r

diff --git a/MdeModulePkg/Universal/BootManagerPolicyDxe/BootManagerPolicyDxe.c b/MdeModulePkg/Universal/BootManagerPolicyDxe/BootManagerPolicyDxe.c
index 412ecbda55b97d5668fc4bcdef863934268e4d32..a044eaf22c3d9a90771b3d9e43eb08092ada3846 100644 (file)
--- a/MdeModulePkg/Universal/BootManagerPolicyDxe/BootManagerPolicyDxe.c
+++ b/MdeModulePkg/Universal/BootManagerPolicyDxe/BootManagerPolicyDxe.c
@@ -1,7 +1,7 @@
 /** @file\r
   This module produces Boot Manager Policy protocol.\r
 \r
 /** @file\r
   This module produces Boot Manager Policy protocol.\r
 \r

-Copyright (c) 2015, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2015 - 2018, Intel Corporation. All rights reserved.<BR>\r

 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r


@@ -139,7 +139,7 @@ ConnectNetwork (
                         system will be connected using the platforms EFI Boot\r
                         Manager policy.\r
   @param[in] Recursive  If TRUE, then ConnectController() is called recursively\r
                         system will be connected using the platforms EFI Boot\r
                         Manager policy.\r
   @param[in] Recursive  If TRUE, then ConnectController() is called recursively\r

-                        until the entire tree of controllers below the \r
+                        until the entire tree of controllers below the\r

                         controller specified by DevicePath have been created.\r
                         If FALSE, then the tree of controllers is only expanded\r
                         one level. If DevicePath is NULL then Recursive is ignored.\r
                         controller specified by DevicePath have been created.\r
                         If FALSE, then the tree of controllers is only expanded\r
                         one level. If DevicePath is NULL then Recursive is ignored.\r


@@ -147,7 +147,7 @@ ConnectNetwork (
   @retval EFI_SUCCESS            The DevicePath was connected.\r
   @retval EFI_NOT_FOUND          The DevicePath was not found.\r
   @retval EFI_NOT_FOUND          No driver was connected to DevicePath.\r
   @retval EFI_SUCCESS            The DevicePath was connected.\r
   @retval EFI_NOT_FOUND          The DevicePath was not found.\r
   @retval EFI_NOT_FOUND          No driver was connected to DevicePath.\r

-  @retval EFI_SECURITY_VIOLATION The user has no permission to start UEFI device \r
+  @retval EFI_SECURITY_VIOLATION The user has no permission to start UEFI device\r

                                  drivers on the DevicePath.\r
   @retval EFI_UNSUPPORTED        The current TPL is not TPL_APPLICATION.\r
 **/\r
                                  drivers on the DevicePath.\r
   @retval EFI_UNSUPPORTED        The current TPL is not TPL_APPLICATION.\r
 **/\r


@@ -188,7 +188,7 @@ BootManagerPolicyConnectDevicePath (
   Manager connect a class of devices.\r
 \r
   If Class is EFI_BOOT_MANAGER_POLICY_CONSOLE_GUID then the Boot Manager will\r
   Manager connect a class of devices.\r
 \r
   If Class is EFI_BOOT_MANAGER_POLICY_CONSOLE_GUID then the Boot Manager will\r

-  use platform policy to connect consoles. Some platforms may restrict the \r
+  use platform policy to connect consoles. Some platforms may restrict the\r

   number of consoles connected as they attempt to fast boot, and calling\r
   ConnectDeviceClass() with a Class value of EFI_BOOT_MANAGER_POLICY_CONSOLE_GUID\r
   must connect the set of consoles that follow the Boot Manager platform policy,\r
   number of consoles connected as they attempt to fast boot, and calling\r
   ConnectDeviceClass() with a Class value of EFI_BOOT_MANAGER_POLICY_CONSOLE_GUID\r
   must connect the set of consoles that follow the Boot Manager platform policy,\r


@@ -206,7 +206,7 @@ BootManagerPolicyConnectDevicePath (
   application that called ConnectDeviceClass() may need to use the published\r
   protocols to establish the network connection. The Boot Manager can optionally\r
   have a policy to establish a network connection.\r
   application that called ConnectDeviceClass() may need to use the published\r
   protocols to establish the network connection. The Boot Manager can optionally\r
   have a policy to establish a network connection.\r

-  \r
+\r

   If Class is EFI_BOOT_MANAGER_POLICY_CONNECT_ALL_GUID then the Boot Manager\r
   will connect all UEFI drivers using the UEFI Boot Service\r
   EFI_BOOT_SERVICES.ConnectController(). If the Boot Manager has policy\r
   If Class is EFI_BOOT_MANAGER_POLICY_CONNECT_ALL_GUID then the Boot Manager\r
   will connect all UEFI drivers using the UEFI Boot Service\r
   EFI_BOOT_SERVICES.ConnectController(). If the Boot Manager has policy\r


@@ -223,7 +223,7 @@ BootManagerPolicyConnectDevicePath (
   @retval EFI_DEVICE_ERROR Devices were not connected due to an error.\r
   @retval EFI_NOT_FOUND    The Class is not supported by the platform.\r
   @retval EFI_UNSUPPORTED  The current TPL is not TPL_APPLICATION.\r
   @retval EFI_DEVICE_ERROR Devices were not connected due to an error.\r
   @retval EFI_NOT_FOUND    The Class is not supported by the platform.\r
   @retval EFI_UNSUPPORTED  The current TPL is not TPL_APPLICATION.\r

-**/        \r
+**/\r

 EFI_STATUS\r
 EFIAPI\r
 BootManagerPolicyConnectDeviceClass (\r
 EFI_STATUS\r
 EFIAPI\r
 BootManagerPolicyConnectDeviceClass (\r

diff --git a/MdeModulePkg/Universal/BootManagerPolicyDxe/BootManagerPolicyDxe.inf b/MdeModulePkg/Universal/BootManagerPolicyDxe/BootManagerPolicyDxe.inf
index 488f421341e1084ec680f4bcbf4dd60efd816763..33014723d0d526cf8c39684cb804f01a719c79c0 100644 (file)
--- a/MdeModulePkg/Universal/BootManagerPolicyDxe/BootManagerPolicyDxe.inf
+++ b/MdeModulePkg/Universal/BootManagerPolicyDxe/BootManagerPolicyDxe.inf
@@ -1,7 +1,7 @@
 ## @file\r
 #  This module produces Boot Manager Policy protocol.\r
 ## @file\r
 #  This module produces Boot Manager Policy protocol.\r

-#  \r
-#  Copyright (c) 2015, Intel Corporation. All rights reserved.<BR>\r
+#\r
+#  Copyright (c) 2015 - 2018, Intel Corporation. All rights reserved.<BR>\r

 #  This program and the accompanying materials\r
 #  are licensed and made available under the terms and conditions of the BSD License\r
 #  which accompanies this distribution.  The full text of the license may be found at\r
 #  This program and the accompanying materials\r
 #  are licensed and made available under the terms and conditions of the BSD License\r
 #  which accompanies this distribution.  The full text of the license may be found at\r


@@ -18,7 +18,7 @@
   MODULE_UNI_FILE                = BootManagerPolicyDxe.uni\r
   FILE_GUID                      = E622443C-284E-4b47-A984-FD66B482DAC0\r
   MODULE_TYPE                    = DXE_DRIVER\r
   MODULE_UNI_FILE                = BootManagerPolicyDxe.uni\r
   FILE_GUID                      = E622443C-284E-4b47-A984-FD66B482DAC0\r
   MODULE_TYPE                    = DXE_DRIVER\r

-  VERSION_STRING                 = 1.0 \r
+  VERSION_STRING                 = 1.0\r

   ENTRY_POINT                    = BootManagerPolicyInitialize\r
 \r
 #\r
   ENTRY_POINT                    = BootManagerPolicyInitialize\r
 \r
 #\r

diff --git a/MdeModulePkg/Universal/BootManagerPolicyDxe/BootManagerPolicyDxe.uni b/MdeModulePkg/Universal/BootManagerPolicyDxe/BootManagerPolicyDxe.uni
index 487299c41f41ee29753a490aeba73e2cd67299f1..c73fe3077fd4c2c2e3bac392be1828006bcff430 100644 (file)
--- a/MdeModulePkg/Universal/BootManagerPolicyDxe/BootManagerPolicyDxe.uni
+++ b/MdeModulePkg/Universal/BootManagerPolicyDxe/BootManagerPolicyDxe.uni
@@ -1,12 +1,12 @@
 // /** @file\r
 // This module produces Boot Manager Policy protocol.\r
 //\r
 // /** @file\r
 // This module produces Boot Manager Policy protocol.\r
 //\r

-// Copyright (c) 2015, Intel Corporation. All rights reserved.<BR>\r
+// Copyright (c) 2015 - 2018, Intel Corporation. All rights reserved.<BR>\r

 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r
 // which accompanies this distribution.  The full text of the license may be found at\r
 // http://opensource.org/licenses/bsd-license.php\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r
 // which accompanies this distribution.  The full text of the license may be found at\r
 // http://opensource.org/licenses/bsd-license.php\r

-// \r
+//\r

 // THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 // WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 //\r
 // THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 // WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 //\r

diff --git a/MdeModulePkg/Universal/BootManagerPolicyDxe/BootManagerPolicyDxeExtra.uni b/MdeModulePkg/Universal/BootManagerPolicyDxe/BootManagerPolicyDxeExtra.uni
index a87e2960757f3c242ef10c346d4536008ac70ea0..45b6bf1ec397165e9012eef4c613d8a79f87c2c5 100644 (file)
--- a/MdeModulePkg/Universal/BootManagerPolicyDxe/BootManagerPolicyDxeExtra.uni
+++ b/MdeModulePkg/Universal/BootManagerPolicyDxe/BootManagerPolicyDxeExtra.uni
@@ -1,7 +1,7 @@
 // /** @file\r
 // This module produces Boot Manager Policy protocol.\r
 //\r
 // /** @file\r
 // This module produces Boot Manager Policy protocol.\r
 //\r

-// Copyright (c) 2015, Intel Corporation. All rights reserved.<BR>\r
+// Copyright (c) 2015 - 2018, Intel Corporation. All rights reserved.<BR>\r

 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r
 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r


@@ -13,8 +13,8 @@
 //\r
 // **/\r
 \r
 //\r
 // **/\r
 \r

-#string STR_PROPERTIES_MODULE_NAME \r
-#language en-US \r
+#string STR_PROPERTIES_MODULE_NAME\r
+#language en-US\r

 "Boot Manager Policy DXE Driver"\r
 \r
 \r
 "Boot Manager Policy DXE Driver"\r
 \r
 \r

diff --git a/MdeModulePkg/Universal/CapsulePei/Capsule.h b/MdeModulePkg/Universal/CapsulePei/Capsule.h
index 3614c21f878072a7771590195f309a3482af0c4b..3b8d8a9321386048c737e9faaef4acf430493a20 100644 (file)
--- a/MdeModulePkg/Universal/CapsulePei/Capsule.h
+++ b/MdeModulePkg/Universal/CapsulePei/Capsule.h
@@ -1,6 +1,6 @@
 /** @file\r
 \r
 /** @file\r
 \r

-Copyright (c) 2006 - 2016, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r

 \r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions\r
 \r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions\r


@@ -40,7 +40,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #include <IndustryStandard/PeImage.h>\r
 #include "Common/CommonHeader.h"\r
 \r
 #include <IndustryStandard/PeImage.h>\r
 #include "Common/CommonHeader.h"\r
 \r

-#ifdef MDE_CPU_IA32 \r
+#ifdef MDE_CPU_IA32\r

 \r
 #pragma pack(1)\r
 \r
 \r
 #pragma pack(1)\r
 \r


@@ -79,7 +79,7 @@ typedef union {
     UINT64  CacheDisabled:1;          // 0 = Cached, 1=Non-Cached\r
     UINT64  Accessed:1;               // 0 = Not accessed, 1 = Accessed (set by CPU)\r
     UINT64  Dirty:1;                  // 0 = Not Dirty, 1 = written by processor on access to page\r
     UINT64  CacheDisabled:1;          // 0 = Cached, 1=Non-Cached\r
     UINT64  Accessed:1;               // 0 = Not accessed, 1 = Accessed (set by CPU)\r
     UINT64  Dirty:1;                  // 0 = Not Dirty, 1 = written by processor on access to page\r

-    UINT64  MustBe1:1;                // Must be 1 \r
+    UINT64  MustBe1:1;                // Must be 1\r

     UINT64  Global:1;                 // 0 = Not global page, 1 = global page TLB not cleared on CR3 write\r
     UINT64  Available:3;              // Available for use by system software\r
     UINT64  PAT:1;                    //\r
     UINT64  Global:1;                 // 0 = Not global page, 1 = global page TLB not cleared on CR3 write\r
     UINT64  Available:3;              // Available for use by system software\r
     UINT64  PAT:1;                    //\r


@@ -103,7 +103,7 @@ typedef union {
     UINT64  CacheDisabled:1;          // 0 = Cached, 1=Non-Cached\r
     UINT64  Accessed:1;               // 0 = Not accessed, 1 = Accessed (set by CPU)\r
     UINT64  Dirty:1;                  // 0 = Not Dirty, 1 = written by processor on access to page\r
     UINT64  CacheDisabled:1;          // 0 = Cached, 1=Non-Cached\r
     UINT64  Accessed:1;               // 0 = Not accessed, 1 = Accessed (set by CPU)\r
     UINT64  Dirty:1;                  // 0 = Not Dirty, 1 = written by processor on access to page\r

-    UINT64  MustBe1:1;                // Must be 1 \r
+    UINT64  MustBe1:1;                // Must be 1\r

     UINT64  Global:1;                 // 0 = Not global page, 1 = global page TLB not cleared on CR3 write\r
     UINT64  Available:3;              // Available for use by system software\r
     UINT64  PAT:1;                    //\r
     UINT64  Global:1;                 // 0 = Not global page, 1 = global page TLB not cleared on CR3 write\r
     UINT64  Available:3;              // Available for use by system software\r
     UINT64  PAT:1;                    //\r

diff --git a/MdeModulePkg/Universal/CapsulePei/CapsulePei.inf b/MdeModulePkg/Universal/CapsulePei/CapsulePei.inf
index c54bc21a95a8ff9f6df909ea75d7d72aedbb2fcb..02cf90c75d58446599cae7f42146c963cbae0aa1 100644 (file)
--- a/MdeModulePkg/Universal/CapsulePei/CapsulePei.inf
+++ b/MdeModulePkg/Universal/CapsulePei/CapsulePei.inf
@@ -6,7 +6,7 @@
 #  This external input must be validated carefully to avoid security issue like\r
 #  buffer overflow, integer overflow.\r
 #\r
 #  This external input must be validated carefully to avoid security issue like\r
 #  buffer overflow, integer overflow.\r
 #\r

-# Copyright (c) 2006 - 2016, Intel Corporation. All rights reserved.<BR>\r
+# Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r

 # Copyright (c) 2017, AMD Incorporated. All rights reserved.<BR>\r
 #\r
 # This program and the accompanying materials\r
 # Copyright (c) 2017, AMD Incorporated. All rights reserved.<BR>\r
 #\r
 # This program and the accompanying materials\r


@@ -39,7 +39,7 @@
 [Sources]\r
   UefiCapsule.c\r
   Capsule.h\r
 [Sources]\r
   UefiCapsule.c\r
   Capsule.h\r

-  Common/CapsuleCoalesce.c  \r
+  Common/CapsuleCoalesce.c\r

 \r
 [Packages]\r
   MdePkg/MdePkg.dec\r
 \r
 [Packages]\r
   MdePkg/MdePkg.dec\r


@@ -70,8 +70,8 @@
 [Ppis]\r
   gEfiPeiReadOnlyVariable2PpiGuid               ## CONSUMES\r
   gEfiPeiCapsulePpiGuid                         ## PRODUCES\r
 [Ppis]\r
   gEfiPeiReadOnlyVariable2PpiGuid               ## CONSUMES\r
   gEfiPeiCapsulePpiGuid                         ## PRODUCES\r

-  \r
-[Ppis.IA32]  \r
+\r
+[Ppis.IA32]\r

   gEfiPeiLoadFilePpiGuid                        ## SOMETIMES_CONSUMES\r
 \r
 [Pcd.IA32]\r
   gEfiPeiLoadFilePpiGuid                        ## SOMETIMES_CONSUMES\r
 \r
 [Pcd.IA32]\r

diff --git a/MdeModulePkg/Universal/CapsulePei/CapsulePei.uni b/MdeModulePkg/Universal/CapsulePei/CapsulePei.uni
index 227a965d192d29bf78a8f0c8f78e61852903b98a..8835dc3956070f655f1b2bf805ec7b3dbabc1262 100644 (file)
--- a/MdeModulePkg/Universal/CapsulePei/CapsulePei.uni
+++ b/MdeModulePkg/Universal/CapsulePei/CapsulePei.uni
@@ -6,14 +6,14 @@
 // This external input must be validated carefully to avoid security issue like\r
 // buffer overflow, integer overflow.\r
 //\r
 // This external input must be validated carefully to avoid security issue like\r
 // buffer overflow, integer overflow.\r
 //\r

-// Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.<BR>\r
+// Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r

 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions\r
 // of the BSD License which accompanies this distribution.  The\r
 // full text of the license may be found at\r
 // http://opensource.org/licenses/bsd-license.php\r
 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions\r
 // of the BSD License which accompanies this distribution.  The\r
 // full text of the license may be found at\r
 // http://opensource.org/licenses/bsd-license.php\r

-// \r
+//\r

 // THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 // WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 //\r
 // THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 // WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 //\r

diff --git a/MdeModulePkg/Universal/CapsulePei/CapsulePeiExtra.uni b/MdeModulePkg/Universal/CapsulePei/CapsulePeiExtra.uni
index d6d3a67d8f411b6f75823bbb5fcbd20eaa30e8ce..4c6e1016ffe02c781d2c6c0eb48e09c979a355fe 100644 (file)
--- a/MdeModulePkg/Universal/CapsulePei/CapsulePeiExtra.uni
+++ b/MdeModulePkg/Universal/CapsulePei/CapsulePeiExtra.uni
@@ -1,7 +1,7 @@
 // /** @file\r
 // CapsulePei Localized Strings and Content\r
 //\r
 // /** @file\r
 // CapsulePei Localized Strings and Content\r
 //\r

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

 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions\r
 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions\r


@@ -14,8 +14,8 @@
 //\r
 // **/\r
 \r
 //\r
 // **/\r
 \r

-#string STR_PROPERTIES_MODULE_NAME \r
-#language en-US \r
+#string STR_PROPERTIES_MODULE_NAME\r
+#language en-US\r

 "Firmware Update PEI Module"\r
 \r
 \r
 "Firmware Update PEI Module"\r
 \r
 \r

diff --git a/MdeModulePkg/Universal/CapsulePei/CapsuleX64.uni b/MdeModulePkg/Universal/CapsulePei/CapsuleX64.uni
index 731cf14e598d288c329d91a7f91429e1b51318dc..44e07728b947f08123f91718a2912b7b29f05634 100644 (file)
--- a/MdeModulePkg/Universal/CapsulePei/CapsuleX64.uni
+++ b/MdeModulePkg/Universal/CapsulePei/CapsuleX64.uni
@@ -3,20 +3,20 @@
 //\r
 // The X64 entrypoint to process capsule in long mode.\r
 // This module is built as X64.\r
 //\r
 // The X64 entrypoint to process capsule in long mode.\r
 // This module is built as X64.\r

-// \r
+//\r

 // Caution: This module requires additional review when modified.\r
 // This driver will have external input - capsule image.\r
 // This external input must be validated carefully to avoid security issue like\r
 // buffer overflow, integer overflow.\r
 //\r
 // Caution: This module requires additional review when modified.\r
 // This driver will have external input - capsule image.\r
 // This external input must be validated carefully to avoid security issue like\r
 // buffer overflow, integer overflow.\r
 //\r

-// Copyright (c) 2011 - 2014, Intel Corporation. All rights reserved.<BR>\r
+// Copyright (c) 2011 - 2018, Intel Corporation. All rights reserved.<BR>\r

 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions\r
 // of the BSD License which accompanies this distribution.  The\r
 // full text of the license may be found at\r
 // http://opensource.org/licenses/bsd-license.php\r
 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions\r
 // of the BSD License which accompanies this distribution.  The\r
 // full text of the license may be found at\r
 // http://opensource.org/licenses/bsd-license.php\r

-// \r
+//\r

 // THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 // WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 //\r
 // THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 // WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 //\r

diff --git a/MdeModulePkg/Universal/CapsulePei/CapsuleX64Extra.uni b/MdeModulePkg/Universal/CapsulePei/CapsuleX64Extra.uni
index 5395ec576cca74ce50bd06e043d4ef57241148cb..152a520eb2120cbcbfc25fab3efdd36c299607d1 100644 (file)
--- a/MdeModulePkg/Universal/CapsulePei/CapsuleX64Extra.uni
+++ b/MdeModulePkg/Universal/CapsulePei/CapsuleX64Extra.uni
@@ -1,7 +1,7 @@
 // /** @file\r
 // CapsuleX64 Localized Strings and Content\r
 //\r
 // /** @file\r
 // CapsuleX64 Localized Strings and Content\r
 //\r

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

 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions\r
 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions\r


@@ -14,8 +14,8 @@
 //\r
 // **/\r
 \r
 //\r
 // **/\r
 \r

-#string STR_PROPERTIES_MODULE_NAME \r
-#language en-US \r
+#string STR_PROPERTIES_MODULE_NAME\r
+#language en-US\r

 "Firmware Update PEI Module over 4GB"\r
 \r
 \r
 "Firmware Update PEI Module over 4GB"\r
 \r
 \r

diff --git a/MdeModulePkg/Universal/CapsulePei/Common/CapsuleCoalesce.c b/MdeModulePkg/Universal/CapsulePei/Common/CapsuleCoalesce.c
index 3e7054cd38a9516bbeb89f7221494b98351d81ae..3575a94d0fb2f68c094165e29a65ab05a77a30d9 100644 (file)
--- a/MdeModulePkg/Universal/CapsulePei/Common/CapsuleCoalesce.c
+++ b/MdeModulePkg/Universal/CapsulePei/Common/CapsuleCoalesce.c
@@ -10,7 +10,7 @@
   into memory.\r
 \r
 (C) Copyright 2014 Hewlett-Packard Development Company, L.P.<BR>\r
   into memory.\r
 \r
 (C) Copyright 2014 Hewlett-Packard Development Company, L.P.<BR>\r

-Copyright (c) 2011 - 2017, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2011 - 2018, Intel Corporation. All rights reserved.<BR>\r

 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r


@@ -45,7 +45,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   @param MemSize     The size of the block of memory pointed to by MemBase\r
   @param DataSize    How big a free block we want to find\r
 \r
   @param MemSize     The size of the block of memory pointed to by MemBase\r
   @param DataSize    How big a free block we want to find\r
 \r

-  @return A pointer to a memory block of at least DataSize that lies somewhere \r
+  @return A pointer to a memory block of at least DataSize that lies somewhere\r

           between MemBase and (MemBase + MemSize). The memory pointed to does not\r
           contain any of the capsule block descriptors or capsule blocks pointed to\r
           by the BlockList.\r
           between MemBase and (MemBase + MemSize). The memory pointed to does not\r
           contain any of the capsule block descriptors or capsule blocks pointed to\r
           by the BlockList.\r


@@ -75,7 +75,7 @@ FindFreeMem (
   @param MemSize        size of the system memory pointed to by MemBase\r
 \r
   @retval NULL    could not relocate the descriptors\r
   @param MemSize        size of the system memory pointed to by MemBase\r
 \r
   @retval NULL    could not relocate the descriptors\r

-  @retval Pointer to the base of the successfully-relocated block descriptors. \r
+  @retval Pointer to the base of the successfully-relocated block descriptors.\r

 \r
 **/\r
 EFI_CAPSULE_BLOCK_DESCRIPTOR *\r
 \r
 **/\r
 EFI_CAPSULE_BLOCK_DESCRIPTOR *\r


@@ -93,7 +93,7 @@ RelocateBlockDescriptors (
   @param CapsuleHeader   The pointer to EFI_CAPSULE_HEADER\r
 \r
   @retval FALSE  Capsule is OK\r
   @param CapsuleHeader   The pointer to EFI_CAPSULE_HEADER\r
 \r
   @retval FALSE  Capsule is OK\r

-  @retval TRUE   Capsule is corrupted \r
+  @retval TRUE   Capsule is corrupted\r

 \r
 **/\r
 BOOLEAN\r
 \r
 **/\r
 BOOLEAN\r


@@ -153,7 +153,7 @@ GetCapsuleInfo (
   @param MemSize     The size of the block of memory pointed to by MemBase\r
   @param DataSize    How big a free block we want to find\r
 \r
   @param MemSize     The size of the block of memory pointed to by MemBase\r
   @param DataSize    How big a free block we want to find\r
 \r

-  @return A pointer to a memory block of at least DataSize that lies somewhere \r
+  @return A pointer to a memory block of at least DataSize that lies somewhere\r

           between MemBase and (MemBase + MemSize). The memory pointed to does not\r
           contain any of the capsule block descriptors or capsule blocks pointed to\r
           by the BlockList.\r
           between MemBase and (MemBase + MemSize). The memory pointed to does not\r
           contain any of the capsule block descriptors or capsule blocks pointed to\r
           by the BlockList.\r


@@ -321,7 +321,7 @@ ValidateCapsuleIntegrity (
   //   * The first capsule header flag\r
   //   * The first capsule header HeaderSize\r
   //   * Below check will be done in ValidateCapsuleByMemoryResource()\r
   //   * The first capsule header flag\r
   //   * The first capsule header HeaderSize\r
   //   * Below check will be done in ValidateCapsuleByMemoryResource()\r

-  //     Length > MAX_ADDRESS \r
+  //     Length > MAX_ADDRESS\r

   //     Ptr + sizeof (EFI_CAPSULE_BLOCK_DESCRIPTOR) > MAX_ADDRESS\r
   //     DataBlock + Length > MAX_ADDRESS\r
   //\r
   //     Ptr + sizeof (EFI_CAPSULE_BLOCK_DESCRIPTOR) > MAX_ADDRESS\r
   //     DataBlock + Length > MAX_ADDRESS\r
   //\r


@@ -450,7 +450,7 @@ ValidateCapsuleIntegrity (
   @param MemSize        size of the system memory pointed to by MemBase\r
 \r
   @retval NULL    could not relocate the descriptors\r
   @param MemSize        size of the system memory pointed to by MemBase\r
 \r
   @retval NULL    could not relocate the descriptors\r

-  @retval Pointer to the base of the successfully-relocated block descriptors. \r
+  @retval Pointer to the base of the successfully-relocated block descriptors.\r

 \r
 **/\r
 EFI_CAPSULE_BLOCK_DESCRIPTOR  *\r
 \r
 **/\r
 EFI_CAPSULE_BLOCK_DESCRIPTOR  *\r


@@ -737,7 +737,7 @@ GetCapsuleInfo (
   @param CapsuleHeader   The pointer to EFI_CAPSULE_HEADER\r
 \r
   @retval FALSE  Capsule is OK\r
   @param CapsuleHeader   The pointer to EFI_CAPSULE_HEADER\r
 \r
   @retval FALSE  Capsule is OK\r

-  @retval TRUE   Capsule is corrupted \r
+  @retval TRUE   Capsule is corrupted\r

 \r
 **/\r
 BOOLEAN\r
 \r
 **/\r
 BOOLEAN\r


@@ -769,7 +769,7 @@ IsCapsuleCorrupted (
   capsule gets coalesced. This can be useful in narrowing down\r
   where capsule data corruption occurs.\r
 \r
   capsule gets coalesced. This can be useful in narrowing down\r
   where capsule data corruption occurs.\r
 \r

-  The test pattern mode fills in memory with a counting UINT32 value. \r
+  The test pattern mode fills in memory with a counting UINT32 value.\r

   If the capsule is not divided up in a multiple of 4-byte blocks, then\r
   things get messy doing the check. Therefore there are some cases\r
   here where we just give up and skip the pre-coalesce check.\r
   If the capsule is not divided up in a multiple of 4-byte blocks, then\r
   things get messy doing the check. Therefore there are some cases\r
   here where we just give up and skip the pre-coalesce check.\r


@@ -865,7 +865,7 @@ EFI_STATUS
 BuildCapsuleDescriptors (\r
   IN  EFI_PHYSICAL_ADDRESS            *BlockListBuffer,\r
   IN  MEMORY_RESOURCE_DESCRIPTOR      *MemoryResource,\r
 BuildCapsuleDescriptors (\r
   IN  EFI_PHYSICAL_ADDRESS            *BlockListBuffer,\r
   IN  MEMORY_RESOURCE_DESCRIPTOR      *MemoryResource,\r

-  OUT EFI_CAPSULE_BLOCK_DESCRIPTOR    **BlockDescriptorList \r
+  OUT EFI_CAPSULE_BLOCK_DESCRIPTOR    **BlockDescriptorList\r

   )\r
 {\r
   UINTN                            Index;\r
   )\r
 {\r
   UINTN                            Index;\r


@@ -908,7 +908,7 @@ BuildCapsuleDescriptors (
     }\r
     Index ++;\r
   }\r
     }\r
     Index ++;\r
   }\r

-  \r
+\r

   if (HeadBlock != NULL) {\r
     *BlockDescriptorList = HeadBlock;\r
     return EFI_SUCCESS;\r
   if (HeadBlock != NULL) {\r
     *BlockDescriptorList = HeadBlock;\r
     return EFI_SUCCESS;\r


@@ -930,7 +930,7 @@ BuildCapsuleDescriptors (
                    | ------------------------- |            |\r
                    | |  Capsule [0]          | |            |\r
                    | ------------------------- |            |\r
                    | ------------------------- |            |\r
                    | |  Capsule [0]          | |            |\r
                    | ------------------------- |            |\r

-                   |    Capsule Image          |            |   \r
+                   |    Capsule Image          |            |\r

 CapsuleImageBase-->+---------------------------+\r
                    | ------------------------- |            |\r
                    | |  CapsuleOffset[Num-1] | |            |\r
 CapsuleImageBase-->+---------------------------+\r
                    | ------------------------- |            |\r
                    | |  CapsuleOffset[Num-1] | |            |\r


@@ -1004,9 +1004,9 @@ CapsuleDataCoalesce (
   UINT8                          *DestPtr;\r
   UINTN                          DestLength;\r
   UINT8                          *RelocPtr;\r
   UINT8                          *DestPtr;\r
   UINTN                          DestLength;\r
   UINT8                          *RelocPtr;\r

-  UINTN                          CapsuleTimes; \r
-  UINT64                         SizeLeft; \r
-  UINT64                         CapsuleImageSize; \r
+  UINTN                          CapsuleTimes;\r
+  UINT64                         SizeLeft;\r
+  UINT64                         CapsuleImageSize;\r

   UINTN                          CapsuleSize;\r
   UINTN                          CapsuleNumber;\r
   UINTN                          DescriptorsSize;\r
   UINTN                          CapsuleSize;\r
   UINTN                          CapsuleNumber;\r
   UINTN                          DescriptorsSize;\r


@@ -1265,7 +1265,7 @@ CapsuleDataCoalesce (
         //\r
         //Here is the end of the current capsule image.\r
         //\r
         //\r
         //Here is the end of the current capsule image.\r
         //\r

-        CapsuleBeginFlag = TRUE; \r
+        CapsuleBeginFlag = TRUE;\r

       }\r
     } else {\r
       //\r
       }\r
     } else {\r
       //\r

diff --git a/MdeModulePkg/Universal/CapsulePei/UefiCapsule.c b/MdeModulePkg/Universal/CapsulePei/UefiCapsule.c
index 043365f7f770193ca2e02af507da9e1f614fd13d..1131094c4f097e20ed67a3a1253a19ac79ff2419 100644 (file)
--- a/MdeModulePkg/Universal/CapsulePei/UefiCapsule.c
+++ b/MdeModulePkg/Universal/CapsulePei/UefiCapsule.c
@@ -1,7 +1,7 @@
 /** @file\r
   Capsule update PEIM for UEFI2.0\r
 \r
 /** @file\r
   Capsule update PEIM for UEFI2.0\r
 \r

-Copyright (c) 2006 - 2017, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r

 Copyright (c) 2017, AMD Incorporated. All rights reserved.<BR>\r
 \r
 This program and the accompanying materials\r
 Copyright (c) 2017, AMD Incorporated. All rights reserved.<BR>\r
 \r
 This program and the accompanying materials\r


@@ -133,7 +133,7 @@ Create4GPageTables (
   IN EFI_PHYSICAL_ADDRESS   PageTablesAddress,\r
   IN BOOLEAN                Page1GSupport\r
   )\r
   IN EFI_PHYSICAL_ADDRESS   PageTablesAddress,\r
   IN BOOLEAN                Page1GSupport\r
   )\r

-{  \r
+{\r

   UINT8                                         PhysicalAddressBits;\r
   EFI_PHYSICAL_ADDRESS                          PageAddress;\r
   UINTN                                         IndexOfPml4Entries;\r
   UINT8                                         PhysicalAddressBits;\r
   EFI_PHYSICAL_ADDRESS                          PageAddress;\r
   UINTN                                         IndexOfPml4Entries;\r


@@ -172,7 +172,7 @@ Create4GPageTables (
   }\r
 \r
   //\r
   }\r
 \r
   //\r

-  // Pre-allocate big pages to avoid later allocations. \r
+  // Pre-allocate big pages to avoid later allocations.\r

   //\r
   BigPageAddress = (UINTN) PageTablesAddress;\r
 \r
   //\r
   BigPageAddress = (UINTN) PageTablesAddress;\r
 \r


@@ -201,7 +201,7 @@ Create4GPageTables (
 \r
     if (Page1GSupport) {\r
       PageDirectory1GEntry = (VOID *) PageDirectoryPointerEntry;\r
 \r
     if (Page1GSupport) {\r
       PageDirectory1GEntry = (VOID *) PageDirectoryPointerEntry;\r

-    \r
+\r

       for (IndexOfPageDirectoryEntries = 0; IndexOfPageDirectoryEntries < 512; IndexOfPageDirectoryEntries++, PageDirectory1GEntry++, PageAddress += SIZE_1GB) {\r
         //\r
         // Fill in the Page Directory entries\r
       for (IndexOfPageDirectoryEntries = 0; IndexOfPageDirectoryEntries < 512; IndexOfPageDirectoryEntries++, PageDirectory1GEntry++, PageAddress += SIZE_1GB) {\r
         //\r
         // Fill in the Page Directory entries\r


@@ -216,7 +216,7 @@ Create4GPageTables (
         //\r
         // Each Directory Pointer entries points to a page of Page Directory entires.\r
         // So allocate space for them and fill them in in the IndexOfPageDirectoryEntries loop.\r
         //\r
         // Each Directory Pointer entries points to a page of Page Directory entires.\r
         // So allocate space for them and fill them in in the IndexOfPageDirectoryEntries loop.\r

-        //       \r
+        //\r

         PageDirectoryEntry = (VOID *) BigPageAddress;\r
         BigPageAddress += SIZE_4KB;\r
 \r
         PageDirectoryEntry = (VOID *) BigPageAddress;\r
         BigPageAddress += SIZE_4KB;\r
 \r


@@ -360,7 +360,7 @@ Thunk32To64 (
   if ((UINTN) ReturnContext->ReturnStatus != 0) {\r
     Status = ENCODE_ERROR ((UINTN) ReturnContext->ReturnStatus);\r
   }\r
   if ((UINTN) ReturnContext->ReturnStatus != 0) {\r
     Status = ENCODE_ERROR ((UINTN) ReturnContext->ReturnStatus);\r
   }\r

-  \r
+\r

   return Status;\r
 }\r
 \r
   return Status;\r
 }\r
 \r


@@ -401,7 +401,7 @@ ModeSwitch (
 \r
   ZeroMem (&Context, sizeof (SWITCH_32_TO_64_CONTEXT));\r
   ZeroMem (&ReturnContext, sizeof (SWITCH_64_TO_32_CONTEXT));\r
 \r
   ZeroMem (&Context, sizeof (SWITCH_32_TO_64_CONTEXT));\r
   ZeroMem (&ReturnContext, sizeof (SWITCH_64_TO_32_CONTEXT));\r

-  \r
+\r

   MemoryBase64  = (UINT64) (UINTN) *MemoryBase;\r
   MemorySize64  = (UINT64) (UINTN) *MemorySize;\r
   MemoryEnd64   = MemoryBase64 + MemorySize64;\r
   MemoryBase64  = (UINT64) (UINTN) *MemoryBase;\r
   MemorySize64  = (UINT64) (UINTN) *MemorySize;\r
   MemoryEnd64   = MemoryBase64 + MemorySize64;\r


@@ -409,7 +409,7 @@ ModeSwitch (
   Page1GSupport = IsPage1GSupport ();\r
 \r
   //\r
   Page1GSupport = IsPage1GSupport ();\r
 \r
   //\r

-  // Merge memory range reserved for stack and page table  \r
+  // Merge memory range reserved for stack and page table\r

   //\r
   if (LongModeBuffer->StackBaseAddress < LongModeBuffer->PageTableAddress) {\r
     ReservedRangeBase = LongModeBuffer->StackBaseAddress;\r
   //\r
   if (LongModeBuffer->StackBaseAddress < LongModeBuffer->PageTableAddress) {\r
     ReservedRangeBase = LongModeBuffer->StackBaseAddress;\r


@@ -462,14 +462,14 @@ ModeSwitch (
   // Will save the return status of processing capsule\r
   //\r
   ReturnContext.ReturnStatus       = 0;\r
   // Will save the return status of processing capsule\r
   //\r
   ReturnContext.ReturnStatus       = 0;\r

-  \r
+\r

   //\r
   // Save original GDT\r
   //\r
   AsmReadGdtr ((IA32_DESCRIPTOR *)&ReturnContext.Gdtr);\r
   //\r
   // Save original GDT\r
   //\r
   AsmReadGdtr ((IA32_DESCRIPTOR *)&ReturnContext.Gdtr);\r

-  \r
+\r

   Status = Thunk32To64 (LongModeBuffer->PageTableAddress, &Context, &ReturnContext);\r
   Status = Thunk32To64 (LongModeBuffer->PageTableAddress, &Context, &ReturnContext);\r

-  \r
+\r

   if (!EFI_ERROR (Status)) {\r
     *MemoryBase = (VOID *) (UINTN) MemoryBase64;\r
     *MemorySize = (UINTN) MemorySize64;\r
   if (!EFI_ERROR (Status)) {\r
     *MemoryBase = (VOID *) (UINTN) MemoryBase64;\r
     *MemorySize = (UINTN) MemorySize64;\r


@@ -685,7 +685,7 @@ MergeMemoryResourceDescriptor (
       if (NewMemoryResourceEntry != MemoryResourceEntry) {\r
         NewMemoryResourceEntry->ResourceLength += NextMemoryResourceEntry->ResourceLength;\r
       }\r
       if (NewMemoryResourceEntry != MemoryResourceEntry) {\r
         NewMemoryResourceEntry->ResourceLength += NextMemoryResourceEntry->ResourceLength;\r
       }\r

- \r
+\r

       NextMemoryResourceEntry = NextMemoryResourceEntry + 1;\r
     }\r
 \r
       NextMemoryResourceEntry = NextMemoryResourceEntry + 1;\r
     }\r
 \r


@@ -743,7 +743,7 @@ BuildMemoryResourceDescriptor (
     Status = PeiServicesAllocatePool ((1 + 1) * sizeof (MEMORY_RESOURCE_DESCRIPTOR), (VOID **) &MemoryResource);\r
     ASSERT_EFI_ERROR (Status);\r
     ZeroMem (MemoryResource, (1 + 1) * sizeof (MEMORY_RESOURCE_DESCRIPTOR));\r
     Status = PeiServicesAllocatePool ((1 + 1) * sizeof (MEMORY_RESOURCE_DESCRIPTOR), (VOID **) &MemoryResource);\r
     ASSERT_EFI_ERROR (Status);\r
     ZeroMem (MemoryResource, (1 + 1) * sizeof (MEMORY_RESOURCE_DESCRIPTOR));\r

-  \r
+\r

     MemoryResource[0].PhysicalStart = 0;\r
     MemoryResource[0].ResourceLength = LShiftU64 (1, GetPhysicalAddressBits ());\r
     DEBUG ((EFI_D_INFO, "MemoryResource[0x0] - Start(0x%0lx) Length(0x%0lx)\n",\r
     MemoryResource[0].PhysicalStart = 0;\r
     MemoryResource[0].ResourceLength = LShiftU64 (1, GetPhysicalAddressBits ());\r
     DEBUG ((EFI_D_INFO, "MemoryResource[0x0] - Start(0x%0lx) Length(0x%0lx)\n",\r


@@ -828,7 +828,7 @@ GetCapsuleDescriptors (
   CapsuleVarName[0] = 0;\r
   ValidIndex        = 0;\r
   CapsuleDataPtr64  = 0;\r
   CapsuleVarName[0] = 0;\r
   ValidIndex        = 0;\r
   CapsuleDataPtr64  = 0;\r

-  \r
+\r

   Status = PeiServicesLocatePpi (\r
               &gEfiPeiReadOnlyVariable2PpiGuid,\r
               0,\r
   Status = PeiServicesLocatePpi (\r
               &gEfiPeiReadOnlyVariable2PpiGuid,\r
               0,\r


@@ -885,7 +885,7 @@ GetCapsuleDescriptors (
         if (EFI_ERROR (Status)) {\r
           break;\r
         }\r
         if (EFI_ERROR (Status)) {\r
           break;\r
         }\r

-        \r
+\r

         //\r
         // If this BlockList has been linked before, skip this variable\r
         //\r
         //\r
         // If this BlockList has been linked before, skip this variable\r
         //\r


@@ -901,7 +901,7 @@ GetCapsuleDescriptors (
           continue;\r
         }\r
       }\r
           continue;\r
         }\r
       }\r

-      \r
+\r

       //\r
       // Cache BlockList which has been processed\r
       //\r
       //\r
       // Cache BlockList which has been processed\r
       //\r


@@ -909,7 +909,7 @@ GetCapsuleDescriptors (
       Index ++;\r
     }\r
   }\r
       Index ++;\r
     }\r
   }\r

-  \r
+\r

   return EFI_SUCCESS;\r
 }\r
 \r
   return EFI_SUCCESS;\r
 }\r
 \r


@@ -949,7 +949,7 @@ CapsuleCoalesce (
   UINTN                                VariableCount;\r
   CHAR16                               CapsuleVarName[30];\r
   CHAR16                               *TempVarName;\r
   UINTN                                VariableCount;\r
   CHAR16                               CapsuleVarName[30];\r
   CHAR16                               *TempVarName;\r

-  EFI_PHYSICAL_ADDRESS                 CapsuleDataPtr64;  \r
+  EFI_PHYSICAL_ADDRESS                 CapsuleDataPtr64;\r

   EFI_STATUS                           Status;\r
   EFI_BOOT_MODE                        BootMode;\r
   EFI_PEI_READ_ONLY_VARIABLE2_PPI      *PPIVariableServices;\r
   EFI_STATUS                           Status;\r
   EFI_BOOT_MODE                        BootMode;\r
   EFI_PEI_READ_ONLY_VARIABLE2_PPI      *PPIVariableServices;\r


@@ -973,11 +973,11 @@ CapsuleCoalesce (
   //\r
   Status = PeiServicesGetBootMode (&BootMode);\r
   if (EFI_ERROR (Status) || (BootMode != BOOT_ON_FLASH_UPDATE)) {\r
   //\r
   Status = PeiServicesGetBootMode (&BootMode);\r
   if (EFI_ERROR (Status) || (BootMode != BOOT_ON_FLASH_UPDATE)) {\r

-    DEBUG ((EFI_D_ERROR, "Boot mode is not correct for capsule update path.\n"));    \r
+    DEBUG ((EFI_D_ERROR, "Boot mode is not correct for capsule update path.\n"));\r

     Status = EFI_NOT_FOUND;\r
     goto Done;\r
   }\r
     Status = EFI_NOT_FOUND;\r
     goto Done;\r
   }\r

-  \r
+\r

   //\r
   // User may set the same ScatterGatherList with several different variables,\r
   // so cache all ScatterGatherList for check later.\r
   //\r
   // User may set the same ScatterGatherList with several different variables,\r
   // so cache all ScatterGatherList for check later.\r


@@ -1022,9 +1022,9 @@ CapsuleCoalesce (
     VariableCount++;\r
     Index++;\r
   }\r
     VariableCount++;\r
     Index++;\r
   }\r

-  \r
+\r

   DEBUG ((EFI_D_INFO,"Capsule variable count = %d\n", VariableCount));\r
   DEBUG ((EFI_D_INFO,"Capsule variable count = %d\n", VariableCount));\r

-  \r
+\r

   //\r
   // The last entry is the end flag.\r
   //\r
   //\r
   // The last entry is the end flag.\r
   //\r


@@ -1037,9 +1037,9 @@ CapsuleCoalesce (
     DEBUG ((EFI_D_ERROR, "AllocatePages Failed!, Status = %x\n", Status));\r
     goto Done;\r
   }\r
     DEBUG ((EFI_D_ERROR, "AllocatePages Failed!, Status = %x\n", Status));\r
     goto Done;\r
   }\r

-  \r
+\r

   ZeroMem (VariableArrayAddress, (VariableCount + 1) * sizeof (EFI_PHYSICAL_ADDRESS));\r
   ZeroMem (VariableArrayAddress, (VariableCount + 1) * sizeof (EFI_PHYSICAL_ADDRESS));\r

-  \r
+\r

   //\r
   // Find out if we actually have a capsule.\r
   // GetCapsuleDescriptors depends on variable PPI, so it should run in 32-bit environment.\r
   //\r
   // Find out if we actually have a capsule.\r
   // GetCapsuleDescriptors depends on variable PPI, so it should run in 32-bit environment.\r


@@ -1068,7 +1068,7 @@ CapsuleCoalesce (
       Status = EFI_NOT_FOUND;\r
       goto Done;\r
     }\r
       Status = EFI_NOT_FOUND;\r
       goto Done;\r
     }\r

-    \r
+\r

     Status = FindCapsuleCoalesceImage (&CoalesceImageEntryPoint, &CoalesceImageMachineType);\r
     if ((EFI_ERROR (Status)) || (CoalesceImageMachineType != EFI_IMAGE_MACHINE_X64)) {\r
       DEBUG ((EFI_D_ERROR, "Fail to find CapsuleX64 module in FV!\n"));\r
     Status = FindCapsuleCoalesceImage (&CoalesceImageEntryPoint, &CoalesceImageMachineType);\r
     if ((EFI_ERROR (Status)) || (CoalesceImageMachineType != EFI_IMAGE_MACHINE_X64)) {\r
       DEBUG ((EFI_D_ERROR, "Fail to find CapsuleX64 module in FV!\n"));\r


@@ -1090,13 +1090,13 @@ CapsuleCoalesce (
   //\r
   Status = CapsuleDataCoalesce (PeiServices, (EFI_PHYSICAL_ADDRESS *)(UINTN)VariableArrayAddress, MemoryResource, MemoryBase, MemorySize);\r
 #endif\r
   //\r
   Status = CapsuleDataCoalesce (PeiServices, (EFI_PHYSICAL_ADDRESS *)(UINTN)VariableArrayAddress, MemoryResource, MemoryBase, MemorySize);\r
 #endif\r

-  \r
+\r

   DEBUG ((EFI_D_INFO, "Capsule Coalesce Status = %r!\n", Status));\r
 \r
   if (Status == EFI_BUFFER_TOO_SMALL) {\r
     DEBUG ((EFI_D_ERROR, "There is not enough memory to process capsule!\n"));\r
   }\r
   DEBUG ((EFI_D_INFO, "Capsule Coalesce Status = %r!\n", Status));\r
 \r
   if (Status == EFI_BUFFER_TOO_SMALL) {\r
     DEBUG ((EFI_D_ERROR, "There is not enough memory to process capsule!\n"));\r
   }\r

-  \r
+\r

   if (Status == EFI_NOT_FOUND) {\r
     DEBUG ((EFI_D_ERROR, "Fail to parse capsule descriptor in memory!\n"));\r
     REPORT_STATUS_CODE (\r
   if (Status == EFI_NOT_FOUND) {\r
     DEBUG ((EFI_D_ERROR, "Fail to parse capsule descriptor in memory!\n"));\r
     REPORT_STATUS_CODE (\r


@@ -1129,9 +1129,9 @@ CheckCapsuleUpdate (
   return Status;\r
 }\r
 /**\r
   return Status;\r
 }\r
 /**\r

-  This function will look at a capsule and determine if it's a test pattern. \r
+  This function will look at a capsule and determine if it's a test pattern.\r

   If it is, then it will verify it and emit an error message if corruption is detected.\r
   If it is, then it will verify it and emit an error message if corruption is detected.\r

-  \r
+\r

   @param PeiServices   Standard pei services pointer\r
   @param CapsuleBase   Base address of coalesced capsule, which is preceeded\r
                        by private data. Very implementation specific.\r
   @param PeiServices   Standard pei services pointer\r
   @param CapsuleBase   Base address of coalesced capsule, which is preceeded\r
                        by private data. Very implementation specific.\r


@@ -1220,7 +1220,7 @@ CreateState (
   UINT32                        Index;\r
   EFI_PHYSICAL_ADDRESS          BaseAddress;\r
   UINT64                        Length;\r
   UINT32                        Index;\r
   EFI_PHYSICAL_ADDRESS          BaseAddress;\r
   UINT64                        Length;\r

- \r
+\r

   PrivateData    = (EFI_CAPSULE_PEIM_PRIVATE_DATA *) CapsuleBase;\r
   if (PrivateData->Signature != EFI_CAPSULE_PEIM_PRIVATE_DATA_SIGNATURE) {\r
     return EFI_VOLUME_CORRUPTED;\r
   PrivateData    = (EFI_CAPSULE_PEIM_PRIVATE_DATA *) CapsuleBase;\r
   if (PrivateData->Signature != EFI_CAPSULE_PEIM_PRIVATE_DATA_SIGNATURE) {\r
     return EFI_VOLUME_CORRUPTED;\r


@@ -1276,7 +1276,7 @@ CreateState (
 \r
     BuildCvHob (BaseAddress, Length);\r
   }\r
 \r
     BuildCvHob (BaseAddress, Length);\r
   }\r

-  \r
+\r

   return EFI_SUCCESS;\r
 }\r
 \r
   return EFI_SUCCESS;\r
 }\r
 \r

diff --git a/MdeModulePkg/Universal/CapsulePei/X64/X64Entry.c b/MdeModulePkg/Universal/CapsulePei/X64/X64Entry.c
index e1871c3c2ad585f89924f0471fccefcf0fec7d37..40b709519488862acb5033199ddad06d4df1d222 100644 (file)
--- a/MdeModulePkg/Universal/CapsulePei/X64/X64Entry.c
+++ b/MdeModulePkg/Universal/CapsulePei/X64/X64Entry.c
@@ -1,7 +1,7 @@
 /** @file\r
   The X64 entrypoint is used to process capsule in long mode.\r
 \r
 /** @file\r
   The X64 entrypoint is used to process capsule in long mode.\r
 \r

-Copyright (c) 2011 - 2016, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2011 - 2018, Intel Corporation. All rights reserved.<BR>\r

 Copyright (c) 2017, AMD Incorporated. All rights reserved.<BR>\r
 \r
 This program and the accompanying materials\r
 Copyright (c) 2017, AMD Incorporated. All rights reserved.<BR>\r
 \r
 This program and the accompanying materials\r


@@ -165,7 +165,7 @@ PageFaultHandler (
   //\r
   // Get the IDT Descriptor.\r
   //\r
   //\r
   // Get the IDT Descriptor.\r
   //\r

-  AsmReadIdtr ((IA32_DESCRIPTOR *) &Idtr); \r
+  AsmReadIdtr ((IA32_DESCRIPTOR *) &Idtr);\r

   //\r
   // Then get page fault context by IDT Descriptor.\r
   //\r
   //\r
   // Then get page fault context by IDT Descriptor.\r
   //\r


@@ -233,7 +233,7 @@ _ModuleEntryPoint (
   //\r
   // Save the IA32 IDT Descriptor\r
   //\r
   //\r
   // Save the IA32 IDT Descriptor\r
   //\r

-  AsmReadIdtr ((IA32_DESCRIPTOR *) &Ia32Idtr); \r
+  AsmReadIdtr ((IA32_DESCRIPTOR *) &Ia32Idtr);\r

 \r
   //\r
   // Setup X64 IDT table\r
 \r
   //\r
   // Setup X64 IDT table\r


@@ -241,7 +241,7 @@ _ModuleEntryPoint (
   ZeroMem (PageFaultIdtTable.IdtEntryTable, sizeof (IA32_IDT_GATE_DESCRIPTOR) * EXCEPTION_VECTOR_NUMBER);\r
   X64Idtr.Base = (UINTN) PageFaultIdtTable.IdtEntryTable;\r
   X64Idtr.Limit = (UINT16) (sizeof (IA32_IDT_GATE_DESCRIPTOR) * EXCEPTION_VECTOR_NUMBER - 1);\r
   ZeroMem (PageFaultIdtTable.IdtEntryTable, sizeof (IA32_IDT_GATE_DESCRIPTOR) * EXCEPTION_VECTOR_NUMBER);\r
   X64Idtr.Base = (UINTN) PageFaultIdtTable.IdtEntryTable;\r
   X64Idtr.Limit = (UINT16) (sizeof (IA32_IDT_GATE_DESCRIPTOR) * EXCEPTION_VECTOR_NUMBER - 1);\r

-  AsmWriteIdtr ((IA32_DESCRIPTOR *) &X64Idtr);  \r
+  AsmWriteIdtr ((IA32_DESCRIPTOR *) &X64Idtr);\r

 \r
   //\r
   // Setup the default CPU exception handlers\r
 \r
   //\r
   // Setup the default CPU exception handlers\r


@@ -272,7 +272,7 @@ _ModuleEntryPoint (
              (VOID **) (UINTN) EntrypointContext->MemoryBase64Ptr,\r
              (UINTN *) (UINTN) EntrypointContext->MemorySize64Ptr\r
              );\r
              (VOID **) (UINTN) EntrypointContext->MemoryBase64Ptr,\r
              (UINTN *) (UINTN) EntrypointContext->MemorySize64Ptr\r
              );\r

-  \r
+\r

   ReturnContext->ReturnStatus = Status;\r
 \r
   DEBUG ((\r
   ReturnContext->ReturnStatus = Status;\r
 \r
   DEBUG ((\r


@@ -290,8 +290,8 @@ _ModuleEntryPoint (
   //\r
   // Restore IA32 IDT table\r
   //\r
   //\r
   // Restore IA32 IDT table\r
   //\r

-  AsmWriteIdtr ((IA32_DESCRIPTOR *) &Ia32Idtr);  \r
-  \r
+  AsmWriteIdtr ((IA32_DESCRIPTOR *) &Ia32Idtr);\r
+\r

   //\r
   // Finish to coalesce capsule, and return to 32-bit mode.\r
   //\r
   //\r
   // Finish to coalesce capsule, and return to 32-bit mode.\r
   //\r


@@ -301,8 +301,8 @@ _ModuleEntryPoint (
     (UINT32) (UINTN) EntrypointContext,\r
     (UINT32) (UINTN) ReturnContext,\r
     (UINT32) (EntrypointContext->StackBufferBase + EntrypointContext->StackBufferLength)\r
     (UINT32) (UINTN) EntrypointContext,\r
     (UINT32) (UINTN) ReturnContext,\r
     (UINT32) (EntrypointContext->StackBufferBase + EntrypointContext->StackBufferLength)\r

-    );  \r
-  \r
+    );\r
+\r

   //\r
   // Should never be here.\r
   //\r
   //\r
   // Should never be here.\r
   //\r

diff --git a/MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleRuntimeDxe.inf b/MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleRuntimeDxe.inf
index 43a29ee229488dbb04296c27edc3ae8cb1132eed..3849bc84a853074c8da03e2d9f96a9ca8961afb5 100644 (file)
--- a/MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleRuntimeDxe.inf
+++ b/MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleRuntimeDxe.inf
@@ -1,18 +1,18 @@
 ## @file\r
 #  Capsule Runtime Driver produces two UEFI capsule runtime services: (UpdateCapsule, QueryCapsuleCapabilities).\r
 #\r
 ## @file\r
 #  Capsule Runtime Driver produces two UEFI capsule runtime services: (UpdateCapsule, QueryCapsuleCapabilities).\r
 #\r

-#  It installs the Capsule Architectural Protocol defined in PI1.0a to signify \r
+#  It installs the Capsule Architectural Protocol defined in PI1.0a to signify\r

 #  the capsule runtime services are ready.\r
 #  the capsule runtime services are ready.\r

-#  \r
-#  Copyright (c) 2006 - 2017, Intel Corporation. All rights reserved.<BR>\r
+#\r
+#  Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r

 #  This program and the accompanying materials\r
 #  are licensed and made available under the terms and conditions of the BSD License\r
 #  which accompanies this distribution.  The full text of the license may be found at\r
 #  http://opensource.org/licenses/bsd-license.php\r
 #  This program and the accompanying materials\r
 #  are licensed and made available under the terms and conditions of the BSD License\r
 #  which accompanies this distribution.  The full text of the license may be found at\r
 #  http://opensource.org/licenses/bsd-license.php\r

-#  \r
+#\r

 #  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 #  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 #  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 #  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r

-#  \r
+#\r

 ##\r
 \r
 [Defines]\r
 ##\r
 \r
 [Defines]\r

diff --git a/MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleRuntimeDxe.uni b/MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleRuntimeDxe.uni
index 8fdf7097a9505948a9b46c8f661f675addffd06d..cf93e22947f201413d360dd43153ce3674da64fe 100644 (file)
--- a/MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleRuntimeDxe.uni
+++ b/MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleRuntimeDxe.uni
@@ -4,13 +4,13 @@
 // It installs the Capsule Architectural Protocol defined in PI1.0a to signify\r
 // the capsule runtime services are ready.\r
 //\r
 // It installs the Capsule Architectural Protocol defined in PI1.0a to signify\r
 // the capsule runtime services are ready.\r
 //\r

-// Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.<BR>\r
+// Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r

 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r
 // which accompanies this distribution.  The full text of the license may be found at\r
 // http://opensource.org/licenses/bsd-license.php\r
 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r
 // which accompanies this distribution.  The full text of the license may be found at\r
 // http://opensource.org/licenses/bsd-license.php\r

-// \r
+//\r

 // THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 // WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 //\r
 // THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 // WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 //\r

diff --git a/MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleRuntimeDxeExtra.uni b/MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleRuntimeDxeExtra.uni
index 50acf088f182517794d43268378e7f8e3e7ac3e6..00d75c321426395932bf1592357fc33e95d47292 100644 (file)
--- a/MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleRuntimeDxeExtra.uni
+++ b/MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleRuntimeDxeExtra.uni
@@ -1,7 +1,7 @@
 // /** @file\r
 // CapsuleRuntimeDxe Localized Strings and Content\r
 //\r
 // /** @file\r
 // CapsuleRuntimeDxe Localized Strings and Content\r
 //\r

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

 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r
 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r


@@ -13,8 +13,8 @@
 //\r
 // **/\r
 \r
 //\r
 // **/\r
 \r

-#string STR_PROPERTIES_MODULE_NAME \r
-#language en-US \r
+#string STR_PROPERTIES_MODULE_NAME\r
+#language en-US\r

 "Runtime Firmware Update DXE Driver"\r
 \r
 \r
 "Runtime Firmware Update DXE Driver"\r
 \r
 \r

diff --git a/MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleService.c b/MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleService.c
index 23fd6d59c59e7d4341c57c78cf5170d990e4d2d3..9e5fc9f83bdd07a6e9298252c04b71bc46c75795 100644 (file)
--- a/MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleService.c
+++ b/MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleService.c
@@ -1,10 +1,10 @@
 /** @file\r
   Capsule Runtime Driver produces two UEFI capsule runtime services.\r
   (UpdateCapsule, QueryCapsuleCapabilities)\r
 /** @file\r
   Capsule Runtime Driver produces two UEFI capsule runtime services.\r
   (UpdateCapsule, QueryCapsuleCapabilities)\r

-  It installs the Capsule Architectural Protocol defined in PI1.0a to signify \r
+  It installs the Capsule Architectural Protocol defined in PI1.0a to signify\r

   the capsule runtime services are ready.\r
 \r
   the capsule runtime services are ready.\r
 \r

-Copyright (c) 2006 - 2017, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r

 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r


@@ -54,10 +54,10 @@ UINT32      mMaxSizeNonPopulateCapsule  = 0;
   @retval EFI_INVALID_PARAMETER CapsuleCount is Zero.\r
   @retval EFI_INVALID_PARAMETER For across reset capsule image, ScatterGatherList is NULL.\r
   @retval EFI_UNSUPPORTED       CapsuleImage is not recognized by the firmware.\r
   @retval EFI_INVALID_PARAMETER CapsuleCount is Zero.\r
   @retval EFI_INVALID_PARAMETER For across reset capsule image, ScatterGatherList is NULL.\r
   @retval EFI_UNSUPPORTED       CapsuleImage is not recognized by the firmware.\r

-  @retval EFI_OUT_OF_RESOURCES  When ExitBootServices() has been previously called this error indicates the capsule \r
-                                is compatible with this platform but is not capable of being submitted or processed \r
+  @retval EFI_OUT_OF_RESOURCES  When ExitBootServices() has been previously called this error indicates the capsule\r
+                                is compatible with this platform but is not capable of being submitted or processed\r

                                 in runtime. The caller may resubmit the capsule prior to ExitBootServices().\r
                                 in runtime. The caller may resubmit the capsule prior to ExitBootServices().\r

-  @retval EFI_OUT_OF_RESOURCES  When ExitBootServices() has not been previously called then this error indicates \r
+  @retval EFI_OUT_OF_RESOURCES  When ExitBootServices() has not been previously called then this error indicates\r

                                 the capsule is compatible with this platform but there are insufficient resources to process.\r
 \r
 **/\r
                                 the capsule is compatible with this platform but there are insufficient resources to process.\r
 \r
 **/\r


@@ -75,8 +75,8 @@ UpdateCapsule (
   BOOLEAN                   NeedReset;\r
   BOOLEAN                   InitiateReset;\r
   CHAR16                    CapsuleVarName[30];\r
   BOOLEAN                   NeedReset;\r
   BOOLEAN                   InitiateReset;\r
   CHAR16                    CapsuleVarName[30];\r

-  CHAR16                    *TempVarName;  \r
-  \r
+  CHAR16                    *TempVarName;\r
+\r

   //\r
   // Capsule Count can't be less than one.\r
   //\r
   //\r
   // Capsule Count can't be less than one.\r
   //\r


@@ -107,7 +107,7 @@ UpdateCapsule (
     }\r
 \r
     //\r
     }\r
 \r
     //\r

-    // Check FMP capsule flag \r
+    // Check FMP capsule flag\r

     //\r
     if (CompareGuid(&CapsuleHeader->CapsuleGuid, &gEfiFmpCapsuleGuid)\r
      && (CapsuleHeader->Flags & CAPSULE_FLAGS_POPULATE_SYSTEM_TABLE) != 0 ) {\r
     //\r
     if (CompareGuid(&CapsuleHeader->CapsuleGuid, &gEfiFmpCapsuleGuid)\r
      && (CapsuleHeader->Flags & CAPSULE_FLAGS_POPULATE_SYSTEM_TABLE) != 0 ) {\r


@@ -115,7 +115,7 @@ UpdateCapsule (
     }\r
 \r
     //\r
     }\r
 \r
     //\r

-    // Check Capsule image without populate flag by firmware support capsule function  \r
+    // Check Capsule image without populate flag by firmware support capsule function\r

     //\r
     if ((CapsuleHeader->Flags & CAPSULE_FLAGS_POPULATE_SYSTEM_TABLE) == 0) {\r
       Status = SupportCapsuleImage (CapsuleHeader);\r
     //\r
     if ((CapsuleHeader->Flags & CAPSULE_FLAGS_POPULATE_SYSTEM_TABLE) == 0) {\r
       Status = SupportCapsuleImage (CapsuleHeader);\r


@@ -136,7 +136,7 @@ UpdateCapsule (
     // Platform specific update for the non-reset capsule image.\r
     //\r
     if ((CapsuleHeader->Flags & CAPSULE_FLAGS_PERSIST_ACROSS_RESET) == 0) {\r
     // Platform specific update for the non-reset capsule image.\r
     //\r
     if ((CapsuleHeader->Flags & CAPSULE_FLAGS_PERSIST_ACROSS_RESET) == 0) {\r

-      if (EfiAtRuntime ()) { \r
+      if (EfiAtRuntime ()) {\r

         Status = EFI_OUT_OF_RESOURCES;\r
       } else {\r
         Status = ProcessCapsuleImage(CapsuleHeader);\r
         Status = EFI_OUT_OF_RESOURCES;\r
       } else {\r
         Status = ProcessCapsuleImage(CapsuleHeader);\r


@@ -151,7 +151,7 @@ UpdateCapsule (
       }\r
     }\r
   }\r
       }\r
     }\r
   }\r

-  \r
+\r

   //\r
   // After launching all capsules who has no reset flag, if no more capsules claims\r
   // for a system reset just return.\r
   //\r
   // After launching all capsules who has no reset flag, if no more capsules claims\r
   // for a system reset just return.\r


@@ -162,7 +162,7 @@ UpdateCapsule (
 \r
   //\r
   // ScatterGatherList is only referenced if the capsules are defined to persist across\r
 \r
   //\r
   // ScatterGatherList is only referenced if the capsules are defined to persist across\r

-  // system reset. \r
+  // system reset.\r

   //\r
   if (ScatterGatherList == (EFI_PHYSICAL_ADDRESS) (UINTN) NULL) {\r
     return EFI_INVALID_PARAMETER;\r
   //\r
   if (ScatterGatherList == (EFI_PHYSICAL_ADDRESS) (UINTN) NULL) {\r
     return EFI_INVALID_PARAMETER;\r


@@ -195,7 +195,7 @@ UpdateCapsule (
 \r
   //\r
   // ScatterGatherList is only referenced if the capsules are defined to persist across\r
 \r
   //\r
   // ScatterGatherList is only referenced if the capsules are defined to persist across\r

-  // system reset. Set its value into NV storage to let pre-boot driver to pick it up \r
+  // system reset. Set its value into NV storage to let pre-boot driver to pick it up\r

   // after coming through a system reset.\r
   //\r
   Status = EfiSetVariable (\r
   // after coming through a system reset.\r
   //\r
   Status = EfiSetVariable (\r


@@ -213,7 +213,7 @@ UpdateCapsule (
      if(InitiateReset) {\r
        //\r
        // Firmware that encounters a capsule which has the CAPSULE_FLAGS_INITIATE_RESET Flag set in its header\r
      if(InitiateReset) {\r
        //\r
        // Firmware that encounters a capsule which has the CAPSULE_FLAGS_INITIATE_RESET Flag set in its header\r

-       // will initiate a reset of the platform which is compatible with the passed-in capsule request and will \r
+       // will initiate a reset of the platform which is compatible with the passed-in capsule request and will\r

        // not return back to the caller.\r
        //\r
        EfiResetSystem (EfiResetWarm, EFI_SUCCESS, 0, NULL);\r
        // not return back to the caller.\r
        //\r
        EfiResetSystem (EfiResetWarm, EFI_SUCCESS, 0, NULL);\r


@@ -261,7 +261,7 @@ QueryCapsuleCapabilities (
   if (CapsuleCount < 1) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
   if (CapsuleCount < 1) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r

-  \r
+\r

   //\r
   // Check whether input parameter is valid\r
   //\r
   //\r
   // Check whether input parameter is valid\r
   //\r


@@ -290,7 +290,7 @@ QueryCapsuleCapabilities (
     }\r
 \r
     //\r
     }\r
 \r
     //\r

-    // Check FMP capsule flag \r
+    // Check FMP capsule flag\r

     //\r
     if (CompareGuid(&CapsuleHeader->CapsuleGuid, &gEfiFmpCapsuleGuid)\r
      && (CapsuleHeader->Flags & CAPSULE_FLAGS_POPULATE_SYSTEM_TABLE) != 0 ) {\r
     //\r
     if (CompareGuid(&CapsuleHeader->CapsuleGuid, &gEfiFmpCapsuleGuid)\r
      && (CapsuleHeader->Flags & CAPSULE_FLAGS_POPULATE_SYSTEM_TABLE) != 0 ) {\r


@@ -309,7 +309,7 @@ QueryCapsuleCapabilities (
   }\r
 \r
   //\r
   }\r
 \r
   //\r

-  // Find out whether there is any capsule defined to persist across system reset. \r
+  // Find out whether there is any capsule defined to persist across system reset.\r

   //\r
   for (ArrayNumber = 0; ArrayNumber < CapsuleCount ; ArrayNumber++) {\r
     CapsuleHeader = CapsuleHeaderArray[ArrayNumber];\r
   //\r
   for (ArrayNumber = 0; ArrayNumber < CapsuleCount ; ArrayNumber++) {\r
     CapsuleHeader = CapsuleHeaderArray[ArrayNumber];\r


@@ -344,10 +344,10 @@ QueryCapsuleCapabilities (
 \r
   This code installs UEFI capsule runtime service.\r
 \r
 \r
   This code installs UEFI capsule runtime service.\r
 \r

-  @param  ImageHandle    The firmware allocated handle for the EFI image.  \r
+  @param  ImageHandle    The firmware allocated handle for the EFI image.\r

   @param  SystemTable    A pointer to the EFI System Table.\r
 \r
   @param  SystemTable    A pointer to the EFI System Table.\r
 \r

-  @retval EFI_SUCCESS    UEFI Capsule Runtime Services are installed successfully. \r
+  @retval EFI_SUCCESS    UEFI Capsule Runtime Services are installed successfully.\r

 \r
 **/\r
 EFI_STATUS\r
 \r
 **/\r
 EFI_STATUS\r


@@ -363,14 +363,14 @@ CapsuleServiceInitialize (
   mMaxSizeNonPopulateCapsule = PcdGet32(PcdMaxSizeNonPopulateCapsule);\r
 \r
   //\r
   mMaxSizeNonPopulateCapsule = PcdGet32(PcdMaxSizeNonPopulateCapsule);\r
 \r
   //\r

-  // When PEI phase is IA32, DXE phase is X64, it is possible that capsule data are \r
+  // When PEI phase is IA32, DXE phase is X64, it is possible that capsule data are\r

   // put above 4GB, so capsule PEI will transfer to long mode to get capsule data.\r
   // The page table and stack is used to transfer processor mode from IA32 to long mode.\r
   // Create the base address of page table and stack, and save them into variable.\r
   // This is not needed when capsule with reset type is not supported.\r
   //\r
   SaveLongModeContext ();\r
   // put above 4GB, so capsule PEI will transfer to long mode to get capsule data.\r
   // The page table and stack is used to transfer processor mode from IA32 to long mode.\r
   // Create the base address of page table and stack, and save them into variable.\r
   // This is not needed when capsule with reset type is not supported.\r
   //\r
   SaveLongModeContext ();\r

-    \r
+\r

   //\r
   // Install capsule runtime services into UEFI runtime service tables.\r
   //\r
   //\r
   // Install capsule runtime services into UEFI runtime service tables.\r
   //\r

diff --git a/MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleService.h b/MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleService.h
index 787c70c1957dedfc7720ae2187d9e9f42ed1caf5..b514b7f0f3512268f06b9147cc3f524be0d663e7 100644 (file)
--- a/MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleService.h
+++ b/MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleService.h
@@ -1,10 +1,10 @@
 /** @file\r
   Capsule Runtime Driver produces two UEFI capsule runtime services.\r
   (UpdateCapsule, QueryCapsuleCapabilities)\r
 /** @file\r
   Capsule Runtime Driver produces two UEFI capsule runtime services.\r
   (UpdateCapsule, QueryCapsuleCapabilities)\r

-  It installs the Capsule Architectural Protocol defined in PI1.0a to signify \r
+  It installs the Capsule Architectural Protocol defined in PI1.0a to signify\r

   the capsule runtime services are ready.\r
 \r
   the capsule runtime services are ready.\r
 \r

-  Copyright (c) 2006 - 2017, Intel Corporation. All rights reserved.<BR>\r
+  Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r

   Copyright (c) 2018, Linaro, Ltd. All rights reserved.<BR>\r
 \r
   This program and the accompanying materials are licensed and made available\r
   Copyright (c) 2018, Linaro, Ltd. All rights reserved.<BR>\r
 \r
   This program and the accompanying materials are licensed and made available\r

diff --git a/MdeModulePkg/Universal/CapsuleRuntimeDxe/X64/SaveLongModeContext.c b/MdeModulePkg/Universal/CapsuleRuntimeDxe/X64/SaveLongModeContext.c
index b0512fdf1342292e7b1c3005d92885d0b48dbefa..b4d4844278d2a0d178a59f54bed8f5289dbdef46 100644 (file)
--- a/MdeModulePkg/Universal/CapsuleRuntimeDxe/X64/SaveLongModeContext.c
+++ b/MdeModulePkg/Universal/CapsuleRuntimeDxe/X64/SaveLongModeContext.c
@@ -2,7 +2,7 @@
   Create the variable to save the base address of page table and stack\r
   for transferring into long mode in IA32 capsule PEI.\r
 \r
   Create the variable to save the base address of page table and stack\r
   for transferring into long mode in IA32 capsule PEI.\r
 \r

-Copyright (c) 2011 - 2017, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2011 - 2018, Intel Corporation. All rights reserved.<BR>\r

 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r


@@ -42,7 +42,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   This function allocates EfiReservedMemoryType below 4G memory address.\r
 \r
   @param  Size      Size of memory to allocate.\r
   This function allocates EfiReservedMemoryType below 4G memory address.\r
 \r
   @param  Size      Size of memory to allocate.\r

-  \r
+\r

   @return Allocated Address for output.\r
 \r
 **/\r
   @return Allocated Address for output.\r
 \r
 **/\r


@@ -164,14 +164,14 @@ PrepareContextForCapsulePei (
 \r
   LongModeBuffer.PageTableAddress = (EFI_PHYSICAL_ADDRESS)(UINTN)AllocateReservedMemoryBelow4G (EFI_PAGES_TO_SIZE (TotalPagesNum));\r
   ASSERT (LongModeBuffer.PageTableAddress != 0);\r
 \r
   LongModeBuffer.PageTableAddress = (EFI_PHYSICAL_ADDRESS)(UINTN)AllocateReservedMemoryBelow4G (EFI_PAGES_TO_SIZE (TotalPagesNum));\r
   ASSERT (LongModeBuffer.PageTableAddress != 0);\r

-  \r
+\r

   //\r
   // Allocate stack\r
   //\r
   LongModeBuffer.StackSize        = PcdGet32 (PcdCapsulePeiLongModeStackSize);\r
   LongModeBuffer.StackBaseAddress = (EFI_PHYSICAL_ADDRESS)(UINTN)AllocateReservedMemoryBelow4G (PcdGet32 (PcdCapsulePeiLongModeStackSize));\r
   //\r
   // Allocate stack\r
   //\r
   LongModeBuffer.StackSize        = PcdGet32 (PcdCapsulePeiLongModeStackSize);\r
   LongModeBuffer.StackBaseAddress = (EFI_PHYSICAL_ADDRESS)(UINTN)AllocateReservedMemoryBelow4G (PcdGet32 (PcdCapsulePeiLongModeStackSize));\r

-  ASSERT (LongModeBuffer.StackBaseAddress != 0);  \r
-  \r
+  ASSERT (LongModeBuffer.StackBaseAddress != 0);\r
+\r

   Status = gRT->SetVariable (\r
                   EFI_CAPSULE_LONG_MODE_BUFFER_NAME,\r
                   &gEfiCapsuleVendorGuid,\r
   Status = gRT->SetVariable (\r
                   EFI_CAPSULE_LONG_MODE_BUFFER_NAME,\r
                   &gEfiCapsuleVendorGuid,\r


@@ -190,7 +190,7 @@ PrepareContextForCapsulePei (
         VariableLockCapsuleLongModeBufferVariable,\r
         NULL,\r
         &Registration\r
         VariableLockCapsuleLongModeBufferVariable,\r
         NULL,\r
         &Registration\r

-        );    \r
+        );\r

   } else {\r
       DEBUG ((EFI_D_ERROR, "FATAL ERROR: CapsuleLongModeBuffer cannot be saved: %r. Capsule in PEI may fail!\n", Status));\r
       gBS->FreePages (LongModeBuffer.StackBaseAddress, EFI_SIZE_TO_PAGES (LongModeBuffer.StackSize));\r
   } else {\r
       DEBUG ((EFI_D_ERROR, "FATAL ERROR: CapsuleLongModeBuffer cannot be saved: %r. Capsule in PEI may fail!\n", Status));\r
       gBS->FreePages (LongModeBuffer.StackBaseAddress, EFI_SIZE_TO_PAGES (LongModeBuffer.StackSize));\r

diff --git a/MdeModulePkg/Universal/Console/ConPlatformDxe/ConPlatform.c b/MdeModulePkg/Universal/Console/ConPlatformDxe/ConPlatform.c
index 6b53e8ac74e36c480bb989086529993c39e9b7c1..5fa7facfcac809393f9e7632a10d4e1723a89d60 100644 (file)
--- a/MdeModulePkg/Universal/Console/ConPlatformDxe/ConPlatform.c
+++ b/MdeModulePkg/Universal/Console/ConPlatformDxe/ConPlatform.c
@@ -2,7 +2,7 @@
   Console Platform DXE Driver, install Console Device Guids and update Console\r
   Environment Variables.\r
 \r
   Console Platform DXE Driver, install Console Device Guids and update Console\r
   Environment Variables.\r
 \r

-Copyright (c) 2006 - 2017, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r

 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r


@@ -80,7 +80,7 @@ InitializeConPlatform(
 \r
 \r
 /**\r
 \r
 \r
 /**\r

-  Test to see if EFI_SIMPLE_TEXT_INPUT_PROTOCOL is supported on ControllerHandle. \r
+  Test to see if EFI_SIMPLE_TEXT_INPUT_PROTOCOL is supported on ControllerHandle.\r

 \r
   @param  This                Protocol instance pointer.\r
   @param  ControllerHandle    Handle of device to test.\r
 \r
   @param  This                Protocol instance pointer.\r
   @param  ControllerHandle    Handle of device to test.\r


@@ -108,7 +108,7 @@ ConPlatformTextInDriverBindingSupported (
 \r
 \r
 /**\r
 \r
 \r
 /**\r

-  Test to see if EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL is supported on ControllerHandle. \r
+  Test to see if EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL is supported on ControllerHandle.\r

 \r
   @param  This                Protocol instance pointer.\r
   @param  ControllerHandle    Handle of device to test.\r
 \r
   @param  This                Protocol instance pointer.\r
   @param  ControllerHandle    Handle of device to test.\r


@@ -136,7 +136,7 @@ ConPlatformTextOutDriverBindingSupported (
 \r
 \r
 /**\r
 \r
 \r
 /**\r

-  Test to see if the specified protocol is supported on ControllerHandle. \r
+  Test to see if the specified protocol is supported on ControllerHandle.\r

 \r
   @param  This                Protocol instance pointer.\r
   @param  ControllerHandle    Handle of device to test.\r
 \r
   @param  This                Protocol instance pointer.\r
   @param  ControllerHandle    Handle of device to test.\r


@@ -202,9 +202,9 @@ ConPlatformDriverBindingSupported (
   Start this driver on ControllerHandle by opening Simple Text Input Protocol,\r
   reading Device Path, and installing Console In Devcice GUID on ControllerHandle.\r
 \r
   Start this driver on ControllerHandle by opening Simple Text Input Protocol,\r
   reading Device Path, and installing Console In Devcice GUID on ControllerHandle.\r
 \r

-  If this devcie is not one hot-plug devce, append its device path into the \r
+  If this devcie is not one hot-plug devce, append its device path into the\r

   console environment variables ConInDev.\r
   console environment variables ConInDev.\r

-  \r
+\r

   @param  This                 Protocol instance pointer.\r
   @param  ControllerHandle     Handle of device to bind driver to\r
   @param  RemainingDevicePath  Optional parameter use to pick a specific child\r
   @param  This                 Protocol instance pointer.\r
   @param  ControllerHandle     Handle of device to bind driver to\r
   @param  RemainingDevicePath  Optional parameter use to pick a specific child\r


@@ -334,9 +334,9 @@ ConPlatformTextInDriverBindingStart (
   reading Device Path, and installing Console Out Devcic GUID, Standard Error\r
   Device GUID on ControllerHandle.\r
 \r
   reading Device Path, and installing Console Out Devcic GUID, Standard Error\r
   Device GUID on ControllerHandle.\r
 \r

-  If this devcie is not one hot-plug devce, append its device path into the \r
+  If this devcie is not one hot-plug devce, append its device path into the\r

   console environment variables ConOutDev, ErrOutDev.\r
   console environment variables ConOutDev, ErrOutDev.\r

-  \r
+\r

   @param  This                 Protocol instance pointer.\r
   @param  ControllerHandle     Handle of device to bind driver to\r
   @param  RemainingDevicePath  Optional parameter use to pick a specific child\r
   @param  This                 Protocol instance pointer.\r
   @param  ControllerHandle     Handle of device to bind driver to\r
   @param  RemainingDevicePath  Optional parameter use to pick a specific child\r


@@ -450,7 +450,7 @@ ConPlatformTextOutDriverBindingStart (
     }\r
   } else {\r
     //\r
     }\r
   } else {\r
     //\r

-    // If it is not a hot-plug device, append the device path to \r
+    // If it is not a hot-plug device, append the device path to\r

     // the ConOutDev and ErrOutDev environment variable.\r
     // For GOP device path, append the sibling device path as well.\r
     //\r
     // the ConOutDev and ErrOutDev environment variable.\r
     // For GOP device path, append the sibling device path as well.\r
     //\r


@@ -511,7 +511,7 @@ ConPlatformTextOutDriverBindingStart (
 }\r
 \r
 /**\r
 }\r
 \r
 /**\r

-  Stop this driver on ControllerHandle by removing Console In Devcice GUID \r
+  Stop this driver on ControllerHandle by removing Console In Devcice GUID\r

   and closing the Simple Text Input protocol on ControllerHandle.\r
 \r
   @param  This              Protocol instance pointer.\r
   and closing the Simple Text Input protocol on ControllerHandle.\r
 \r
   @param  This              Protocol instance pointer.\r


@@ -585,7 +585,7 @@ ConPlatformTextInDriverBindingStop (
 \r
 \r
 /**\r
 \r
 \r
 /**\r

-  Stop this driver on ControllerHandle by removing Console Out Devcice GUID \r
+  Stop this driver on ControllerHandle by removing Console Out Devcice GUID\r

   and closing the Simple Text Output protocol on ControllerHandle.\r
 \r
   @param  This              Protocol instance pointer.\r
   and closing the Simple Text Output protocol on ControllerHandle.\r
 \r
   @param  This              Protocol instance pointer.\r


@@ -714,7 +714,7 @@ ConPlatformUnInstallProtocol (
   @param  Name             String part of EFI variable name\r
 \r
   @return Dynamically allocated memory that contains a copy of the EFI variable.\r
   @param  Name             String part of EFI variable name\r
 \r
   @return Dynamically allocated memory that contains a copy of the EFI variable.\r

-          Caller is repsoncible freeing the buffer. Return NULL means Variable \r
+          Caller is repsoncible freeing the buffer. Return NULL means Variable\r

           was not read.\r
 \r
 **/\r
           was not read.\r
 \r
 **/\r


@@ -922,7 +922,7 @@ ConPlatformMatchDevicePaths (
 }\r
 \r
 /**\r
 }\r
 \r
 /**\r

-  Update console environment variables. \r
+  Update console environment variables.\r

 \r
   @param  VariableName    Console environment variables, ConOutDev, ConInDev\r
                           ErrOutDev, ConIn ,ConOut or ErrOut.\r
 \r
   @param  VariableName    Console environment variables, ConOutDev, ConInDev\r
                           ErrOutDev, ConIn ,ConOut or ErrOut.\r


@@ -958,7 +958,7 @@ ConPlatformUpdateDeviceVariable (
   if (Operation != Delete) {\r
     //\r
     // Match specified DevicePath in Console Variable.\r
   if (Operation != Delete) {\r
     //\r
     // Match specified DevicePath in Console Variable.\r

-    // \r
+    //\r

     Status = ConPlatformMatchDevicePaths (\r
                VariableDevicePath,\r
                DevicePath,\r
     Status = ConPlatformMatchDevicePaths (\r
                VariableDevicePath,\r
                DevicePath,\r


@@ -1052,7 +1052,7 @@ IsHotPlugDevice (
   while (!IsDevicePathEnd (CheckDevicePath)) {\r
     //\r
     // Check device whether is hot plug device or not throught Device Path\r
   while (!IsDevicePathEnd (CheckDevicePath)) {\r
     //\r
     // Check device whether is hot plug device or not throught Device Path\r

-    // \r
+    //\r

     if ((DevicePathType (CheckDevicePath) == MESSAGING_DEVICE_PATH) &&\r
         (DevicePathSubType (CheckDevicePath) == MSG_USB_DP ||\r
          DevicePathSubType (CheckDevicePath) == MSG_USB_CLASS_DP ||\r
     if ((DevicePathType (CheckDevicePath) == MESSAGING_DEVICE_PATH) &&\r
         (DevicePathSubType (CheckDevicePath) == MSG_USB_DP ||\r
          DevicePathSubType (CheckDevicePath) == MSG_USB_CLASS_DP ||\r


@@ -1069,7 +1069,7 @@ IsHotPlugDevice (
       //\r
       return TRUE;\r
     }\r
       //\r
       return TRUE;\r
     }\r

-  \r
+\r

     CheckDevicePath = NextDevicePathNode (CheckDevicePath);\r
   }\r
 \r
     CheckDevicePath = NextDevicePathNode (CheckDevicePath);\r
   }\r
 \r

diff --git a/MdeModulePkg/Universal/Console/ConPlatformDxe/ConPlatform.h b/MdeModulePkg/Universal/Console/ConPlatformDxe/ConPlatform.h
index 6d853c136010a1157d541f317a1029b1d23ccb9d..1d5f11e94c50736183186da26491b1af5136a1f4 100644 (file)
--- a/MdeModulePkg/Universal/Console/ConPlatformDxe/ConPlatform.h
+++ b/MdeModulePkg/Universal/Console/ConPlatformDxe/ConPlatform.h
@@ -1,7 +1,7 @@
 /** @file\r
   Header file for Console Platfrom DXE Driver.\r
 \r
 /** @file\r
   Header file for Console Platfrom DXE Driver.\r
 \r

-Copyright (c) 2006 - 2017, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r

 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r


@@ -56,7 +56,7 @@ typedef enum {
 } CONPLATFORM_VAR_OPERATION;\r
 \r
 /**\r
 } CONPLATFORM_VAR_OPERATION;\r
 \r
 /**\r

-  Test to see if specific protocol could be supported on the ControllerHandle. \r
+  Test to see if specific protocol could be supported on the ControllerHandle.\r

 \r
   @param  This                Protocol instance pointer.\r
   @param  ControllerHandle    Handle of device to test.\r
 \r
   @param  This                Protocol instance pointer.\r
   @param  ControllerHandle    Handle of device to test.\r


@@ -74,7 +74,7 @@ ConPlatformDriverBindingSupported (
   );\r
 \r
 /**\r
   );\r
 \r
 /**\r

-  Test to see if EFI_SIMPLE_TEXT_INPUT_PROTOCOL is supported on ControllerHandle. \r
+  Test to see if EFI_SIMPLE_TEXT_INPUT_PROTOCOL is supported on ControllerHandle.\r

 \r
   @param  This                Protocol instance pointer.\r
   @param  ControllerHandle    Handle of device to test.\r
 \r
   @param  This                Protocol instance pointer.\r
   @param  ControllerHandle    Handle of device to test.\r


@@ -94,7 +94,7 @@ ConPlatformTextInDriverBindingSupported (
   );\r
 \r
 /**\r
   );\r
 \r
 /**\r

-  Test to see if EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL is supported on ControllerHandle. \r
+  Test to see if EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL is supported on ControllerHandle.\r

 \r
   @param  This                Protocol instance pointer.\r
   @param  ControllerHandle    Handle of device to test.\r
 \r
   @param  This                Protocol instance pointer.\r
   @param  ControllerHandle    Handle of device to test.\r


@@ -119,9 +119,9 @@ ConPlatformTextOutDriverBindingSupported (
   Start this driver on ControllerHandle by opening Simple Text Input Protocol,\r
   reading Device Path, and installing Console In Devcice GUID on ControllerHandle.\r
 \r
   Start this driver on ControllerHandle by opening Simple Text Input Protocol,\r
   reading Device Path, and installing Console In Devcice GUID on ControllerHandle.\r
 \r

-  If this devcie is not one hot-plug devce, append its device path into the \r
+  If this devcie is not one hot-plug devce, append its device path into the\r

   console environment variables ConInDev.\r
   console environment variables ConInDev.\r

-  \r
+\r

   @param  This                 Protocol instance pointer.\r
   @param  ControllerHandle     Handle of device to bind driver to\r
   @param  RemainingDevicePath  Optional parameter use to pick a specific child\r
   @param  This                 Protocol instance pointer.\r
   @param  ControllerHandle     Handle of device to bind driver to\r
   @param  RemainingDevicePath  Optional parameter use to pick a specific child\r


@@ -147,9 +147,9 @@ ConPlatformTextInDriverBindingStart (
   reading Device Path, and installing Console Out Devcic GUID, Standard Error\r
   Device GUID on ControllerHandle.\r
 \r
   reading Device Path, and installing Console Out Devcic GUID, Standard Error\r
   Device GUID on ControllerHandle.\r
 \r

-  If this devcie is not one hot-plug devce, append its device path into the \r
+  If this devcie is not one hot-plug devce, append its device path into the\r

   console environment variables ConOutDev, StdErrDev.\r
   console environment variables ConOutDev, StdErrDev.\r

-  \r
+\r

   @param  This                 Protocol instance pointer.\r
   @param  ControllerHandle     Handle of device to bind driver to\r
   @param  RemainingDevicePath  Optional parameter use to pick a specific child\r
   @param  This                 Protocol instance pointer.\r
   @param  ControllerHandle     Handle of device to bind driver to\r
   @param  RemainingDevicePath  Optional parameter use to pick a specific child\r


@@ -169,7 +169,7 @@ ConPlatformTextOutDriverBindingStart (
   );\r
 \r
 /**\r
   );\r
 \r
 /**\r

-  Stop this driver on ControllerHandle by removing Console In Devcice GUID \r
+  Stop this driver on ControllerHandle by removing Console In Devcice GUID\r

   and closing the Simple Text Input protocol on ControllerHandle.\r
 \r
   @param  This              Protocol instance pointer.\r
   and closing the Simple Text Input protocol on ControllerHandle.\r
 \r
   @param  This              Protocol instance pointer.\r


@@ -192,7 +192,7 @@ ConPlatformTextInDriverBindingStop (
   );\r
 \r
 /**\r
   );\r
 \r
 /**\r

-  Stop this driver on ControllerHandle by removing Console Out Devcice GUID \r
+  Stop this driver on ControllerHandle by removing Console Out Devcice GUID\r

   and closing the Simple Text Output protocol on ControllerHandle.\r
 \r
   @param  This              Protocol instance pointer.\r
   and closing the Simple Text Output protocol on ControllerHandle.\r
 \r
   @param  This              Protocol instance pointer.\r


@@ -236,7 +236,7 @@ ConPlatformUnInstallProtocol (
   @param  Name             String part of EFI variable name\r
 \r
   @return Dynamically allocated memory that contains a copy of the EFI variable.\r
   @param  Name             String part of EFI variable name\r
 \r
   @return Dynamically allocated memory that contains a copy of the EFI variable.\r

-          Caller is repsoncible freeing the buffer. Return NULL means Variable \r
+          Caller is repsoncible freeing the buffer. Return NULL means Variable\r

           was not read.\r
 \r
 **/\r
           was not read.\r
 \r
 **/\r

diff --git a/MdeModulePkg/Universal/Console/ConPlatformDxe/ConPlatformDxe.inf b/MdeModulePkg/Universal/Console/ConPlatformDxe/ConPlatformDxe.inf
index 1d404dfc6f957f55fcfe3e5b93651b7dbf515bce..bc57e2c8a1fedcd05dbc9bd1cf3a83fad2c9c1b9 100644 (file)
--- a/MdeModulePkg/Universal/Console/ConPlatformDxe/ConPlatformDxe.inf
+++ b/MdeModulePkg/Universal/Console/ConPlatformDxe/ConPlatformDxe.inf
@@ -4,7 +4,7 @@
 # Console Platfrom DXE Driver that specifies whether device can be used as console\r
 # input/output device or error output device and update global variables accordingly.\r
 #\r
 # Console Platfrom DXE Driver that specifies whether device can be used as console\r
 # input/output device or error output device and update global variables accordingly.\r
 #\r

-# Copyright (c) 2006 - 2017, Intel Corporation. All rights reserved.<BR>\r
+# Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r

 #\r
 #  This program and the accompanying materials\r
 #  are licensed and made available under the terms and conditions of the BSD License\r
 #\r
 #  This program and the accompanying materials\r
 #  are licensed and made available under the terms and conditions of the BSD License\r


@@ -96,4 +96,4 @@
   gEfiGraphicsOutputProtocolGuid                ## SOMETIMES_CONSUMES\r
 \r
 [UserExtensions.TianoCore."ExtraFiles"]\r
   gEfiGraphicsOutputProtocolGuid                ## SOMETIMES_CONSUMES\r
 \r
 [UserExtensions.TianoCore."ExtraFiles"]\r

-  ConPlatformDxeExtra.uni
\ No newline at end of file
+  ConPlatformDxeExtra.uni\r

diff --git a/MdeModulePkg/Universal/Console/ConPlatformDxe/ConPlatformDxeExtra.uni b/MdeModulePkg/Universal/Console/ConPlatformDxe/ConPlatformDxeExtra.uni
index 8edad9e12e90ad0f0f02df2af4dad142e546555f..ef9fc3048c98194473dcd7dbf0d51115932b8c88 100644 (file)
--- a/MdeModulePkg/Universal/Console/ConPlatformDxe/ConPlatformDxeExtra.uni
+++ b/MdeModulePkg/Universal/Console/ConPlatformDxe/ConPlatformDxeExtra.uni
@@ -1,7 +1,7 @@
 // /** @file\r
 // ConPlatformDxe Localized Strings and Content\r
 //\r
 // /** @file\r
 // ConPlatformDxe Localized Strings and Content\r
 //\r

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

 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r
 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r


@@ -12,8 +12,8 @@
 //\r
 // **/\r
 \r
 //\r
 // **/\r
 \r

-#string STR_PROPERTIES_MODULE_NAME \r
-#language en-US \r
+#string STR_PROPERTIES_MODULE_NAME\r
+#language en-US\r

 "Console Platform DXE Driver"\r
 \r
 \r
 "Console Platform DXE Driver"\r
 \r
 \r

diff --git a/MdeModulePkg/Universal/Console/ConSplitterDxe/ComponentName.c b/MdeModulePkg/Universal/Console/ConSplitterDxe/ComponentName.c
index 9ad1726599cd802addc264383d957dcd87aea649..e985657175edf66657c81d8bcdccebcff30d1e2a 100644 (file)
--- a/MdeModulePkg/Universal/Console/ConSplitterDxe/ComponentName.c
+++ b/MdeModulePkg/Universal/Console/ConSplitterDxe/ComponentName.c
@@ -1,7 +1,7 @@
 /** @file\r
   UEFI Component Name(2) protocol implementation for ConSplitter driver.\r
 \r
 /** @file\r
   UEFI Component Name(2) protocol implementation for ConSplitter driver.\r
 \r

-Copyright (c) 2006 - 2011, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r

 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r


@@ -225,7 +225,7 @@ ConSplitterComponentNameGetDriverName (
            This->SupportedLanguages,\r
            mConSplitterDriverNameTable,\r
            DriverName,\r
            This->SupportedLanguages,\r
            mConSplitterDriverNameTable,\r
            DriverName,\r

-           (BOOLEAN)((This == &gConSplitterConInComponentName) || \r
+           (BOOLEAN)((This == &gConSplitterConInComponentName) ||\r

                      (This == &gConSplitterSimplePointerComponentName) ||\r
                      (This == &gConSplitterAbsolutePointerComponentName) ||\r
                      (This == &gConSplitterConOutComponentName) ||\r
                      (This == &gConSplitterSimplePointerComponentName) ||\r
                      (This == &gConSplitterAbsolutePointerComponentName) ||\r
                      (This == &gConSplitterConOutComponentName) ||\r

diff --git a/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitter.c b/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitter.c
index 931630d1fc3c9d0c51fe48677b383439d4320004..763f3fafb27a8c63075b7f712843816b49fa2e1b 100644 (file)
--- a/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitter.c
+++ b/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitter.c
@@ -31,7 +31,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #include "ConSplitter.h"\r
 \r
 //\r
 #include "ConSplitter.h"\r
 \r
 //\r

-// Identify if ConIn is connected in PcdConInConnectOnDemand enabled mode. \r
+// Identify if ConIn is connected in PcdConInConnectOnDemand enabled mode.\r

 // default not connect\r
 //\r
 BOOLEAN  mConInIsConnect = FALSE;\r
 // default not connect\r
 //\r
 BOOLEAN  mConInIsConnect = FALSE;\r


@@ -567,7 +567,7 @@ ConSplitterDriverEntry(
                     &mStdErr.TextOut,\r
                     NULL\r
                     );\r
                     &mStdErr.TextOut,\r
                     NULL\r
                     );\r

-    if (!EFI_ERROR (Status)) {  \r
+    if (!EFI_ERROR (Status)) {\r

       //\r
       // Update the EFI System Table with new virtual console\r
       // and update the pointer to Text Output protocol.\r
       //\r
       // Update the EFI System Table with new virtual console\r
       // and update the pointer to Text Output protocol.\r


@@ -576,7 +576,7 @@ ConSplitterDriverEntry(
       gST->StdErr               = &mStdErr.TextOut;\r
     }\r
   }\r
       gST->StdErr               = &mStdErr.TextOut;\r
     }\r
   }\r

-  \r
+\r

   //\r
   // Update the CRC32 in the EFI System Table header\r
   //\r
   //\r
   // Update the CRC32 in the EFI System Table header\r
   //\r


@@ -2298,7 +2298,7 @@ ConSplitterGrowMapTable (
     Size        = Private->CurrentNumberOfConsoles * sizeof (INT32);\r
     Index       = 0;\r
     SrcAddress  = OldTextOutModeMap;\r
     Size        = Private->CurrentNumberOfConsoles * sizeof (INT32);\r
     Index       = 0;\r
     SrcAddress  = OldTextOutModeMap;\r

-    NewStepSize = NewSize / sizeof(INT32);    \r
+    NewStepSize = NewSize / sizeof(INT32);\r

     // If Private->CurrentNumberOfConsoles is not zero and OldTextOutModeMap\r
     // is not NULL, it indicates that the original TextOutModeMap is not enough\r
     // for the new console devices and has been enlarged by CONSOLE_SPLITTER_ALLOC_UNIT columns.\r
     // If Private->CurrentNumberOfConsoles is not zero and OldTextOutModeMap\r
     // is not NULL, it indicates that the original TextOutModeMap is not enough\r
     // for the new console devices and has been enlarged by CONSOLE_SPLITTER_ALLOC_UNIT columns.\r


@@ -2972,7 +2972,7 @@ Done:
   //\r
   // Force GraphicsOutput mode to be set,\r
   //\r
   //\r
   // Force GraphicsOutput mode to be set,\r
   //\r

-  \r
+\r

   Mode = &Private->GraphicsOutputModeBuffer[CurrentIndex];\r
   if ((GraphicsOutput != NULL) &&\r
       (Mode->HorizontalResolution == CurrentGraphicsOutputMode->Info->HorizontalResolution) &&\r
   Mode = &Private->GraphicsOutputModeBuffer[CurrentIndex];\r
   if ((GraphicsOutput != NULL) &&\r
       (Mode->HorizontalResolution == CurrentGraphicsOutputMode->Info->HorizontalResolution) &&\r


@@ -3051,7 +3051,7 @@ ConsplitterSetConsoleOutMode (
   MaxMode      = (UINTN) (TextOut->Mode->MaxMode);\r
 \r
   MaxModeInfo.Column = 0;\r
   MaxMode      = (UINTN) (TextOut->Mode->MaxMode);\r
 \r
   MaxModeInfo.Column = 0;\r

-  MaxModeInfo.Row    = 0; \r
+  MaxModeInfo.Row    = 0;\r

   ModeInfo.Column    = PcdGet32 (PcdConOutColumn);\r
   ModeInfo.Row       = PcdGet32 (PcdConOutRow);\r
 \r
   ModeInfo.Column    = PcdGet32 (PcdConOutColumn);\r
   ModeInfo.Row       = PcdGet32 (PcdConOutRow);\r
 \r


@@ -3191,7 +3191,7 @@ ConSplitterTextOutAddDevice (
 \r
   DeviceStatus = EFI_DEVICE_ERROR;\r
   Status       = EFI_DEVICE_ERROR;\r
 \r
   DeviceStatus = EFI_DEVICE_ERROR;\r
   Status       = EFI_DEVICE_ERROR;\r

-  \r
+\r

   //\r
   // This device display mode will be added into Graphics Ouput modes.\r
   //\r
   //\r
   // This device display mode will be added into Graphics Ouput modes.\r
   //\r


@@ -3361,7 +3361,7 @@ ConSplitterTextOutDeleteDevice (
                       Private->VirtualHandle,\r
                       &gEfiUgaDrawProtocolGuid,\r
                       &Private->UgaDraw\r
                       Private->VirtualHandle,\r
                       &gEfiUgaDrawProtocolGuid,\r
                       &Private->UgaDraw\r

-                      );      \r
+                      );\r

     } else if (!FeaturePcdGet (PcdConOutUgaSupport)) {\r
       Status = gBS->UninstallProtocolInterface (\r
                       Private->VirtualHandle,\r
     } else if (!FeaturePcdGet (PcdConOutUgaSupport)) {\r
       Status = gBS->UninstallProtocolInterface (\r
                       Private->VirtualHandle,\r


@@ -3536,7 +3536,7 @@ ConSplitterTextInPrivateReadKeyStroke (
   EFI_STATUS    Status;\r
   UINTN         Index;\r
   EFI_KEY_DATA  KeyData;\r
   EFI_STATUS    Status;\r
   UINTN         Index;\r
   EFI_KEY_DATA  KeyData;\r

- \r
+\r

   //\r
   // Return the first saved non-NULL key.\r
   //\r
   //\r
   // Return the first saved non-NULL key.\r
   //\r


@@ -3616,7 +3616,7 @@ ConSplitterTextInReadKeyStroke (
   // Signal ConnectConIn event on first call in Lazy ConIn mode\r
   //\r
   if (!mConInIsConnect && PcdGetBool (PcdConInConnectOnDemand)) {\r
   // Signal ConnectConIn event on first call in Lazy ConIn mode\r
   //\r
   if (!mConInIsConnect && PcdGetBool (PcdConInConnectOnDemand)) {\r

-    DEBUG ((EFI_D_INFO, "Connect ConIn in first ReadKeyStoke in Lazy ConIn mode.\n"));    \r
+    DEBUG ((EFI_D_INFO, "Connect ConIn in first ReadKeyStoke in Lazy ConIn mode.\n"));\r

     gBS->SignalEvent (Private->ConnectConInEvent);\r
     mConInIsConnect = TRUE;\r
   }\r
     gBS->SignalEvent (Private->ConnectConInEvent);\r
     mConInIsConnect = TRUE;\r
   }\r


@@ -3810,7 +3810,7 @@ ConSplitterTextInReadKeyStrokeEx (
   // Signal ConnectConIn event on first call in Lazy ConIn mode\r
   //\r
   if (!mConInIsConnect && PcdGetBool (PcdConInConnectOnDemand)) {\r
   // Signal ConnectConIn event on first call in Lazy ConIn mode\r
   //\r
   if (!mConInIsConnect && PcdGetBool (PcdConInConnectOnDemand)) {\r

-    DEBUG ((EFI_D_INFO, "Connect ConIn in first ReadKeyStoke in Lazy ConIn mode.\n"));    \r
+    DEBUG ((EFI_D_INFO, "Connect ConIn in first ReadKeyStoke in Lazy ConIn mode.\n"));\r

     gBS->SignalEvent (Private->ConnectConInEvent);\r
     mConInIsConnect = TRUE;\r
   }\r
     gBS->SignalEvent (Private->ConnectConInEvent);\r
     mConInIsConnect = TRUE;\r
   }\r


@@ -3877,7 +3877,7 @@ ConSplitterTextInReadKeyStrokeEx (
   for (Index = 0; Index < Private->CurrentNumberOfKeys; Index++) {\r
     CopyMem (&Private->KeyQueue[Index].KeyState, &KeyState, sizeof (EFI_KEY_STATE));\r
   }\r
   for (Index = 0; Index < Private->CurrentNumberOfKeys; Index++) {\r
     CopyMem (&Private->KeyQueue[Index].KeyState, &KeyState, sizeof (EFI_KEY_STATE));\r
   }\r

-  \r
+\r

   //\r
   // Return the first saved key.\r
   //\r
   //\r
   // Return the first saved key.\r
   //\r


@@ -4642,7 +4642,7 @@ ConSplitterTextOutOutputString (
     Private->TextOutMode.CursorRow    = Private->TextOutList[0].TextOut->Mode->CursorRow;\r
   } else {\r
     //\r
     Private->TextOutMode.CursorRow    = Private->TextOutList[0].TextOut->Mode->CursorRow;\r
   } else {\r
     //\r

-    // When there is no real console devices in system, \r
+    // When there is no real console devices in system,\r

     // update cursor position for the virtual device in consplitter.\r
     //\r
     Private->TextOut.QueryMode (\r
     // update cursor position for the virtual device in consplitter.\r
     //\r
     Private->TextOut.QueryMode (\r


@@ -4650,28 +4650,28 @@ ConSplitterTextOutOutputString (
                        Private->TextOutMode.Mode,\r
                        &MaxColumn,\r
                        &MaxRow\r
                        Private->TextOutMode.Mode,\r
                        &MaxColumn,\r
                        &MaxRow\r

-                       );    \r
+                       );\r

     for (; *WString != CHAR_NULL; WString++) {\r
       switch (*WString) {\r
       case CHAR_BACKSPACE:\r
         if (Private->TextOutMode.CursorColumn == 0 && Private->TextOutMode.CursorRow > 0) {\r
           Private->TextOutMode.CursorRow--;\r
     for (; *WString != CHAR_NULL; WString++) {\r
       switch (*WString) {\r
       case CHAR_BACKSPACE:\r
         if (Private->TextOutMode.CursorColumn == 0 && Private->TextOutMode.CursorRow > 0) {\r
           Private->TextOutMode.CursorRow--;\r

-          Private->TextOutMode.CursorColumn = (INT32) (MaxColumn - 1);          \r
+          Private->TextOutMode.CursorColumn = (INT32) (MaxColumn - 1);\r

         } else if (Private->TextOutMode.CursorColumn > 0) {\r
           Private->TextOutMode.CursorColumn--;\r
         }\r
         break;\r
         } else if (Private->TextOutMode.CursorColumn > 0) {\r
           Private->TextOutMode.CursorColumn--;\r
         }\r
         break;\r

-      \r
+\r

       case CHAR_LINEFEED:\r
         if (Private->TextOutMode.CursorRow < (INT32) (MaxRow - 1)) {\r
           Private->TextOutMode.CursorRow++;\r
         }\r
         break;\r
       case CHAR_LINEFEED:\r
         if (Private->TextOutMode.CursorRow < (INT32) (MaxRow - 1)) {\r
           Private->TextOutMode.CursorRow++;\r
         }\r
         break;\r

-      \r
+\r

       case CHAR_CARRIAGE_RETURN:\r
         Private->TextOutMode.CursorColumn = 0;\r
         break;\r
       case CHAR_CARRIAGE_RETURN:\r
         Private->TextOutMode.CursorColumn = 0;\r
         break;\r

-      \r
+\r

       default:\r
         if (Private->TextOutMode.CursorColumn < (INT32) (MaxColumn - 1)) {\r
           Private->TextOutMode.CursorColumn++;\r
       default:\r
         if (Private->TextOutMode.CursorColumn < (INT32) (MaxColumn - 1)) {\r
           Private->TextOutMode.CursorColumn++;\r

diff --git a/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterDxe.inf b/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterDxe.inf
index ff10a50b50177a808683a43bcea837199a3c4c3f..a191ebcd9b25d73496288ff67ba3d2b12975c4f2 100644 (file)
--- a/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterDxe.inf
+++ b/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterDxe.inf
@@ -10,7 +10,7 @@
 # Note: If only UGA Draw protocol is installed in system, PcdUgaConsumeSupport should be\r
 # set to TRUE.\r
 #\r
 # Note: If only UGA Draw protocol is installed in system, PcdUgaConsumeSupport should be\r
 # set to TRUE.\r
 #\r

-# Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.<BR>\r
+# Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r

 #\r
 #  This program and the accompanying materials\r
 #  are licensed and made available under the terms and conditions of the BSD License\r
 #\r
 #  This program and the accompanying materials\r
 #  are licensed and made available under the terms and conditions of the BSD License\r


@@ -92,7 +92,7 @@
   ## TO_START\r
   gEfiSimpleTextInputExProtocolGuid\r
   ## PRODUCES\r
   ## TO_START\r
   gEfiSimpleTextInputExProtocolGuid\r
   ## PRODUCES\r

-  ## TO_START \r
+  ## TO_START\r

   gEfiSimpleTextOutProtocolGuid\r
   ## SOMETIMES_PRODUCES\r
   ## SOMETIMES_CONSUMES\r
   gEfiSimpleTextOutProtocolGuid\r
   ## SOMETIMES_PRODUCES\r
   ## SOMETIMES_CONSUMES\r

diff --git a/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterDxeExtra.uni b/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterDxeExtra.uni
index c05a53970c96380f41ee11936ef76c513a66a52d..31f563c3b4128f038c263446045a562deb3a9f7a 100644 (file)
--- a/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterDxeExtra.uni
+++ b/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterDxeExtra.uni
@@ -1,7 +1,7 @@
 // /** @file\r
 // ConSplitterDxe Localized Strings and Content\r
 //\r
 // /** @file\r
 // ConSplitterDxe Localized Strings and Content\r
 //\r

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

 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r
 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r


@@ -12,8 +12,8 @@
 //\r
 // **/\r
 \r
 //\r
 // **/\r
 \r

-#string STR_PROPERTIES_MODULE_NAME \r
-#language en-US \r
+#string STR_PROPERTIES_MODULE_NAME\r
+#language en-US\r

 "Console Splitter DXE Driver"\r
 \r
 \r
 "Console Splitter DXE Driver"\r
 \r
 \r

diff --git a/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterGraphics.c b/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterGraphics.c
index b7cdd7af39c003d5075852d13bf5f076e1e7ab73..b40b5cb2bb00ac84ce6ff6be877e14366d519ab0 100644 (file)
--- a/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterGraphics.c
+++ b/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterGraphics.c
@@ -1,7 +1,7 @@
 /** @file\r
   Support for Graphics output spliter.\r
 /** @file\r
   Support for Graphics output spliter.\r

-  \r
-Copyright (c) 2006 - 2011, Intel Corporation. All rights reserved.<BR>\r
+\r
+Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r

 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r


@@ -58,7 +58,7 @@ ConSplitterGraphicsOutputQueryMode (
   Private = GRAPHICS_OUTPUT_SPLITTER_PRIVATE_DATA_FROM_THIS (This);\r
 \r
   GraphicsOutput = NULL;\r
   Private = GRAPHICS_OUTPUT_SPLITTER_PRIVATE_DATA_FROM_THIS (This);\r
 \r
   GraphicsOutput = NULL;\r

-  \r
+\r

   if (Private->CurrentNumberOfGraphicsOutput == 1) {\r
     //\r
     // Find the only one GraphicsOutput.\r
   if (Private->CurrentNumberOfGraphicsOutput == 1) {\r
     //\r
     // Find the only one GraphicsOutput.\r


@@ -70,7 +70,7 @@ ConSplitterGraphicsOutputQueryMode (
       }\r
     }\r
   }\r
       }\r
     }\r
   }\r

-  \r
+\r

   if (GraphicsOutput != NULL) {\r
     //\r
     // If only one physical GOP device exist, return its information.\r
   if (GraphicsOutput != NULL) {\r
     //\r
     // If only one physical GOP device exist, return its information.\r


@@ -79,7 +79,7 @@ ConSplitterGraphicsOutputQueryMode (
     return Status;\r
   } else {\r
     //\r
     return Status;\r
   } else {\r
     //\r

-    // If 2 more phyiscal GOP device exist or GOP protocol does not exist, \r
+    // If 2 more phyiscal GOP device exist or GOP protocol does not exist,\r

     // return GOP information (PixelFormat is PixelBltOnly) created in ConSplitterAddGraphicsOutputMode ().\r
     //\r
     *Info = AllocatePool (sizeof (EFI_GRAPHICS_OUTPUT_MODE_INFORMATION));\r
     // return GOP information (PixelFormat is PixelBltOnly) created in ConSplitterAddGraphicsOutputMode ().\r
     //\r
     *Info = AllocatePool (sizeof (EFI_GRAPHICS_OUTPUT_MODE_INFORMATION));\r


@@ -191,7 +191,7 @@ ConSplitterGraphicsOutputSetMode (
     This->Mode->FrameBufferSize = PhysicalGraphicsOutput->Mode->FrameBufferSize;\r
   } else {\r
     //\r
     This->Mode->FrameBufferSize = PhysicalGraphicsOutput->Mode->FrameBufferSize;\r
   } else {\r
     //\r

-    // If 2 more phyiscal GOP device exist or GOP protocol does not exist, \r
+    // If 2 more phyiscal GOP device exist or GOP protocol does not exist,\r

     // return GOP information (PixelFormat is PixelBltOnly) created in ConSplitterAddGraphicsOutputMode ().\r
     //\r
     CopyMem (This->Mode->Info, &Private->GraphicsOutputModeBuffer[ModeNumber], This->Mode->SizeOfInfo);\r
     // return GOP information (PixelFormat is PixelBltOnly) created in ConSplitterAddGraphicsOutputMode ().\r
     //\r
     CopyMem (This->Mode->Info, &Private->GraphicsOutputModeBuffer[ModeNumber], This->Mode->SizeOfInfo);\r


@@ -273,7 +273,7 @@ ConSplitterGraphicsOutputBlt (
   if (This == NULL || ((UINTN) BltOperation) >= EfiGraphicsOutputBltOperationMax) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
   if (This == NULL || ((UINTN) BltOperation) >= EfiGraphicsOutputBltOperationMax) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r

-  \r
+\r

   Private = GRAPHICS_OUTPUT_SPLITTER_PRIVATE_DATA_FROM_THIS (This);\r
 \r
   ReturnStatus = EFI_SUCCESS;\r
   Private = GRAPHICS_OUTPUT_SPLITTER_PRIVATE_DATA_FROM_THIS (This);\r
 \r
   ReturnStatus = EFI_SUCCESS;\r

diff --git a/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsole.c b/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsole.c
index 7b1c37b357955582866537eaec996a4b16683e34..444773d089bfc30052cfb33df2f66ed88650a7e1 100644 (file)
--- a/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsole.c
+++ b/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsole.c
@@ -1,7 +1,7 @@
 /** @file\r
   This is the main routine for initializing the Graphics Console support routines.\r
 \r
 /** @file\r
   This is the main routine for initializing the Graphics Console support routines.\r
 \r

-Copyright (c) 2006 - 2016, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r

 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r


@@ -245,8 +245,8 @@ InitializeGraphicsConsoleTextMode (
   UINTN                       ValidCount;\r
   UINTN                       ValidIndex;\r
   UINTN                       MaxColumns;\r
   UINTN                       ValidCount;\r
   UINTN                       ValidIndex;\r
   UINTN                       MaxColumns;\r

-  UINTN                       MaxRows;  \r
-  \r
+  UINTN                       MaxRows;\r
+\r

   if ((TextModeCount == NULL) || (TextModeData == NULL)) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
   if ((TextModeCount == NULL) || (TextModeData == NULL)) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r


@@ -287,7 +287,7 @@ InitializeGraphicsConsoleTextMode (
   //\r
   // Mode 0 and mode 1 is for 80x25, 80x50 according to UEFI spec.\r
   //\r
   //\r
   // Mode 0 and mode 1 is for 80x25, 80x50 according to UEFI spec.\r
   //\r

-  ValidCount = 0;  \r
+  ValidCount = 0;\r

 \r
   NewModeBuffer[ValidCount].Columns       = 80;\r
   NewModeBuffer[ValidCount].Rows          = 25;\r
 \r
   NewModeBuffer[ValidCount].Columns       = 80;\r
   NewModeBuffer[ValidCount].Rows          = 25;\r


@@ -295,20 +295,20 @@ InitializeGraphicsConsoleTextMode (
   NewModeBuffer[ValidCount].GopHeight     = VerticalResolution;\r
   NewModeBuffer[ValidCount].GopModeNumber = GopModeNumber;\r
   NewModeBuffer[ValidCount].DeltaX        = (HorizontalResolution - (NewModeBuffer[ValidCount].Columns * EFI_GLYPH_WIDTH)) >> 1;\r
   NewModeBuffer[ValidCount].GopHeight     = VerticalResolution;\r
   NewModeBuffer[ValidCount].GopModeNumber = GopModeNumber;\r
   NewModeBuffer[ValidCount].DeltaX        = (HorizontalResolution - (NewModeBuffer[ValidCount].Columns * EFI_GLYPH_WIDTH)) >> 1;\r

-  NewModeBuffer[ValidCount].DeltaY        = (VerticalResolution - (NewModeBuffer[ValidCount].Rows * EFI_GLYPH_HEIGHT)) >> 1;      \r
+  NewModeBuffer[ValidCount].DeltaY        = (VerticalResolution - (NewModeBuffer[ValidCount].Rows * EFI_GLYPH_HEIGHT)) >> 1;\r

   ValidCount++;\r
 \r
   if ((MaxColumns >= 80) && (MaxRows >= 50)) {\r
     NewModeBuffer[ValidCount].Columns = 80;\r
     NewModeBuffer[ValidCount].Rows    = 50;\r
     NewModeBuffer[ValidCount].DeltaX  = (HorizontalResolution - (80 * EFI_GLYPH_WIDTH)) >> 1;\r
   ValidCount++;\r
 \r
   if ((MaxColumns >= 80) && (MaxRows >= 50)) {\r
     NewModeBuffer[ValidCount].Columns = 80;\r
     NewModeBuffer[ValidCount].Rows    = 50;\r
     NewModeBuffer[ValidCount].DeltaX  = (HorizontalResolution - (80 * EFI_GLYPH_WIDTH)) >> 1;\r

-    NewModeBuffer[ValidCount].DeltaY  = (VerticalResolution - (50 * EFI_GLYPH_HEIGHT)) >> 1;    \r
+    NewModeBuffer[ValidCount].DeltaY  = (VerticalResolution - (50 * EFI_GLYPH_HEIGHT)) >> 1;\r

   }\r
   NewModeBuffer[ValidCount].GopWidth      = HorizontalResolution;\r
   NewModeBuffer[ValidCount].GopHeight     = VerticalResolution;\r
   NewModeBuffer[ValidCount].GopModeNumber = GopModeNumber;\r
   ValidCount++;\r
   }\r
   NewModeBuffer[ValidCount].GopWidth      = HorizontalResolution;\r
   NewModeBuffer[ValidCount].GopHeight     = VerticalResolution;\r
   NewModeBuffer[ValidCount].GopModeNumber = GopModeNumber;\r
   ValidCount++;\r

-  \r
+\r

   //\r
   // Start from mode 2 to put the valid mode other than 80x25 and 80x50 in the output mode buffer.\r
   //\r
   //\r
   // Start from mode 2 to put the valid mode other than 80x25 and 80x50 in the output mode buffer.\r
   //\r


@@ -340,14 +340,14 @@ InitializeGraphicsConsoleTextMode (
       ValidCount++;\r
     }\r
   }\r
       ValidCount++;\r
     }\r
   }\r

- \r
+\r

   DEBUG_CODE (\r
     for (Index = 0; Index < ValidCount; Index++) {\r
   DEBUG_CODE (\r
     for (Index = 0; Index < ValidCount; Index++) {\r

-      DEBUG ((EFI_D_INFO, "Graphics - Mode %d, Column = %d, Row = %d\n", \r
-                           Index, NewModeBuffer[Index].Columns, NewModeBuffer[Index].Rows));  \r
+      DEBUG ((EFI_D_INFO, "Graphics - Mode %d, Column = %d, Row = %d\n",\r
+                           Index, NewModeBuffer[Index].Columns, NewModeBuffer[Index].Rows));\r

     }\r
   );\r
     }\r
   );\r

-  \r
+\r

   //\r
   // Return valid mode count and mode information buffer.\r
   //\r
   //\r
   // Return valid mode count and mode information buffer.\r
   //\r


@@ -388,9 +388,9 @@ GraphicsConsoleControllerDriverStart (
   UINTN                                MaxMode;\r
   UINT32                               ModeNumber;\r
   EFI_GRAPHICS_OUTPUT_PROTOCOL_MODE    *Mode;\r
   UINTN                                MaxMode;\r
   UINT32                               ModeNumber;\r
   EFI_GRAPHICS_OUTPUT_PROTOCOL_MODE    *Mode;\r

-  UINTN                                SizeOfInfo;  \r
+  UINTN                                SizeOfInfo;\r

   EFI_GRAPHICS_OUTPUT_MODE_INFORMATION *Info;\r
   EFI_GRAPHICS_OUTPUT_MODE_INFORMATION *Info;\r

-  \r
+\r

   ModeNumber = 0;\r
 \r
   //\r
   ModeNumber = 0;\r
 \r
   //\r


@@ -442,9 +442,9 @@ GraphicsConsoleControllerDriverStart (
     if ((HorizontalResolution == 0x0) || (VerticalResolution == 0x0)) {\r
       //\r
       // Find the highest resolution which GOP supports.\r
     if ((HorizontalResolution == 0x0) || (VerticalResolution == 0x0)) {\r
       //\r
       // Find the highest resolution which GOP supports.\r

-      //    \r
+      //\r

       MaxMode = Private->GraphicsOutput->Mode->MaxMode;\r
       MaxMode = Private->GraphicsOutput->Mode->MaxMode;\r

-      \r
+\r

       for (ModeIndex = 0; ModeIndex < MaxMode; ModeIndex++) {\r
         Status = Private->GraphicsOutput->QueryMode (\r
                            Private->GraphicsOutput,\r
       for (ModeIndex = 0; ModeIndex < MaxMode; ModeIndex++) {\r
         Status = Private->GraphicsOutput->QueryMode (\r
                            Private->GraphicsOutput,\r


@@ -581,7 +581,7 @@ GraphicsConsoleControllerDriverStart (
     Status = GraphicsConsoleConOutOutputString (&Private->SimpleTextOutput, (CHAR16 *)L"Graphics Console Started\n\r");\r
     if (EFI_ERROR (Status)) {\r
       goto Error;\r
     Status = GraphicsConsoleConOutOutputString (&Private->SimpleTextOutput, (CHAR16 *)L"Graphics Console Started\n\r");\r
     if (EFI_ERROR (Status)) {\r
       goto Error;\r

-    }  \r
+    }\r

   DEBUG_CODE_END ();\r
 \r
   //\r
   DEBUG_CODE_END ();\r
 \r
   //\r


@@ -915,7 +915,7 @@ GraphicsConsoleConOutOutputString (
   }\r
 \r
   Status = EFI_SUCCESS;\r
   }\r
 \r
   Status = EFI_SUCCESS;\r

-  \r
+\r

   OldTpl = gBS->RaiseTPL (TPL_NOTIFY);\r
   //\r
   // Current mode\r
   OldTpl = gBS->RaiseTPL (TPL_NOTIFY);\r
   //\r
   // Current mode\r


@@ -1305,7 +1305,7 @@ GraphicsConsoleConOutSetMode (
     Status = EFI_UNSUPPORTED;\r
     goto Done;\r
   }\r
     Status = EFI_UNSUPPORTED;\r
     goto Done;\r
   }\r

-  \r
+\r

   ModeData  = &(Private->ModeData[ModeNumber]);\r
 \r
   if (ModeData->Columns <= 0 && ModeData->Rows <= 0) {\r
   ModeData  = &(Private->ModeData[ModeNumber]);\r
 \r
   if (ModeData->Columns <= 0 && ModeData->Rows <= 0) {\r


@@ -1443,7 +1443,7 @@ GraphicsConsoleConOutSetMode (
   This->Mode->CursorColumn  = 0;\r
   This->Mode->CursorRow     = 0;\r
 \r
   This->Mode->CursorColumn  = 0;\r
   This->Mode->CursorRow     = 0;\r
 \r

-  FlushCursor (This);  \r
+  FlushCursor (This);\r

 \r
   Status = EFI_SUCCESS;\r
 \r
 \r
   Status = EFI_SUCCESS;\r
 \r


@@ -1527,7 +1527,7 @@ GraphicsConsoleConOutClearScreen (
   EFI_GRAPHICS_OUTPUT_BLT_PIXEL Foreground;\r
   EFI_GRAPHICS_OUTPUT_BLT_PIXEL Background;\r
   EFI_TPL                       OldTpl;\r
   EFI_GRAPHICS_OUTPUT_BLT_PIXEL Foreground;\r
   EFI_GRAPHICS_OUTPUT_BLT_PIXEL Background;\r
   EFI_TPL                       OldTpl;\r

-  \r
+\r

   if (This->Mode->Mode == -1) {\r
     //\r
     // If current mode is not valid, return error.\r
   if (This->Mode->Mode == -1) {\r
     //\r
     // If current mode is not valid, return error.\r


@@ -1876,11 +1876,11 @@ DrawUnicodeWeightAtCursorN (
 \r
 /**\r
   Flush the cursor on the screen.\r
 \r
 /**\r
   Flush the cursor on the screen.\r

-  \r
+\r

   If CursorVisible is FALSE, nothing to do and return directly.\r
   If CursorVisible is FALSE, nothing to do and return directly.\r

-  If CursorVisible is TRUE, \r
+  If CursorVisible is TRUE,\r

      i) If the cursor shows on screen, it will be erased.\r
      i) If the cursor shows on screen, it will be erased.\r

-    ii) If the cursor does not show on screen, it will be shown. \r
+    ii) If the cursor does not show on screen, it will be shown.\r

 \r
   @param  This                  Protocol instance pointer.\r
 \r
 \r
   @param  This                  Protocol instance pointer.\r
 \r

diff --git a/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsole.h b/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsole.h
index 0db6f04c11f948c7d4a13b659dc620070a51b470..be43f2afc8e3c1d19f17ba6d81d06512ff828065 100644 (file)
--- a/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsole.h
+++ b/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsole.h
@@ -1,7 +1,7 @@
 /** @file\r
   Header file for GraphicsConsole driver.\r
 \r
 /** @file\r
   Header file for GraphicsConsole driver.\r
 \r

-Copyright (c) 2006 - 2011, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r

 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r


@@ -209,7 +209,7 @@ GraphicsConsoleComponentNameGetControllerName (
 \r
 /**\r
   Reset the text output device hardware and optionally run diagnostics.\r
 \r
 /**\r
   Reset the text output device hardware and optionally run diagnostics.\r

-  \r
+\r

   Implements SIMPLE_TEXT_OUTPUT.Reset().\r
   If ExtendeVerification is TRUE, then perform dependent Graphics Console\r
   device reset, and set display mode to mode 0.\r
   Implements SIMPLE_TEXT_OUTPUT.Reset().\r
   If ExtendeVerification is TRUE, then perform dependent Graphics Console\r
   device reset, and set display mode to mode 0.\r


@@ -235,7 +235,7 @@ GraphicsConsoleConOutReset (
 /**\r
   Write a Unicode string to the output device.\r
 \r
 /**\r
   Write a Unicode string to the output device.\r
 \r

-  Implements SIMPLE_TEXT_OUTPUT.OutputString(). \r
+  Implements SIMPLE_TEXT_OUTPUT.OutputString().\r

   The Unicode string will be converted to Glyphs and will be\r
   sent to the Graphics Console.\r
 \r
   The Unicode string will be converted to Glyphs and will be\r
   sent to the Graphics Console.\r
 \r


@@ -262,7 +262,7 @@ GraphicsConsoleConOutOutputString (
   );\r
 \r
 /**\r
   );\r
 \r
 /**\r

-  Verifies that all characters in a Unicode string can be output to the \r
+  Verifies that all characters in a Unicode string can be output to the\r

   target device.\r
 \r
   Implements SIMPLE_TEXT_OUTPUT.TestString().\r
   target device.\r
 \r
   Implements SIMPLE_TEXT_OUTPUT.TestString().\r


@@ -316,7 +316,7 @@ GraphicsConsoleConOutQueryMode (
 \r
 /**\r
   Sets the output device(s) to a specified mode.\r
 \r
 /**\r
   Sets the output device(s) to a specified mode.\r

-  \r
+\r

   Implements SIMPLE_TEXT_OUTPUT.SetMode().\r
   Set the Graphics Console to a specified mode. In this driver, we only support mode 0.\r
 \r
   Implements SIMPLE_TEXT_OUTPUT.SetMode().\r
   Set the Graphics Console to a specified mode. In this driver, we only support mode 0.\r
 \r


@@ -324,7 +324,7 @@ GraphicsConsoleConOutQueryMode (
   @param  ModeNumber            The text mode to set.\r
 \r
   @retval EFI_SUCCESS           The requested text mode is set.\r
   @param  ModeNumber            The text mode to set.\r
 \r
   @retval EFI_SUCCESS           The requested text mode is set.\r

-  @retval EFI_DEVICE_ERROR      The requested text mode cannot be set because of \r
+  @retval EFI_DEVICE_ERROR      The requested text mode cannot be set because of\r

                                 Graphics Console device error.\r
   @retval EFI_UNSUPPORTED       The text mode number is not valid.\r
 \r
                                 Graphics Console device error.\r
   @retval EFI_UNSUPPORTED       The text mode number is not valid.\r
 \r


@@ -344,7 +344,7 @@ GraphicsConsoleConOutSetMode (
 \r
   @param  This                  Protocol instance pointer.\r
   @param  Attribute             The attribute to set. Bits 0..3 are the foreground\r
 \r
   @param  This                  Protocol instance pointer.\r
   @param  Attribute             The attribute to set. Bits 0..3 are the foreground\r

-                                color, and bits 4..6 are the background color. \r
+                                color, and bits 4..6 are the background color.\r

                                 All other bits are undefined and must be zero.\r
 \r
   @retval EFI_SUCCESS           The requested attribute is set.\r
                                 All other bits are undefined and must be zero.\r
 \r
   @retval EFI_SUCCESS           The requested attribute is set.\r


@@ -360,7 +360,7 @@ GraphicsConsoleConOutSetAttribute (
   );\r
 \r
 /**\r
   );\r
 \r
 /**\r

-  Clears the output device(s) display to the currently selected background \r
+  Clears the output device(s) display to the currently selected background\r

   color.\r
 \r
   Implements SIMPLE_TEXT_OUTPUT.ClearScreen().\r
   color.\r
 \r
   Implements SIMPLE_TEXT_OUTPUT.ClearScreen().\r


@@ -451,10 +451,10 @@ GraphicsConsoleControllerDriverSupported (
 \r
 \r
 /**\r
 \r
 \r
 /**\r

-  Start this driver on Controller by opening Graphics Output protocol or \r
+  Start this driver on Controller by opening Graphics Output protocol or\r

   UGA Draw protocol, and installing Simple Text Out protocol on Controller.\r
   (UGA Draw protocol could be skipped if PcdUgaConsumeSupport is set to FALSE.)\r
   UGA Draw protocol, and installing Simple Text Out protocol on Controller.\r
   (UGA Draw protocol could be skipped if PcdUgaConsumeSupport is set to FALSE.)\r

-  \r
+\r

   @param  This                 Protocol instance pointer.\r
   @param  Controller           Handle of device to bind driver to\r
   @param  RemainingDevicePath  Optional parameter use to pick a specific child\r
   @param  This                 Protocol instance pointer.\r
   @param  Controller           Handle of device to bind driver to\r
   @param  RemainingDevicePath  Optional parameter use to pick a specific child\r


@@ -473,10 +473,10 @@ GraphicsConsoleControllerDriverStart (
   );\r
 \r
 /**\r
   );\r
 \r
 /**\r

-  Stop this driver on Controller by removing Simple Text Out protocol \r
+  Stop this driver on Controller by removing Simple Text Out protocol\r

   and closing the Graphics Output Protocol or UGA Draw protocol on Controller.\r
   (UGA Draw protocol could be skipped if PcdUgaConsumeSupport is set to FALSE.)\r
   and closing the Graphics Output Protocol or UGA Draw protocol on Controller.\r
   (UGA Draw protocol could be skipped if PcdUgaConsumeSupport is set to FALSE.)\r

-  \r
+\r

 \r
   @param  This              Protocol instance pointer.\r
   @param  Controller        Handle of device to stop driver on\r
 \r
   @param  This              Protocol instance pointer.\r
   @param  Controller        Handle of device to stop driver on\r


@@ -485,7 +485,7 @@ GraphicsConsoleControllerDriverStart (
   @param  ChildHandleBuffer List of Child Handles to Stop.\r
 \r
   @retval EFI_SUCCESS       This driver is removed Controller.\r
   @param  ChildHandleBuffer List of Child Handles to Stop.\r
 \r
   @retval EFI_SUCCESS       This driver is removed Controller.\r

-  @retval EFI_NOT_STARTED   Simple Text Out protocol could not be found the \r
+  @retval EFI_NOT_STARTED   Simple Text Out protocol could not be found the\r

                             Controller.\r
   @retval other             This driver was not removed from this device.\r
 \r
                             Controller.\r
   @retval other             This driver was not removed from this device.\r
 \r


@@ -503,9 +503,9 @@ GraphicsConsoleControllerDriverStop (
 /**\r
   Locate HII Database protocol and HII Font protocol.\r
 \r
 /**\r
   Locate HII Database protocol and HII Font protocol.\r
 \r

-  @retval  EFI_SUCCESS     HII Database protocol and HII Font protocol \r
+  @retval  EFI_SUCCESS     HII Database protocol and HII Font protocol\r

                            are located successfully.\r
                            are located successfully.\r

-  @return  other           Failed to locate HII Database protocol or \r
+  @return  other           Failed to locate HII Database protocol or\r

                            HII Font protocol.\r
 \r
 **/\r
                            HII Font protocol.\r
 \r
 **/\r


@@ -554,11 +554,11 @@ DrawUnicodeWeightAtCursorN (
 \r
 /**\r
   Flush the cursor on the screen.\r
 \r
 /**\r
   Flush the cursor on the screen.\r

-  \r
+\r

   If CursorVisible is FALSE, nothing to do and return directly.\r
   If CursorVisible is FALSE, nothing to do and return directly.\r

-  If CursorVisible is TRUE, \r
+  If CursorVisible is TRUE,\r

      i) If the cursor shows on screen, it will be erased.\r
      i) If the cursor shows on screen, it will be erased.\r

-    ii) If the cursor does not show on screen, it will be shown. \r
+    ii) If the cursor does not show on screen, it will be shown.\r

 \r
   @param  This                  Protocol instance pointer.\r
 \r
 \r
   @param  This                  Protocol instance pointer.\r
 \r


@@ -575,17 +575,17 @@ FlushCursor (
   for the Graphics Console device based on Graphics Output Protocol.\r
 \r
   If yes, set the graphic device's current mode to this specific mode.\r
   for the Graphics Console device based on Graphics Output Protocol.\r
 \r
   If yes, set the graphic device's current mode to this specific mode.\r

-  \r
+\r

   @param  GraphicsOutput        Graphics Output Protocol instance pointer.\r
   @param  HorizontalResolution  User defined horizontal resolution\r
   @param  VerticalResolution    User defined vertical resolution.\r
   @param  CurrentModeNumber     Current specific mode to be check.\r
 \r
   @retval EFI_SUCCESS       The mode is supported.\r
   @param  GraphicsOutput        Graphics Output Protocol instance pointer.\r
   @param  HorizontalResolution  User defined horizontal resolution\r
   @param  VerticalResolution    User defined vertical resolution.\r
   @param  CurrentModeNumber     Current specific mode to be check.\r
 \r
   @retval EFI_SUCCESS       The mode is supported.\r

-  @retval EFI_UNSUPPORTED   The specific mode is out of range of graphics \r
+  @retval EFI_UNSUPPORTED   The specific mode is out of range of graphics\r

                             device supported.\r
                             device supported.\r

-  @retval other             The specific mode does not support user defined \r
-                            resolution or failed to set the current mode to the \r
+  @retval other             The specific mode does not support user defined\r
+                            resolution or failed to set the current mode to the\r

                             specific mode on graphics device.\r
 \r
 **/\r
                             specific mode on graphics device.\r
 \r
 **/\r

diff --git a/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsoleDxe.inf b/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsoleDxe.inf
index ccf44979d5e9f48b7fcc9fbf3313c06516545421..bf387cd97bbdeaf8926f1a8b60bc0a66d90f0a7b 100644 (file)
--- a/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsoleDxe.inf
+++ b/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsoleDxe.inf
@@ -3,8 +3,8 @@
 #\r
 #  This driver will install Simple Text Output protocol by consuming Graphices Output\r
 #  protocol or UGA Draw protocol on graphic devices.\r
 #\r
 #  This driver will install Simple Text Output protocol by consuming Graphices Output\r
 #  protocol or UGA Draw protocol on graphic devices.\r

-#  \r
-#  Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.<BR>\r
+#\r
+#  Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r

 #  This program and the accompanying materials\r
 #  are licensed and made available under the terms and conditions of the BSD License\r
 #  which accompanies this distribution. The full text of the license may be found at\r
 #  This program and the accompanying materials\r
 #  are licensed and made available under the terms and conditions of the BSD License\r
 #  which accompanies this distribution. The full text of the license may be found at\r

diff --git a/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsoleDxeExtra.uni b/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsoleDxeExtra.uni
index 9dc3e4e0c348fcfe77ac31fdbc289548aea289e6..ff2237c6d1ecd2793914163c88d5386e7148a1b8 100644 (file)
--- a/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsoleDxeExtra.uni
+++ b/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsoleDxeExtra.uni
@@ -1,7 +1,7 @@
 // /** @file\r
 // GraphicsConsoleDxe Localized Strings and Content\r
 //\r
 // /** @file\r
 // GraphicsConsoleDxe Localized Strings and Content\r
 //\r

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

 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r
 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r


@@ -12,8 +12,8 @@
 //\r
 // **/\r
 \r
 //\r
 // **/\r
 \r

-#string STR_PROPERTIES_MODULE_NAME \r
-#language en-US \r
+#string STR_PROPERTIES_MODULE_NAME\r
+#language en-US\r

 "Graphics Console DXE Driver"\r
 \r
 \r
 "Graphics Console DXE Driver"\r
 \r
 \r

diff --git a/MdeModulePkg/Universal/Console/TerminalDxe/Ansi.c b/MdeModulePkg/Universal/Console/TerminalDxe/Ansi.c
index 15147c1f2c2da89111265ca62247f41da5d09619..63a5dff3f59b067406e9039f2d09ae699ba43d4a 100644 (file)
--- a/MdeModulePkg/Universal/Console/TerminalDxe/Ansi.c
+++ b/MdeModulePkg/Universal/Console/TerminalDxe/Ansi.c
@@ -1,7 +1,7 @@
 /** @file\r
   Implementation of translation upon PC ANSI.\r
 \r
 /** @file\r
   Implementation of translation upon PC ANSI.\r
 \r

-Copyright (c) 2006 - 2008, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r

 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r


@@ -47,8 +47,8 @@ AnsiRawDataToUnicode (
   or valid text graphics.\r
 \r
   @param  TerminalDevice          The terminal device.\r
   or valid text graphics.\r
 \r
   @param  TerminalDevice          The terminal device.\r

-  @param  WString                 The input string.          \r
- \r
+  @param  WString                 The input string.\r
+\r

   @retval EFI_UNSUPPORTED         If not all input characters are valid.\r
   @retval EFI_SUCCESS             If all input characters are valid.\r
 \r
   @retval EFI_UNSUPPORTED         If not all input characters are valid.\r
   @retval EFI_SUCCESS             If all input characters are valid.\r
 \r

diff --git a/MdeModulePkg/Universal/Console/TerminalDxe/Terminal.h b/MdeModulePkg/Universal/Console/TerminalDxe/Terminal.h
index 7dded00cad7866f4b2619d1ad10d4e7d2b8d1382..a4543fc8de99f6699f88e896e46de5af71710b6a 100644 (file)
--- a/MdeModulePkg/Universal/Console/TerminalDxe/Terminal.h
+++ b/MdeModulePkg/Universal/Console/TerminalDxe/Terminal.h
@@ -1,7 +1,7 @@
 /** @file\r
   Header file for Terminal driver.\r
 \r
 /** @file\r
   Header file for Terminal driver.\r
 \r

-Copyright (c) 2006 - 2017, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r

 Copyright (C) 2016 Silicon Graphics, Inc. All rights reserved.<BR>\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 Copyright (C) 2016 Silicon Graphics, Inc. All rights reserved.<BR>\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r


@@ -1090,7 +1090,7 @@ UnicodeFiFoInsertOneKey (
 \r
 /**\r
   Remove one pre-fetched key out of the Unicode FIFO buffer.\r
 \r
 /**\r
   Remove one pre-fetched key out of the Unicode FIFO buffer.\r

-  The caller should guarantee that Unicode FIFO buffer is not empty \r
+  The caller should guarantee that Unicode FIFO buffer is not empty\r

   by IsUnicodeFiFoEmpty ().\r
 \r
   @param  TerminalDevice       Terminal driver private structure.\r
   by IsUnicodeFiFoEmpty ().\r
 \r
   @param  TerminalDevice       Terminal driver private structure.\r


@@ -1292,10 +1292,10 @@ VTUTF8TestString (
   Translate one Unicode character into VT-UTF8 characters.\r
 \r
   UTF8 Encoding Table\r
   Translate one Unicode character into VT-UTF8 characters.\r
 \r
   UTF8 Encoding Table\r

-  Bits per Character | Unicode Character Range | Unicode Binary  Encoding |    UTF8 Binary Encoding\r
-        0-7             |     0x0000 - 0x007F      |     00000000 0xxxxxxx        |   0xxxxxxx\r
-        8-11          |     0x0080 - 0x07FF        |     00000xxx xxxxxxxx       |   110xxxxx 10xxxxxx\r
-       12-16           |     0x0800 - 0xFFFF       |     xxxxxxxx xxxxxxxx        |   1110xxxx 10xxxxxx 10xxxxxx\r
+  Bits per Character | Unicode Character Range | Unicode Binary  Encoding |  UTF8 Binary Encoding\r
+        0-7           |     0x0000 - 0x007F      |     00000000 0xxxxxxx     |   0xxxxxxx\r
+        8-11          |     0x0080 - 0x07FF      |     00000xxx xxxxxxxx     |   110xxxxx 10xxxxxx\r
+       12-16          |     0x0800 - 0xFFFF      |     xxxxxxxx xxxxxxxx     |   1110xxxx 10xxxxxx 10xxxxxx\r

 \r
 \r
   @param  Unicode          Unicode character need translating.\r
 \r
 \r
   @param  Unicode          Unicode character need translating.\r


@@ -1331,10 +1331,10 @@ GetOneValidUtf8Char (
   Translate VT-UTF8 characters into one Unicode character.\r
 \r
   UTF8 Encoding Table\r
   Translate VT-UTF8 characters into one Unicode character.\r
 \r
   UTF8 Encoding Table\r

-  Bits per Character | Unicode Character Range | Unicode Binary  Encoding |    UTF8 Binary Encoding\r
-        0-7             |     0x0000 - 0x007F      |     00000000 0xxxxxxx        |   0xxxxxxx\r
-        8-11          |     0x0080 - 0x07FF        |     00000xxx xxxxxxxx       |   110xxxxx 10xxxxxx\r
-       12-16           |     0x0800 - 0xFFFF       |     xxxxxxxx xxxxxxxx        |   1110xxxx 10xxxxxx 10xxxxxx\r
+  Bits per Character | Unicode Character Range | Unicode Binary  Encoding |  UTF8 Binary Encoding\r
+        0-7           |     0x0000 - 0x007F      |     00000000 0xxxxxxx     |   0xxxxxxx\r
+        8-11          |     0x0080 - 0x07FF      |     00000xxx xxxxxxxx     |   110xxxxx 10xxxxxx\r
+       12-16          |     0x0800 - 0xFFFF      |     xxxxxxxx xxxxxxxx     |   1110xxxx 10xxxxxx 10xxxxxx\r

 \r
 \r
   @param  Utf8Char         VT-UTF8 character set needs translating.\r
 \r
 \r
   @param  Utf8Char         VT-UTF8 character set needs translating.\r

diff --git a/MdeModulePkg/Universal/Console/TerminalDxe/TerminalConIn.c b/MdeModulePkg/Universal/Console/TerminalDxe/TerminalConIn.c
index 99316376cb062d456fe3a0388bb6efa1f99ca5dc..80c4f6b483d429705710146919f8f4db3dd3f6ec 100644 (file)
--- a/MdeModulePkg/Universal/Console/TerminalDxe/TerminalConIn.c
+++ b/MdeModulePkg/Universal/Console/TerminalDxe/TerminalConIn.c
@@ -632,7 +632,7 @@ KeyNotifyProcessHandler (
   while (TRUE) {\r
     //\r
     // Enter critical section\r
   while (TRUE) {\r
     //\r
     // Enter critical section\r

-    //  \r
+    //\r

     OldTpl = gBS->RaiseTPL (TPL_NOTIFY);\r
     HasKey = EfiKeyFiFoForNotifyRemoveOneKey (TerminalDevice->EfiKeyFiFoForNotify, &Key);\r
     CopyMem (&KeyData.Key, &Key, sizeof (EFI_INPUT_KEY));\r
     OldTpl = gBS->RaiseTPL (TPL_NOTIFY);\r
     HasKey = EfiKeyFiFoForNotifyRemoveOneKey (TerminalDevice->EfiKeyFiFoForNotify, &Key);\r
     CopyMem (&KeyData.Key, &Key, sizeof (EFI_INPUT_KEY));\r


@@ -1128,7 +1128,7 @@ UnicodeFiFoInsertOneKey (
 \r
 /**\r
   Remove one pre-fetched key out of the Unicode FIFO buffer.\r
 \r
 /**\r
   Remove one pre-fetched key out of the Unicode FIFO buffer.\r

-  The caller should guarantee that Unicode FIFO buffer is not empty \r
+  The caller should guarantee that Unicode FIFO buffer is not empty\r

   by IsUnicodeFiFoEmpty ().\r
 \r
   @param  TerminalDevice       Terminal driver private structure.\r
   by IsUnicodeFiFoEmpty ().\r
 \r
   @param  TerminalDevice       Terminal driver private structure.\r


@@ -1304,10 +1304,10 @@ UnicodeToEfiKeyFlushState (
   There is one special input sequence that will force the system to reset.\r
   This is ESC R ESC r ESC R.\r
 \r
   There is one special input sequence that will force the system to reset.\r
   This is ESC R ESC r ESC R.\r
 \r

-  Note: current implementation support terminal types include: PC ANSI, VT100+/VTUTF8, VT100. \r
+  Note: current implementation support terminal types include: PC ANSI, VT100+/VTUTF8, VT100.\r

         The table below is not same with UEFI Spec 2.3 Appendix B Table 201(not support ANSI X3.64 /\r
         DEC VT200-500 and extra support PC ANSI, VT100)since UEFI Table 201 is just an example.\r
         The table below is not same with UEFI Spec 2.3 Appendix B Table 201(not support ANSI X3.64 /\r
         DEC VT200-500 and extra support PC ANSI, VT100)since UEFI Table 201 is just an example.\r

-        \r
+\r

   Symbols used in table below\r
   ===========================\r
     ESC = 0x1B\r
   Symbols used in table below\r
   ===========================\r
     ESC = 0x1B\r

diff --git a/MdeModulePkg/Universal/Console/TerminalDxe/TerminalConOut.c b/MdeModulePkg/Universal/Console/TerminalDxe/TerminalConOut.c
index 5a8343162fee451d0839356210f86357679152e0..4d7218e415481e7d1489b6392766df1f50d5df69 100644 (file)
--- a/MdeModulePkg/Universal/Console/TerminalDxe/TerminalConOut.c
+++ b/MdeModulePkg/Universal/Console/TerminalDxe/TerminalConOut.c
@@ -1,7 +1,7 @@
 /** @file\r
   Implementation for EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL protocol.\r
 \r
 /** @file\r
   Implementation for EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL protocol.\r
 \r

-Copyright (c) 2006 - 2017, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r

 Copyright (C) 2016 Silicon Graphics, Inc. All rights reserved.<BR>\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 Copyright (C) 2016 Silicon Graphics, Inc. All rights reserved.<BR>\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r


@@ -451,7 +451,7 @@ TerminalConOutQueryMode (
   //\r
   // Get Terminal device data structure pointer.\r
   //\r
   //\r
   // Get Terminal device data structure pointer.\r
   //\r

-  TerminalDevice = TERMINAL_CON_OUT_DEV_FROM_THIS (This);  \r
+  TerminalDevice = TERMINAL_CON_OUT_DEV_FROM_THIS (This);\r

   *Columns = TerminalDevice->TerminalConsoleModeData[ModeNumber].Columns;\r
   *Rows    = TerminalDevice->TerminalConsoleModeData[ModeNumber].Rows;\r
 \r
   *Columns = TerminalDevice->TerminalConsoleModeData[ModeNumber].Columns;\r
   *Rows    = TerminalDevice->TerminalConsoleModeData[ModeNumber].Rows;\r
 \r


@@ -469,7 +469,7 @@ TerminalConOutQueryMode (
   @param ModeNumber    The text mode to set.\r
 \r
   @retval EFI_SUCCESS       The requested text mode is set.\r
   @param ModeNumber    The text mode to set.\r
 \r
   @retval EFI_SUCCESS       The requested text mode is set.\r

-  @retval EFI_DEVICE_ERROR  The requested text mode cannot be set \r
+  @retval EFI_DEVICE_ERROR  The requested text mode cannot be set\r

                             because of serial device error.\r
   @retval EFI_UNSUPPORTED   The text mode number is not valid.\r
 \r
                             because of serial device error.\r
   @retval EFI_UNSUPPORTED   The text mode number is not valid.\r
 \r


@@ -911,7 +911,7 @@ TerminalIsValidTextGraphics (
   Detects if a valid ASCII char.\r
 \r
   @param  Ascii        An ASCII character.\r
   Detects if a valid ASCII char.\r
 \r
   @param  Ascii        An ASCII character.\r

-                       \r
+\r

   @retval TRUE         If it is a valid ASCII character.\r
   @retval FALSE        If it is not a valid ASCII character.\r
 \r
   @retval TRUE         If it is a valid ASCII character.\r
   @retval FALSE        If it is not a valid ASCII character.\r
 \r


@@ -935,7 +935,7 @@ TerminalIsValidAscii (
   Detects if a valid EFI control character.\r
 \r
   @param  CharC        An input EFI Control character.\r
   Detects if a valid EFI control character.\r
 \r
   @param  CharC        An input EFI Control character.\r

-                       \r
+\r

   @retval TRUE         If it is a valid EFI control character.\r
   @retval FALSE        If it is not a valid EFI control character.\r
 \r
   @retval TRUE         If it is a valid EFI control character.\r
   @retval FALSE        If it is not a valid EFI control character.\r
 \r

diff --git a/MdeModulePkg/Universal/Console/TerminalDxe/TerminalDxeExtra.uni b/MdeModulePkg/Universal/Console/TerminalDxe/TerminalDxeExtra.uni
index e2f494517d3201a939234656967b16cec4e49a7b..2679a8f749bdfe4f6977ee09fb8f80c7392efcfd 100644 (file)
--- a/MdeModulePkg/Universal/Console/TerminalDxe/TerminalDxeExtra.uni
+++ b/MdeModulePkg/Universal/Console/TerminalDxe/TerminalDxeExtra.uni
@@ -1,7 +1,7 @@
 // /** @file\r
 // TerminalDxe Localized Strings and Content\r
 //\r
 // /** @file\r
 // TerminalDxe Localized Strings and Content\r
 //\r

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

 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r
 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r


@@ -12,8 +12,8 @@
 //\r
 // **/\r
 \r
 //\r
 // **/\r
 \r

-#string STR_PROPERTIES_MODULE_NAME \r
-#language en-US \r
+#string STR_PROPERTIES_MODULE_NAME\r
+#language en-US\r

 "Terminal DXE Driver"\r
 \r
 \r
 "Terminal DXE Driver"\r
 \r
 \r

diff --git a/MdeModulePkg/Universal/Console/TerminalDxe/Vtutf8.c b/MdeModulePkg/Universal/Console/TerminalDxe/Vtutf8.c
index 586e8ab769d982ad455fd3a508b661f966618d89..0768273863d09dbb6f698a13e7d86b8fdaeff8ae 100644 (file)
--- a/MdeModulePkg/Universal/Console/TerminalDxe/Vtutf8.c
+++ b/MdeModulePkg/Universal/Console/TerminalDxe/Vtutf8.c
@@ -1,7 +1,7 @@
 /** @file\r
   Implementation of translation upon VT-UTF8.\r
 \r
 /** @file\r
   Implementation of translation upon VT-UTF8.\r
 \r

-Copyright (c) 2006 - 2010, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r

 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r


@@ -177,10 +177,10 @@ GetOneValidUtf8Char (
   Translate VT-UTF8 characters into one Unicode character.\r
 \r
   UTF8 Encoding Table\r
   Translate VT-UTF8 characters into one Unicode character.\r
 \r
   UTF8 Encoding Table\r

-  Bits per Character | Unicode Character Range | Unicode Binary  Encoding |    UTF8 Binary Encoding\r
-        0-7             |     0x0000 - 0x007F     |     00000000 0xxxxxxx        |   0xxxxxxx\r
-        8-11          |     0x0080 - 0x07FF       |     00000xxx xxxxxxxx        |   110xxxxx 10xxxxxx\r
-       12-16          |     0x0800 - 0xFFFF       |     xxxxxxxx xxxxxxxx        |   1110xxxx 10xxxxxx 10xxxxxx\r
+  Bits per Character | Unicode Character Range | Unicode Binary  Encoding |  UTF8 Binary Encoding\r
+        0-7           |     0x0000 - 0x007F     |     00000000 0xxxxxxx    |   0xxxxxxx\r
+        8-11          |     0x0080 - 0x07FF     |     00000xxx xxxxxxxx     |   110xxxxx 10xxxxxx\r
+       12-16         |     0x0800 - 0xFFFF     |     xxxxxxxx xxxxxxxx    |   1110xxxx 10xxxxxx 10xxxxxx\r

 \r
 \r
   @param  Utf8Char         VT-UTF8 character set needs translating.\r
 \r
 \r
   @param  Utf8Char         VT-UTF8 character set needs translating.\r


@@ -250,10 +250,10 @@ Utf8ToUnicode (
   Translate one Unicode character into VT-UTF8 characters.\r
 \r
   UTF8 Encoding Table\r
   Translate one Unicode character into VT-UTF8 characters.\r
 \r
   UTF8 Encoding Table\r

-  Bits per Character | Unicode Character Range | Unicode Binary  Encoding |    UTF8 Binary Encoding\r
-        0-7             |     0x0000 - 0x007F     |     00000000 0xxxxxxx        |   0xxxxxxx\r
-        8-11          |     0x0080 - 0x07FF       |     00000xxx xxxxxxxx        |   110xxxxx 10xxxxxx\r
-       12-16          |     0x0800 - 0xFFFF       |     xxxxxxxx xxxxxxxx        |   1110xxxx 10xxxxxx 10xxxxxx\r
+  Bits per Character | Unicode Character Range | Unicode Binary  Encoding |  UTF8 Binary Encoding\r
+        0-7           |     0x0000 - 0x007F     |     00000000 0xxxxxxx    |   0xxxxxxx\r
+        8-11          |     0x0080 - 0x07FF     |     00000xxx xxxxxxxx     |   110xxxxx 10xxxxxx\r
+       12-16         |     0x0800 - 0xFFFF     |     xxxxxxxx xxxxxxxx    |   1110xxxx 10xxxxxx 10xxxxxx\r

 \r
 \r
   @param  Unicode          Unicode character need translating.\r
 \r
 \r
   @param  Unicode          Unicode character need translating.\r

diff --git a/MdeModulePkg/Universal/DebugPortDxe/DebugPort.h b/MdeModulePkg/Universal/DebugPortDxe/DebugPort.h
index 3ce702dfa46b5a1588cffbd2b2d7a717dd10cdbf..0a64ec55b9b8e91a12357b6908fd7109d9aeccd4 100644 (file)
--- a/MdeModulePkg/Universal/DebugPortDxe/DebugPort.h
+++ b/MdeModulePkg/Universal/DebugPortDxe/DebugPort.h
@@ -1,7 +1,7 @@
 /** @file\r
   Definitions and prototypes for DebugPort driver.\r
 \r
 /** @file\r
   Definitions and prototypes for DebugPort driver.\r
 \r

-Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r

 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r


@@ -83,15 +83,15 @@ typedef struct {
 #define IS_UART_DEVICEPATH(dp)           (DevicePathType (dp) == MESSAGING_DEVICE_PATH && DevicePathSubType (dp) == MSG_UART_DP)\r
 \r
 /**\r
 #define IS_UART_DEVICEPATH(dp)           (DevicePathType (dp) == MESSAGING_DEVICE_PATH && DevicePathSubType (dp) == MSG_UART_DP)\r
 \r
 /**\r

-  Debug Port Driver entry point. \r
+  Debug Port Driver entry point.\r

 \r
   Reads DebugPort variable to determine what device and settings to use as the\r
   debug port.  Binds exclusively to SerialIo. Reverts to defaults if no variable\r
   is found.\r
 \r
 \r
   Reads DebugPort variable to determine what device and settings to use as the\r
   debug port.  Binds exclusively to SerialIo. Reverts to defaults if no variable\r
   is found.\r
 \r

-  @param[in] ImageHandle       The firmware allocated handle for the EFI image.  \r
+  @param[in] ImageHandle       The firmware allocated handle for the EFI image.\r

   @param[in] SystemTable       A pointer to the EFI System Table.\r
   @param[in] SystemTable       A pointer to the EFI System Table.\r

-  \r
+\r

   @retval EFI_SUCCESS          The entry point is executed successfully.\r
   @retval EFI_OUT_OF_RESOURCES Fails to allocate memory for device.\r
   @retval other                Some error occurs when executing this entry point.\r
   @retval EFI_SUCCESS          The entry point is executed successfully.\r
   @retval EFI_OUT_OF_RESOURCES Fails to allocate memory for device.\r
   @retval other                Some error occurs when executing this entry point.\r


@@ -105,7 +105,7 @@ InitializeDebugPortDriver (
   );\r
 \r
 /**\r
   );\r
 \r
 /**\r

-  Checks to see if there's not already a DebugPort interface somewhere. \r
+  Checks to see if there's not already a DebugPort interface somewhere.\r

 \r
   If there's a DEBUGPORT variable, the device path must match exactly.  If there's\r
   no DEBUGPORT variable, then device path is not checked and does not matter.\r
 \r
   If there's a DEBUGPORT variable, the device path must match exactly.  If there's\r
   no DEBUGPORT variable, then device path is not checked and does not matter.\r


@@ -144,7 +144,7 @@ DebugPortSupported (
 \r
   @retval EFI_SUCCESS          This driver is added to ControllerHandle.\r
   @retval EFI_OUT_OF_RESOURCES Fails to allocate memory for device.\r
 \r
   @retval EFI_SUCCESS          This driver is added to ControllerHandle.\r
   @retval EFI_OUT_OF_RESOURCES Fails to allocate memory for device.\r

-  @retval others               Some error occurs.                \r
+  @retval others               Some error occurs.\r

 \r
 **/\r
 EFI_STATUS\r
 \r
 **/\r
 EFI_STATUS\r


@@ -316,7 +316,7 @@ DebugPortComponentNameGetControllerName (
 \r
   The port itself should be fine since it was set up during initialization.\r
 \r
 \r
   The port itself should be fine since it was set up during initialization.\r
 \r

-  @param  This              Protocol instance pointer.   \r
+  @param  This              Protocol instance pointer.\r

 \r
   @return EFI_SUCCESS       Always.\r
 \r
 \r
   @return EFI_SUCCESS       Always.\r
 \r


@@ -337,8 +337,8 @@ DebugPortReset (
                               On output, the amount of data actually written.\r
   @param  Buffer              Pointer to buffer to read.\r
 \r
                               On output, the amount of data actually written.\r
   @param  Buffer              Pointer to buffer to read.\r
 \r

-  @retval EFI_SUCCESS         \r
-  @retval others              \r
+  @retval EFI_SUCCESS\r
+  @retval others\r

 \r
 **/\r
 EFI_STATUS\r
 \r
 **/\r
 EFI_STATUS\r


@@ -386,7 +386,7 @@ DebugPortWrite (
                               DebugPort interface\r
   @retval EFI_DEVICE_ERROR    A hardware failure occured... (from SerialIo)\r
 \r
                               DebugPort interface\r
   @retval EFI_DEVICE_ERROR    A hardware failure occured... (from SerialIo)\r
 \r

-**/ \r
+**/\r

 EFI_STATUS\r
 EFIAPI\r
 DebugPortPoll (\r
 EFI_STATUS\r
 EFIAPI\r
 DebugPortPoll (\r

diff --git a/MdeModulePkg/Universal/DebugPortDxe/DebugPortDxeExtra.uni b/MdeModulePkg/Universal/DebugPortDxe/DebugPortDxeExtra.uni
index a1f5f32bffc40d098326eb7a77c4afaedd209bb3..1e23258cc78b3f3be157b3f14beb637fbc863d19 100644 (file)
--- a/MdeModulePkg/Universal/DebugPortDxe/DebugPortDxeExtra.uni
+++ b/MdeModulePkg/Universal/DebugPortDxe/DebugPortDxeExtra.uni
@@ -1,7 +1,7 @@
 // /** @file\r
 // DebugPortDxe Localized Strings and Content\r
 //\r
 // /** @file\r
 // DebugPortDxe Localized Strings and Content\r
 //\r

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

 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r
 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r


@@ -12,8 +12,8 @@
 //\r
 // **/\r
 \r
 //\r
 // **/\r
 \r

-#string STR_PROPERTIES_MODULE_NAME \r
-#language en-US \r
+#string STR_PROPERTIES_MODULE_NAME\r
+#language en-US\r

 "Debug Port DXE Driver"\r
 \r
 \r
 "Debug Port DXE Driver"\r
 \r
 \r

diff --git a/MdeModulePkg/Universal/DebugSupportDxe/DebugSupport.c b/MdeModulePkg/Universal/DebugSupportDxe/DebugSupport.c
index 9a8f86de10f44638ad4d4d380a5ed118d33fe87b..b7c1c5c4dd9eb96b4b5eef7d3f9991bfa266d17b 100644 (file)
--- a/MdeModulePkg/Universal/DebugSupportDxe/DebugSupport.c
+++ b/MdeModulePkg/Universal/DebugSupportDxe/DebugSupport.c
@@ -1,7 +1,7 @@
 /** @file\r
   Top level C file for debug support driver.  Contains initialization function.\r
 \r
 /** @file\r
   Top level C file for debug support driver.  Contains initialization function.\r
 \r

-Copyright (c) 2006 - 2009, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r

 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r


@@ -24,14 +24,14 @@ EFI_DEBUG_SUPPORT_PROTOCOL  mDebugSupportProtocolInterface = {
 \r
 \r
 /**\r
 \r
 \r
 /**\r

-  Debug Support Driver entry point. \r
+  Debug Support Driver entry point.\r

 \r
 \r

-  Checks to see if there's not already a Debug Support protocol installed for \r
+  Checks to see if there's not already a Debug Support protocol installed for\r

   the selected processor before installing it.\r
 \r
   the selected processor before installing it.\r
 \r

-  @param[in] ImageHandle       The firmware allocated handle for the EFI image.  \r
+  @param[in] ImageHandle       The firmware allocated handle for the EFI image.\r

   @param[in] SystemTable       A pointer to the EFI System Table.\r
   @param[in] SystemTable       A pointer to the EFI System Table.\r

-  \r
+\r

   @retval EFI_SUCCESS          The entry point is executed successfully.\r
   @retval EFI_ALREADY_STARTED  Debug Support protocol is installed already.\r
   @retval other                Some error occurs when executing this entry point.\r
   @retval EFI_SUCCESS          The entry point is executed successfully.\r
   @retval EFI_ALREADY_STARTED  Debug Support protocol is installed already.\r
   @retval other                Some error occurs when executing this entry point.\r


@@ -105,7 +105,7 @@ InitializeDebugSupportDriver (
   LoadedImageProtocolPtr->Unload = PlUnloadDebugSupportDriver;\r
 \r
   //\r
   LoadedImageProtocolPtr->Unload = PlUnloadDebugSupportDriver;\r
 \r
   //\r

-  // Call hook for processor specific initialization \r
+  // Call hook for processor specific initialization\r

   //\r
   Status = PlInitializeDebugSupportDriver ();\r
   ASSERT (!EFI_ERROR (Status));\r
   //\r
   Status = PlInitializeDebugSupportDriver ();\r
   ASSERT (!EFI_ERROR (Status));\r

diff --git a/MdeModulePkg/Universal/DebugSupportDxe/DebugSupportDxeExtra.uni b/MdeModulePkg/Universal/DebugSupportDxe/DebugSupportDxeExtra.uni
index 9e92374696d339f91eb9327d87bb0c8ebd667210..3beaa7aa72d4caad2b8c8bf07b7ad0cd68b5ced4 100644 (file)
--- a/MdeModulePkg/Universal/DebugSupportDxe/DebugSupportDxeExtra.uni
+++ b/MdeModulePkg/Universal/DebugSupportDxe/DebugSupportDxeExtra.uni
@@ -1,7 +1,7 @@
 // /** @file\r
 // DebugSupportDxe Localized Strings and Content\r
 //\r
 // /** @file\r
 // DebugSupportDxe Localized Strings and Content\r
 //\r

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

 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r
 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r


@@ -12,8 +12,8 @@
 //\r
 // **/\r
 \r
 //\r
 // **/\r
 \r

-#string STR_PROPERTIES_MODULE_NAME \r
-#language en-US \r
+#string STR_PROPERTIES_MODULE_NAME\r
+#language en-US\r

 "Debug Support DXE Driver"\r
 \r
 \r
 "Debug Support DXE Driver"\r
 \r
 \r

diff --git a/MdeModulePkg/Universal/DebugSupportDxe/Ia32/DebugSupport.h b/MdeModulePkg/Universal/DebugSupportDxe/Ia32/DebugSupport.h
index 7f7d8e5ba69e04c30de47c817f1e7eaafb327551..8e5c5b85b988e3c4472699b1522968f86d854397 100644 (file)
--- a/MdeModulePkg/Universal/DebugSupportDxe/Ia32/DebugSupport.h
+++ b/MdeModulePkg/Universal/DebugSupportDxe/Ia32/DebugSupport.h
@@ -1,14 +1,14 @@
 /** @file\r
   Generic debug support macros, typedefs and prototypes for IA32/x64.\r
 \r
 /** @file\r
   Generic debug support macros, typedefs and prototypes for IA32/x64.\r
 \r

-Copyright (c) 2006 - 2010, Intel Corporation. All rights reserved.<BR>\r
-This program and the accompanying materials                          \r
-are licensed and made available under the terms and conditions of the BSD License         \r
-which accompanies this distribution.  The full text of the license may be found at        \r
-http://opensource.org/licenses/bsd-license.php                                            \r
-                                                                                          \r
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     \r
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             \r
+Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r
+This program and the accompanying materials\r
+are licensed and made available under the terms and conditions of the BSD License\r
+which accompanies this distribution.  The full text of the license may be found at\r
+http://opensource.org/licenses/bsd-license.php\r
+\r
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r

 \r
 **/\r
 \r
 \r
 **/\r
 \r


@@ -90,8 +90,8 @@ Vect2Desc (
   );\r
 \r
 /**\r
   );\r
 \r
 /**\r

-  Initializes driver's handler registration database. \r
-  \r
+  Initializes driver's handler registration database.\r
+\r

   This code executes in boot services context\r
   Must be public because it's referenced from DebugSupport.c\r
 \r
   This code executes in boot services context\r
   Must be public because it's referenced from DebugSupport.c\r
 \r


@@ -124,14 +124,14 @@ PlUnloadDebugSupportDriver (
 \r
 /**\r
   Returns the maximum value that may be used for the ProcessorIndex parameter in\r
 \r
 /**\r
   Returns the maximum value that may be used for the ProcessorIndex parameter in\r

-  RegisterPeriodicCallback() and RegisterExceptionCallback().                   \r
-    \r
+  RegisterPeriodicCallback() and RegisterExceptionCallback().\r
+\r

   Hard coded to support only 1 processor for now.\r
 \r
   @param  This                  A pointer to the EFI_DEBUG_SUPPORT_PROTOCOL instance.\r
   @param  MaxProcessorIndex     Pointer to a caller-allocated UINTN in which the maximum supported\r
   Hard coded to support only 1 processor for now.\r
 \r
   @param  This                  A pointer to the EFI_DEBUG_SUPPORT_PROTOCOL instance.\r
   @param  MaxProcessorIndex     Pointer to a caller-allocated UINTN in which the maximum supported\r

-                                processor index is returned. Always 0 returned.                                     \r
-                                \r
+                                processor index is returned. Always 0 returned.\r
+\r

   @retval EFI_SUCCESS           Always returned with **MaxProcessorIndex set to 0.\r
 \r
 **/\r
   @retval EFI_SUCCESS           Always returned with **MaxProcessorIndex set to 0.\r
 \r
 **/\r


@@ -144,17 +144,17 @@ GetMaximumProcessorIndex (
 \r
 /**\r
   Registers a function to be called back periodically in interrupt context.\r
 \r
 /**\r
   Registers a function to be called back periodically in interrupt context.\r

-    \r
+\r

   @param  This                  A pointer to the EFI_DEBUG_SUPPORT_PROTOCOL instance.\r
   @param  ProcessorIndex        Specifies which processor the callback function applies to.\r
   @param  PeriodicCallback      A pointer to a function of type PERIODIC_CALLBACK that is the main\r
                                 periodic entry point of the debug agent.\r
   @param  This                  A pointer to the EFI_DEBUG_SUPPORT_PROTOCOL instance.\r
   @param  ProcessorIndex        Specifies which processor the callback function applies to.\r
   @param  PeriodicCallback      A pointer to a function of type PERIODIC_CALLBACK that is the main\r
                                 periodic entry point of the debug agent.\r

-                                \r
-  @retval EFI_SUCCESS           The function completed successfully.  \r
+\r
+  @retval EFI_SUCCESS           The function completed successfully.\r

   @retval EFI_ALREADY_STARTED   Non-NULL PeriodicCallback parameter when a callback\r
   @retval EFI_ALREADY_STARTED   Non-NULL PeriodicCallback parameter when a callback\r

-                                function was previously registered.                \r
-  @retval EFI_OUT_OF_RESOURCES  System has insufficient memory resources to register new callback                               \r
-                                function. \r
+                                function was previously registered.\r
+  @retval EFI_OUT_OF_RESOURCES  System has insufficient memory resources to register new callback\r
+                                function.\r

 **/\r
 EFI_STATUS\r
 EFIAPI\r
 **/\r
 EFI_STATUS\r
 EFIAPI\r


@@ -168,17 +168,17 @@ RegisterPeriodicCallback (
   Registers a function to be called when a given processor exception occurs.\r
 \r
   This code executes in boot services context.\r
   Registers a function to be called when a given processor exception occurs.\r
 \r
   This code executes in boot services context.\r

-    \r
+\r

   @param  This                  A pointer to the EFI_DEBUG_SUPPORT_PROTOCOL instance.\r
   @param  ProcessorIndex        Specifies which processor the callback function applies to.\r
   @param  ExceptionCallback     A pointer to a function of type EXCEPTION_CALLBACK that is called\r
   @param  This                  A pointer to the EFI_DEBUG_SUPPORT_PROTOCOL instance.\r
   @param  ProcessorIndex        Specifies which processor the callback function applies to.\r
   @param  ExceptionCallback     A pointer to a function of type EXCEPTION_CALLBACK that is called\r

-                                when the processor exception specified by ExceptionType occurs.  \r
-  @param  ExceptionType         Specifies which processor exception to hook.                       \r
-                                \r
-  @retval EFI_SUCCESS           The function completed successfully.  \r
+                                when the processor exception specified by ExceptionType occurs.\r
+  @param  ExceptionType         Specifies which processor exception to hook.\r
+\r
+  @retval EFI_SUCCESS           The function completed successfully.\r

   @retval EFI_ALREADY_STARTED   Non-NULL PeriodicCallback parameter when a callback\r
   @retval EFI_ALREADY_STARTED   Non-NULL PeriodicCallback parameter when a callback\r

-                                function was previously registered.                \r
-  @retval EFI_OUT_OF_RESOURCES  System has insufficient memory resources to register new callback                               \r
+                                function was previously registered.\r
+  @retval EFI_OUT_OF_RESOURCES  System has insufficient memory resources to register new callback\r

                                 function.\r
 **/\r
 EFI_STATUS\r
                                 function.\r
 **/\r
 EFI_STATUS\r


@@ -192,14 +192,14 @@ RegisterExceptionCallback (
 \r
 /**\r
   Invalidates processor instruction cache for a memory range. Subsequent execution in this range\r
 \r
 /**\r
   Invalidates processor instruction cache for a memory range. Subsequent execution in this range\r

-  causes a fresh memory fetch to retrieve code to be executed.                                  \r
-    \r
+  causes a fresh memory fetch to retrieve code to be executed.\r
+\r

   @param  This                  A pointer to the EFI_DEBUG_SUPPORT_PROTOCOL instance.\r
   @param  ProcessorIndex        Specifies which processor's instruction cache is to be invalidated.\r
   @param  This                  A pointer to the EFI_DEBUG_SUPPORT_PROTOCOL instance.\r
   @param  ProcessorIndex        Specifies which processor's instruction cache is to be invalidated.\r

-  @param  Start                 Specifies the physical base of the memory range to be invalidated.                                \r
+  @param  Start                 Specifies the physical base of the memory range to be invalidated.\r

   @param  Length                Specifies the minimum number of bytes in the processor's instruction\r
   @param  Length                Specifies the minimum number of bytes in the processor's instruction\r

-                                cache to invalidate.                                                 \r
-                                \r
+                                cache to invalidate.\r
+\r

   @retval EFI_SUCCESS           Always returned.\r
 \r
 **/\r
   @retval EFI_SUCCESS           Always returned.\r
 \r
 **/\r

diff --git a/MdeModulePkg/Universal/DebugSupportDxe/Ia32/PlDebugSupport.c b/MdeModulePkg/Universal/DebugSupportDxe/Ia32/PlDebugSupport.c
index f0c529a41beb5d395ca5832e9cee0df2e171f9af..782ce10490199bdd24bb8684a78b80ea21c66392 100644 (file)
--- a/MdeModulePkg/Universal/DebugSupportDxe/Ia32/PlDebugSupport.c
+++ b/MdeModulePkg/Universal/DebugSupportDxe/Ia32/PlDebugSupport.c
@@ -1,7 +1,7 @@
 /** @file\r
   IA32/x64 generic functions to support Debug Support protocol.\r
 \r
 /** @file\r
   IA32/x64 generic functions to support Debug Support protocol.\r
 \r

-Copyright (c) 2006 - 2010, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r

 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r


@@ -84,7 +84,7 @@ HookEntry (
   BOOLEAN     OldIntFlagState;\r
 \r
   CreateEntryStub (ExceptionType, (VOID **) &IdtEntryTable[ExceptionType].StubEntry);\r
   BOOLEAN     OldIntFlagState;\r
 \r
   CreateEntryStub (ExceptionType, (VOID **) &IdtEntryTable[ExceptionType].StubEntry);\r

-                          \r
+\r

   //\r
   // Disables CPU interrupts and returns the previous interrupt state\r
   //\r
   //\r
   // Disables CPU interrupts and returns the previous interrupt state\r
   //\r


@@ -95,12 +95,12 @@ HookEntry (
   //\r
   ReadIdtGateDescriptor (ExceptionType, &(IdtEntryTable[ExceptionType].OrigDesc));\r
   //\r
   //\r
   ReadIdtGateDescriptor (ExceptionType, &(IdtEntryTable[ExceptionType].OrigDesc));\r
   //\r

-  // stores orignal interrupt handle \r
+  // stores orignal interrupt handle\r

   //\r
   IdtEntryTable[ExceptionType].OrigVector = (DEBUG_PROC) GetInterruptHandleFromIdt (&(IdtEntryTable[ExceptionType].OrigDesc));\r
 \r
   //\r
   IdtEntryTable[ExceptionType].OrigVector = (DEBUG_PROC) GetInterruptHandleFromIdt (&(IdtEntryTable[ExceptionType].OrigDesc));\r
 \r

-  // \r
-  // encodes new IDT Gate descriptor by stub entry \r
+  //\r
+  // encodes new IDT Gate descriptor by stub entry\r

   //\r
   Vect2Desc (&IdtEntryTable[ExceptionType].NewDesc, IdtEntryTable[ExceptionType].StubEntry);\r
   //\r
   //\r
   Vect2Desc (&IdtEntryTable[ExceptionType].NewDesc, IdtEntryTable[ExceptionType].StubEntry);\r
   //\r


@@ -154,14 +154,14 @@ UnhookEntry (
 \r
 /**\r
   Returns the maximum value that may be used for the ProcessorIndex parameter in\r
 \r
 /**\r
   Returns the maximum value that may be used for the ProcessorIndex parameter in\r

-  RegisterPeriodicCallback() and RegisterExceptionCallback().                   \r
-    \r
+  RegisterPeriodicCallback() and RegisterExceptionCallback().\r
+\r

   Hard coded to support only 1 processor for now.\r
 \r
   @param  This                  A pointer to the EFI_DEBUG_SUPPORT_PROTOCOL instance.\r
   @param  MaxProcessorIndex     Pointer to a caller-allocated UINTN in which the maximum supported\r
   Hard coded to support only 1 processor for now.\r
 \r
   @param  This                  A pointer to the EFI_DEBUG_SUPPORT_PROTOCOL instance.\r
   @param  MaxProcessorIndex     Pointer to a caller-allocated UINTN in which the maximum supported\r

-                                processor index is returned. Always 0 returned.                                     \r
-                                \r
+                                processor index is returned. Always 0 returned.\r
+\r

   @retval EFI_SUCCESS           Always returned with **MaxProcessorIndex set to 0.\r
 \r
 **/\r
   @retval EFI_SUCCESS           Always returned with **MaxProcessorIndex set to 0.\r
 \r
 **/\r


@@ -178,17 +178,17 @@ GetMaximumProcessorIndex (
 \r
 /**\r
   Registers a function to be called back periodically in interrupt context.\r
 \r
 /**\r
   Registers a function to be called back periodically in interrupt context.\r

-    \r
+\r

   @param  This                  A pointer to the EFI_DEBUG_SUPPORT_PROTOCOL instance.\r
   @param  ProcessorIndex        Specifies which processor the callback function applies to.\r
   @param  PeriodicCallback      A pointer to a function of type PERIODIC_CALLBACK that is the main\r
                                 periodic entry point of the debug agent.\r
   @param  This                  A pointer to the EFI_DEBUG_SUPPORT_PROTOCOL instance.\r
   @param  ProcessorIndex        Specifies which processor the callback function applies to.\r
   @param  PeriodicCallback      A pointer to a function of type PERIODIC_CALLBACK that is the main\r
                                 periodic entry point of the debug agent.\r

-                                \r
-  @retval EFI_SUCCESS           The function completed successfully.  \r
+\r
+  @retval EFI_SUCCESS           The function completed successfully.\r

   @retval EFI_ALREADY_STARTED   Non-NULL PeriodicCallback parameter when a callback\r
   @retval EFI_ALREADY_STARTED   Non-NULL PeriodicCallback parameter when a callback\r

-                                function was previously registered.                \r
-  @retval EFI_OUT_OF_RESOURCES  System has insufficient memory resources to register new callback                               \r
-                                function. \r
+                                function was previously registered.\r
+  @retval EFI_OUT_OF_RESOURCES  System has insufficient memory resources to register new callback\r
+                                function.\r

 **/\r
 EFI_STATUS\r
 EFIAPI\r
 **/\r
 EFI_STATUS\r
 EFIAPI\r


@@ -205,17 +205,17 @@ RegisterPeriodicCallback (
   Registers a function to be called when a given processor exception occurs.\r
 \r
   This code executes in boot services context.\r
   Registers a function to be called when a given processor exception occurs.\r
 \r
   This code executes in boot services context.\r

-    \r
+\r

   @param  This                  A pointer to the EFI_DEBUG_SUPPORT_PROTOCOL instance.\r
   @param  ProcessorIndex        Specifies which processor the callback function applies to.\r
   @param  ExceptionCallback     A pointer to a function of type EXCEPTION_CALLBACK that is called\r
   @param  This                  A pointer to the EFI_DEBUG_SUPPORT_PROTOCOL instance.\r
   @param  ProcessorIndex        Specifies which processor the callback function applies to.\r
   @param  ExceptionCallback     A pointer to a function of type EXCEPTION_CALLBACK that is called\r

-                                when the processor exception specified by ExceptionType occurs.  \r
-  @param  ExceptionType         Specifies which processor exception to hook.                       \r
-                                \r
-  @retval EFI_SUCCESS           The function completed successfully.  \r
+                                when the processor exception specified by ExceptionType occurs.\r
+  @param  ExceptionType         Specifies which processor exception to hook.\r
+\r
+  @retval EFI_SUCCESS           The function completed successfully.\r

   @retval EFI_ALREADY_STARTED   Non-NULL PeriodicCallback parameter when a callback\r
   @retval EFI_ALREADY_STARTED   Non-NULL PeriodicCallback parameter when a callback\r

-                                function was previously registered.                \r
-  @retval EFI_OUT_OF_RESOURCES  System has insufficient memory resources to register new callback                               \r
+                                function was previously registered.\r
+  @retval EFI_OUT_OF_RESOURCES  System has insufficient memory resources to register new callback\r

                                 function.\r
 **/\r
 EFI_STATUS\r
                                 function.\r
 **/\r
 EFI_STATUS\r


@@ -233,14 +233,14 @@ RegisterExceptionCallback (
 \r
 /**\r
   Invalidates processor instruction cache for a memory range. Subsequent execution in this range\r
 \r
 /**\r
   Invalidates processor instruction cache for a memory range. Subsequent execution in this range\r

-  causes a fresh memory fetch to retrieve code to be executed.                                  \r
-    \r
+  causes a fresh memory fetch to retrieve code to be executed.\r
+\r

   @param  This                  A pointer to the EFI_DEBUG_SUPPORT_PROTOCOL instance.\r
   @param  ProcessorIndex        Specifies which processor's instruction cache is to be invalidated.\r
   @param  This                  A pointer to the EFI_DEBUG_SUPPORT_PROTOCOL instance.\r
   @param  ProcessorIndex        Specifies which processor's instruction cache is to be invalidated.\r

-  @param  Start                 Specifies the physical base of the memory range to be invalidated.                                \r
+  @param  Start                 Specifies the physical base of the memory range to be invalidated.\r

   @param  Length                Specifies the minimum number of bytes in the processor's instruction\r
   @param  Length                Specifies the minimum number of bytes in the processor's instruction\r

-                                cache to invalidate.                                                 \r
-                                \r
+                                cache to invalidate.\r
+\r

   @retval EFI_SUCCESS           Always returned.\r
 \r
 **/\r
   @retval EFI_SUCCESS           Always returned.\r
 \r
 **/\r


@@ -317,8 +317,8 @@ PlUnloadDebugSupportDriver (
 }\r
 \r
 /**\r
 }\r
 \r
 /**\r

-  Initializes driver's handler registration database. \r
-  \r
+  Initializes driver's handler registration database.\r
+\r

   This code executes in boot services context.\r
   Must be public because it's referenced from DebugSupport.c\r
 \r
   This code executes in boot services context.\r
   Must be public because it's referenced from DebugSupport.c\r
 \r


@@ -352,7 +352,7 @@ PlInitializeDebugSupportDriver (
     if (IdtEntryTable[ExceptionType].StubEntry == NULL) {\r
       goto ErrorCleanup;\r
     }\r
     if (IdtEntryTable[ExceptionType].StubEntry == NULL) {\r
       goto ErrorCleanup;\r
     }\r

-    \r
+\r

     //\r
     // Copy Interrupt stub code.\r
     //\r
     //\r
     // Copy Interrupt stub code.\r
     //\r

diff --git a/MdeModulePkg/Universal/DebugSupportDxe/Ia32/PlDebugSupport.h b/MdeModulePkg/Universal/DebugSupportDxe/Ia32/PlDebugSupport.h
index 0a1577fab3f80bff7fe54411bc475f4cda28114c..21373435709b38c6bc5e32ee3f79901a5d71ba72 100644 (file)
--- a/MdeModulePkg/Universal/DebugSupportDxe/Ia32/PlDebugSupport.h
+++ b/MdeModulePkg/Universal/DebugSupportDxe/Ia32/PlDebugSupport.h
@@ -1,14 +1,14 @@
 /** @file\r
   IA32 specific debug support macros, typedefs and prototypes.\r
 \r
 /** @file\r
   IA32 specific debug support macros, typedefs and prototypes.\r
 \r

-Copyright (c) 2006 - 2008, Intel Corporation. All rights reserved.<BR>\r
-This program and the accompanying materials                          \r
-are licensed and made available under the terms and conditions of the BSD License         \r
-which accompanies this distribution.  The full text of the license may be found at        \r
-http://opensource.org/licenses/bsd-license.php                                            \r
-                                                                                          \r
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     \r
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             \r
+Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r
+This program and the accompanying materials\r
+are licensed and made available under the terms and conditions of the BSD License\r
+which accompanies this distribution.  The full text of the license may be found at\r
+http://opensource.org/licenses/bsd-license.php\r
+\r
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r

 \r
 **/\r
 \r
 \r
 **/\r
 \r

diff --git a/MdeModulePkg/Universal/DebugSupportDxe/Ipf/PlDebugSupport.h b/MdeModulePkg/Universal/DebugSupportDxe/Ipf/PlDebugSupport.h
index 0cf29cadfbd60b1bc2d37758141fc9afe53e5459..1701fbff42e59ac913d39dd423b373b95c6c24e3 100644 (file)
--- a/MdeModulePkg/Universal/DebugSupportDxe/Ipf/PlDebugSupport.h
+++ b/MdeModulePkg/Universal/DebugSupportDxe/Ipf/PlDebugSupport.h
@@ -1,7 +1,7 @@
 /** @file\r
   IPF specific types, macros, and definitions for Debug Support Driver.\r
 \r
 /** @file\r
   IPF specific types, macros, and definitions for Debug Support Driver.\r
 \r

-Copyright (c) 2004 - 2010, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2004 - 2018, Intel Corporation. All rights reserved.<BR>\r

 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r


@@ -185,7 +185,7 @@ RegisterPeriodicCallback (
   @param  This                  A pointer to the EFI_DEBUG_SUPPORT_PROTOCOL instance.\r
   @param  ProcessorIndex        Specifies which processor the callback function applies to.\r
   @param  ExceptionCallback     A pointer to a function of type EXCEPTION_CALLBACK that is called\r
   @param  This                  A pointer to the EFI_DEBUG_SUPPORT_PROTOCOL instance.\r
   @param  ProcessorIndex        Specifies which processor the callback function applies to.\r
   @param  ExceptionCallback     A pointer to a function of type EXCEPTION_CALLBACK that is called\r

-                                when the processor exception specified by ExceptionType occurs.  \r
+                                when the processor exception specified by ExceptionType occurs.\r

   @param  ExceptionType         Specifies which processor exception to hook.\r
 \r
   @retval EFI_SUCCESS           The function completed successfully.\r
   @param  ExceptionType         Specifies which processor exception to hook.\r
 \r
   @retval EFI_SUCCESS           The function completed successfully.\r

diff --git a/MdeModulePkg/Universal/DebugSupportDxe/X64/PlDebugSupport.h b/MdeModulePkg/Universal/DebugSupportDxe/X64/PlDebugSupport.h
index 044e5d9d07e038f369c43ab2d68acfb28dbff76f..078c280588c0f1cff3584c6ca86cc2d875921509 100644 (file)
--- a/MdeModulePkg/Universal/DebugSupportDxe/X64/PlDebugSupport.h
+++ b/MdeModulePkg/Universal/DebugSupportDxe/X64/PlDebugSupport.h
@@ -1,14 +1,14 @@
 /** @file\r
   X64 specific debug support macros.\r
 \r
 /** @file\r
   X64 specific debug support macros.\r
 \r

-Copyright (c) 2006 - 2008, Intel Corporation. All rights reserved.<BR>\r
-This program and the accompanying materials                          \r
-are licensed and made available under the terms and conditions of the BSD License         \r
-which accompanies this distribution.  The full text of the license may be found at        \r
-http://opensource.org/licenses/bsd-license.php                                            \r
-                                                                                          \r
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     \r
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             \r
+Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r
+This program and the accompanying materials\r
+are licensed and made available under the terms and conditions of the BSD License\r
+which accompanies this distribution.  The full text of the license may be found at\r
+http://opensource.org/licenses/bsd-license.php\r
+\r
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r

 \r
 **/\r
 \r
 \r
 **/\r
 \r

diff --git a/MdeModulePkg/Universal/DevicePathDxe/DevicePathDxe.inf b/MdeModulePkg/Universal/DevicePathDxe/DevicePathDxe.inf
index ba6ed6b6d80306ad229af34dac71af4fe75afcaf..37bbe297e6e5200d873c3b4c0992bc0ffb1afc6c 100644 (file)
--- a/MdeModulePkg/Universal/DevicePathDxe/DevicePathDxe.inf
+++ b/MdeModulePkg/Universal/DevicePathDxe/DevicePathDxe.inf
@@ -6,7 +6,7 @@
 #  PcdDevicePathSupportDevicePathToText & PcdDevicePathSupportDevicePathFromText\r
 #  respectively.\r
 #\r
 #  PcdDevicePathSupportDevicePathToText & PcdDevicePathSupportDevicePathFromText\r
 #  respectively.\r
 #\r

-#  Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.<BR>\r
+#  Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r

 #  This program and the accompanying materials\r
 #  are licensed and made available under the terms and conditions of the BSD License\r
 #  which accompanies this distribution.  The full text of the license may be found at\r
 #  This program and the accompanying materials\r
 #  are licensed and made available under the terms and conditions of the BSD License\r
 #  which accompanies this distribution.  The full text of the license may be found at\r


@@ -43,7 +43,7 @@
   DevicePathLib\r
   UefiBootServicesTableLib\r
   UefiDriverEntryPoint\r
   DevicePathLib\r
   UefiBootServicesTableLib\r
   UefiDriverEntryPoint\r

-  \r
+\r

 [Protocols]\r
   gEfiDevicePathToTextProtocolGuid   | gEfiMdeModulePkgTokenSpaceGuid.PcdDevicePathSupportDevicePathFromText ## SOMETIMES_PRODUCES\r
   gEfiDevicePathFromTextProtocolGuid | gEfiMdeModulePkgTokenSpaceGuid.PcdDevicePathSupportDevicePathToText ## SOMETIMES_PRODUCES\r
 [Protocols]\r
   gEfiDevicePathToTextProtocolGuid   | gEfiMdeModulePkgTokenSpaceGuid.PcdDevicePathSupportDevicePathFromText ## SOMETIMES_PRODUCES\r
   gEfiDevicePathFromTextProtocolGuid | gEfiMdeModulePkgTokenSpaceGuid.PcdDevicePathSupportDevicePathToText ## SOMETIMES_PRODUCES\r

diff --git a/MdeModulePkg/Universal/DevicePathDxe/DevicePathDxe.uni b/MdeModulePkg/Universal/DevicePathDxe/DevicePathDxe.uni
index 0f485742f5d61ecadd22f25dd31a7d0bdf31c813..249f5df1141593e33557e1577e47c00caa6e462c 100644 (file)
--- a/MdeModulePkg/Universal/DevicePathDxe/DevicePathDxe.uni
+++ b/MdeModulePkg/Universal/DevicePathDxe/DevicePathDxe.uni
@@ -6,13 +6,13 @@
 // PcdDevicePathSupportDevicePathToText & PcdDevicePathSupportDevicePathFromText\r
 // respectively.\r
 //\r
 // PcdDevicePathSupportDevicePathToText & PcdDevicePathSupportDevicePathFromText\r
 // respectively.\r
 //\r

-// Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.<BR>\r
+// Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r

 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r
 // which accompanies this distribution.  The full text of the license may be found at\r
 // http://opensource.org/licenses/bsd-license.php\r
 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r
 // which accompanies this distribution.  The full text of the license may be found at\r
 // http://opensource.org/licenses/bsd-license.php\r

-// \r
+//\r

 // THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 // WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 //\r
 // THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 // WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 //\r

diff --git a/MdeModulePkg/Universal/DevicePathDxe/DevicePathDxeExtra.uni b/MdeModulePkg/Universal/DevicePathDxe/DevicePathDxeExtra.uni
index 8ac8e3491b07577eb00d2da67b4c4fc600b1b193..04729f641af3360468baf4bc9b68e322b0b929e3 100644 (file)
--- a/MdeModulePkg/Universal/DevicePathDxe/DevicePathDxeExtra.uni
+++ b/MdeModulePkg/Universal/DevicePathDxe/DevicePathDxeExtra.uni
@@ -1,7 +1,7 @@
 // /** @file\r
 // DevicePathDxe Localized Strings and Content\r
 //\r
 // /** @file\r
 // DevicePathDxe Localized Strings and Content\r
 //\r

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

 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r
 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r


@@ -13,8 +13,8 @@
 //\r
 // **/\r
 \r
 //\r
 // **/\r
 \r

-#string STR_PROPERTIES_MODULE_NAME \r
-#language en-US \r
+#string STR_PROPERTIES_MODULE_NAME\r
+#language en-US\r

 "UEFI Device Path DXE Driver"\r
 \r
 \r
 "UEFI Device Path DXE Driver"\r
 \r
 \r

diff --git a/MdeModulePkg/Universal/Disk/CdExpressPei/CdExpressPei.inf b/MdeModulePkg/Universal/Disk/CdExpressPei/CdExpressPei.inf
index facad470ef508923f55b2ee7529362a01f06241c..e9ddecf967d843cf404d895ccf505e31df44bead 100644 (file)
--- a/MdeModulePkg/Universal/Disk/CdExpressPei/CdExpressPei.inf
+++ b/MdeModulePkg/Universal/Disk/CdExpressPei/CdExpressPei.inf
@@ -1,11 +1,11 @@
 ## @file\r
 # PeiCdExpress recovery module.\r
 #\r
 ## @file\r
 # PeiCdExpress recovery module.\r
 #\r

-# This module reads data from CDROM device by all installed block IO ppi and \r
+# This module reads data from CDROM device by all installed block IO ppi and\r

 # finds whether there is Recovery data in the device. If it finds recovery\r
 # data, it will install Device Recovery Module PPI.\r
 #\r
 # finds whether there is Recovery data in the device. If it finds recovery\r
 # data, it will install Device Recovery Module PPI.\r
 #\r

-# Copyright (c) 2006 - 2016, Intel Corporation. All rights reserved.<BR>\r
+# Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r

 #\r
 # This program and the accompanying materials\r
 # are licensed and made available under the terms and conditions\r
 #\r
 # This program and the accompanying materials\r
 # are licensed and made available under the terms and conditions\r

diff --git a/MdeModulePkg/Universal/Disk/CdExpressPei/CdExpressPei.uni b/MdeModulePkg/Universal/Disk/CdExpressPei/CdExpressPei.uni
index 7b17af011c3195d3baabfeddadfe1a9df985891b..71f0acc3e91b7253ffaf841aa96c719e9dbe92ba 100644 (file)
--- a/MdeModulePkg/Universal/Disk/CdExpressPei/CdExpressPei.uni
+++ b/MdeModulePkg/Universal/Disk/CdExpressPei/CdExpressPei.uni
@@ -5,14 +5,14 @@
 // finds whether there is Recovery data in the device. If it finds recovery\r
 // data, it will install Device Recovery Module PPI.\r
 //\r
 // finds whether there is Recovery data in the device. If it finds recovery\r
 // data, it will install Device Recovery Module PPI.\r
 //\r

-// Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.<BR>\r
+// Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r

 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions\r
 // of the BSD License which accompanies this distribution.  The\r
 // full text of the license may be found at\r
 // http://opensource.org/licenses/bsd-license.php\r
 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions\r
 // of the BSD License which accompanies this distribution.  The\r
 // full text of the license may be found at\r
 // http://opensource.org/licenses/bsd-license.php\r

-// \r
+//\r

 // THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 // WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 //\r
 // THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 // WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 //\r

diff --git a/MdeModulePkg/Universal/Disk/CdExpressPei/CdExpressPeiExtra.uni b/MdeModulePkg/Universal/Disk/CdExpressPei/CdExpressPeiExtra.uni
index 47244c8813d6a5a2d71dc0e50da6959d7b078228..528ed1ec3280d5887a85cfe52cbc86f7812e52d0 100644 (file)
--- a/MdeModulePkg/Universal/Disk/CdExpressPei/CdExpressPeiExtra.uni
+++ b/MdeModulePkg/Universal/Disk/CdExpressPei/CdExpressPeiExtra.uni
@@ -1,7 +1,7 @@
 // /** @file\r
 // CdExpressPei Localized Strings and Content\r
 //\r
 // /** @file\r
 // CdExpressPei Localized Strings and Content\r
 //\r

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

 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions\r
 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions\r


@@ -14,8 +14,8 @@
 //\r
 // **/\r
 \r
 //\r
 // **/\r
 \r

-#string STR_PROPERTIES_MODULE_NAME \r
-#language en-US \r
+#string STR_PROPERTIES_MODULE_NAME\r
+#language en-US\r

 "CD PEI Module for Recovery"\r
 \r
 \r
 "CD PEI Module for Recovery"\r
 \r
 \r

diff --git a/MdeModulePkg/Universal/Disk/CdExpressPei/PeiCdExpress.c b/MdeModulePkg/Universal/Disk/CdExpressPei/PeiCdExpress.c
index d3cbfaa2b1e58d0e97ebe6ae9bc24b13b0c6dc31..76e5e1685dc6925f7b5fae5840b3f8266965a85f 100644 (file)
--- a/MdeModulePkg/Universal/Disk/CdExpressPei/PeiCdExpress.c
+++ b/MdeModulePkg/Universal/Disk/CdExpressPei/PeiCdExpress.c
@@ -1,7 +1,7 @@
 /** @file\r
   Source file for CD recovery PEIM\r
 \r
 /** @file\r
   Source file for CD recovery PEIM\r
 \r

-Copyright (c) 2006 - 2016, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r

 \r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions\r
 \r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions\r


@@ -21,7 +21,7 @@ CHAR8 *mRecoveryFileName;
 UINTN mRecoveryFileNameSize;\r
 \r
 /**\r
 UINTN mRecoveryFileNameSize;\r
 \r
 /**\r

-  Installs the Device Recovery Module PPI, Initialize BlockIo Ppi \r
+  Installs the Device Recovery Module PPI, Initialize BlockIo Ppi\r

   installation notification\r
 \r
   @param  FileHandle            The file handle of the image.\r
   installation notification\r
 \r
   @param  FileHandle            The file handle of the image.\r


@@ -118,8 +118,8 @@ CdExpressPeimEntry (
 }\r
 \r
 /**\r
 }\r
 \r
 /**\r

-  BlockIo installation notification function. \r
-  \r
+  BlockIo installation notification function.\r
+\r

   This function finds out all the current Block IO PPIs in the system and add them\r
   into private data.\r
 \r
   This function finds out all the current Block IO PPIs in the system and add them\r
   into private data.\r
 \r


@@ -275,7 +275,7 @@ UpdateBlocksAndVolumes (
       if (EFI_ERROR (Status)) {\r
         continue;\r
       }\r
       if (EFI_ERROR (Status)) {\r
         continue;\r
       }\r

-  \r
+\r

       PrivateData->CapsuleCount++;\r
     }\r
 \r
       PrivateData->CapsuleCount++;\r
     }\r
 \r


@@ -411,7 +411,7 @@ FindRecoveryCapsules (
 \r
   @retval EFI_SUCCESS                   The recovery capsule is successfully found in the volume.\r
   @retval EFI_NOT_FOUND                 The recovery capsule is not found in the volume.\r
 \r
   @retval EFI_SUCCESS                   The recovery capsule is successfully found in the volume.\r
   @retval EFI_NOT_FOUND                 The recovery capsule is not found in the volume.\r

-  @retval Others                        \r
+  @retval Others\r

 \r
 **/\r
 EFI_STATUS\r
 \r
 **/\r
 EFI_STATUS\r


@@ -508,18 +508,18 @@ RetrieveCapsuleFileFromRoot (
   Returns the number of DXE capsules residing on the device.\r
 \r
   This function searches for DXE capsules from the associated device and returns\r
   Returns the number of DXE capsules residing on the device.\r
 \r
   This function searches for DXE capsules from the associated device and returns\r

-  the number and maximum size in bytes of the capsules discovered. Entry 1 is \r
-  assumed to be the highest load priority and entry N is assumed to be the lowest \r
+  the number and maximum size in bytes of the capsules discovered. Entry 1 is\r
+  assumed to be the highest load priority and entry N is assumed to be the lowest\r

   priority.\r
 \r
   priority.\r
 \r

-  @param[in]  PeiServices              General-purpose services that are available \r
+  @param[in]  PeiServices              General-purpose services that are available\r

                                        to every PEIM\r
   @param[in]  This                     Indicates the EFI_PEI_DEVICE_RECOVERY_MODULE_PPI\r
                                        instance.\r
                                        to every PEIM\r
   @param[in]  This                     Indicates the EFI_PEI_DEVICE_RECOVERY_MODULE_PPI\r
                                        instance.\r

-  @param[out] NumberRecoveryCapsules   Pointer to a caller-allocated UINTN. On \r
-                                       output, *NumberRecoveryCapsules contains \r
-                                       the number of recovery capsule images \r
-                                       available for retrieval from this PEIM \r
+  @param[out] NumberRecoveryCapsules   Pointer to a caller-allocated UINTN. On\r
+                                       output, *NumberRecoveryCapsules contains\r
+                                       the number of recovery capsule images\r
+                                       available for retrieval from this PEIM\r

                                        instance.\r
 \r
   @retval EFI_SUCCESS        One or more capsules were discovered.\r
                                        instance.\r
 \r
   @retval EFI_SUCCESS        One or more capsules were discovered.\r


@@ -555,18 +555,18 @@ GetNumberRecoveryCapsules (
   This function gets the size and type of the capsule specified by CapsuleInstance.\r
 \r
   @param[in]  PeiServices       General-purpose services that are available to every PEIM\r
   This function gets the size and type of the capsule specified by CapsuleInstance.\r
 \r
   @param[in]  PeiServices       General-purpose services that are available to every PEIM\r

-  @param[in]  This              Indicates the EFI_PEI_DEVICE_RECOVERY_MODULE_PPI \r
+  @param[in]  This              Indicates the EFI_PEI_DEVICE_RECOVERY_MODULE_PPI\r

                                 instance.\r
                                 instance.\r

-  @param[in]  CapsuleInstance   Specifies for which capsule instance to retrieve \r
-                                the information.  This parameter must be between \r
-                                one and the value returned by GetNumberRecoveryCapsules() \r
+  @param[in]  CapsuleInstance   Specifies for which capsule instance to retrieve\r
+                                the information.  This parameter must be between\r
+                                one and the value returned by GetNumberRecoveryCapsules()\r

                                 in NumberRecoveryCapsules.\r
                                 in NumberRecoveryCapsules.\r

-  @param[out] Size              A pointer to a caller-allocated UINTN in which \r
-                                the size of the requested recovery module is \r
+  @param[out] Size              A pointer to a caller-allocated UINTN in which\r
+                                the size of the requested recovery module is\r

                                 returned.\r
                                 returned.\r

-  @param[out] CapsuleType       A pointer to a caller-allocated EFI_GUID in which \r
-                                the type of the requested recovery capsule is \r
-                                returned.  The semantic meaning of the value \r
+  @param[out] CapsuleType       A pointer to a caller-allocated EFI_GUID in which\r
+                                the type of the requested recovery capsule is\r
+                                returned.  The semantic meaning of the value\r

                                 returned is defined by the implementation.\r
 \r
   @retval EFI_SUCCESS        One or more capsules were discovered.\r
                                 returned is defined by the implementation.\r
 \r
   @retval EFI_SUCCESS        One or more capsules were discovered.\r


@@ -620,12 +620,12 @@ GetRecoveryCapsuleInfo (
   This function, by whatever mechanism, retrieves a DXE capsule from some device\r
   and loads it into memory. Note that the published interface is device neutral.\r
 \r
   This function, by whatever mechanism, retrieves a DXE capsule from some device\r
   and loads it into memory. Note that the published interface is device neutral.\r
 \r

-  @param[in]     PeiServices       General-purpose services that are available \r
+  @param[in]     PeiServices       General-purpose services that are available\r

                                    to every PEIM\r
   @param[in]     This              Indicates the EFI_PEI_DEVICE_RECOVERY_MODULE_PPI\r
                                    instance.\r
   @param[in]     CapsuleInstance   Specifies which capsule instance to retrieve.\r
                                    to every PEIM\r
   @param[in]     This              Indicates the EFI_PEI_DEVICE_RECOVERY_MODULE_PPI\r
                                    instance.\r
   @param[in]     CapsuleInstance   Specifies which capsule instance to retrieve.\r

-  @param[out]    Buffer            Specifies a caller-allocated buffer in which \r
+  @param[out]    Buffer            Specifies a caller-allocated buffer in which\r

                                    the requested recovery capsule will be returned.\r
 \r
   @retval EFI_SUCCESS        The capsule was loaded correctly.\r
                                    the requested recovery capsule will be returned.\r
 \r
   @retval EFI_SUCCESS        The capsule was loaded correctly.\r

diff --git a/MdeModulePkg/Universal/Disk/CdExpressPei/PeiCdExpress.h b/MdeModulePkg/Universal/Disk/CdExpressPei/PeiCdExpress.h
index 1c8843cfc499760686d4d5bdc9bc84764ced307f..681c1ffcc79664f130c1228612852419cc3e7e6b 100644 (file)
--- a/MdeModulePkg/Universal/Disk/CdExpressPei/PeiCdExpress.h
+++ b/MdeModulePkg/Universal/Disk/CdExpressPei/PeiCdExpress.h
@@ -1,7 +1,7 @@
 /** @file\r
   Header file for CD recovery PEIM\r
 \r
 /** @file\r
   Header file for CD recovery PEIM\r
 \r

-Copyright (c) 2006 - 2016, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r

 \r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions\r
 \r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions\r


@@ -105,8 +105,8 @@ typedef struct {
 } PEI_CD_EXPRESS_DIR_FILE_RECORD;\r
 \r
 /**\r
 } PEI_CD_EXPRESS_DIR_FILE_RECORD;\r
 \r
 /**\r

-  BlockIo installation notification function. \r
-  \r
+  BlockIo installation notification function.\r
+\r

   This function finds out all the current Block IO PPIs in the system and add them\r
   into private data.\r
 \r
   This function finds out all the current Block IO PPIs in the system and add them\r
   into private data.\r
 \r


@@ -144,18 +144,18 @@ UpdateBlocksAndVolumes (
   Returns the number of DXE capsules residing on the device.\r
 \r
   This function searches for DXE capsules from the associated device and returns\r
   Returns the number of DXE capsules residing on the device.\r
 \r
   This function searches for DXE capsules from the associated device and returns\r

-  the number and maximum size in bytes of the capsules discovered. Entry 1 is \r
-  assumed to be the highest load priority and entry N is assumed to be the lowest \r
+  the number and maximum size in bytes of the capsules discovered. Entry 1 is\r
+  assumed to be the highest load priority and entry N is assumed to be the lowest\r

   priority.\r
 \r
   priority.\r
 \r

-  @param[in]  PeiServices              General-purpose services that are available \r
+  @param[in]  PeiServices              General-purpose services that are available\r

                                        to every PEIM\r
   @param[in]  This                     Indicates the EFI_PEI_DEVICE_RECOVERY_MODULE_PPI\r
                                        instance.\r
                                        to every PEIM\r
   @param[in]  This                     Indicates the EFI_PEI_DEVICE_RECOVERY_MODULE_PPI\r
                                        instance.\r

-  @param[out] NumberRecoveryCapsules   Pointer to a caller-allocated UINTN. On \r
-                                       output, *NumberRecoveryCapsules contains \r
-                                       the number of recovery capsule images \r
-                                       available for retrieval from this PEIM \r
+  @param[out] NumberRecoveryCapsules   Pointer to a caller-allocated UINTN. On\r
+                                       output, *NumberRecoveryCapsules contains\r
+                                       the number of recovery capsule images\r
+                                       available for retrieval from this PEIM\r

                                        instance.\r
 \r
   @retval EFI_SUCCESS        One or more capsules were discovered.\r
                                        instance.\r
 \r
   @retval EFI_SUCCESS        One or more capsules were discovered.\r


@@ -177,18 +177,18 @@ GetNumberRecoveryCapsules (
   This function gets the size and type of the capsule specified by CapsuleInstance.\r
 \r
   @param[in]  PeiServices       General-purpose services that are available to every PEIM\r
   This function gets the size and type of the capsule specified by CapsuleInstance.\r
 \r
   @param[in]  PeiServices       General-purpose services that are available to every PEIM\r

-  @param[in]  This              Indicates the EFI_PEI_DEVICE_RECOVERY_MODULE_PPI \r
+  @param[in]  This              Indicates the EFI_PEI_DEVICE_RECOVERY_MODULE_PPI\r

                                 instance.\r
                                 instance.\r

-  @param[in]  CapsuleInstance   Specifies for which capsule instance to retrieve \r
-                                the information.  This parameter must be between \r
-                                one and the value returned by GetNumberRecoveryCapsules() \r
+  @param[in]  CapsuleInstance   Specifies for which capsule instance to retrieve\r
+                                the information.  This parameter must be between\r
+                                one and the value returned by GetNumberRecoveryCapsules()\r

                                 in NumberRecoveryCapsules.\r
                                 in NumberRecoveryCapsules.\r

-  @param[out] Size              A pointer to a caller-allocated UINTN in which \r
-                                the size of the requested recovery module is \r
+  @param[out] Size              A pointer to a caller-allocated UINTN in which\r
+                                the size of the requested recovery module is\r

                                 returned.\r
                                 returned.\r

-  @param[out] CapsuleType       A pointer to a caller-allocated EFI_GUID in which \r
-                                the type of the requested recovery capsule is \r
-                                returned.  The semantic meaning of the value \r
+  @param[out] CapsuleType       A pointer to a caller-allocated EFI_GUID in which\r
+                                the type of the requested recovery capsule is\r
+                                returned.  The semantic meaning of the value\r

                                 returned is defined by the implementation.\r
 \r
   @retval EFI_SUCCESS        One or more capsules were discovered.\r
                                 returned is defined by the implementation.\r
 \r
   @retval EFI_SUCCESS        One or more capsules were discovered.\r


@@ -212,12 +212,12 @@ GetRecoveryCapsuleInfo (
   This function, by whatever mechanism, retrieves a DXE capsule from some device\r
   and loads it into memory. Note that the published interface is device neutral.\r
 \r
   This function, by whatever mechanism, retrieves a DXE capsule from some device\r
   and loads it into memory. Note that the published interface is device neutral.\r
 \r

-  @param[in]     PeiServices       General-purpose services that are available \r
+  @param[in]     PeiServices       General-purpose services that are available\r

                                    to every PEIM\r
   @param[in]     This              Indicates the EFI_PEI_DEVICE_RECOVERY_MODULE_PPI\r
                                    instance.\r
   @param[in]     CapsuleInstance   Specifies which capsule instance to retrieve.\r
                                    to every PEIM\r
   @param[in]     This              Indicates the EFI_PEI_DEVICE_RECOVERY_MODULE_PPI\r
                                    instance.\r
   @param[in]     CapsuleInstance   Specifies which capsule instance to retrieve.\r

-  @param[out]    Buffer            Specifies a caller-allocated buffer in which \r
+  @param[out]    Buffer            Specifies a caller-allocated buffer in which\r

                                    the requested recovery capsule will be returned.\r
 \r
   @retval EFI_SUCCESS        The capsule was loaded correctly.\r
                                    the requested recovery capsule will be returned.\r
 \r
   @retval EFI_SUCCESS        The capsule was loaded correctly.\r


@@ -260,7 +260,7 @@ FindRecoveryCapsules (
 \r
   @retval EFI_SUCCESS                   The recovery capsule is successfully found in the volume.\r
   @retval EFI_NOT_FOUND                 The recovery capsule is not found in the volume.\r
 \r
   @retval EFI_SUCCESS                   The recovery capsule is successfully found in the volume.\r
   @retval EFI_NOT_FOUND                 The recovery capsule is not found in the volume.\r

-  @retval Others                        \r
+  @retval Others\r

 \r
 **/\r
 EFI_STATUS\r
 \r
 **/\r
 EFI_STATUS\r

diff --git a/MdeModulePkg/Universal/Disk/DiskIoDxe/DiskIo.c b/MdeModulePkg/Universal/Disk/DiskIoDxe/DiskIo.c
index b8bde2a25e16086a210e418ccb984b26dff80f63..157e1b6d0ed95f424faaa10de83ecf28691bb8de 100644 (file)
--- a/MdeModulePkg/Universal/Disk/DiskIoDxe/DiskIo.c
+++ b/MdeModulePkg/Universal/Disk/DiskIoDxe/DiskIo.c
@@ -9,7 +9,7 @@
     Aligned  - A read of N contiguous sectors.\r
     OverRun  - The last byte is not on a sector boundary.\r
 \r
     Aligned  - A read of N contiguous sectors.\r
     OverRun  - The last byte is not on a sector boundary.\r
 \r

-Copyright (c) 2006 - 2016, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r

 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r


@@ -55,7 +55,7 @@ DISK_IO_PRIVATE_DATA        gDiskIoPrivateDataTemplate = {
 };\r
 \r
 /**\r
 };\r
 \r
 /**\r

-  Test to see if this driver supports ControllerHandle. \r
+  Test to see if this driver supports ControllerHandle.\r

 \r
   @param  This                Protocol instance pointer.\r
   @param  ControllerHandle    Handle of device to test\r
 \r
   @param  This                Protocol instance pointer.\r
   @param  ControllerHandle    Handle of device to test\r


@@ -162,7 +162,7 @@ DiskIoDriverBindingStart (
   if (EFI_ERROR (Status)) {\r
     gDiskIoPrivateDataTemplate.BlockIo2 = NULL;\r
   }\r
   if (EFI_ERROR (Status)) {\r
     gDiskIoPrivateDataTemplate.BlockIo2 = NULL;\r
   }\r

-  \r
+\r

   //\r
   // Initialize the Disk IO device instance.\r
   //\r
   //\r
   // Initialize the Disk IO device instance.\r
   //\r


@@ -171,15 +171,15 @@ DiskIoDriverBindingStart (
     Status = EFI_OUT_OF_RESOURCES;\r
     goto ErrorExit;\r
   }\r
     Status = EFI_OUT_OF_RESOURCES;\r
     goto ErrorExit;\r
   }\r

-  \r
+\r

   //\r
   // The BlockSize and IoAlign of BlockIo and BlockIo2 should equal.\r
   //\r
   ASSERT ((Instance->BlockIo2 == NULL) ||\r
   //\r
   // The BlockSize and IoAlign of BlockIo and BlockIo2 should equal.\r
   //\r
   ASSERT ((Instance->BlockIo2 == NULL) ||\r

-          ((Instance->BlockIo->Media->IoAlign == Instance->BlockIo2->Media->IoAlign) && \r
+          ((Instance->BlockIo->Media->IoAlign == Instance->BlockIo2->Media->IoAlign) &&\r

            (Instance->BlockIo->Media->BlockSize == Instance->BlockIo2->Media->BlockSize)\r
           ));\r
            (Instance->BlockIo->Media->BlockSize == Instance->BlockIo2->Media->BlockSize)\r
           ));\r

-  \r
+\r

   InitializeListHead (&Instance->TaskQueue);\r
   EfiInitializeLock (&Instance->TaskQueueLock, TPL_NOTIFY);\r
   Instance->SharedWorkingBuffer = AllocateAlignedPages (\r
   InitializeListHead (&Instance->TaskQueue);\r
   EfiInitializeLock (&Instance->TaskQueueLock, TPL_NOTIFY);\r
   Instance->SharedWorkingBuffer = AllocateAlignedPages (\r


@@ -289,7 +289,7 @@ DiskIoDriverBindingStop (
   if (EFI_ERROR (Status)) {\r
     DiskIo2 = NULL;\r
   }\r
   if (EFI_ERROR (Status)) {\r
     DiskIo2 = NULL;\r
   }\r

-  \r
+\r

   Instance = DISK_IO_PRIVATE_DATA_FROM_DISK_IO (DiskIo);\r
 \r
   if (DiskIo2 != NULL) {\r
   Instance = DISK_IO_PRIVATE_DATA_FROM_DISK_IO (DiskIo);\r
 \r
   if (DiskIo2 != NULL) {\r


@@ -315,7 +315,7 @@ DiskIoDriverBindingStop (
                     );\r
   }\r
   if (!EFI_ERROR (Status)) {\r
                     );\r
   }\r
   if (!EFI_ERROR (Status)) {\r

-    \r
+\r

     do {\r
       EfiAcquireLock (&Instance->TaskQueueLock);\r
       AllTaskDone = IsListEmpty (&Instance->TaskQueue);\r
     do {\r
       EfiAcquireLock (&Instance->TaskQueueLock);\r
       AllTaskDone = IsListEmpty (&Instance->TaskQueue);\r


@@ -343,7 +343,7 @@ DiskIoDriverBindingStop (
                       );\r
       ASSERT_EFI_ERROR (Status);\r
     }\r
                       );\r
       ASSERT_EFI_ERROR (Status);\r
     }\r

-    \r
+\r

     FreePool (Instance);\r
   }\r
 \r
     FreePool (Instance);\r
   }\r
 \r


@@ -378,7 +378,7 @@ DiskIoDestroySubtask (
   if (!Subtask->Blocking) {\r
     if (Subtask->WorkingBuffer != NULL) {\r
       FreeAlignedPages (\r
   if (!Subtask->Blocking) {\r
     if (Subtask->WorkingBuffer != NULL) {\r
       FreeAlignedPages (\r

-        Subtask->WorkingBuffer, \r
+        Subtask->WorkingBuffer,\r

         Subtask->Length < Instance->BlockIo->Media->BlockSize\r
         ? EFI_SIZE_TO_PAGES (Instance->BlockIo->Media->BlockSize)\r
         : EFI_SIZE_TO_PAGES (Subtask->Length)\r
         Subtask->Length < Instance->BlockIo->Media->BlockSize\r
         ? EFI_SIZE_TO_PAGES (Instance->BlockIo->Media->BlockSize)\r
         : EFI_SIZE_TO_PAGES (Subtask->Length)\r


@@ -420,7 +420,7 @@ DiskIo2OnReadWriteComplete (
   ASSERT (Instance->Signature == DISK_IO_PRIVATE_DATA_SIGNATURE);\r
   ASSERT (Task->Signature     == DISK_IO2_TASK_SIGNATURE);\r
 \r
   ASSERT (Instance->Signature == DISK_IO_PRIVATE_DATA_SIGNATURE);\r
   ASSERT (Task->Signature     == DISK_IO2_TASK_SIGNATURE);\r
 \r

-  if ((Subtask->WorkingBuffer != NULL) && !EFI_ERROR (TransactionStatus) && \r
+  if ((Subtask->WorkingBuffer != NULL) && !EFI_ERROR (TransactionStatus) &&\r

       (Task->Token != NULL) && !Subtask->Write\r
      ) {\r
     CopyMem (Subtask->Buffer, Subtask->WorkingBuffer + Subtask->Offset, Subtask->Length);\r
       (Task->Token != NULL) && !Subtask->Write\r
      ) {\r
     CopyMem (Subtask->Buffer, Subtask->WorkingBuffer + Subtask->Offset, Subtask->Length);\r


@@ -498,7 +498,7 @@ DiskIoCreateSubtask (
     }\r
   }\r
   DEBUG ((\r
     }\r
   }\r
   DEBUG ((\r

-    EFI_D_BLKIO, \r
+    EFI_D_BLKIO,\r

     "  %c:Lba/Offset/Length/WorkingBuffer/Buffer = %016lx/%08x/%08x/%08x/%08x\n",\r
     Write ? 'W': 'R', Lba, Offset, Length, WorkingBuffer, Buffer\r
     ));\r
     "  %c:Lba/Offset/Length/WorkingBuffer/Buffer = %016lx/%08x/%08x/%08x/%08x\n",\r
     Write ? 'W': 'R', Lba, Offset, Length, WorkingBuffer, Buffer\r
     ));\r


@@ -553,7 +553,7 @@ DiskIoCreateSubtaskList (
   if (IoAlign == 0) {\r
     IoAlign = 1;\r
   }\r
   if (IoAlign == 0) {\r
     IoAlign = 1;\r
   }\r

-  \r
+\r

   Lba       = DivU64x32Remainder (Offset, BlockSize, &UnderRun);\r
   BufferPtr = (UINT8 *) Buffer;\r
 \r
   Lba       = DivU64x32Remainder (Offset, BlockSize, &UnderRun);\r
   BufferPtr = (UINT8 *) Buffer;\r
 \r


@@ -596,7 +596,7 @@ DiskIoCreateSubtaskList (
       goto Done;\r
     }\r
     InsertTailList (Subtasks, &Subtask->Link);\r
       goto Done;\r
     }\r
     InsertTailList (Subtasks, &Subtask->Link);\r

-  \r
+\r

     BufferPtr  += Length;\r
     Offset     += Length;\r
     BufferSize -= Length;\r
     BufferPtr  += Length;\r
     Offset     += Length;\r
     BufferSize -= Length;\r


@@ -633,7 +633,7 @@ DiskIoCreateSubtaskList (
     }\r
     InsertTailList (Subtasks, &Subtask->Link);\r
   }\r
     }\r
     InsertTailList (Subtasks, &Subtask->Link);\r
   }\r

-  \r
+\r

   if (OverRunLba > Lba) {\r
     //\r
     // If the DiskIo maps directly to a BlockIo device do the read.\r
   if (OverRunLba > Lba) {\r
     //\r
     // If the DiskIo maps directly to a BlockIo device do the read.\r


@@ -726,7 +726,7 @@ DiskIo2Cancel (
   DISK_IO_PRIVATE_DATA  *Instance;\r
   DISK_IO2_TASK         *Task;\r
   LIST_ENTRY            *Link;\r
   DISK_IO_PRIVATE_DATA  *Instance;\r
   DISK_IO2_TASK         *Task;\r
   LIST_ENTRY            *Link;\r

-  \r
+\r

   Instance = DISK_IO_PRIVATE_DATA_FROM_DISK_IO2 (This);\r
 \r
   EfiAcquireLock (&Instance->TaskQueueLock);\r
   Instance = DISK_IO_PRIVATE_DATA_FROM_DISK_IO2 (This);\r
 \r
   EfiAcquireLock (&Instance->TaskQueueLock);\r


@@ -799,7 +799,7 @@ DiskIo2RemoveCompletedTask (
                      If this field is NULL, synchronous/blocking IO is performed.\r
   @param  BufferSize            The size in bytes of Buffer. The number of bytes to read from the device.\r
   @param  Buffer                A pointer to the destination buffer for the data.\r
                      If this field is NULL, synchronous/blocking IO is performed.\r
   @param  BufferSize            The size in bytes of Buffer. The number of bytes to read from the device.\r
   @param  Buffer                A pointer to the destination buffer for the data.\r

-                                The caller is responsible either having implicit or explicit ownership of the buffer. \r
+                                The caller is responsible either having implicit or explicit ownership of the buffer.\r

 **/\r
 EFI_STATUS\r
 DiskIo2ReadWriteDisk (\r
 **/\r
 EFI_STATUS\r
 DiskIo2ReadWriteDisk (\r


@@ -948,7 +948,7 @@ DiskIo2ReadWriteDisk (
       break;\r
     }\r
   }\r
       break;\r
     }\r
   }\r

-  \r
+\r

   gBS->RaiseTPL (TPL_NOTIFY);\r
 \r
   //\r
   gBS->RaiseTPL (TPL_NOTIFY);\r
 \r
   //\r


@@ -1235,9 +1235,9 @@ DiskIoWriteDisk (
 /**\r
   The user Entry Point for module DiskIo. The user code starts with this function.\r
 \r
 /**\r
   The user Entry Point for module DiskIo. The user code starts with this function.\r
 \r

-  @param[in] ImageHandle    The firmware allocated handle for the EFI image.  \r
+  @param[in] ImageHandle    The firmware allocated handle for the EFI image.\r

   @param[in] SystemTable    A pointer to the EFI System Table.\r
   @param[in] SystemTable    A pointer to the EFI System Table.\r

-  \r
+\r

   @retval EFI_SUCCESS       The entry point is executed successfully.\r
   @retval other             Some error occurs when executing this entry point.\r
 \r
   @retval EFI_SUCCESS       The entry point is executed successfully.\r
   @retval other             Some error occurs when executing this entry point.\r
 \r

diff --git a/MdeModulePkg/Universal/Disk/DiskIoDxe/DiskIo.h b/MdeModulePkg/Universal/Disk/DiskIoDxe/DiskIo.h
index 7591e469a19b465cb22b12525d11748308d46ecb..44940d9e4e86425a80f154b368d66a1760bbf52b 100644 (file)
--- a/MdeModulePkg/Universal/Disk/DiskIoDxe/DiskIo.h
+++ b/MdeModulePkg/Universal/Disk/DiskIoDxe/DiskIo.h
@@ -1,7 +1,7 @@
 /** @file\r
   Master header file for DiskIo driver. It includes the module private defininitions.\r
 \r
 /** @file\r
   Master header file for DiskIo driver. It includes the module private defininitions.\r
 \r

-Copyright (c) 2006 - 2013, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r

 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r


@@ -100,7 +100,7 @@ extern EFI_COMPONENT_NAME2_PROTOCOL  gDiskIoComponentName2;
 // Driver model protocol interface\r
 //\r
 /**\r
 // Driver model protocol interface\r
 //\r
 /**\r

-  Test to see if this driver supports ControllerHandle. \r
+  Test to see if this driver supports ControllerHandle.\r

 \r
   @param  This                Protocol instance pointer.\r
   @param  ControllerHandle    Handle of device to test\r
 \r
   @param  This                Protocol instance pointer.\r
   @param  ControllerHandle    Handle of device to test\r

diff --git a/MdeModulePkg/Universal/Disk/DiskIoDxe/DiskIoDxe.inf b/MdeModulePkg/Universal/Disk/DiskIoDxe/DiskIoDxe.inf
index cee27d5b11d8fa4e3c9196b62628588a8629f715..6c00f553aa23c154439f92009e3da23106d06637 100644 (file)
--- a/MdeModulePkg/Universal/Disk/DiskIoDxe/DiskIoDxe.inf
+++ b/MdeModulePkg/Universal/Disk/DiskIoDxe/DiskIoDxe.inf
@@ -7,16 +7,16 @@
 #  to any Block I/O interface that appears in the system that does not\r
 #  already have a Disk I/O protocol. File systems and other disk access\r
 #  code utilize the Disk I/O protocol.\r
 #  to any Block I/O interface that appears in the system that does not\r
 #  already have a Disk I/O protocol. File systems and other disk access\r
 #  code utilize the Disk I/O protocol.\r

-#  \r
-#  Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.<BR>\r
+#\r
+#  Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r

 #  This program and the accompanying materials\r
 #  are licensed and made available under the terms and conditions of the BSD License\r
 #  which accompanies this distribution.  The full text of the license may be found at\r
 #  http://opensource.org/licenses/bsd-license.php\r
 #  This program and the accompanying materials\r
 #  are licensed and made available under the terms and conditions of the BSD License\r
 #  which accompanies this distribution.  The full text of the license may be found at\r
 #  http://opensource.org/licenses/bsd-license.php\r

-#  \r
+#\r

 #  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 #  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 #  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 #  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r

-#  \r
+#\r

 ##\r
 \r
 [Defines]\r
 ##\r
 \r
 [Defines]\r

diff --git a/MdeModulePkg/Universal/Disk/DiskIoDxe/DiskIoDxe.uni b/MdeModulePkg/Universal/Disk/DiskIoDxe/DiskIoDxe.uni
index 88d7debf72284acd838f47c2561babd820b438ac..5e82489cb5d6dda9bf0b2b4ea57deea7115f6e33 100644 (file)
--- a/MdeModulePkg/Universal/Disk/DiskIoDxe/DiskIoDxe.uni
+++ b/MdeModulePkg/Universal/Disk/DiskIoDxe/DiskIoDxe.uni
@@ -8,13 +8,13 @@
 // already have a Disk I/O protocol. File systems and other disk access\r
 // code utilize the Disk I/O protocol.\r
 //\r
 // already have a Disk I/O protocol. File systems and other disk access\r
 // code utilize the Disk I/O protocol.\r
 //\r

-// Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.<BR>\r
+// Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r

 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r
 // which accompanies this distribution.  The full text of the license may be found at\r
 // http://opensource.org/licenses/bsd-license.php\r
 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r
 // which accompanies this distribution.  The full text of the license may be found at\r
 // http://opensource.org/licenses/bsd-license.php\r

-// \r
+//\r

 // THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 // WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 //\r
 // THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 // WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 //\r

diff --git a/MdeModulePkg/Universal/Disk/DiskIoDxe/DiskIoDxeExtra.uni b/MdeModulePkg/Universal/Disk/DiskIoDxe/DiskIoDxeExtra.uni
index d970e76ccaf750f1658bf40ed7a5d67b7b076365..e18cc0d039b0bf1f6771858ce323c26bc9140864 100644 (file)
--- a/MdeModulePkg/Universal/Disk/DiskIoDxe/DiskIoDxeExtra.uni
+++ b/MdeModulePkg/Universal/Disk/DiskIoDxe/DiskIoDxeExtra.uni
@@ -1,7 +1,7 @@
 // /** @file\r
 // DiskIoDxe Localized Strings and Content\r
 //\r
 // /** @file\r
 // DiskIoDxe Localized Strings and Content\r
 //\r

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

 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r
 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r


@@ -13,8 +13,8 @@
 //\r
 // **/\r
 \r
 //\r
 // **/\r
 \r

-#string STR_PROPERTIES_MODULE_NAME \r
-#language en-US \r
+#string STR_PROPERTIES_MODULE_NAME\r
+#language en-US\r

 "Disk I/O DXE Driver"\r
 \r
 \r
 "Disk I/O DXE Driver"\r
 \r
 \r

diff --git a/MdeModulePkg/Universal/Disk/PartitionDxe/Gpt.c b/MdeModulePkg/Universal/Disk/PartitionDxe/Gpt.c
index fe26a64541c2522db335d8d62a93b459559ae70d..fe87761bde168ea97fad7a2a4cd6df662721d9ca 100644 (file)
--- a/MdeModulePkg/Universal/Disk/PartitionDxe/Gpt.c
+++ b/MdeModulePkg/Universal/Disk/PartitionDxe/Gpt.c
@@ -14,7 +14,7 @@
   partition content and validate the GPT table and GPT entry.\r
 \r
 Copyright (c) 2018 Qualcomm Datacenter Technologies, Inc.\r
   partition content and validate the GPT table and GPT entry.\r
 \r
 Copyright (c) 2018 Qualcomm Datacenter Technologies, Inc.\r

-Copyright (c) 2006 - 2017, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r

 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r


@@ -101,7 +101,7 @@ PartitionRestoreGptTable (
 \r
   @param[in]    PartHeader    Partition table header structure\r
   @param[in]    PartEntry     The partition entry array\r
 \r
   @param[in]    PartHeader    Partition table header structure\r
   @param[in]    PartEntry     The partition entry array\r

-  @param[out]   PEntryStatus  the partition entry status array \r
+  @param[out]   PEntryStatus  the partition entry status array\r

                               recording the status of each partition\r
 \r
 **/\r
                               recording the status of each partition\r
 \r
 **/\r


@@ -698,7 +698,7 @@ Done:
 \r
   @param[in]    PartHeader    Partition table header structure\r
   @param[in]    PartEntry     The partition entry array\r
 \r
   @param[in]    PartHeader    Partition table header structure\r
   @param[in]    PartEntry     The partition entry array\r

-  @param[out]   PEntryStatus  the partition entry status array \r
+  @param[out]   PEntryStatus  the partition entry status array\r

                               recording the status of each partition\r
 \r
 **/\r
                               recording the status of each partition\r
 \r
 **/\r


@@ -736,7 +736,7 @@ PartitionCheckGptEntry (
 \r
     if ((Entry->Attributes & BIT1) != 0) {\r
       //\r
 \r
     if ((Entry->Attributes & BIT1) != 0) {\r
       //\r

-      // If Bit 1 is set, this indicate that this is an OS specific GUID partition. \r
+      // If Bit 1 is set, this indicate that this is an OS specific GUID partition.\r

       //\r
       PEntryStatus[Index1].OsSpecific = TRUE;\r
     }\r
       //\r
       PEntryStatus[Index1].OsSpecific = TRUE;\r
     }\r

diff --git a/MdeModulePkg/Universal/Disk/PartitionDxe/Mbr.c b/MdeModulePkg/Universal/Disk/PartitionDxe/Mbr.c
index 479745b657291e7426d60f2ae5e4f32f2b55afdc..b1a99ee85b278f612734e81c14e02f81bd8c57a7 100644 (file)
--- a/MdeModulePkg/Universal/Disk/PartitionDxe/Mbr.c
+++ b/MdeModulePkg/Universal/Disk/PartitionDxe/Mbr.c
@@ -3,17 +3,17 @@
 \r
   MBR - Master Boot Record is in the first sector of a partitioned hard disk.\r
         The MBR supports four partitions per disk. The MBR also contains legacy\r
 \r
   MBR - Master Boot Record is in the first sector of a partitioned hard disk.\r
         The MBR supports four partitions per disk. The MBR also contains legacy\r

-        code that is not run on an EFI system. The legacy code reads the \r
-        first sector of the active partition into memory and \r
+        code that is not run on an EFI system. The legacy code reads the\r
+        first sector of the active partition into memory and\r

 \r
 \r

-  BPB - BIOS Parameter Block is in the first sector of a FAT file system. \r
-        The BPB contains information about the FAT file system. The BPB is \r
+  BPB - BIOS Parameter Block is in the first sector of a FAT file system.\r
+        The BPB contains information about the FAT file system. The BPB is\r

         always on the first sector of a media. The first sector also contains\r
         the legacy boot strap code.\r
 \r
 Copyright (c) 2018 Qualcomm Datacenter Technologies, Inc.\r
 Copyright (c) 2014, Hewlett-Packard Development Company, L.P.<BR>\r
         always on the first sector of a media. The first sector also contains\r
         the legacy boot strap code.\r
 \r
 Copyright (c) 2018 Qualcomm Datacenter Technologies, Inc.\r
 Copyright (c) 2014, Hewlett-Packard Development Company, L.P.<BR>\r

-Copyright (c) 2006 - 2017, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r

 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r


@@ -31,7 +31,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 \r
   @param  Mbr         Parent Handle.\r
   @param  LastLba     Last Lba address on the device.\r
 \r
   @param  Mbr         Parent Handle.\r
   @param  LastLba     Last Lba address on the device.\r

-   \r
+\r

   @retval TRUE        Mbr is a Valid MBR.\r
   @retval FALSE       Mbr is not a Valid MBR.\r
 \r
   @retval TRUE        Mbr is a Valid MBR.\r
   @retval FALSE       Mbr is not a Valid MBR.\r
 \r


@@ -76,7 +76,7 @@ PartitionValidMbr (
       // return FALSE since no block devices on a system are implemented\r
       // with INT 13h\r
       //\r
       // return FALSE since no block devices on a system are implemented\r
       // with INT 13h\r
       //\r

-    \r
+\r

       DEBUG((EFI_D_INFO, "PartitionValidMbr: Bad MBR partition size EndingLBA(%1x) > LastLBA(%1x)\n", EndingLBA, LastLba));\r
 \r
       return FALSE;\r
       DEBUG((EFI_D_INFO, "PartitionValidMbr: Bad MBR partition size EndingLBA(%1x) > LastLBA(%1x)\n", EndingLBA, LastLba));\r
 \r
       return FALSE;\r


@@ -113,7 +113,7 @@ PartitionValidMbr (
   @param[in]  BlockIo           Parent BlockIo interface.\r
   @param[in]  BlockIo2          Parent BlockIo2 interface.\r
   @param[in]  DevicePath        Parent Device Path.\r
   @param[in]  BlockIo           Parent BlockIo interface.\r
   @param[in]  BlockIo2          Parent BlockIo2 interface.\r
   @param[in]  DevicePath        Parent Device Path.\r

-   \r
+\r

   @retval EFI_SUCCESS       A child handle was added.\r
   @retval EFI_MEDIA_CHANGED Media change was detected.\r
   @retval Others            MBR partition was not found.\r
   @retval EFI_SUCCESS       A child handle was added.\r
   @retval EFI_MEDIA_CHANGED Media change was detected.\r
   @retval Others            MBR partition was not found.\r


@@ -215,9 +215,9 @@ PartitionInstallMbrChildHandles (
       if (Mbr->Partition[Index].OSIndicator == PMBR_GPT_PARTITION) {\r
         //\r
         // This is the guard MBR for the GPT. If you ever see a GPT disk with zero partitions you can get here.\r
       if (Mbr->Partition[Index].OSIndicator == PMBR_GPT_PARTITION) {\r
         //\r
         // This is the guard MBR for the GPT. If you ever see a GPT disk with zero partitions you can get here.\r

-        //  We can not produce an MBR BlockIo for this device as the MBR spans the GPT headers. So formating \r
+        //  We can not produce an MBR BlockIo for this device as the MBR spans the GPT headers. So formating\r

         //  this BlockIo would corrupt the GPT structures and require a recovery that would corrupt the format\r
         //  this BlockIo would corrupt the GPT structures and require a recovery that would corrupt the format\r

-        //  that corrupted the GPT partition. \r
+        //  that corrupted the GPT partition.\r

         //\r
         continue;\r
       }\r
         //\r
         continue;\r
       }\r

diff --git a/MdeModulePkg/Universal/Disk/PartitionDxe/Partition.c b/MdeModulePkg/Universal/Disk/PartitionDxe/Partition.c
index 71acdcc8985140e4883288a42925a7662b4f1fd5..bef6a48bc6e64be8f719f4b199ad90ec6c857ad4 100644 (file)
--- a/MdeModulePkg/Universal/Disk/PartitionDxe/Partition.c
+++ b/MdeModulePkg/Universal/Disk/PartitionDxe/Partition.c
@@ -27,8 +27,8 @@ EFI_DRIVER_BINDING_PROTOCOL gPartitionDriverBinding = {
   PartitionDriverBindingStart,\r
   PartitionDriverBindingStop,\r
   //\r
   PartitionDriverBindingStart,\r
   PartitionDriverBindingStop,\r
   //\r

-  // Grub4Dos copies the BPB of the first partition to the MBR. If the \r
-  // DriverBindingStart() of the Fat driver gets run before that of Partition \r
+  // Grub4Dos copies the BPB of the first partition to the MBR. If the\r
+  // DriverBindingStart() of the Fat driver gets run before that of Partition\r

   // driver only the first partition can be recognized.\r
   // Let the driver binding version of Partition driver be higher than that of\r
   // Fat driver to make sure the DriverBindingStart() of the Partition driver\r
   // driver only the first partition can be recognized.\r
   // Let the driver binding version of Partition driver be higher than that of\r
   // Fat driver to make sure the DriverBindingStart() of the Partition driver\r


@@ -40,7 +40,7 @@ EFI_DRIVER_BINDING_PROTOCOL gPartitionDriverBinding = {
 };\r
 \r
 //\r
 };\r
 \r
 //\r

-// Prioritized function list to detect partition table. \r
+// Prioritized function list to detect partition table.\r

 //\r
 PARTITION_DETECT_ROUTINE mPartitionDetectRoutineTable[] = {\r
   PartitionInstallGptChildHandles,\r
 //\r
 PARTITION_DETECT_ROUTINE mPartitionDetectRoutineTable[] = {\r
   PartitionInstallGptChildHandles,\r


@@ -82,7 +82,7 @@ PartitionDriverBindingSupported (
   //\r
   if (RemainingDevicePath != NULL) {\r
     //\r
   //\r
   if (RemainingDevicePath != NULL) {\r
     //\r

-    // Check if RemainingDevicePath is the End of Device Path Node, \r
+    // Check if RemainingDevicePath is the End of Device Path Node,\r

     // if yes, go on checking other conditions\r
     //\r
     if (!IsDevicePathEnd (RemainingDevicePath)) {\r
     // if yes, go on checking other conditions\r
     //\r
     if (!IsDevicePathEnd (RemainingDevicePath)) {\r


@@ -205,13 +205,13 @@ PartitionDriverBindingStart (
   EFI_TPL                   OldTpl;\r
 \r
   BlockIo2 = NULL;\r
   EFI_TPL                   OldTpl;\r
 \r
   BlockIo2 = NULL;\r

-  OldTpl = gBS->RaiseTPL (TPL_CALLBACK); \r
+  OldTpl = gBS->RaiseTPL (TPL_CALLBACK);\r

   //\r
   // Check RemainingDevicePath validation\r
   //\r
   if (RemainingDevicePath != NULL) {\r
     //\r
   //\r
   // Check RemainingDevicePath validation\r
   //\r
   if (RemainingDevicePath != NULL) {\r
     //\r

-    // Check if RemainingDevicePath is the End of Device Path Node, \r
+    // Check if RemainingDevicePath is the End of Device Path Node,\r

     // if yes, return EFI_SUCCESS\r
     //\r
     if (IsDevicePathEnd (RemainingDevicePath)) {\r
     // if yes, return EFI_SUCCESS\r
     //\r
     if (IsDevicePathEnd (RemainingDevicePath)) {\r


@@ -333,12 +333,12 @@ PartitionDriverBindingStart (
   // driver. So don't try to close them. Otherwise, we will break the dependency\r
   // between the controller and the driver set up before.\r
   //\r
   // driver. So don't try to close them. Otherwise, we will break the dependency\r
   // between the controller and the driver set up before.\r
   //\r

-  // In the case that when the media changes on a device it will Reinstall the \r
+  // In the case that when the media changes on a device it will Reinstall the\r

   // BlockIo interaface. This will cause a call to our Stop(), and a subsequent\r
   // reentrant call to our Start() successfully. We should leave the device open\r
   // when this happen. The "media change" case includes either the status is\r
   // BlockIo interaface. This will cause a call to our Stop(), and a subsequent\r
   // reentrant call to our Start() successfully. We should leave the device open\r
   // when this happen. The "media change" case includes either the status is\r

-  // EFI_MEDIA_CHANGED or it is a "media" to "no media" change. \r
-  //  \r
+  // EFI_MEDIA_CHANGED or it is a "media" to "no media" change.\r
+  //\r

   if (EFI_ERROR (Status)          &&\r
       !EFI_ERROR (OpenStatus)     &&\r
       Status != EFI_MEDIA_CHANGED &&\r
   if (EFI_ERROR (Status)          &&\r
       !EFI_ERROR (OpenStatus)     &&\r
       Status != EFI_MEDIA_CHANGED &&\r


@@ -351,7 +351,7 @@ PartitionDriverBindingStart (
           );\r
     //\r
     // Close Parent DiskIo2 if has.\r
           );\r
     //\r
     // Close Parent DiskIo2 if has.\r

-    //    \r
+    //\r

     gBS->CloseProtocol (\r
            ControllerHandle,\r
            &gEfiDiskIo2ProtocolGuid,\r
     gBS->CloseProtocol (\r
            ControllerHandle,\r
            &gEfiDiskIo2ProtocolGuid,\r


@@ -430,7 +430,7 @@ PartitionDriverBindingStop (
           );\r
     //\r
     // Close Parent BlockIO2 if has.\r
           );\r
     //\r
     // Close Parent BlockIO2 if has.\r

-    //    \r
+    //\r

     gBS->CloseProtocol (\r
            ControllerHandle,\r
            &gEfiDiskIo2ProtocolGuid,\r
     gBS->CloseProtocol (\r
            ControllerHandle,\r
            &gEfiDiskIo2ProtocolGuid,\r


@@ -467,7 +467,7 @@ PartitionDriverBindingStop (
            This->DriverBindingHandle,\r
            ControllerHandle,\r
            EFI_OPEN_PROTOCOL_GET_PROTOCOL\r
            This->DriverBindingHandle,\r
            ControllerHandle,\r
            EFI_OPEN_PROTOCOL_GET_PROTOCOL\r

-           ); \r
+           );\r

 \r
 \r
     Private = PARTITION_DEVICE_FROM_BLOCK_IO_THIS (BlockIo);\r
 \r
 \r
     Private = PARTITION_DEVICE_FROM_BLOCK_IO_THIS (BlockIo);\r


@@ -893,7 +893,7 @@ PartitionCreateAccessTask (
 \r
 /**\r
   Read BufferSize bytes from Lba into Buffer.\r
 \r
 /**\r
   Read BufferSize bytes from Lba into Buffer.\r

-  \r
+\r

   This function reads the requested number of blocks from the device. All the\r
   blocks are read, or an error is returned.\r
   If EFI_DEVICE_ERROR, EFI_NO_MEDIA,_or EFI_MEDIA_CHANGED is returned and\r
   This function reads the requested number of blocks from the device. All the\r
   blocks are read, or an error is returned.\r
   If EFI_DEVICE_ERROR, EFI_NO_MEDIA,_or EFI_MEDIA_CHANGED is returned and\r


@@ -901,13 +901,13 @@ PartitionCreateAccessTask (
   not be signaled.\r
 \r
   @param[in]       This       Indicates a pointer to the calling context.\r
   not be signaled.\r
 \r
   @param[in]       This       Indicates a pointer to the calling context.\r

-  @param[in]       MediaId    Id of the media, changes every time the media is \r
+  @param[in]       MediaId    Id of the media, changes every time the media is\r

                               replaced.\r
   @param[in]       Lba        The starting Logical Block Address to read from.\r
                               replaced.\r
   @param[in]       Lba        The starting Logical Block Address to read from.\r

-  @param[in, out]  Token           A pointer to the token associated with the transaction.\r
-  @param[in]       BufferSize Size of Buffer, must be a multiple of device block size.  \r
-  @param[out]      Buffer     A pointer to the destination buffer for the data. The \r
-                              caller is responsible for either having implicit or \r
+  @param[in, out]  Token      A pointer to the token associated with the transaction.\r
+  @param[in]       BufferSize Size of Buffer, must be a multiple of device block size.\r
+  @param[out]      Buffer     A pointer to the destination buffer for the data. The\r
+                              caller is responsible for either having implicit or\r

                               explicit ownership of the buffer.\r
 \r
   @retval EFI_SUCCESS           The read request was queued if Token->Event is\r
                               explicit ownership of the buffer.\r
 \r
   @retval EFI_SUCCESS           The read request was queued if Token->Event is\r


@@ -919,7 +919,7 @@ PartitionCreateAccessTask (
   @retval EFI_MEDIA_CHANGED     The MediaId is not for the current media.\r
   @retval EFI_BAD_BUFFER_SIZE   The BufferSize parameter is not a multiple of the\r
                                 intrinsic block size of the device.\r
   @retval EFI_MEDIA_CHANGED     The MediaId is not for the current media.\r
   @retval EFI_BAD_BUFFER_SIZE   The BufferSize parameter is not a multiple of the\r
                                 intrinsic block size of the device.\r

-  @retval EFI_INVALID_PARAMETER The read request contains LBAs that are not valid, \r
+  @retval EFI_INVALID_PARAMETER The read request contains LBAs that are not valid,\r

                                 or the buffer is not on proper alignment.\r
   @retval EFI_OUT_OF_RESOURCES  The request could not be completed due to a lack\r
                                 of resources.\r
                                 or the buffer is not on proper alignment.\r
   @retval EFI_OUT_OF_RESOURCES  The request could not be completed due to a lack\r
                                 of resources.\r


@@ -994,7 +994,7 @@ PartitionReadBlocksEx (
   @retval EFI_MEDIA_CHNAGED     The MediaId does not matched the current device.\r
   @retval EFI_DEVICE_ERROR      The device reported an error while performing the write.\r
   @retval EFI_BAD_BUFFER_SIZE   The Buffer was not a multiple of the block size of the device.\r
   @retval EFI_MEDIA_CHNAGED     The MediaId does not matched the current device.\r
   @retval EFI_DEVICE_ERROR      The device reported an error while performing the write.\r
   @retval EFI_BAD_BUFFER_SIZE   The Buffer was not a multiple of the block size of the device.\r

-  @retval EFI_INVALID_PARAMETER The write request contains LBAs that are not valid, \r
+  @retval EFI_INVALID_PARAMETER The write request contains LBAs that are not valid,\r

                                 or the buffer is not on proper alignment.\r
   @retval EFI_OUT_OF_RESOURCES  The request could not be completed due to a lack\r
                                 of resources.\r
                                 or the buffer is not on proper alignment.\r
   @retval EFI_OUT_OF_RESOURCES  The request could not be completed due to a lack\r
                                 of resources.\r


@@ -1026,7 +1026,7 @@ PartitionWriteBlocksEx (
   if (Offset + BufferSize > Private->End) {\r
     return ProbeMediaStatusEx (Private->DiskIo2, MediaId, EFI_INVALID_PARAMETER);\r
   }\r
   if (Offset + BufferSize > Private->End) {\r
     return ProbeMediaStatusEx (Private->DiskIo2, MediaId, EFI_INVALID_PARAMETER);\r
   }\r

-  \r
+\r

   if ((Token != NULL) && (Token->Event != NULL)) {\r
     Task = PartitionCreateAccessTask (Token);\r
     if (Task == NULL) {\r
   if ((Token != NULL) && (Token->Event != NULL)) {\r
     Task = PartitionCreateAccessTask (Token);\r
     if (Task == NULL) {\r


@@ -1046,10 +1046,10 @@ PartitionWriteBlocksEx (
 \r
 /**\r
   Flush the Block Device.\r
 \r
 /**\r
   Flush the Block Device.\r

- \r
+\r

   If EFI_DEVICE_ERROR, EFI_NO_MEDIA,_EFI_WRITE_PROTECTED or EFI_MEDIA_CHANGED\r
   is returned and non-blocking I/O is being used, the Event associated with\r
   If EFI_DEVICE_ERROR, EFI_NO_MEDIA,_EFI_WRITE_PROTECTED or EFI_MEDIA_CHANGED\r
   is returned and non-blocking I/O is being used, the Event associated with\r

-  this request will not be signaled.  \r
+  this request will not be signaled.\r

 \r
   @param[in]      This     Indicates a pointer to the calling context.\r
   @param[in, out] Token    A pointer to the token associated with the transaction\r
 \r
   @param[in]      This     Indicates a pointer to the calling context.\r
   @param[in, out] Token    A pointer to the token associated with the transaction\r


@@ -1160,7 +1160,7 @@ PartitionInstallChildHandle (
   // Set the BlockIO into Private Data.\r
   //\r
   Private->BlockIo.Revision = ParentBlockIo->Revision;\r
   // Set the BlockIO into Private Data.\r
   //\r
   Private->BlockIo.Revision = ParentBlockIo->Revision;\r

-  \r
+\r

   Private->BlockIo.Media    = &Private->Media;\r
   CopyMem (Private->BlockIo.Media, ParentBlockIo->Media, sizeof (EFI_BLOCK_IO_MEDIA));\r
 \r
   Private->BlockIo.Media    = &Private->Media;\r
   CopyMem (Private->BlockIo.Media, ParentBlockIo->Media, sizeof (EFI_BLOCK_IO_MEDIA));\r
 \r


@@ -1180,7 +1180,7 @@ PartitionInstallChildHandle (
     Private->BlockIo2.Reset          = PartitionResetEx;\r
     Private->BlockIo2.ReadBlocksEx   = PartitionReadBlocksEx;\r
     Private->BlockIo2.WriteBlocksEx  = PartitionWriteBlocksEx;\r
     Private->BlockIo2.Reset          = PartitionResetEx;\r
     Private->BlockIo2.ReadBlocksEx   = PartitionReadBlocksEx;\r
     Private->BlockIo2.WriteBlocksEx  = PartitionWriteBlocksEx;\r

-    Private->BlockIo2.FlushBlocksEx  = PartitionFlushBlocksEx; \r
+    Private->BlockIo2.FlushBlocksEx  = PartitionFlushBlocksEx;\r

   }\r
 \r
   Private->Media.IoAlign   = 0;\r
   }\r
 \r
   Private->Media.IoAlign   = 0;\r


@@ -1234,7 +1234,7 @@ PartitionInstallChildHandle (
   }\r
 \r
   //\r
   }\r
 \r
   //\r

-  // Create the new handle. \r
+  // Create the new handle.\r

   //\r
   Private->Handle = NULL;\r
   if (Private->DiskIo2 != NULL) {\r
   //\r
   Private->Handle = NULL;\r
   if (Private->DiskIo2 != NULL) {\r


@@ -1252,7 +1252,7 @@ PartitionInstallChildHandle (
                     NULL,\r
                     NULL\r
                     );\r
                     NULL,\r
                     NULL\r
                     );\r

-  } else {    \r
+  } else {\r

     Status = gBS->InstallMultipleProtocolInterfaces (\r
                     &Private->Handle,\r
                     &gEfiDevicePathProtocolGuid,\r
     Status = gBS->InstallMultipleProtocolInterfaces (\r
                     &Private->Handle,\r
                     &gEfiDevicePathProtocolGuid,\r


@@ -1291,9 +1291,9 @@ PartitionInstallChildHandle (
 /**\r
   The user Entry Point for module Partition. The user code starts with this function.\r
 \r
 /**\r
   The user Entry Point for module Partition. The user code starts with this function.\r
 \r

-  @param[in] ImageHandle    The firmware allocated handle for the EFI image.  \r
+  @param[in] ImageHandle    The firmware allocated handle for the EFI image.\r

   @param[in] SystemTable    A pointer to the EFI System Table.\r
   @param[in] SystemTable    A pointer to the EFI System Table.\r

-  \r
+\r

   @retval EFI_SUCCESS       The entry point is executed successfully.\r
   @retval other             Some error occurs when executing this entry point.\r
 \r
   @retval EFI_SUCCESS       The entry point is executed successfully.\r
   @retval other             Some error occurs when executing this entry point.\r
 \r

diff --git a/MdeModulePkg/Universal/Disk/PartitionDxe/Partition.h b/MdeModulePkg/Universal/Disk/PartitionDxe/Partition.h
index f1a05207bfa98bd257dd18195cbdfde2b4b13053..cd16f494f61ba5d57c8768ca14b1e365a2fb839e 100644 (file)
--- a/MdeModulePkg/Universal/Disk/PartitionDxe/Partition.h
+++ b/MdeModulePkg/Universal/Disk/PartitionDxe/Partition.h
@@ -1,11 +1,11 @@
 /** @file\r
 /** @file\r

-  Partition driver that produces logical BlockIo devices from a physical \r
+  Partition driver that produces logical BlockIo devices from a physical\r

   BlockIo device. The logical BlockIo devices are based on the format\r
   of the raw block devices media. Currently "El Torito CD-ROM", UDF, Legacy\r
   MBR, and GPT partition schemes are supported.\r
 \r
 Copyright (c) 2018 Qualcomm Datacenter Technologies, Inc.\r
   BlockIo device. The logical BlockIo devices are based on the format\r
   of the raw block devices media. Currently "El Torito CD-ROM", UDF, Legacy\r
   MBR, and GPT partition schemes are supported.\r
 \r
 Copyright (c) 2018 Qualcomm Datacenter Technologies, Inc.\r

-Copyright (c) 2006 - 2017, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r

 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r


@@ -16,8 +16,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 \r
 **/\r
 \r
 \r
 **/\r
 \r

-#ifndef _PARTITION_H_ \r
-#define _PARTITION_H_ \r
+#ifndef _PARTITION_H_\r
+#define _PARTITION_H_\r

 \r
 #include <Uefi.h>\r
 #include <Protocol/BlockIo.h>\r
 \r
 #include <Uefi.h>\r
 #include <Protocol/BlockIo.h>\r


@@ -431,7 +431,7 @@ PartitionInstallElToritoChildHandles (
   @param[in]  BlockIo           Parent BlockIo interface.\r
   @param[in]  BlockIo2          Parent BlockIo2 interface.\r
   @param[in]  DevicePath        Parent Device Path.\r
   @param[in]  BlockIo           Parent BlockIo interface.\r
   @param[in]  BlockIo2          Parent BlockIo2 interface.\r
   @param[in]  DevicePath        Parent Device Path.\r

-   \r
+\r

   @retval EFI_SUCCESS       A child handle was added.\r
   @retval EFI_MEDIA_CHANGED Media change was detected.\r
   @retval Others            MBR partition was not found.\r
   @retval EFI_SUCCESS       A child handle was added.\r
   @retval EFI_MEDIA_CHANGED Media change was detected.\r
   @retval Others            MBR partition was not found.\r

diff --git a/MdeModulePkg/Universal/Disk/PartitionDxe/PartitionDxe.inf b/MdeModulePkg/Universal/Disk/PartitionDxe/PartitionDxe.inf
index fb2ea87a9d3e2081a600a03f2bf9907e11a91ca7..46e39129cf1ed7e5360491084e2c9102af810bf4 100644 (file)
--- a/MdeModulePkg/Universal/Disk/PartitionDxe/PartitionDxe.inf
+++ b/MdeModulePkg/Universal/Disk/PartitionDxe/PartitionDxe.inf
@@ -11,15 +11,15 @@
 #  This external input must be validated carefully to avoid security issue like\r
 #  buffer overflow, integer overflow.\r
 #\r
 #  This external input must be validated carefully to avoid security issue like\r
 #  buffer overflow, integer overflow.\r
 #\r

-#  Copyright (c) 2006 - 2017, Intel Corporation. All rights reserved.<BR>\r
+#  Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r

 #  This program and the accompanying materials\r
 #  are licensed and made available under the terms and conditions of the BSD License\r
 #  which accompanies this distribution.  The full text of the license may be found at\r
 #  http://opensource.org/licenses/bsd-license.php\r
 #  This program and the accompanying materials\r
 #  are licensed and made available under the terms and conditions of the BSD License\r
 #  which accompanies this distribution.  The full text of the license may be found at\r
 #  http://opensource.org/licenses/bsd-license.php\r

-#  \r
+#\r

 #  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 #  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 #  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 #  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r

-#  \r
+#\r

 ##\r
 \r
 [Defines]\r
 ##\r
 \r
 [Defines]\r

diff --git a/MdeModulePkg/Universal/Disk/PartitionDxe/PartitionDxe.uni b/MdeModulePkg/Universal/Disk/PartitionDxe/PartitionDxe.uni
index ef0b6efa64dc97aef234fa26b58652672778aeb5..d6e2c827aea23db4713a71417b31de01d0b9ada7 100644 (file)
--- a/MdeModulePkg/Universal/Disk/PartitionDxe/PartitionDxe.uni
+++ b/MdeModulePkg/Universal/Disk/PartitionDxe/PartitionDxe.uni
@@ -5,19 +5,19 @@
 // the bytes from Start to End of the Parent Block I/O device.\r
 // The partition of physical BlockIo device supported is one of legacy MBR, GPT,\r
 // and "El Torito" partitions.\r
 // the bytes from Start to End of the Parent Block I/O device.\r
 // The partition of physical BlockIo device supported is one of legacy MBR, GPT,\r
 // and "El Torito" partitions.\r

-// \r
+//\r

 // Caution: This module requires additional review when modified.\r
 // This driver will have external input - disk partition.\r
 // This external input must be validated carefully to avoid security issue like\r
 // buffer overflow, integer overflow.\r
 //\r
 // Caution: This module requires additional review when modified.\r
 // This driver will have external input - disk partition.\r
 // This external input must be validated carefully to avoid security issue like\r
 // buffer overflow, integer overflow.\r
 //\r

-// Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.<BR>\r
+// Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r

 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r
 // which accompanies this distribution.  The full text of the license may be found at\r
 // http://opensource.org/licenses/bsd-license.php\r
 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r
 // which accompanies this distribution.  The full text of the license may be found at\r
 // http://opensource.org/licenses/bsd-license.php\r

-// \r
+//\r

 // THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 // WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 //\r
 // THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 // WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 //\r

diff --git a/MdeModulePkg/Universal/Disk/PartitionDxe/PartitionDxeExtra.uni b/MdeModulePkg/Universal/Disk/PartitionDxe/PartitionDxeExtra.uni
index 5530042aee25c777ddddfcf55ead60358fc235a3..a37d49774cb195d51c0d5aeebb74d15062c677fa 100644 (file)
--- a/MdeModulePkg/Universal/Disk/PartitionDxe/PartitionDxeExtra.uni
+++ b/MdeModulePkg/Universal/Disk/PartitionDxe/PartitionDxeExtra.uni
@@ -1,7 +1,7 @@
 // /** @file\r
 // PartitionDxe Localized Strings and Content\r
 //\r
 // /** @file\r
 // PartitionDxe Localized Strings and Content\r
 //\r

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

 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r
 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r


@@ -13,8 +13,8 @@
 //\r
 // **/\r
 \r
 //\r
 // **/\r
 \r

-#string STR_PROPERTIES_MODULE_NAME \r
-#language en-US \r
+#string STR_PROPERTIES_MODULE_NAME\r
+#language en-US\r

 "Partition DXE Driver"\r
 \r
 \r
 "Partition DXE Driver"\r
 \r
 \r

diff --git a/MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf b/MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf
index 46c834c64822cde56e04ea39381271c8da658bda..ad763b1af4c352f71064d4827a9e90f4caf6bd29 100644 (file)
--- a/MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf
+++ b/MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf
@@ -1,21 +1,21 @@
 ## @file\r
 #  English module that provides Unicode Collation supports.\r
 ## @file\r
 #  English module that provides Unicode Collation supports.\r

-#  \r
+#\r

 #  This driver installs Unicode ISO 639-2 Collation and\r
 #  RFC 4646 Unicode Collation 2 protocols based on feature flags\r
 #  PcdUnicodeCollationSupport & PcdUnicodeCollation2Support respectively.\r
 #  It allows code running in the boot services environment to perform lexical\r
 #  comparison functions on Unicode strings for English languages.\r
 #  This driver installs Unicode ISO 639-2 Collation and\r
 #  RFC 4646 Unicode Collation 2 protocols based on feature flags\r
 #  PcdUnicodeCollationSupport & PcdUnicodeCollation2Support respectively.\r
 #  It allows code running in the boot services environment to perform lexical\r
 #  comparison functions on Unicode strings for English languages.\r

-#  \r
-#  Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.<BR>\r
+#\r
+#  Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r

 #  This program and the accompanying materials\r
 #  are licensed and made available under the terms and conditions of the BSD License\r
 #  which accompanies this distribution.  The full text of the license may be found at\r
 #  http://opensource.org/licenses/bsd-license.php\r
 #  This program and the accompanying materials\r
 #  are licensed and made available under the terms and conditions of the BSD License\r
 #  which accompanies this distribution.  The full text of the license may be found at\r
 #  http://opensource.org/licenses/bsd-license.php\r

-#  \r
+#\r

 #  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 #  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 #  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 #  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r

-#  \r
+#\r

 ##\r
 \r
 [Defines]\r
 ##\r
 \r
 [Defines]\r

diff --git a/MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.uni b/MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.uni
index de9a52399e74fd895a148cebef1fac24396fa0ec..b3c1fe7b6f4f82b7086cfc7aa883cf70b7ee4763 100644 (file)
--- a/MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.uni
+++ b/MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.uni
@@ -7,13 +7,13 @@
 // It allows code running in the boot services environment to perform lexical\r
 // comparison functions on Unicode strings for English languages.\r
 //\r
 // It allows code running in the boot services environment to perform lexical\r
 // comparison functions on Unicode strings for English languages.\r
 //\r

-// Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.<BR>\r
+// Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r

 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r
 // which accompanies this distribution.  The full text of the license may be found at\r
 // http://opensource.org/licenses/bsd-license.php\r
 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r
 // which accompanies this distribution.  The full text of the license may be found at\r
 // http://opensource.org/licenses/bsd-license.php\r

-// \r
+//\r

 // THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 // WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 //\r
 // THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 // WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 //\r

diff --git a/MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxeExtra.uni b/MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxeExtra.uni
index 34e3208c0680bf54186fee15b67e526db1f84257..59284ce02f7e75b57abc4da5c5b3f4b5c6edacfc 100644 (file)
--- a/MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxeExtra.uni
+++ b/MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxeExtra.uni
@@ -1,7 +1,7 @@
 // /** @file\r
 // EnglishDxe Localized Strings and Content\r
 //\r
 // /** @file\r
 // EnglishDxe Localized Strings and Content\r
 //\r

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

 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r
 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r


@@ -13,8 +13,8 @@
 //\r
 // **/\r
 \r
 //\r
 // **/\r
 \r

-#string STR_PROPERTIES_MODULE_NAME \r
-#language en-US \r
+#string STR_PROPERTIES_MODULE_NAME\r
+#language en-US\r

 "English Language Support"\r
 \r
 \r
 "English Language Support"\r
 \r
 \r

diff --git a/MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/UnicodeCollationEng.c b/MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/UnicodeCollationEng.c
index a37f5c923cd76bd2f14605f0ce09bea9ff827bb6..4ca5fe3f7b4b37b1914eadf90c0f2708f05a41b9 100644 (file)
--- a/MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/UnicodeCollationEng.c
+++ b/MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/UnicodeCollationEng.c
@@ -1,7 +1,7 @@
 /** @file\r
   Driver to implement English version of Unicode Collation Protocol.\r
 \r
 /** @file\r
   Driver to implement English version of Unicode Collation Protocol.\r
 \r

-Copyright (c) 2006 - 2011, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r

 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r


@@ -81,13 +81,13 @@ GLOBAL_REMOVE_IF_UNREFERENCED EFI_UNICODE_COLLATION_PROTOCOL  Unicode2Eng = {
 \r
 /**\r
   The user Entry Point for English module.\r
 \r
 /**\r
   The user Entry Point for English module.\r

- \r
+\r

   This function initializes unicode character mapping and then installs Unicode\r
   This function initializes unicode character mapping and then installs Unicode\r

-  Collation & Unicode Collation 2 Protocols based on the feature flags.  \r
+  Collation & Unicode Collation 2 Protocols based on the feature flags.\r

 \r
 \r

-  @param  ImageHandle    The firmware allocated handle for the EFI image.  \r
+  @param  ImageHandle    The firmware allocated handle for the EFI image.\r

   @param  SystemTable    A pointer to the EFI System Table.\r
   @param  SystemTable    A pointer to the EFI System Table.\r

-  \r
+\r

   @retval EFI_SUCCESS    The entry point is executed successfully.\r
   @retval other          Some error occurs when executing this entry point.\r
 \r
   @retval EFI_SUCCESS    The entry point is executed successfully.\r
   @retval other          Some error occurs when executing this entry point.\r
 \r


@@ -204,7 +204,7 @@ EngStriColl (
 \r
 \r
 /**\r
 \r
 \r
 /**\r

-  Converts all the characters in a Null-terminated string to \r
+  Converts all the characters in a Null-terminated string to\r

   lower case characters.\r
 \r
   @param  This   Protocol instance pointer.\r
   lower case characters.\r
 \r
   @param  This   Protocol instance pointer.\r


@@ -418,8 +418,8 @@ EngFatToStr (
 \r
 \r
 /**\r
 \r
 \r
 /**\r

-  Converts a Null-terminated string to legal characters in a FAT \r
-  filename using an OEM character set. \r
+  Converts a Null-terminated string to legal characters in a FAT\r
+  filename using an OEM character set.\r

 \r
   @param  This    Protocol instance pointer.\r
   @param  String  A pointer to a Null-terminated string. The string must\r
 \r
   @param  This    Protocol instance pointer.\r
   @param  String  A pointer to a Null-terminated string. The string must\r

diff --git a/MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/UnicodeCollationEng.h b/MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/UnicodeCollationEng.h
index ac6dfc4033883dabb363250ae0318d394938b0e9..ddce2f69d375a68466e6353f4790187c7dc1d23e 100644 (file)
--- a/MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/UnicodeCollationEng.h
+++ b/MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/UnicodeCollationEng.h
@@ -1,7 +1,7 @@
 /** @file\r
   Head file for Unicode Collation Protocol (English)\r
 \r
 /** @file\r
   Head file for Unicode Collation Protocol (English)\r
 \r

-Copyright (c) 2006 - 2011, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r

 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r


@@ -90,7 +90,7 @@ EngMetaiMatch (
   );\r
 \r
 /**\r
   );\r
 \r
 /**\r

-  Converts all the characters in a Null-terminated string to \r
+  Converts all the characters in a Null-terminated string to\r

   lower case characters.\r
 \r
   @param  This   Protocol instance pointer.\r
   lower case characters.\r
 \r
   @param  This   Protocol instance pointer.\r


@@ -140,8 +140,8 @@ EngFatToStr (
   );\r
 \r
 /**\r
   );\r
 \r
 /**\r

-  Converts a Null-terminated string to legal characters in a FAT \r
-  filename using an OEM character set. \r
+  Converts a Null-terminated string to legal characters in a FAT\r
+  filename using an OEM character set.\r

 \r
   @param  This    Protocol instance pointer.\r
   @param  String  A pointer to a Null-terminated string. The string must\r
 \r
   @param  This    Protocol instance pointer.\r
   @param  String  A pointer to a Null-terminated string. The string must\r


@@ -165,13 +165,13 @@ EngStrToFat (
 \r
 /**\r
   The user Entry Point for English module.\r
 \r
 /**\r
   The user Entry Point for English module.\r

- \r
+\r

   This function initializes unicode character mapping and then installs Unicode\r
   This function initializes unicode character mapping and then installs Unicode\r

-  Collation & Unicode Collation 2 Protocols based on the feature flags.  \r
+  Collation & Unicode Collation 2 Protocols based on the feature flags.\r

 \r
 \r

-  @param  ImageHandle    The firmware allocated handle for the EFI image.  \r
+  @param  ImageHandle    The firmware allocated handle for the EFI image.\r

   @param  SystemTable    A pointer to the EFI System Table.\r
   @param  SystemTable    A pointer to the EFI System Table.\r

-  \r
+\r

   @retval EFI_SUCCESS    The entry point is executed successfully.\r
   @retval other          Some error occurs when executing this entry point.\r
 \r
   @retval EFI_SUCCESS    The entry point is executed successfully.\r
   @retval other          Some error occurs when executing this entry point.\r
 \r

diff --git a/MdeModulePkg/Universal/DisplayEngineDxe/DisplayEngine.uni b/MdeModulePkg/Universal/DisplayEngineDxe/DisplayEngine.uni
index 79868ec776c7b812c61ad17a1662631e1e41a9c0..c25da883b4e2bbf77abd3c8ee3f982fca55e269c 100644 (file)
--- a/MdeModulePkg/Universal/DisplayEngineDxe/DisplayEngine.uni
+++ b/MdeModulePkg/Universal/DisplayEngineDxe/DisplayEngine.uni
@@ -3,13 +3,13 @@
 //\r
 // A generic Timestamp driver producing Timestamp Protocol using UEFI APIs.\r
 //\r
 //\r
 // A generic Timestamp driver producing Timestamp Protocol using UEFI APIs.\r
 //\r

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

 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r
 // which accompanies this distribution. The full text of the license may be found at\r
 // http://opensource.org/licenses/bsd-license.php\r
 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r
 // which accompanies this distribution. The full text of the license may be found at\r
 // http://opensource.org/licenses/bsd-license.php\r

-// \r
+//\r

 // THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 // WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 //\r
 // THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 // WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 //\r

diff --git a/MdeModulePkg/Universal/DisplayEngineDxe/DisplayEngineDxe.inf b/MdeModulePkg/Universal/DisplayEngineDxe/DisplayEngineDxe.inf
index fa7b2ca35d9992f52f9b01bf609509ed3f401e09..c1c1974c1315be0641b33e1925efcd54c7c7ac67 100644 (file)
--- a/MdeModulePkg/Universal/DisplayEngineDxe/DisplayEngineDxe.inf
+++ b/MdeModulePkg/Universal/DisplayEngineDxe/DisplayEngineDxe.inf
@@ -1,7 +1,7 @@
 ## @file\r
 # The DXE driver produces FORM DISPLAY ENGIEN protocol.\r
 #\r
 ## @file\r
 # The DXE driver produces FORM DISPLAY ENGIEN protocol.\r
 #\r

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

 #\r
 #  This program and the accompanying materials\r
 #  are licensed and made available under the terms and conditions of the BSD License\r
 #\r
 #  This program and the accompanying materials\r
 #  are licensed and made available under the terms and conditions of the BSD License\r


@@ -36,11 +36,11 @@
   ProcessOptions.c\r
   InputHandler.c\r
   Popup.c\r
   ProcessOptions.c\r
   InputHandler.c\r
   Popup.c\r

-  \r
+\r

 [Packages]\r
   MdePkg/MdePkg.dec\r
   MdeModulePkg/MdeModulePkg.dec\r
 [Packages]\r
   MdePkg/MdePkg.dec\r
   MdeModulePkg/MdeModulePkg.dec\r

-  \r
+\r

 [LibraryClasses]\r
   UefiDriverEntryPoint\r
   UefiBootServicesTableLib\r
 [LibraryClasses]\r
   UefiDriverEntryPoint\r
   UefiBootServicesTableLib\r


@@ -59,7 +59,7 @@
 \r
 [Depex]\r
   gEfiHiiDatabaseProtocolGuid AND gEfiHiiConfigRoutingProtocolGuid AND gEdkiiFormBrowserEx2ProtocolGuid\r
 \r
 [Depex]\r
   gEfiHiiDatabaseProtocolGuid AND gEfiHiiConfigRoutingProtocolGuid AND gEdkiiFormBrowserEx2ProtocolGuid\r

-  \r
+\r

 [FeaturePcd]\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdBrowserGrayOutTextStatement     ## CONSUMES\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdBrowerGrayOutReadOnlyMenu       ## CONSUMES\r
 [FeaturePcd]\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdBrowserGrayOutTextStatement     ## CONSUMES\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdBrowerGrayOutReadOnlyMenu       ## CONSUMES\r

diff --git a/MdeModulePkg/Universal/DisplayEngineDxe/DisplayEngineExtra.uni b/MdeModulePkg/Universal/DisplayEngineDxe/DisplayEngineExtra.uni
index 7d97faf7dde6fe3cfb38e99100136ade16e6837c..b8019bfd828102a503e79d64abaf2b1156873398 100644 (file)
--- a/MdeModulePkg/Universal/DisplayEngineDxe/DisplayEngineExtra.uni
+++ b/MdeModulePkg/Universal/DisplayEngineDxe/DisplayEngineExtra.uni
@@ -1,7 +1,7 @@
 // /** @file\r
 // DisplayEngine Localized Strings and Content\r
 //\r
 // /** @file\r
 // DisplayEngine Localized Strings and Content\r
 //\r

-// Copyright (c) 2014, Intel Corporation. All rights reserved.<BR>\r
+// Copyright (c) 2014 - 2018, Intel Corporation. All rights reserved.<BR>\r

 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r
 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r


@@ -12,8 +12,8 @@
 //\r
 // **/\r
 \r
 //\r
 // **/\r
 \r

-#string STR_PROPERTIES_MODULE_NAME \r
-#language en-US \r
+#string STR_PROPERTIES_MODULE_NAME\r
+#language en-US\r

 "DisplayEngine DXE Driver"\r
 \r
 \r
 "DisplayEngine DXE Driver"\r
 \r
 \r

diff --git a/MdeModulePkg/Universal/DisplayEngineDxe/FormDisplay.c b/MdeModulePkg/Universal/DisplayEngineDxe/FormDisplay.c
index d2867d2921ccbf861b1002af6661a9f771ce1605..f2eac4d3fece8715efab2d900fd128945e160f7a 100644 (file)
--- a/MdeModulePkg/Universal/DisplayEngineDxe/FormDisplay.c
+++ b/MdeModulePkg/Universal/DisplayEngineDxe/FormDisplay.c
@@ -1,7 +1,7 @@
 /** @file\r
 Entry and initialization module for the browser.\r
 \r
 /** @file\r
 Entry and initialization module for the browser.\r
 \r

-Copyright (c) 2007 - 2017, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2007 - 2018, Intel Corporation. All rights reserved.<BR>\r

 Copyright (c) 2014, Hewlett-Packard Development Company, L.P.<BR>\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 Copyright (c) 2014, Hewlett-Packard Development Company, L.P.<BR>\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r


@@ -87,7 +87,7 @@ SCREEN_OPERATION_T0_CONTROL_FLAG  gScreenOperationToControlFlag[] = {
   {\r
     UiPageDown,\r
     CfUiPageDown\r
   {\r
     UiPageDown,\r
     CfUiPageDown\r

-  }, \r
+  },\r

   {\r
     UiHotKey,\r
     CfUiHotKey\r
   {\r
     UiHotKey,\r
     CfUiHotKey\r


@@ -418,10 +418,10 @@ GetWidth (
       //\r
       ((Statement->OpCode->OpCode == EFI_IFR_TEXT_OP) && (Size == 0))\r
       ) {\r
       //\r
       ((Statement->OpCode->OpCode == EFI_IFR_TEXT_OP) && (Size == 0))\r
       ) {\r

-    \r
+\r

     //\r
     // Return the space width.\r
     //\r
     // Return the space width.\r

-    // \r
+    //\r

     if (AdjustWidth != NULL) {\r
       *AdjustWidth = 2;\r
     }\r
     if (AdjustWidth != NULL) {\r
       *AdjustWidth = 2;\r
     }\r


@@ -462,7 +462,7 @@ GetWidth (
   @param  Index                  Where in InputString to start the copy process\r
   @param  OutputString           Buffer to copy the string into\r
 \r
   @param  Index                  Where in InputString to start the copy process\r
   @param  OutputString           Buffer to copy the string into\r
 \r

-  @return Returns the number of CHAR16 characters that were copied into the OutputString \r
+  @return Returns the number of CHAR16 characters that were copied into the OutputString\r

   buffer, include extra glyph info and '\0' info.\r
 \r
 **/\r
   buffer, include extra glyph info and '\0' info.\r
 \r
 **/\r


@@ -541,7 +541,7 @@ GetLineByWidth (
     if (ReturnFlag) {\r
       break;\r
     }\r
     if (ReturnFlag) {\r
       break;\r
     }\r

-  } \r
+  }\r

 \r
   //\r
   // Rewind the string from the maximum size until we see a space to break the line\r
 \r
   //\r
   // Rewind the string from the maximum size until we see a space to break the line\r


@@ -590,7 +590,7 @@ GetLineByWidth (
   if (InputString[*Index + StrOffset] == CHAR_SPACE) {\r
     //\r
     // Skip the space info at the begin of next line.\r
   if (InputString[*Index + StrOffset] == CHAR_SPACE) {\r
     //\r
     // Skip the space info at the begin of next line.\r

-    //  \r
+    //\r

     *Index = (UINT16) (*Index + StrOffset + 1);\r
   } else if (InputString[*Index + StrOffset] == CHAR_LINEFEED) {\r
     //\r
     *Index = (UINT16) (*Index + StrOffset + 1);\r
   } else if (InputString[*Index + StrOffset] == CHAR_LINEFEED) {\r
     //\r


@@ -604,7 +604,7 @@ GetLineByWidth (
   } else if (InputString[*Index + StrOffset] == CHAR_CARRIAGE_RETURN) {\r
     //\r
     // Skip the /r or /r/n info.\r
   } else if (InputString[*Index + StrOffset] == CHAR_CARRIAGE_RETURN) {\r
     //\r
     // Skip the /r or /r/n info.\r

-    //  \r
+    //\r

     if (InputString[*Index + StrOffset + 1] == CHAR_LINEFEED) {\r
       *Index = (UINT16) (*Index + StrOffset + 2);\r
     } else {\r
     if (InputString[*Index + StrOffset + 1] == CHAR_LINEFEED) {\r
       *Index = (UINT16) (*Index + StrOffset + 2);\r
     } else {\r


@@ -705,7 +705,7 @@ UiAddMenuOption (
     case EFI_IFR_TEXT_OP:\r
       if (FeaturePcdGet (PcdBrowserGrayOutTextStatement)) {\r
         //\r
     case EFI_IFR_TEXT_OP:\r
       if (FeaturePcdGet (PcdBrowserGrayOutTextStatement)) {\r
         //\r

-        // Initializing GrayOut option as TRUE for Text setup options \r
+        // Initializing GrayOut option as TRUE for Text setup options\r

         // so that those options will be Gray in colour and un selectable.\r
         //\r
         MenuOption->GrayOut = TRUE;\r
         // so that those options will be Gray in colour and un selectable.\r
         //\r
         MenuOption->GrayOut = TRUE;\r


@@ -723,8 +723,8 @@ UiAddMenuOption (
       }\r
     }\r
 \r
       }\r
     }\r
 \r

-    if (Index == 0 && \r
-      (Statement->OpCode->OpCode != EFI_IFR_DATE_OP) && \r
+    if (Index == 0 &&\r
+      (Statement->OpCode->OpCode != EFI_IFR_DATE_OP) &&\r

       (Statement->OpCode->OpCode != EFI_IFR_TIME_OP)) {\r
       Width  = GetWidth (MenuOption, NULL);\r
       for (; GetLineByWidth (MenuOption->Description, Width, &GlyphWidth,&ArrayEntry, &OutputString) != 0x0000;) {\r
       (Statement->OpCode->OpCode != EFI_IFR_TIME_OP)) {\r
       Width  = GetWidth (MenuOption, NULL);\r
       for (; GetLineByWidth (MenuOption->Description, Width, &GlyphWidth,&ArrayEntry, &OutputString) != 0x0000;) {\r


@@ -741,7 +741,7 @@ UiAddMenuOption (
       // Add three MenuOptions for Date/Time\r
       // Data format :      [01/02/2004]      [11:22:33]\r
       // Line number :        0  0    1         0  0  1\r
       // Add three MenuOptions for Date/Time\r
       // Data format :      [01/02/2004]      [11:22:33]\r
       // Line number :        0  0    1         0  0  1\r

-      //    \r
+      //\r

       NumberOfLines = 0;\r
     }\r
 \r
       NumberOfLines = 0;\r
     }\r
 \r


@@ -920,8 +920,8 @@ UpdateSkipInfoForMenu (
     FreePool (OutputString);\r
   }\r
 \r
     FreePool (OutputString);\r
   }\r
 \r

-  if ((Row > MenuOption->Skip) && \r
-      (MenuOption->ThisTag->OpCode->OpCode != EFI_IFR_DATE_OP) && \r
+  if ((Row > MenuOption->Skip) &&\r
+      (MenuOption->ThisTag->OpCode->OpCode != EFI_IFR_DATE_OP) &&\r

       (MenuOption->ThisTag->OpCode->OpCode != EFI_IFR_TIME_OP)) {\r
     MenuOption->Skip = Row;\r
   }\r
       (MenuOption->ThisTag->OpCode->OpCode != EFI_IFR_TIME_OP)) {\r
     MenuOption->Skip = Row;\r
   }\r


@@ -1045,8 +1045,8 @@ IsSelectable (
   @return The row distance from current MenuOption to next selectable MenuOption.\r
 \r
   @retval -1       Reach the begin of the menu, still can't find the selectable menu.\r
   @return The row distance from current MenuOption to next selectable MenuOption.\r
 \r
   @retval -1       Reach the begin of the menu, still can't find the selectable menu.\r

-  @retval Value    Find the selectable menu, maybe the truly selectable, maybe the \r
-                   first menu showing beyond current form or last menu showing in \r
+  @retval Value    Find the selectable menu, maybe the truly selectable, maybe the\r
+                   first menu showing beyond current form or last menu showing in\r

                    current form.\r
                    The value is the line number between the new selected menu and the\r
                    current select menu, not include the new selected menu.\r
                    current form.\r
                    The value is the line number between the new selected menu and the\r
                    current select menu, not include the new selected menu.\r


@@ -1126,10 +1126,10 @@ MoveToNextStatement (
 \r
   @param  MenuOption              Menu option point to date/time.\r
   @param  OptionString            Option string input for process.\r
 \r
   @param  MenuOption              Menu option point to date/time.\r
   @param  OptionString            Option string input for process.\r

-  @param  AddOptCol               Whether need to update MenuOption->OptCol. \r
+  @param  AddOptCol               Whether need to update MenuOption->OptCol.\r

 \r
 **/\r
 \r
 **/\r

-VOID \r
+VOID\r

 ProcessStringForDateTime (\r
   UI_MENU_OPTION                  *MenuOption,\r
   CHAR16                          *OptionString,\r
 ProcessStringForDateTime (\r
   UI_MENU_OPTION                  *MenuOption,\r
   CHAR16                          *OptionString,\r


@@ -1143,7 +1143,7 @@ ProcessStringForDateTime (
   EFI_IFR_TIME                           *Time;\r
 \r
   ASSERT (MenuOption != NULL && OptionString != NULL);\r
   EFI_IFR_TIME                           *Time;\r
 \r
   ASSERT (MenuOption != NULL && OptionString != NULL);\r

-  \r
+\r

   Statement = MenuOption->ThisTag;\r
   Date      = NULL;\r
   Time      = NULL;\r
   Statement = MenuOption->ThisTag;\r
   Date      = NULL;\r
   Time      = NULL;\r


@@ -1152,7 +1152,7 @@ ProcessStringForDateTime (
   } else if (Statement->OpCode->OpCode == EFI_IFR_TIME_OP) {\r
     Time = (EFI_IFR_TIME *) Statement->OpCode;\r
   }\r
   } else if (Statement->OpCode->OpCode == EFI_IFR_TIME_OP) {\r
     Time = (EFI_IFR_TIME *) Statement->OpCode;\r
   }\r

-  \r
+\r

   //\r
   // If leading spaces on OptionString - remove the spaces\r
   //\r
   //\r
   // If leading spaces on OptionString - remove the spaces\r
   //\r


@@ -1164,13 +1164,13 @@ ProcessStringForDateTime (
       MenuOption->OptCol++;\r
     }\r
   }\r
       MenuOption->OptCol++;\r
     }\r
   }\r

-  \r
+\r

   for (Count = 0; OptionString[Index] != CHAR_NULL; Index++) {\r
     OptionString[Count] = OptionString[Index];\r
     Count++;\r
   }\r
   OptionString[Count] = CHAR_NULL;\r
   for (Count = 0; OptionString[Index] != CHAR_NULL; Index++) {\r
     OptionString[Count] = OptionString[Index];\r
     Count++;\r
   }\r
   OptionString[Count] = CHAR_NULL;\r

-  \r
+\r

   //\r
   // Enable to suppress field in the opcode base on the flag.\r
   //\r
   //\r
   // Enable to suppress field in the opcode base on the flag.\r
   //\r


@@ -1182,21 +1182,21 @@ ProcessStringForDateTime (
     //\r
     if ((Date->Flags & EFI_QF_DATE_MONTH_SUPPRESS) && (MenuOption->Sequence == 0)) {\r
       //\r
     //\r
     if ((Date->Flags & EFI_QF_DATE_MONTH_SUPPRESS) && (MenuOption->Sequence == 0)) {\r
       //\r

-      // At this point, only "<**:" in the optionstring. \r
+      // At this point, only "<**:" in the optionstring.\r

       // Clean the day's ** field, after clean, the format is "<  :"\r
       //\r
       SetUnicodeMem (&OptionString[1], 2, L' ');\r
     } else if ((Date->Flags & EFI_QF_DATE_DAY_SUPPRESS) && (MenuOption->Sequence == 1)) {\r
       //\r
       // Clean the day's ** field, after clean, the format is "<  :"\r
       //\r
       SetUnicodeMem (&OptionString[1], 2, L' ');\r
     } else if ((Date->Flags & EFI_QF_DATE_DAY_SUPPRESS) && (MenuOption->Sequence == 1)) {\r
       //\r

-      // At this point, only "**:" in the optionstring. \r
+      // At this point, only "**:" in the optionstring.\r

       // Clean the month's "**" field, after clean, the format is "  :"\r
       // Clean the month's "**" field, after clean, the format is "  :"\r

-      //                \r
+      //\r

       SetUnicodeMem (&OptionString[0], 2, L' ');\r
     } else if ((Date->Flags & EFI_QF_DATE_YEAR_SUPPRESS) && (MenuOption->Sequence == 2)) {\r
       //\r
       SetUnicodeMem (&OptionString[0], 2, L' ');\r
     } else if ((Date->Flags & EFI_QF_DATE_YEAR_SUPPRESS) && (MenuOption->Sequence == 2)) {\r
       //\r

-      // At this point, only "****>" in the optionstring. \r
+      // At this point, only "****>" in the optionstring.\r

       // Clean the year's "****" field, after clean, the format is "  >"\r
       // Clean the year's "****" field, after clean, the format is "  >"\r

-      //                \r
+      //\r

       SetUnicodeMem (&OptionString[0], 4, L' ');\r
     }\r
   } else if (Statement->OpCode->OpCode == EFI_IFR_TIME_OP) {\r
       SetUnicodeMem (&OptionString[0], 4, L' ');\r
     }\r
   } else if (Statement->OpCode->OpCode == EFI_IFR_TIME_OP) {\r


@@ -1207,21 +1207,21 @@ ProcessStringForDateTime (
     //\r
     if ((Time->Flags & QF_TIME_HOUR_SUPPRESS) && (MenuOption->Sequence == 0)) {\r
       //\r
     //\r
     if ((Time->Flags & QF_TIME_HOUR_SUPPRESS) && (MenuOption->Sequence == 0)) {\r
       //\r

-      // At this point, only "<**:" in the optionstring. \r
+      // At this point, only "<**:" in the optionstring.\r

       // Clean the hour's ** field, after clean, the format is "<  :"\r
       //\r
       SetUnicodeMem (&OptionString[1], 2, L' ');\r
     } else if ((Time->Flags & QF_TIME_MINUTE_SUPPRESS) && (MenuOption->Sequence == 1)) {\r
       //\r
       // Clean the hour's ** field, after clean, the format is "<  :"\r
       //\r
       SetUnicodeMem (&OptionString[1], 2, L' ');\r
     } else if ((Time->Flags & QF_TIME_MINUTE_SUPPRESS) && (MenuOption->Sequence == 1)) {\r
       //\r

-      // At this point, only "**:" in the optionstring. \r
+      // At this point, only "**:" in the optionstring.\r

       // Clean the minute's "**" field, after clean, the format is "  :"\r
       // Clean the minute's "**" field, after clean, the format is "  :"\r

-      //                \r
+      //\r

       SetUnicodeMem (&OptionString[0], 2, L' ');\r
     } else if ((Time->Flags & QF_TIME_SECOND_SUPPRESS) && (MenuOption->Sequence == 2)) {\r
       //\r
       SetUnicodeMem (&OptionString[0], 2, L' ');\r
     } else if ((Time->Flags & QF_TIME_SECOND_SUPPRESS) && (MenuOption->Sequence == 2)) {\r
       //\r

-      // At this point, only "**>" in the optionstring. \r
+      // At this point, only "**>" in the optionstring.\r

       // Clean the second's "**" field, after clean, the format is "  >"\r
       // Clean the second's "**" field, after clean, the format is "  >"\r

-      //                \r
+      //\r

       SetUnicodeMem (&OptionString[0], 2, L' ');\r
     }\r
   }\r
       SetUnicodeMem (&OptionString[0], 2, L' ');\r
     }\r
   }\r


@@ -1304,7 +1304,7 @@ AdjustDateAndTimePosition (
 \r
 /**\r
   Get step info from numeric opcode.\r
 \r
 /**\r
   Get step info from numeric opcode.\r

-  \r
+\r

   @param[in] OpCode     The input numeric op code.\r
 \r
   @return step info for this opcode.\r
   @param[in] OpCode     The input numeric op code.\r
 \r
   @return step info for this opcode.\r


@@ -1318,24 +1318,24 @@ GetFieldFromNum (
   UINT64                Step;\r
 \r
   NumericOp = (EFI_IFR_NUMERIC *) OpCode;\r
   UINT64                Step;\r
 \r
   NumericOp = (EFI_IFR_NUMERIC *) OpCode;\r

-  \r
+\r

   switch (NumericOp->Flags & EFI_IFR_NUMERIC_SIZE) {\r
   case EFI_IFR_NUMERIC_SIZE_1:\r
     Step    = NumericOp->data.u8.Step;\r
     break;\r
   switch (NumericOp->Flags & EFI_IFR_NUMERIC_SIZE) {\r
   case EFI_IFR_NUMERIC_SIZE_1:\r
     Step    = NumericOp->data.u8.Step;\r
     break;\r

-  \r
+\r

   case EFI_IFR_NUMERIC_SIZE_2:\r
     Step    = NumericOp->data.u16.Step;\r
     break;\r
   case EFI_IFR_NUMERIC_SIZE_2:\r
     Step    = NumericOp->data.u16.Step;\r
     break;\r

-  \r
+\r

   case EFI_IFR_NUMERIC_SIZE_4:\r
     Step    = NumericOp->data.u32.Step;\r
     break;\r
   case EFI_IFR_NUMERIC_SIZE_4:\r
     Step    = NumericOp->data.u32.Step;\r
     break;\r

-  \r
+\r

   case EFI_IFR_NUMERIC_SIZE_8:\r
     Step    = NumericOp->data.u64.Step;\r
     break;\r
   case EFI_IFR_NUMERIC_SIZE_8:\r
     Step    = NumericOp->data.u64.Step;\r
     break;\r

-  \r
+\r

   default:\r
     Step = 0;\r
     break;\r
   default:\r
     Step = 0;\r
     break;\r


@@ -1346,7 +1346,7 @@ GetFieldFromNum (
 \r
 /**\r
   Find the registered HotKey based on KeyData.\r
 \r
 /**\r
   Find the registered HotKey based on KeyData.\r

-  \r
+\r

   @param[in] KeyData     A pointer to a buffer that describes the keystroke\r
                          information for the hot key.\r
 \r
   @param[in] KeyData     A pointer to a buffer that describes the keystroke\r
                          information for the hot key.\r
 \r


@@ -1363,14 +1363,14 @@ GetHotKeyFromRegisterList (
   Link = GetFirstNode (&gFormData->HotKeyListHead);\r
   while (!IsNull (&gFormData->HotKeyListHead, Link)) {\r
     HotKey = BROWSER_HOT_KEY_FROM_LINK (Link);\r
   Link = GetFirstNode (&gFormData->HotKeyListHead);\r
   while (!IsNull (&gFormData->HotKeyListHead, Link)) {\r
     HotKey = BROWSER_HOT_KEY_FROM_LINK (Link);\r

-    \r
+\r

     if (HotKey->KeyData->ScanCode == KeyData->ScanCode) {\r
       return HotKey;\r
     }\r
 \r
     Link = GetNextNode (&gFormData->HotKeyListHead, Link);\r
   }\r
     if (HotKey->KeyData->ScanCode == KeyData->ScanCode) {\r
       return HotKey;\r
     }\r
 \r
     Link = GetNextNode (&gFormData->HotKeyListHead, Link);\r
   }\r

-  \r
+\r

   return NULL;\r
 }\r
 \r
   return NULL;\r
 }\r
 \r


@@ -1440,13 +1440,13 @@ UiWaitForEvent (
           Timeout\r
           );\r
   }\r
           Timeout\r
           );\r
   }\r

-  \r
+\r

   WaitList[0] = Event;\r
   EventNum    = 1;\r
   if (gFormData->FormRefreshEvent != NULL) {\r
     WaitList[EventNum] = gFormData->FormRefreshEvent;\r
     EventNum ++;\r
   WaitList[0] = Event;\r
   EventNum    = 1;\r
   if (gFormData->FormRefreshEvent != NULL) {\r
     WaitList[EventNum] = gFormData->FormRefreshEvent;\r
     EventNum ++;\r

-  } \r
+  }\r

 \r
   if (Timeout != 0) {\r
     WaitList[EventNum] = TimerEvent;\r
 \r
   if (Timeout != 0) {\r
     WaitList[EventNum] = TimerEvent;\r


@@ -1479,7 +1479,7 @@ UiWaitForEvent (
   if (Timeout != 0) {\r
     gBS->CloseEvent (TimerEvent);\r
   }\r
   if (Timeout != 0) {\r
     gBS->CloseEvent (TimerEvent);\r
   }\r

-  \r
+\r

   return EventType;\r
 }\r
 \r
   return EventType;\r
 }\r
 \r


@@ -1603,7 +1603,7 @@ GetIndexInfoForOpcode (
   @retval  FALSE  This is not the highlight statement.\r
 \r
 **/\r
   @retval  FALSE  This is not the highlight statement.\r
 \r
 **/\r

-BOOLEAN \r
+BOOLEAN\r

 IsSavedHighlightStatement (\r
   IN FORM_DISPLAY_ENGINE_STATEMENT  *HighLightedStatement\r
   )\r
 IsSavedHighlightStatement (\r
   IN FORM_DISPLAY_ENGINE_STATEMENT  *HighLightedStatement\r
   )\r


@@ -1735,7 +1735,7 @@ IsTopOfScreeMenuOption (
 {\r
   if (gHighligthMenuInfo.TOSQuestionId != 0) {\r
     return (BOOLEAN) (GetQuestionIdInfo(MenuOption->ThisTag->OpCode) == gHighligthMenuInfo.TOSQuestionId);\r
 {\r
   if (gHighligthMenuInfo.TOSQuestionId != 0) {\r
     return (BOOLEAN) (GetQuestionIdInfo(MenuOption->ThisTag->OpCode) == gHighligthMenuInfo.TOSQuestionId);\r

-  } \r
+  }\r

 \r
   if(CompareMem (gHighligthMenuInfo.TOSOpCode, MenuOption->ThisTag->OpCode, gHighligthMenuInfo.TOSOpCode->Length) == 0) {\r
     if (gHighligthMenuInfo.TOSIndex == 0 || gHighligthMenuInfo.TOSIndex == GetIndexInfoForOpcode(MenuOption->ThisTag->OpCode)) {\r
 \r
   if(CompareMem (gHighligthMenuInfo.TOSOpCode, MenuOption->ThisTag->OpCode, gHighligthMenuInfo.TOSOpCode->Length) == 0) {\r
     if (gHighligthMenuInfo.TOSIndex == 0 || gHighligthMenuInfo.TOSIndex == GetIndexInfoForOpcode(MenuOption->ThisTag->OpCode)) {\r


@@ -1863,7 +1863,7 @@ FindTopMenu (
   //\r
   if (gMisMatch && gFormData->HiiHandle == gHighligthMenuInfo.HiiHandle && gFormData->FormId == gHighligthMenuInfo.FormId) {\r
     //\r
   //\r
   if (gMisMatch && gFormData->HiiHandle == gHighligthMenuInfo.HiiHandle && gFormData->FormId == gHighligthMenuInfo.FormId) {\r
     //\r

-    // Reenter caused by option mismatch or auto exit caused by refresh form(refresh interval/guid), \r
+    // Reenter caused by option mismatch or auto exit caused by refresh form(refresh interval/guid),\r

     // base on the record highlight info to find the highlight menu.\r
     //\r
 \r
     // base on the record highlight info to find the highlight menu.\r
     //\r
 \r


@@ -1930,7 +1930,7 @@ FindTopMenu (
       //\r
       MenuOption = MENU_OPTION_FROM_LINK (*HighlightMenu);\r
       UpdateOptionSkipLines (MenuOption);\r
       //\r
       MenuOption = MENU_OPTION_FROM_LINK (*HighlightMenu);\r
       UpdateOptionSkipLines (MenuOption);\r

-      \r
+\r

       *TopOfScreen = FindTopOfScreenMenuOption(*HighlightMenu);\r
       if (*TopOfScreen == NULL) {\r
         //\r
       *TopOfScreen = FindTopOfScreenMenuOption(*HighlightMenu);\r
       if (*TopOfScreen == NULL) {\r
         //\r


@@ -2090,7 +2090,7 @@ SetDisplayAttribute (
   )\r
 {\r
   FORM_DISPLAY_ENGINE_STATEMENT   *Statement;\r
   )\r
 {\r
   FORM_DISPLAY_ENGINE_STATEMENT   *Statement;\r

-  \r
+\r

   Statement = MenuOption->ThisTag;\r
 \r
   if (Highlight) {\r
   Statement = MenuOption->ThisTag;\r
 \r
   if (Highlight) {\r


@@ -2140,11 +2140,11 @@ DisplayMenuString (
     PrintStringAtWithWidth (Col, Row, String, Width);\r
     return;\r
   }\r
     PrintStringAtWithWidth (Col, Row, String, Width);\r
     return;\r
   }\r

-  \r
+\r

   //\r
   // Print the highlight menu string.\r
   // First print the highlight string.\r
   //\r
   // Print the highlight menu string.\r
   // First print the highlight string.\r

-  // \r
+  //\r

   SetDisplayAttribute(MenuOption, TRUE);\r
   Length = PrintStringAt (Col, Row, String);\r
 \r
   SetDisplayAttribute(MenuOption, TRUE);\r
   Length = PrintStringAt (Col, Row, String);\r
 \r


@@ -2164,7 +2164,7 @@ DisplayMenuString (
   @retval FALSE                    This menu option can't have option string.\r
 \r
 **/\r
   @retval FALSE                    This menu option can't have option string.\r
 \r
 **/\r

-BOOLEAN \r
+BOOLEAN\r

 HasOptionString (\r
   IN UI_MENU_OPTION                  *MenuOption\r
   )\r
 HasOptionString (\r
   IN UI_MENU_OPTION                  *MenuOption\r
   )\r


@@ -2233,8 +2233,8 @@ FxConfirmPopup (
 \r
   //\r
   // Below action need extra popup dialog to confirm.\r
 \r
   //\r
   // Below action need extra popup dialog to confirm.\r

-  // \r
-  CheckFlags = BROWSER_ACTION_DISCARD | \r
+  //\r
+  CheckFlags = BROWSER_ACTION_DISCARD |\r

                BROWSER_ACTION_DEFAULT |\r
                BROWSER_ACTION_SUBMIT |\r
                BROWSER_ACTION_RESET |\r
                BROWSER_ACTION_DEFAULT |\r
                BROWSER_ACTION_SUBMIT |\r
                BROWSER_ACTION_RESET |\r


@@ -2249,12 +2249,12 @@ FxConfirmPopup (
 \r
   if ((Action & BROWSER_ACTION_DISCARD) == BROWSER_ACTION_DISCARD) {\r
     CfmStrLen += StrLen (gConfirmDiscardMsg);\r
 \r
   if ((Action & BROWSER_ACTION_DISCARD) == BROWSER_ACTION_DISCARD) {\r
     CfmStrLen += StrLen (gConfirmDiscardMsg);\r

-  } \r
+  }\r

 \r
   if ((Action & BROWSER_ACTION_DEFAULT) == BROWSER_ACTION_DEFAULT) {\r
     if (CfmStrLen != 0) {\r
       CfmStrLen += CatLen;\r
 \r
   if ((Action & BROWSER_ACTION_DEFAULT) == BROWSER_ACTION_DEFAULT) {\r
     if (CfmStrLen != 0) {\r
       CfmStrLen += CatLen;\r

-    } \r
+    }\r

 \r
     CfmStrLen += StrLen (gConfirmDefaultMsg);\r
   }\r
 \r
     CfmStrLen += StrLen (gConfirmDefaultMsg);\r
   }\r


@@ -2262,7 +2262,7 @@ FxConfirmPopup (
   if ((Action & BROWSER_ACTION_SUBMIT)  == BROWSER_ACTION_SUBMIT) {\r
     if (CfmStrLen != 0) {\r
       CfmStrLen += CatLen;\r
   if ((Action & BROWSER_ACTION_SUBMIT)  == BROWSER_ACTION_SUBMIT) {\r
     if (CfmStrLen != 0) {\r
       CfmStrLen += CatLen;\r

-    } \r
+    }\r

 \r
     CfmStrLen += StrLen (gConfirmSubmitMsg);\r
   }\r
 \r
     CfmStrLen += StrLen (gConfirmSubmitMsg);\r
   }\r


@@ -2270,7 +2270,7 @@ FxConfirmPopup (
   if ((Action & BROWSER_ACTION_RESET)  == BROWSER_ACTION_RESET) {\r
     if (CfmStrLen != 0) {\r
       CfmStrLen += CatLen;\r
   if ((Action & BROWSER_ACTION_RESET)  == BROWSER_ACTION_RESET) {\r
     if (CfmStrLen != 0) {\r
       CfmStrLen += CatLen;\r

-    } \r
+    }\r

 \r
     CfmStrLen += StrLen (gConfirmResetMsg);\r
   }\r
 \r
     CfmStrLen += StrLen (gConfirmResetMsg);\r
   }\r


@@ -2278,7 +2278,7 @@ FxConfirmPopup (
   if ((Action & BROWSER_ACTION_EXIT)  == BROWSER_ACTION_EXIT) {\r
     if (CfmStrLen != 0) {\r
       CfmStrLen += CatLen;\r
   if ((Action & BROWSER_ACTION_EXIT)  == BROWSER_ACTION_EXIT) {\r
     if (CfmStrLen != 0) {\r
       CfmStrLen += CatLen;\r

-    } \r
+    }\r

 \r
     CfmStrLen += StrLen (gConfirmExitMsg);\r
   }\r
 \r
     CfmStrLen += StrLen (gConfirmExitMsg);\r
   }\r


@@ -2356,7 +2356,7 @@ FxConfirmPopup (
   @param  MenuOption               The menu opton which this attribut used to.\r
   @param  SkipWidth                The skip width between the left to the start of the prompt.\r
   @param  BeginCol                 The begin column for one menu.\r
   @param  MenuOption               The menu opton which this attribut used to.\r
   @param  SkipWidth                The skip width between the left to the start of the prompt.\r
   @param  BeginCol                 The begin column for one menu.\r

-  @param  SkipLine                 The skip line for this menu. \r
+  @param  SkipLine                 The skip line for this menu.\r

   @param  BottomRow                The bottom row for this form.\r
   @param  Highlight                Whether this menu will be highlight.\r
   @param  UpdateCol                Whether need to update the column info for Date/Time.\r
   @param  BottomRow                The bottom row for this form.\r
   @param  Highlight                Whether this menu will be highlight.\r
   @param  UpdateCol                Whether need to update the column info for Date/Time.\r


@@ -2425,12 +2425,12 @@ DisplayOneMenu (
       //\r
       ProcessStringForDateTime(MenuOption, OptionString, UpdateCol);\r
     }\r
       //\r
       ProcessStringForDateTime(MenuOption, OptionString, UpdateCol);\r
     }\r

-  \r
+\r

     Width       = (UINT16) gOptionBlockWidth - 1;\r
     Row         = MenuOption->Row;\r
     GlyphWidth  = 1;\r
     OptionLineNum = 0;\r
     Width       = (UINT16) gOptionBlockWidth - 1;\r
     Row         = MenuOption->Row;\r
     GlyphWidth  = 1;\r
     OptionLineNum = 0;\r

-  \r
+\r

     for (Index = 0; GetLineByWidth (OptionString, Width, &GlyphWidth, &Index, &OutputString) != 0x0000;) {\r
       if (((Temp2 == 0)) && (Row <= BottomRow)) {\r
         if (Statement->OpCode->OpCode == EFI_IFR_DATE_OP || Statement->OpCode->OpCode == EFI_IFR_TIME_OP) {\r
     for (Index = 0; GetLineByWidth (OptionString, Width, &GlyphWidth, &Index, &OutputString) != 0x0000;) {\r
       if (((Temp2 == 0)) && (Row <= BottomRow)) {\r
         if (Statement->OpCode->OpCode == EFI_IFR_DATE_OP || Statement->OpCode->OpCode == EFI_IFR_TIME_OP) {\r


@@ -2448,7 +2448,7 @@ DisplayOneMenu (
           } else {\r
             //\r
             // For date/ time, print the first and second past (year for date and second for time)\r
           } else {\r
             //\r
             // For date/ time, print the first and second past (year for date and second for time)\r

-            // The OutputString has a NARROW_CHAR or WIDE_CHAR at the begin of the string, \r
+            // The OutputString has a NARROW_CHAR or WIDE_CHAR at the begin of the string,\r

             // so need to - 1 to remove it, otherwise, it will clean 1 extr char follow it.\r
             DisplayMenuString (MenuOption, MenuOption->OptCol, Row, OutputString, StrLen (OutputString) - 1, Highlight);\r
           }\r
             // so need to - 1 to remove it, otherwise, it will clean 1 extr char follow it.\r
             DisplayMenuString (MenuOption, MenuOption->OptCol, Row, OutputString, StrLen (OutputString) - 1, Highlight);\r
           }\r


@@ -2457,7 +2457,7 @@ DisplayOneMenu (
         }\r
         OptionLineNum++;\r
       }\r
         }\r
         OptionLineNum++;\r
       }\r

-      \r
+\r

       //\r
       // If there is more string to process print on the next row and increment the Skip value\r
       //\r
       //\r
       // If there is more string to process print on the next row and increment the Skip value\r
       //\r


@@ -2476,13 +2476,13 @@ DisplayOneMenu (
           }\r
         }\r
       }\r
           }\r
         }\r
       }\r

-  \r
+\r

       FreePool (OutputString);\r
       if (Temp2 != 0) {\r
         Temp2--;\r
       }\r
     }\r
       FreePool (OutputString);\r
       if (Temp2 != 0) {\r
         Temp2--;\r
       }\r
     }\r

-  \r
+\r

     Highlight = FALSE;\r
 \r
     FreePool (OptionString);\r
     Highlight = FALSE;\r
 \r
     FreePool (OptionString);\r


@@ -2500,13 +2500,13 @@ DisplayOneMenu (
     PrintStringAtWithWidth (BeginCol, Row, L"", PromptWidth + AdjustValue + SkipWidth);\r
     PromptLineNum++;\r
   } else {\r
     PrintStringAtWithWidth (BeginCol, Row, L"", PromptWidth + AdjustValue + SkipWidth);\r
     PromptLineNum++;\r
   } else {\r

-    for (Index = 0; GetLineByWidth (MenuOption->Description, PromptWidth, &GlyphWidth, &Index, &OutputString) != 0x0000;) {      \r
-      if ((Temp == 0) && (Row <= BottomRow)) { \r
+    for (Index = 0; GetLineByWidth (MenuOption->Description, PromptWidth, &GlyphWidth, &Index, &OutputString) != 0x0000;) {\r
+      if ((Temp == 0) && (Row <= BottomRow)) {\r

         //\r
         //\r

-        // 1.Clean the start LEFT_SKIPPED_COLUMNS \r
+        // 1.Clean the start LEFT_SKIPPED_COLUMNS\r

         //\r
         PrintStringAtWithWidth (BeginCol, Row, L"", SkipWidth);\r
         //\r
         PrintStringAtWithWidth (BeginCol, Row, L"", SkipWidth);\r

-        \r
+\r

         if (Statement->OpCode->OpCode == EFI_IFR_REF_OP && MenuOption->Col >= 2 && IsProcessingFirstRow) {\r
           //\r
           // Print Arrow for Goto button.\r
         if (Statement->OpCode->OpCode == EFI_IFR_REF_OP && MenuOption->Col >= 2 && IsProcessingFirstRow) {\r
           //\r
           // Print Arrow for Goto button.\r


@@ -2545,13 +2545,13 @@ DisplayOneMenu (
   //\r
   if ((Statement->OpCode->OpCode  == EFI_IFR_TEXT_OP) && (((EFI_IFR_TEXT*)Statement->OpCode)->TextTwo != 0)) {\r
     StringPtr   = GetToken (((EFI_IFR_TEXT*)Statement->OpCode)->TextTwo, gFormData->HiiHandle);\r
   //\r
   if ((Statement->OpCode->OpCode  == EFI_IFR_TEXT_OP) && (((EFI_IFR_TEXT*)Statement->OpCode)->TextTwo != 0)) {\r
     StringPtr   = GetToken (((EFI_IFR_TEXT*)Statement->OpCode)->TextTwo, gFormData->HiiHandle);\r

-  \r
+\r

     Width       = (UINT16) gOptionBlockWidth - 1;\r
     Row         = MenuOption->Row;\r
     GlyphWidth  = 1;\r
     OptionLineNum = 0;\r
 \r
     Width       = (UINT16) gOptionBlockWidth - 1;\r
     Row         = MenuOption->Row;\r
     GlyphWidth  = 1;\r
     OptionLineNum = 0;\r
 \r

-    for (Index = 0; GetLineByWidth (StringPtr, Width, &GlyphWidth, &Index, &OutputString) != 0x0000;) { \r
+    for (Index = 0; GetLineByWidth (StringPtr, Width, &GlyphWidth, &Index, &OutputString) != 0x0000;) {\r

       if ((Temp3 == 0) && (Row <= BottomRow)) {\r
         DisplayMenuString (MenuOption, MenuOption->OptCol, Row, OutputString, Width + 1, Highlight);\r
         OptionLineNum++;\r
       if ((Temp3 == 0) && (Row <= BottomRow)) {\r
         DisplayMenuString (MenuOption, MenuOption->OptCol, Row, OutputString, Width + 1, Highlight);\r
         OptionLineNum++;\r


@@ -2570,7 +2570,7 @@ DisplayOneMenu (
           }\r
         }\r
       }\r
           }\r
         }\r
       }\r

-  \r
+\r

       FreePool (OutputString);\r
       if (Temp3 != 0) {\r
         Temp3--;\r
       FreePool (OutputString);\r
       if (Temp3 != 0) {\r
         Temp3--;\r


@@ -2589,7 +2589,7 @@ DisplayOneMenu (
     Row    = (OptionLineNum < PromptLineNum ? OptionLineNum : PromptLineNum) + MenuOption->Row;\r
     Width  = (UINT16) (OptionLineNum < PromptLineNum ? gOptionBlockWidth : PromptWidth + AdjustValue + SkipWidth);\r
     MaxRow = (OptionLineNum < PromptLineNum ? PromptLineNum : OptionLineNum) + MenuOption->Row - 1;\r
     Row    = (OptionLineNum < PromptLineNum ? OptionLineNum : PromptLineNum) + MenuOption->Row;\r
     Width  = (UINT16) (OptionLineNum < PromptLineNum ? gOptionBlockWidth : PromptWidth + AdjustValue + SkipWidth);\r
     MaxRow = (OptionLineNum < PromptLineNum ? PromptLineNum : OptionLineNum) + MenuOption->Row - 1;\r

-    \r
+\r

     while (Row <= MaxRow) {\r
       DisplayMenuString (MenuOption, Col, Row++, L"", Width, FALSE);\r
     }\r
     while (Row <= MaxRow) {\r
       DisplayMenuString (MenuOption, Col, Row++, L"", Width, FALSE);\r
     }\r


@@ -2717,7 +2717,7 @@ UiDisplayMenu (
   while (TRUE) {\r
     switch (ControlFlag) {\r
     case CfInitialization:\r
   while (TRUE) {\r
     switch (ControlFlag) {\r
     case CfInitialization:\r

-      if ((gOldFormEntry.HiiHandle != FormData->HiiHandle) || \r
+      if ((gOldFormEntry.HiiHandle != FormData->HiiHandle) ||\r

           (!CompareGuid (&gOldFormEntry.FormSetGuid, &FormData->FormSetGuid))) {\r
         //\r
         // Clear Statement range if different formset is painted.\r
           (!CompareGuid (&gOldFormEntry.FormSetGuid, &FormData->FormSetGuid))) {\r
         //\r
         // Clear Statement range if different formset is painted.\r


@@ -2746,7 +2746,7 @@ UiDisplayMenu (
         Row             = TopRow;\r
 \r
         gST->ConOut->SetAttribute (gST->ConOut, GetFieldTextColor ());\r
         Row             = TopRow;\r
 \r
         gST->ConOut->SetAttribute (gST->ConOut, GetFieldTextColor ());\r

-        \r
+\r

         //\r
         // 1. Check whether need to print the arrow up.\r
         //\r
         //\r
         // 1. Check whether need to print the arrow up.\r
         //\r


@@ -2795,19 +2795,19 @@ UiDisplayMenu (
           }\r
 \r
           if ((FormData->Attribute & HII_DISPLAY_MODAL) != 0) {\r
           }\r
 \r
           if ((FormData->Attribute & HII_DISPLAY_MODAL) != 0) {\r

-            Status = DisplayOneMenu (MenuOption, \r
+            Status = DisplayOneMenu (MenuOption,\r

                             MenuOption->Col - gStatementDimensions.LeftColumn,\r
                             MenuOption->Col - gStatementDimensions.LeftColumn,\r

-                            gStatementDimensions.LeftColumn + gModalSkipColumn, \r
-                            Link == TopOfScreen ? SkipValue : 0, \r
+                            gStatementDimensions.LeftColumn + gModalSkipColumn,\r
+                            Link == TopOfScreen ? SkipValue : 0,\r

                             BottomRow,\r
                             (BOOLEAN) ((Link == NewPos) && IsSelectable(MenuOption)),\r
                             TRUE\r
                             );\r
           } else {\r
                             BottomRow,\r
                             (BOOLEAN) ((Link == NewPos) && IsSelectable(MenuOption)),\r
                             TRUE\r
                             );\r
           } else {\r

-            Status = DisplayOneMenu (MenuOption, \r
+            Status = DisplayOneMenu (MenuOption,\r

                             MenuOption->Col - gStatementDimensions.LeftColumn,\r
                             MenuOption->Col - gStatementDimensions.LeftColumn,\r

-                            gStatementDimensions.LeftColumn, \r
-                            Link == TopOfScreen ? SkipValue : 0, \r
+                            gStatementDimensions.LeftColumn,\r
+                            Link == TopOfScreen ? SkipValue : 0,\r

                             BottomRow,\r
                             (BOOLEAN) ((Link == NewPos) && IsSelectable(MenuOption)),\r
                             TRUE\r
                             BottomRow,\r
                             (BOOLEAN) ((Link == NewPos) && IsSelectable(MenuOption)),\r
                             TRUE\r


@@ -2915,10 +2915,10 @@ UiDisplayMenu (
           //\r
           // Remove the old highlight menu.\r
           //\r
           //\r
           // Remove the old highlight menu.\r
           //\r

-          Status = DisplayOneMenu (MenuOption, \r
+          Status = DisplayOneMenu (MenuOption,\r

                           MenuOption->Col - gStatementDimensions.LeftColumn,\r
                           MenuOption->Col - gStatementDimensions.LeftColumn,\r

-                          gStatementDimensions.LeftColumn, \r
-                          Temp, \r
+                          gStatementDimensions.LeftColumn,\r
+                          Temp,\r

                           BottomRow,\r
                           FALSE,\r
                           FALSE\r
                           BottomRow,\r
                           FALSE,\r
                           FALSE\r


@@ -2935,10 +2935,10 @@ UiDisplayMenu (
           break;\r
         }\r
 \r
           break;\r
         }\r
 \r

-        Status = DisplayOneMenu (MenuOption, \r
+        Status = DisplayOneMenu (MenuOption,\r

                         MenuOption->Col - gStatementDimensions.LeftColumn,\r
                         MenuOption->Col - gStatementDimensions.LeftColumn,\r

-                        gStatementDimensions.LeftColumn, \r
-                        Temp2, \r
+                        gStatementDimensions.LeftColumn,\r
+                        Temp2,\r

                         BottomRow,\r
                         TRUE,\r
                         FALSE\r
                         BottomRow,\r
                         TRUE,\r
                         FALSE\r


@@ -3038,7 +3038,7 @@ UiDisplayMenu (
       //\r
       // Check whether need to show the 'More(U/u)' at the begin.\r
       // Base on current direct info, here shows aligned to the right side of the column.\r
       //\r
       // Check whether need to show the 'More(U/u)' at the begin.\r
       // Base on current direct info, here shows aligned to the right side of the column.\r

-      // If the direction is multi line and aligned to right side may have problem, so \r
+      // If the direction is multi line and aligned to right side may have problem, so\r

       // add ASSERT code here.\r
       //\r
       if (HelpPageIndex > 0) {\r
       // add ASSERT code here.\r
       //\r
       if (HelpPageIndex > 0) {\r


@@ -3093,7 +3093,7 @@ UiDisplayMenu (
               );\r
           }\r
         } else {\r
               );\r
           }\r
         } else {\r

-          for (Index = 0; (Index < RowCount - HelpBottomLine - HelpHeaderLine) && \r
+          for (Index = 0; (Index < RowCount - HelpBottomLine - HelpHeaderLine) &&\r

               (Index + HelpPageIndex * (RowCount - 2) + 1 < HelpLine); Index++) {\r
             PrintStringAtWithWidth (\r
               gStatementDimensions.RightColumn - gHelpBlockWidth,\r
               (Index + HelpPageIndex * (RowCount - 2) + 1 < HelpLine); Index++) {\r
             PrintStringAtWithWidth (\r
               gStatementDimensions.RightColumn - gHelpBlockWidth,\r


@@ -3113,13 +3113,13 @@ UiDisplayMenu (
             }\r
             gST->ConOut->SetCursorPosition(gST->ConOut, gStatementDimensions.RightColumn-1, BottomRow);\r
           }\r
             }\r
             gST->ConOut->SetCursorPosition(gST->ConOut, gStatementDimensions.RightColumn-1, BottomRow);\r
           }\r

-        } \r
+        }\r

       }\r
 \r
       //\r
       // Check whether need to print the 'More(D/d)' at the bottom.\r
       // Base on current direct info, here shows aligned to the right side of the column.\r
       }\r
 \r
       //\r
       // Check whether need to print the 'More(D/d)' at the bottom.\r
       // Base on current direct info, here shows aligned to the right side of the column.\r

-      // If the direction is multi line and aligned to right side may have problem, so \r
+      // If the direction is multi line and aligned to right side may have problem, so\r

       // add ASSERT code here.\r
       //\r
       if (HelpPageIndex < HelpPageCount - 1 && MultiHelpPage) {\r
       // add ASSERT code here.\r
       //\r
       if (HelpPageIndex < HelpPageCount - 1 && MultiHelpPage) {\r


@@ -3171,7 +3171,7 @@ UiDisplayMenu (
         if (Status != EFI_NOT_READY) {\r
           continue;\r
         }\r
         if (Status != EFI_NOT_READY) {\r
           continue;\r
         }\r

-        \r
+\r

         EventType = UiWaitForEvent(gST->ConIn->WaitForKey);\r
         if (EventType == UIEventKey) {\r
           gST->ConIn->ReadKeyStroke (gST->ConIn, &Key);\r
         EventType = UiWaitForEvent(gST->ConIn->WaitForKey);\r
         if (EventType == UIEventKey) {\r
           gST->ConIn->ReadKeyStroke (gST->ConIn, &Key);\r


@@ -3185,7 +3185,7 @@ UiDisplayMenu (
         ControlFlag = CfExit;\r
         break;\r
       }\r
         ControlFlag = CfExit;\r
         break;\r
       }\r

-      \r
+\r

       if (EventType == UIEventTimeOut) {\r
         gUserInput->Action = BROWSER_ACTION_FORM_EXIT;\r
         ControlFlag = CfExit;\r
       if (EventType == UIEventTimeOut) {\r
         gUserInput->Action = BROWSER_ACTION_FORM_EXIT;\r
         ControlFlag = CfExit;\r


@@ -3229,7 +3229,7 @@ UiDisplayMenu (
           } else {\r
             gDirection = SCAN_LEFT;\r
           }\r
           } else {\r
             gDirection = SCAN_LEFT;\r
           }\r

-          \r
+\r

           Status = ProcessOptions (MenuOption, TRUE, &OptionString, TRUE);\r
           if (OptionString != NULL) {\r
             FreePool (OptionString);\r
           Status = ProcessOptions (MenuOption, TRUE, &OptionString, TRUE);\r
           if (OptionString != NULL) {\r
             FreePool (OptionString);\r


@@ -3260,7 +3260,7 @@ UiDisplayMenu (
           ControlFlag = CfReadKey;\r
           break;\r
         }\r
           ControlFlag = CfReadKey;\r
           break;\r
         }\r

-        \r
+\r

         ASSERT(MenuOption != NULL);\r
         if (MenuOption->ThisTag->OpCode->OpCode == EFI_IFR_CHECKBOX_OP && !MenuOption->GrayOut && !MenuOption->ReadOnly) {\r
           ScreenOperation = UiSelect;\r
         ASSERT(MenuOption != NULL);\r
         if (MenuOption->ThisTag->OpCode->OpCode == EFI_IFR_CHECKBOX_OP && !MenuOption->GrayOut && !MenuOption->ReadOnly) {\r
           ScreenOperation = UiSelect;\r


@@ -3294,7 +3294,7 @@ UiDisplayMenu (
             break;\r
           }\r
         }\r
             break;\r
           }\r
         }\r

-        \r
+\r

         if (((FormData->Attribute & HII_DISPLAY_MODAL) != 0) && (Key.ScanCode == SCAN_ESC || Index == mScanCodeNumber)) {\r
           //\r
           // ModalForm has no ESC key and Hot Key.\r
         if (((FormData->Attribute & HII_DISPLAY_MODAL) != 0) && (Key.ScanCode == SCAN_ESC || Index == mScanCodeNumber)) {\r
           //\r
           // ModalForm has no ESC key and Hot Key.\r


@@ -3359,11 +3359,11 @@ UiDisplayMenu (
         //\r
         RefreshKeyHelp (gFormData, Statement, TRUE);\r
         Status = ProcessOptions (MenuOption, TRUE, &OptionString, TRUE);\r
         //\r
         RefreshKeyHelp (gFormData, Statement, TRUE);\r
         Status = ProcessOptions (MenuOption, TRUE, &OptionString, TRUE);\r

-        \r
+\r

         if (OptionString != NULL) {\r
           FreePool (OptionString);\r
         }\r
         if (OptionString != NULL) {\r
           FreePool (OptionString);\r
         }\r

-        \r
+\r

         if (EFI_ERROR (Status)) {\r
           Repaint = TRUE;\r
           NewLine = TRUE;\r
         if (EFI_ERROR (Status)) {\r
           Repaint = TRUE;\r
           NewLine = TRUE;\r


@@ -3493,12 +3493,12 @@ UiDisplayMenu (
         // Check whether new highlight menu is selectable, if not, keep highlight on the old one.\r
         //\r
         // BottomRow - TopRow + 1 means the total rows current forms supported.\r
         // Check whether new highlight menu is selectable, if not, keep highlight on the old one.\r
         //\r
         // BottomRow - TopRow + 1 means the total rows current forms supported.\r

-        // Difference + NextMenuOption->Skip + 1 means the distance between last highlight menu \r
-        // and new top menu. New top menu will all shows in next form, but last highlight menu \r
-        // may only shows 1 line. + 1 at right part means at least need to keep 1 line for the \r
+        // Difference + NextMenuOption->Skip + 1 means the distance between last highlight menu\r
+        // and new top menu. New top menu will all shows in next form, but last highlight menu\r
+        // may only shows 1 line. + 1 at right part means at least need to keep 1 line for the\r

         // last highlight menu.\r
         // last highlight menu.\r

-        // \r
-        if (!IsSelectable(NextMenuOption) && IsSelectable(MenuOption) && \r
+        //\r
+        if (!IsSelectable(NextMenuOption) && IsSelectable(MenuOption) &&\r

             (BottomRow - TopRow + 1 >= Difference + NextMenuOption->Skip + 1)) {\r
           NewPos = SavedListEntry;\r
         }\r
             (BottomRow - TopRow + 1 >= Difference + NextMenuOption->Skip + 1)) {\r
           NewPos = SavedListEntry;\r
         }\r


@@ -3539,11 +3539,11 @@ UiDisplayMenu (
       } else {\r
         Index     = (BottomRow + 1) - SkipValue - TopRow;\r
       }\r
       } else {\r
         Index     = (BottomRow + 1) - SkipValue - TopRow;\r
       }\r

-      \r
+\r

       TopOfScreen = FindTopOfScreenMenu(TopOfScreen, Index, &SkipValue);\r
       NewPos = TopOfScreen;\r
       MoveToNextStatement (FALSE, &NewPos, BottomRow - TopRow, FALSE);\r
       TopOfScreen = FindTopOfScreenMenu(TopOfScreen, Index, &SkipValue);\r
       NewPos = TopOfScreen;\r
       MoveToNextStatement (FALSE, &NewPos, BottomRow - TopRow, FALSE);\r

-      \r
+\r

       UpdateStatusBar (INPUT_ERROR, FALSE);\r
 \r
       //\r
       UpdateStatusBar (INPUT_ERROR, FALSE);\r
 \r
       //\r


@@ -3662,7 +3662,7 @@ UiDisplayMenu (
         //\r
         // Scroll to the first page.\r
         //\r
         //\r
         // Scroll to the first page.\r
         //\r

-        if (TopOfScreen != gMenuOption.ForwardLink || SkipValue != 0) { \r
+        if (TopOfScreen != gMenuOption.ForwardLink || SkipValue != 0) {\r

           TopOfScreen = gMenuOption.ForwardLink;\r
           Repaint     = TRUE;\r
           MenuOption  = NULL;\r
           TopOfScreen = gMenuOption.ForwardLink;\r
           Repaint     = TRUE;\r
           MenuOption  = NULL;\r


@@ -3681,7 +3681,7 @@ UiDisplayMenu (
 \r
         UpdateHighlightMenuInfo(NewPos, TopOfScreen, SkipValue);\r
         break;\r
 \r
         UpdateHighlightMenuInfo(NewPos, TopOfScreen, SkipValue);\r
         break;\r

-      }        \r
+      }\r

 \r
       //\r
       // Get next selected menu info.\r
 \r
       //\r
       // Get next selected menu info.\r


@@ -3760,12 +3760,12 @@ UiDisplayMenu (
       // Check whether new highlight menu is selectable, if not, keep highlight on the old one.\r
       //\r
       // BottomRow - TopRow + 1 means the total rows current forms supported.\r
       // Check whether new highlight menu is selectable, if not, keep highlight on the old one.\r
       //\r
       // BottomRow - TopRow + 1 means the total rows current forms supported.\r

-      // Difference + NextMenuOption->Skip + 1 means the distance between last highlight menu \r
-      // and new top menu. New top menu will all shows in next form, but last highlight menu \r
-      // may only shows 1 line. + 1 at right part means at least need to keep 1 line for the \r
+      // Difference + NextMenuOption->Skip + 1 means the distance between last highlight menu\r
+      // and new top menu. New top menu will all shows in next form, but last highlight menu\r
+      // may only shows 1 line. + 1 at right part means at least need to keep 1 line for the\r

       // last highlight menu.\r
       // last highlight menu.\r

-      // \r
-      if (!IsSelectable (NextMenuOption) && IsSelectable (MenuOption) && \r
+      //\r
+      if (!IsSelectable (NextMenuOption) && IsSelectable (MenuOption) &&\r

          (BottomRow - TopRow + 1 >= Difference + NextMenuOption->Skip + 1)) {\r
         NewPos = SavedListEntry;\r
       }\r
          (BottomRow - TopRow + 1 >= Difference + NextMenuOption->Skip + 1)) {\r
         NewPos = SavedListEntry;\r
       }\r


@@ -3984,7 +3984,7 @@ BrowserStatusProcess (
       // Show the dialog first to avoid long time not reaction.\r
       //\r
       gBS->SignalEvent (RefreshIntervalEvent);\r
       // Show the dialog first to avoid long time not reaction.\r
       //\r
       gBS->SignalEvent (RefreshIntervalEvent);\r

-    \r
+\r

       Status = gBS->SetTimer (RefreshIntervalEvent, TimerPeriodic, ONE_SECOND);\r
       ASSERT_EFI_ERROR (Status);\r
 \r
       Status = gBS->SetTimer (RefreshIntervalEvent, TimerPeriodic, ONE_SECOND);\r
       ASSERT_EFI_ERROR (Status);\r
 \r


@@ -4025,17 +4025,17 @@ BrowserStatusProcess (
 \r
 /**\r
   Display one form, and return user input.\r
 \r
 /**\r
   Display one form, and return user input.\r

-  \r
+\r

   @param FormData                Form Data to be shown.\r
   @param UserInputData           User input data.\r
   @param FormData                Form Data to be shown.\r
   @param UserInputData           User input data.\r

-  \r
+\r

   @retval EFI_SUCCESS            1.Form Data is shown, and user input is got.\r
                                  2.Error info has show and return.\r
   @retval EFI_INVALID_PARAMETER  The input screen dimension is not valid\r
   @retval EFI_NOT_FOUND          New form data has some error.\r
 **/\r
 EFI_STATUS\r
   @retval EFI_SUCCESS            1.Form Data is shown, and user input is got.\r
                                  2.Error info has show and return.\r
   @retval EFI_INVALID_PARAMETER  The input screen dimension is not valid\r
   @retval EFI_NOT_FOUND          New form data has some error.\r
 **/\r
 EFI_STATUS\r

-EFIAPI \r
+EFIAPI\r

 FormDisplay (\r
   IN  FORM_DISPLAY_ENGINE_FORM  *FormData,\r
   OUT USER_INPUT                *UserInputData\r
 FormDisplay (\r
   IN  FORM_DISPLAY_ENGINE_FORM  *FormData,\r
   OUT USER_INPUT                *UserInputData\r


@@ -4074,7 +4074,7 @@ FormDisplay (
   //\r
   //  Left                                              right\r
   //   |<-.->|<-.........->|<- .........->|<-...........->|\r
   //\r
   //  Left                                              right\r
   //   |<-.->|<-.........->|<- .........->|<-...........->|\r

-  //     Skip    Prompt         Option         Help \r
+  //     Skip    Prompt         Option         Help\r

   //\r
   gOptionBlockWidth = (CHAR16) ((gStatementDimensions.RightColumn - gStatementDimensions.LeftColumn) / 3) + 1;\r
   gHelpBlockWidth   = (CHAR16) (gOptionBlockWidth - 1 - LEFT_SKIPPED_COLUMNS);\r
   //\r
   gOptionBlockWidth = (CHAR16) ((gStatementDimensions.RightColumn - gStatementDimensions.LeftColumn) / 3) + 1;\r
   gHelpBlockWidth   = (CHAR16) (gOptionBlockWidth - 1 - LEFT_SKIPPED_COLUMNS);\r


@@ -4085,7 +4085,7 @@ FormDisplay (
   //\r
   // Check whether layout is changed.\r
   //\r
   //\r
   // Check whether layout is changed.\r
   //\r

-  if (mIsFirstForm \r
+  if (mIsFirstForm\r

       || (gOldFormEntry.HiiHandle != FormData->HiiHandle)\r
       || (!CompareGuid (&gOldFormEntry.FormSetGuid, &FormData->FormSetGuid))\r
       || (gOldFormEntry.FormId != FormData->FormId)) {\r
       || (gOldFormEntry.HiiHandle != FormData->HiiHandle)\r
       || (!CompareGuid (&gOldFormEntry.FormSetGuid, &FormData->FormSetGuid))\r
       || (gOldFormEntry.FormId != FormData->FormId)) {\r


@@ -4095,7 +4095,7 @@ FormDisplay (
   }\r
 \r
   Status = UiDisplayMenu(FormData);\r
   }\r
 \r
   Status = UiDisplayMenu(FormData);\r

-  \r
+\r

   //\r
   // Backup last form info.\r
   //\r
   //\r
   // Backup last form info.\r
   //\r


@@ -4116,7 +4116,7 @@ FormDisplay (
   Clear Screen to the initial state.\r
 **/\r
 VOID\r
   Clear Screen to the initial state.\r
 **/\r
 VOID\r

-EFIAPI \r
+EFIAPI\r

 DriverClearDisplayPage (\r
   VOID\r
   )\r
 DriverClearDisplayPage (\r
   VOID\r
   )\r


@@ -4204,13 +4204,13 @@ InitializeDisplayEngine (
   ASSERT_EFI_ERROR (Status);\r
 \r
   InitializeDisplayStrings();\r
   ASSERT_EFI_ERROR (Status);\r
 \r
   InitializeDisplayStrings();\r

-  \r
+\r

   ZeroMem (&gHighligthMenuInfo, sizeof (gHighligthMenuInfo));\r
   ZeroMem (&gOldFormEntry, sizeof (gOldFormEntry));\r
 \r
   //\r
   // Use BrowserEx2 protocol to register HotKey.\r
   ZeroMem (&gHighligthMenuInfo, sizeof (gHighligthMenuInfo));\r
   ZeroMem (&gOldFormEntry, sizeof (gOldFormEntry));\r
 \r
   //\r
   // Use BrowserEx2 protocol to register HotKey.\r

-  // \r
+  //\r

   Status = gBS->LocateProtocol (&gEdkiiFormBrowserEx2ProtocolGuid, NULL, (VOID **) &FormBrowserEx2);\r
   if (!EFI_ERROR (Status)) {\r
     //\r
   Status = gBS->LocateProtocol (&gEdkiiFormBrowserEx2ProtocolGuid, NULL, (VOID **) &FormBrowserEx2);\r
   if (!EFI_ERROR (Status)) {\r
     //\r

diff --git a/MdeModulePkg/Universal/DisplayEngineDxe/FormDisplay.h b/MdeModulePkg/Universal/DisplayEngineDxe/FormDisplay.h
index 7e2a1aa64be084d0b394425b6e0315daad28bbd6..fc28f95e729146de05dc71be7f2897b2badc15da 100644 (file)
--- a/MdeModulePkg/Universal/DisplayEngineDxe/FormDisplay.h
+++ b/MdeModulePkg/Universal/DisplayEngineDxe/FormDisplay.h
@@ -1,13 +1,13 @@
 /** @file\r
   FormDiplay protocol to show Form\r
 \r
 /** @file\r
   FormDiplay protocol to show Form\r
 \r

-Copyright (c) 2013 - 2017, Intel Corporation. All rights reserved.<BR>\r
-This program and the accompanying materials are licensed and made available under \r
-the terms and conditions of the BSD License that accompanies this distribution.  \r
+Copyright (c) 2013 - 2018, Intel Corporation. All rights reserved.<BR>\r
+This program and the accompanying materials are licensed and made available under\r
+the terms and conditions of the BSD License that accompanies this distribution.\r

 The full text of the license may be found at\r
 The full text of the license may be found at\r

-http://opensource.org/licenses/bsd-license.php.                                            \r
+http://opensource.org/licenses/bsd-license.php.\r

 \r
 \r

-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     \r
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r

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


@@ -213,22 +213,22 @@ typedef struct {
 typedef struct {\r
   EFI_HII_HANDLE     HiiHandle;\r
   UINT16             FormId;\r
 typedef struct {\r
   EFI_HII_HANDLE     HiiHandle;\r
   UINT16             FormId;\r

-  \r
+\r

   //\r
   // Info for the highlight question.\r
   // HLT means highlight\r
   //\r
   // If one statement has questionid, save questionid info to find the question.\r
   //\r
   // Info for the highlight question.\r
   // HLT means highlight\r
   //\r
   // If one statement has questionid, save questionid info to find the question.\r

-  // If one statement not has questionid info, save the opcode info to find the \r
+  // If one statement not has questionid info, save the opcode info to find the\r

   // statement. If more than one statement has same opcode in one form(just like\r
   // statement. If more than one statement has same opcode in one form(just like\r

-  // empty subtitle info may has more than one info one form), also use Index \r
+  // empty subtitle info may has more than one info one form), also use Index\r

   // info to find the statement.\r
   //\r
   EFI_QUESTION_ID    HLTQuestionId;\r
   EFI_IFR_OP_HEADER  *HLTOpCode;\r
   UINTN              HLTIndex;\r
   UINTN              HLTSequence;\r
   // info to find the statement.\r
   //\r
   EFI_QUESTION_ID    HLTQuestionId;\r
   EFI_IFR_OP_HEADER  *HLTOpCode;\r
   UINTN              HLTIndex;\r
   UINTN              HLTSequence;\r

-  \r
+\r

   //\r
   // Info for the top of screen question.\r
   // TOS means Top Of Screen\r
   //\r
   // Info for the top of screen question.\r
   // TOS means Top Of Screen\r


@@ -390,7 +390,7 @@ GetArrayData (
   IN UINT8                    Type,\r
   IN UINTN                    Index\r
   );\r
   IN UINT8                    Type,\r
   IN UINTN                    Index\r
   );\r

-  \r
+\r

 /**\r
   Search an Option of a Question by its value.\r
 \r
 /**\r
   Search an Option of a Question by its value.\r
 \r


@@ -462,7 +462,7 @@ CreateMultiStringPopUp (
   @param  Index                  Where in InputString to start the copy process\r
   @param  OutputString           Buffer to copy the string into\r
 \r
   @param  Index                  Where in InputString to start the copy process\r
   @param  OutputString           Buffer to copy the string into\r
 \r

-  @return Returns the number of CHAR16 characters that were copied into the OutputString \r
+  @return Returns the number of CHAR16 characters that were copied into the OutputString\r

   buffer, include extra glyph info and '\0' info.\r
 \r
 **/\r
   buffer, include extra glyph info and '\0' info.\r
 \r
 **/\r


@@ -490,7 +490,7 @@ GetToken (
   IN  EFI_STRING_ID                Token,\r
   IN  EFI_HII_HANDLE               HiiHandle\r
   );\r
   IN  EFI_STRING_ID                Token,\r
   IN  EFI_HII_HANDLE               HiiHandle\r
   );\r

-  \r
+\r

 /**\r
   Count the storage space of a Unicode string.\r
 \r
 /**\r
   Count the storage space of a Unicode string.\r
 \r


@@ -559,7 +559,7 @@ CreateSharedPopUp (
   IN  UINTN                       NumberOfLines,\r
   IN  VA_LIST                     Marker\r
   );\r
   IN  UINTN                       NumberOfLines,\r
   IN  VA_LIST                     Marker\r
   );\r

-  \r
+\r

 /**\r
   Wait for a key to be pressed by user.\r
 \r
 /**\r
   Wait for a key to be pressed by user.\r
 \r


@@ -642,14 +642,14 @@ SetUnicodeMem (
 \r
 /**\r
   Display one form, and return user input.\r
 \r
 /**\r
   Display one form, and return user input.\r

-  \r
+\r

   @param FormData                Form Data to be shown.\r
   @param UserInputData           User input data.\r
   @param FormData                Form Data to be shown.\r
   @param UserInputData           User input data.\r

-  \r
+\r

   @retval EFI_SUCCESS            Form Data is shown, and user input is got.\r
 **/\r
 EFI_STATUS\r
   @retval EFI_SUCCESS            Form Data is shown, and user input is got.\r
 **/\r
 EFI_STATUS\r

-EFIAPI \r
+EFIAPI\r

 FormDisplay (\r
   IN  FORM_DISPLAY_ENGINE_FORM  *FormData,\r
   OUT USER_INPUT                *UserInputData\r
 FormDisplay (\r
   IN  FORM_DISPLAY_ENGINE_FORM  *FormData,\r
   OUT USER_INPUT                *UserInputData\r


@@ -659,7 +659,7 @@ FormDisplay (
   Clear Screen to the initial state.\r
 **/\r
 VOID\r
   Clear Screen to the initial state.\r
 **/\r
 VOID\r

-EFIAPI \r
+EFIAPI\r

 DriverClearDisplayPage (\r
   VOID\r
   );\r
 DriverClearDisplayPage (\r
   VOID\r
   );\r


@@ -669,7 +669,7 @@ DriverClearDisplayPage (
 \r
 **/\r
 VOID\r
 \r
 **/\r
 VOID\r

-EFIAPI \r
+EFIAPI\r

 ExitDisplay (\r
   VOID\r
   );\r
 ExitDisplay (\r
   VOID\r
   );\r

diff --git a/MdeModulePkg/Universal/DisplayEngineDxe/InputHandler.c b/MdeModulePkg/Universal/DisplayEngineDxe/InputHandler.c
index d02c0bf0742433ef5f0ba2187dad22a410539848..cf829a32145ffa955d8f32b7347e83738c667320 100644 (file)
--- a/MdeModulePkg/Universal/DisplayEngineDxe/InputHandler.c
+++ b/MdeModulePkg/Universal/DisplayEngineDxe/InputHandler.c
@@ -1,7 +1,7 @@
 /** @file\r
 Implementation for handling user input from the User Interfaces.\r
 \r
 /** @file\r
 Implementation for handling user input from the User Interfaces.\r
 \r

-Copyright (c) 2004 - 2017, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2004 - 2018, Intel Corporation. All rights reserved.<BR>\r

 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r


@@ -34,14 +34,14 @@ GetFieldFromOp (
   if (OpCode->OpCode == EFI_IFR_STRING_OP) {\r
     StringOp = (EFI_IFR_STRING *) OpCode;\r
     *Minimum = StringOp->MinSize;\r
   if (OpCode->OpCode == EFI_IFR_STRING_OP) {\r
     StringOp = (EFI_IFR_STRING *) OpCode;\r
     *Minimum = StringOp->MinSize;\r

-    *Maximum = StringOp->MaxSize;    \r
+    *Maximum = StringOp->MaxSize;\r

   } else if (OpCode->OpCode == EFI_IFR_PASSWORD_OP) {\r
     PasswordOp = (EFI_IFR_PASSWORD *) OpCode;\r
     *Minimum = PasswordOp->MinSize;\r
   } else if (OpCode->OpCode == EFI_IFR_PASSWORD_OP) {\r
     PasswordOp = (EFI_IFR_PASSWORD *) OpCode;\r
     *Minimum = PasswordOp->MinSize;\r

-    *Maximum = PasswordOp->MaxSize;       \r
+    *Maximum = PasswordOp->MaxSize;\r

   } else {\r
     *Minimum = 0;\r
   } else {\r
     *Minimum = 0;\r

-    *Maximum = 0;       \r
+    *Maximum = 0;\r

   }\r
 }\r
 \r
   }\r
 }\r
 \r


@@ -160,11 +160,11 @@ ReadString (
     if (!IsPassword) {\r
       PrintStringAt (Start + 1, Top + 3, BufferedString);\r
     }\r
     if (!IsPassword) {\r
       PrintStringAt (Start + 1, Top + 3, BufferedString);\r
     }\r

-    \r
+\r

     gST->ConOut->SetAttribute (gST->ConOut, EFI_TEXT_ATTR (EFI_LIGHTGRAY, EFI_BLACK));\r
     gST->ConOut->SetCursorPosition (gST->ConOut, Start + GetStringWidth (StringPtr) / 2, Top + 3);\r
   }\r
     gST->ConOut->SetAttribute (gST->ConOut, EFI_TEXT_ATTR (EFI_LIGHTGRAY, EFI_BLACK));\r
     gST->ConOut->SetCursorPosition (gST->ConOut, Start + GetStringWidth (StringPtr) / 2, Top + 3);\r
   }\r

-  \r
+\r

   do {\r
     Status = WaitForKeyStroke (&Key);\r
     ASSERT_EFI_ERROR (Status);\r
   do {\r
     Status = WaitForKeyStroke (&Key);\r
     ASSERT_EFI_ERROR (Status);\r


@@ -264,7 +264,7 @@ ReadString (
           for (Index = 0; Index < CurrentCursor; Index++) {\r
             TempString[Index] = StringPtr[Index];\r
           }\r
           for (Index = 0; Index < CurrentCursor; Index++) {\r
             TempString[Index] = StringPtr[Index];\r
           }\r

-                 TempString[Index] = CHAR_NULL;\r
+      TempString[Index] = CHAR_NULL;\r

           StrCatS (TempString, MaxLen, KeyPad);\r
           StrCatS (TempString, MaxLen, StringPtr + CurrentCursor);\r
           StrCpyS (StringPtr, MaxLen, TempString);\r
           StrCatS (TempString, MaxLen, KeyPad);\r
           StrCatS (TempString, MaxLen, StringPtr + CurrentCursor);\r
           StrCpyS (StringPtr, MaxLen, TempString);\r


@@ -361,7 +361,7 @@ AdjustQuestionValue (
       QuestionValue->Value.date.Day = Maximum;\r
     }\r
   }\r
       QuestionValue->Value.date.Day = Maximum;\r
     }\r
   }\r

-  \r
+\r

   //\r
   // Change the Year area.\r
   //\r
   //\r
   // Change the Year area.\r
   //\r


@@ -400,7 +400,7 @@ GetValueFromNum (
   EFI_IFR_NUMERIC       *NumericOp;\r
 \r
   NumericOp = (EFI_IFR_NUMERIC *) OpCode;\r
   EFI_IFR_NUMERIC       *NumericOp;\r
 \r
   NumericOp = (EFI_IFR_NUMERIC *) OpCode;\r

-  \r
+\r

   switch (NumericOp->Flags & EFI_IFR_NUMERIC_SIZE) {\r
   case EFI_IFR_NUMERIC_SIZE_1:\r
     if (IntInput) {\r
   switch (NumericOp->Flags & EFI_IFR_NUMERIC_SIZE) {\r
   case EFI_IFR_NUMERIC_SIZE_1:\r
     if (IntInput) {\r


@@ -415,7 +415,7 @@ GetValueFromNum (
     *Step    = NumericOp->data.u8.Step;\r
     *StorageWidth = (UINT16) sizeof (UINT8);\r
     break;\r
     *Step    = NumericOp->data.u8.Step;\r
     *StorageWidth = (UINT16) sizeof (UINT8);\r
     break;\r

-  \r
+\r

   case EFI_IFR_NUMERIC_SIZE_2:\r
     if (IntInput) {\r
       *Minimum = (INT64) (INT16) NumericOp->data.u16.MinValue;\r
   case EFI_IFR_NUMERIC_SIZE_2:\r
     if (IntInput) {\r
       *Minimum = (INT64) (INT16) NumericOp->data.u16.MinValue;\r


@@ -429,7 +429,7 @@ GetValueFromNum (
     *Step    = NumericOp->data.u16.Step;\r
     *StorageWidth = (UINT16) sizeof (UINT16);\r
     break;\r
     *Step    = NumericOp->data.u16.Step;\r
     *StorageWidth = (UINT16) sizeof (UINT16);\r
     break;\r

-  \r
+\r

   case EFI_IFR_NUMERIC_SIZE_4:\r
     if (IntInput) {\r
       *Minimum = (INT64) (INT32) NumericOp->data.u32.MinValue;\r
   case EFI_IFR_NUMERIC_SIZE_4:\r
     if (IntInput) {\r
       *Minimum = (INT64) (INT32) NumericOp->data.u32.MinValue;\r


@@ -443,7 +443,7 @@ GetValueFromNum (
     *Step    = NumericOp->data.u32.Step;\r
     *StorageWidth = (UINT16) sizeof (UINT32);\r
     break;\r
     *Step    = NumericOp->data.u32.Step;\r
     *StorageWidth = (UINT16) sizeof (UINT32);\r
     break;\r

-  \r
+\r

   case EFI_IFR_NUMERIC_SIZE_8:\r
     if (IntInput) {\r
       *Minimum = (INT64) NumericOp->data.u64.MinValue;\r
   case EFI_IFR_NUMERIC_SIZE_8:\r
     if (IntInput) {\r
       *Minimum = (INT64) NumericOp->data.u64.MinValue;\r


@@ -457,7 +457,7 @@ GetValueFromNum (
     *Step    = NumericOp->data.u64.Step;\r
     *StorageWidth = (UINT16) sizeof (UINT64);\r
     break;\r
     *Step    = NumericOp->data.u64.Step;\r
     *StorageWidth = (UINT16) sizeof (UINT64);\r
     break;\r

-  \r
+\r

   default:\r
     break;\r
   }\r
   default:\r
     break;\r
   }\r


@@ -557,8 +557,8 @@ GetNumericInput (
     case 1:\r
       switch (QuestionValue->Value.date.Month) {\r
       case 2:\r
     case 1:\r
       switch (QuestionValue->Value.date.Month) {\r
       case 2:\r

-        if ((QuestionValue->Value.date.Year % 4) == 0  && \r
-            ((QuestionValue->Value.date.Year % 100) != 0 || \r
+        if ((QuestionValue->Value.date.Year % 4) == 0  &&\r
+            ((QuestionValue->Value.date.Year % 100) != 0 ||\r

             (QuestionValue->Value.date.Year % 400) == 0)) {\r
           Maximum = 29;\r
         } else {\r
             (QuestionValue->Value.date.Year % 400) == 0)) {\r
           Maximum = 29;\r
         } else {\r


@@ -574,7 +574,7 @@ GetNumericInput (
       default:\r
         Maximum = 31;\r
         break;\r
       default:\r
         Maximum = 31;\r
         break;\r

-      } \r
+      }\r

 \r
       EraseLen = 3;\r
       EditValue = QuestionValue->Value.date.Day;\r
 \r
       EraseLen = 3;\r
       EditValue = QuestionValue->Value.date.Day;\r


@@ -907,7 +907,7 @@ EnterCarriageReturn:
       if (IntInput) {\r
         //\r
         // After user input Enter, need to check whether the input value.\r
       if (IntInput) {\r
         //\r
         // After user input Enter, need to check whether the input value.\r

-        // If input a negative value, should compare with maximum value. \r
+        // If input a negative value, should compare with maximum value.\r

         // else compare with the minimum value.\r
         //\r
         if (Negative) {\r
         // else compare with the minimum value.\r
         //\r
         if (Negative) {\r


@@ -977,7 +977,7 @@ EnterCarriageReturn:
       // Sample like: 2012.02.29 -> 2013.02.29 -> 2013.02.01\r
       //              2013.03.29 -> 2013.02.29 -> 2013.02.28\r
       //\r
       // Sample like: 2012.02.29 -> 2013.02.29 -> 2013.02.01\r
       //              2013.03.29 -> 2013.02.29 -> 2013.02.28\r
       //\r

-      if (Question->OpCode->OpCode  == EFI_IFR_DATE_OP && \r
+      if (Question->OpCode->OpCode  == EFI_IFR_DATE_OP &&\r

         (MenuOption->Sequence == 0 || MenuOption->Sequence == 2)) {\r
         AdjustQuestionValue (QuestionValue, (UINT8)MenuOption->Sequence);\r
       }\r
         (MenuOption->Sequence == 0 || MenuOption->Sequence == 2)) {\r
         AdjustQuestionValue (QuestionValue, (UINT8)MenuOption->Sequence);\r
       }\r


@@ -1136,12 +1136,12 @@ AdjustOptionOrder (
       break;\r
     }\r
   }\r
       break;\r
     }\r
   }\r

-  \r
+\r

   *PopUpMenuLines = Index;\r
   *PopUpMenuLines = Index;\r

-  \r
+\r

   //\r
   // Prepare HiiValue array\r
   //\r
   // Prepare HiiValue array\r

-  //  \r
+  //\r

   HiiValueArray = AllocateZeroPool (*PopUpMenuLines * sizeof (EFI_HII_VALUE));\r
   ASSERT (HiiValueArray != NULL);\r
 \r
   HiiValueArray = AllocateZeroPool (*PopUpMenuLines * sizeof (EFI_HII_VALUE));\r
   ASSERT (HiiValueArray != NULL);\r
 \r


@@ -1149,21 +1149,21 @@ AdjustOptionOrder (
     HiiValueArray[Index].Type = ValueType;\r
     HiiValueArray[Index].Value.u64 = GetArrayData (ValueArray, ValueType, Index);\r
   }\r
     HiiValueArray[Index].Type = ValueType;\r
     HiiValueArray[Index].Value.u64 = GetArrayData (ValueArray, ValueType, Index);\r
   }\r

-  \r
+\r

   for (Index = 0; Index < *PopUpMenuLines; Index++) {\r
     OneOfOption = ValueToOption (Question, &HiiValueArray[*PopUpMenuLines - Index - 1]);\r
     if (OneOfOption == NULL) {\r
       return EFI_NOT_FOUND;\r
     }\r
   for (Index = 0; Index < *PopUpMenuLines; Index++) {\r
     OneOfOption = ValueToOption (Question, &HiiValueArray[*PopUpMenuLines - Index - 1]);\r
     if (OneOfOption == NULL) {\r
       return EFI_NOT_FOUND;\r
     }\r

-  \r
+\r

     RemoveEntryList (&OneOfOption->Link);\r
     RemoveEntryList (&OneOfOption->Link);\r

-  \r
+\r

     //\r
     // Insert to head.\r
     //\r
     InsertHeadList (&Question->OptionListHead, &OneOfOption->Link);\r
   }\r
     //\r
     // Insert to head.\r
     //\r
     InsertHeadList (&Question->OptionListHead, &OneOfOption->Link);\r
   }\r

-  \r
+\r

   FreePool (HiiValueArray);\r
 \r
   return EFI_SUCCESS;\r
   FreePool (HiiValueArray);\r
 \r
   return EFI_SUCCESS;\r


@@ -1191,13 +1191,13 @@ IsValuesEqual (
   case EFI_IFR_TYPE_BOOLEAN:\r
   case EFI_IFR_TYPE_NUM_SIZE_8:\r
     return (BOOLEAN) (Value1->u8 == Value2->u8);\r
   case EFI_IFR_TYPE_BOOLEAN:\r
   case EFI_IFR_TYPE_NUM_SIZE_8:\r
     return (BOOLEAN) (Value1->u8 == Value2->u8);\r

-  \r
+\r

   case EFI_IFR_TYPE_NUM_SIZE_16:\r
     return (BOOLEAN) (Value1->u16 == Value2->u16);\r
   case EFI_IFR_TYPE_NUM_SIZE_16:\r
     return (BOOLEAN) (Value1->u16 == Value2->u16);\r

-  \r
+\r

   case EFI_IFR_TYPE_NUM_SIZE_32:\r
     return (BOOLEAN) (Value1->u32 == Value2->u32);\r
   case EFI_IFR_TYPE_NUM_SIZE_32:\r
     return (BOOLEAN) (Value1->u32 == Value2->u32);\r

-  \r
+\r

   case EFI_IFR_TYPE_NUM_SIZE_64:\r
     return (BOOLEAN) (Value1->u64 == Value2->u64);\r
 \r
   case EFI_IFR_TYPE_NUM_SIZE_64:\r
     return (BOOLEAN) (Value1->u64 == Value2->u64);\r
 \r


@@ -1660,7 +1660,7 @@ TheKey:
       gST->ConOut->SetAttribute (gST->ConOut, SavedAttribute);\r
 \r
       return EFI_SUCCESS;\r
       gST->ConOut->SetAttribute (gST->ConOut, SavedAttribute);\r
 \r
       return EFI_SUCCESS;\r

-      \r
+\r

     default:\r
       break;\r
     }\r
     default:\r
       break;\r
     }\r

diff --git a/MdeModulePkg/Universal/DisplayEngineDxe/ProcessOptions.c b/MdeModulePkg/Universal/DisplayEngineDxe/ProcessOptions.c
index 557e8ecd9466af49ec051db2e34fb5dd16fb41f2..709dabc7f556c360b0cc8c134e59f3fe5529966d 100644 (file)
--- a/MdeModulePkg/Universal/DisplayEngineDxe/ProcessOptions.c
+++ b/MdeModulePkg/Universal/DisplayEngineDxe/ProcessOptions.c
@@ -2,7 +2,7 @@
 Implementation for handling the User Interface option processing.\r
 \r
 \r
 Implementation for handling the User Interface option processing.\r
 \r
 \r

-Copyright (c) 2004 - 2016, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2004 - 2018, Intel Corporation. All rights reserved.<BR>\r

 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r


@@ -102,8 +102,8 @@ HiiValueToUINT64 (
 \r
 /**\r
   Check whether this value type can be transfer to EFI_IFR_TYPE_BUFFER type.\r
 \r
 /**\r
   Check whether this value type can be transfer to EFI_IFR_TYPE_BUFFER type.\r

-  \r
-  EFI_IFR_TYPE_REF, EFI_IFR_TYPE_DATE and EFI_IFR_TYPE_TIME are converted to \r
+\r
+  EFI_IFR_TYPE_REF, EFI_IFR_TYPE_DATE and EFI_IFR_TYPE_TIME are converted to\r

   EFI_IFR_TYPE_BUFFER when do the value compare.\r
 \r
   @param  Value                  Expression value to compare on.\r
   EFI_IFR_TYPE_BUFFER when do the value compare.\r
 \r
   @param  Value                  Expression value to compare on.\r


@@ -158,8 +158,8 @@ IsTypeInUINT64 (
 \r
 /**\r
   Return the buffer length and buffer pointer for this value.\r
 \r
 /**\r
   Return the buffer length and buffer pointer for this value.\r

-  \r
-  EFI_IFR_TYPE_REF, EFI_IFR_TYPE_DATE and EFI_IFR_TYPE_TIME are converted to \r
+\r
+  EFI_IFR_TYPE_REF, EFI_IFR_TYPE_DATE and EFI_IFR_TYPE_TIME are converted to\r

   EFI_IFR_TYPE_BUFFER when do the value compare.\r
 \r
   @param  Value                  Expression value to compare on.\r
   EFI_IFR_TYPE_BUFFER when do the value compare.\r
 \r
   @param  Value                  Expression value to compare on.\r


@@ -285,7 +285,7 @@ CompareHiiValue (
       *Result = Buf1Len > Buf2Len ? 1 : -1;\r
     }\r
     return EFI_SUCCESS;\r
       *Result = Buf1Len > Buf2Len ? 1 : -1;\r
     }\r
     return EFI_SUCCESS;\r

-  }  \r
+  }\r

 \r
   //\r
   // Take remain types(integer, boolean, date/time) as integer\r
 \r
   //\r
   // Take remain types(integer, boolean, date/time) as integer\r


@@ -333,7 +333,7 @@ ValueToOption (
     ZeroMem (&Value, sizeof (EFI_HII_VALUE));\r
     Value.Type = Option->OptionOpCode->Type;\r
     CopyMem (&Value.Value, &Option->OptionOpCode->Value, Option->OptionOpCode->Header.Length - OFFSET_OF (EFI_IFR_ONE_OF_OPTION, Value));\r
     ZeroMem (&Value, sizeof (EFI_HII_VALUE));\r
     Value.Type = Option->OptionOpCode->Type;\r
     CopyMem (&Value.Value, &Option->OptionOpCode->Value, Option->OptionOpCode->Header.Length - OFFSET_OF (EFI_IFR_ONE_OF_OPTION, Value));\r

-    \r
+\r

     if ((CompareHiiValue (&Value, OptionValue, &Result, NULL) == EFI_SUCCESS) && (Result == 0)) {\r
       return Option;\r
     }\r
     if ((CompareHiiValue (&Value, OptionValue, &Result, NULL) == EFI_SUCCESS) && (Result == 0)) {\r
       return Option;\r
     }\r


@@ -441,12 +441,12 @@ SetArrayData (
   @param  Type                   Type of the data in this array.\r
   @param  Value                  The value to be find.\r
   @param  Index                  The index in the array which has same value with Value.\r
   @param  Type                   Type of the data in this array.\r
   @param  Value                  The value to be find.\r
   @param  Index                  The index in the array which has same value with Value.\r

-  \r
+\r

   @retval   TRUE Found the value in the array.\r
   @retval   FALSE Not found the value.\r
 \r
 **/\r
   @retval   TRUE Found the value in the array.\r
   @retval   FALSE Not found the value.\r
 \r
 **/\r

-BOOLEAN \r
+BOOLEAN\r

 FindArrayData (\r
   IN VOID                     *Array,\r
   IN UINT8                    Type,\r
 FindArrayData (\r
   IN VOID                     *Array,\r
   IN UINT8                    Type,\r


@@ -457,7 +457,7 @@ FindArrayData (
   UINTN  Count;\r
   UINT64 TmpValue;\r
   UINT64 ValueComp;\r
   UINTN  Count;\r
   UINT64 TmpValue;\r
   UINT64 ValueComp;\r

-  \r
+\r

   ASSERT (Array != NULL);\r
 \r
   Count    = 0;\r
   ASSERT (Array != NULL);\r
 \r
   Count    = 0;\r


@@ -804,7 +804,7 @@ PasswordProcess (
 \r
   StringPtr = AllocateZeroPool ((Maximum + 1) * sizeof (CHAR16));\r
   ASSERT (StringPtr);\r
 \r
   StringPtr = AllocateZeroPool ((Maximum + 1) * sizeof (CHAR16));\r
   ASSERT (StringPtr);\r

-  \r
+\r

   //\r
   // Use a NULL password to test whether old password is required\r
   //\r
   //\r
   // Use a NULL password to test whether old password is required\r
   //\r


@@ -812,7 +812,7 @@ PasswordProcess (
   Status = Question->PasswordCheck (gFormData, Question, StringPtr);\r
   if (Status == EFI_NOT_AVAILABLE_YET || Status == EFI_UNSUPPORTED) {\r
     //\r
   Status = Question->PasswordCheck (gFormData, Question, StringPtr);\r
   if (Status == EFI_NOT_AVAILABLE_YET || Status == EFI_UNSUPPORTED) {\r
     //\r

-    // Password can't be set now. \r
+    // Password can't be set now.\r

     //\r
     if (Status == EFI_UNSUPPORTED) {\r
       do {\r
     //\r
     if (Status == EFI_UNSUPPORTED) {\r
       do {\r


@@ -851,7 +851,7 @@ PasswordProcess (
       return Status;\r
     }\r
   }\r
       return Status;\r
     }\r
   }\r

-  \r
+\r

   //\r
   // Ask for new password\r
   //\r
   //\r
   // Ask for new password\r
   //\r


@@ -865,7 +865,7 @@ PasswordProcess (
     FreePool (StringPtr);\r
     return Status;\r
   }\r
     FreePool (StringPtr);\r
     return Status;\r
   }\r

-  \r
+\r

   //\r
   // Confirm new password\r
   //\r
   //\r
   // Confirm new password\r
   //\r


@@ -881,11 +881,11 @@ PasswordProcess (
     FreePool (TempString);\r
     return Status;\r
   }\r
     FreePool (TempString);\r
     return Status;\r
   }\r

-  \r
+\r

   //\r
   // Compare two typed-in new passwords\r
   //\r
   //\r
   // Compare two typed-in new passwords\r
   //\r

-  if (StrCmp (StringPtr, TempString) == 0) {     \r
+  if (StrCmp (StringPtr, TempString) == 0) {\r

     gUserInput->InputValue.Buffer = AllocateCopyPool (Question->CurrentValue.BufferLen, StringPtr);\r
     gUserInput->InputValue.BufferLen = Question->CurrentValue.BufferLen;\r
     gUserInput->InputValue.Type = Question->CurrentValue.Type;\r
     gUserInput->InputValue.Buffer = AllocateCopyPool (Question->CurrentValue.BufferLen, StringPtr);\r
     gUserInput->InputValue.BufferLen = Question->CurrentValue.BufferLen;\r
     gUserInput->InputValue.Type = Question->CurrentValue.Type;\r


@@ -897,7 +897,7 @@ PasswordProcess (
     // Reset state machine for password\r
     //\r
     Question->PasswordCheck (gFormData, Question, NULL);\r
     // Reset state machine for password\r
     //\r
     Question->PasswordCheck (gFormData, Question, NULL);\r

-  \r
+\r

     //\r
     // Two password mismatch, prompt error message\r
     //\r
     //\r
     // Two password mismatch, prompt error message\r
     //\r


@@ -1039,7 +1039,7 @@ ProcessOptions (
           gUserInput->InputValue.Buffer    = ValueArray;\r
           gUserInput->InputValue.BufferLen = Question->CurrentValue.BufferLen;\r
           gUserInput->InputValue.Type      = Question->CurrentValue.Type;\r
           gUserInput->InputValue.Buffer    = ValueArray;\r
           gUserInput->InputValue.BufferLen = Question->CurrentValue.BufferLen;\r
           gUserInput->InputValue.Type      = Question->CurrentValue.Type;\r

-          \r
+\r

           Link = GetFirstNode (&Question->OptionListHead);\r
           Index2 = 0;\r
           while (!IsNull (&Question->OptionListHead, Link) && Index2 < OrderList->MaxContainers) {\r
           Link = GetFirstNode (&Question->OptionListHead);\r
           Index2 = 0;\r
           while (!IsNull (&Question->OptionListHead, Link) && Index2 < OrderList->MaxContainers) {\r


@@ -1125,7 +1125,7 @@ ProcessOptions (
           gUserInput->InputValue.BufferLen = Question->CurrentValue.BufferLen;\r
           gUserInput->InputValue.Type      = Question->CurrentValue.Type;\r
         }\r
           gUserInput->InputValue.BufferLen = Question->CurrentValue.BufferLen;\r
           gUserInput->InputValue.Type      = Question->CurrentValue.Type;\r
         }\r

-       \r
+\r

         SetArrayData (ValueArray, ValueType, Index++, OneOfOption->OptionOpCode->Value.u64);\r
       }\r
 \r
         SetArrayData (ValueArray, ValueType, Index++, OneOfOption->OptionOpCode->Value.u64);\r
       }\r
 \r


@@ -1159,7 +1159,7 @@ ProcessOptions (
         if (SkipErrorValue) {\r
           //\r
           // Not report error, just get the correct option string info.\r
         if (SkipErrorValue) {\r
           //\r
           // Not report error, just get the correct option string info.\r

-          //          \r
+          //\r

           Link = GetFirstNode (&Question->OptionListHead);\r
           OneOfOption = DISPLAY_QUESTION_OPTION_FROM_LINK (Link);\r
         } else {\r
           Link = GetFirstNode (&Question->OptionListHead);\r
           OneOfOption = DISPLAY_QUESTION_OPTION_FROM_LINK (Link);\r
         } else {\r


@@ -1227,7 +1227,7 @@ ProcessOptions (
       // Perform inconsistent check\r
       //\r
       return EFI_SUCCESS;\r
       // Perform inconsistent check\r
       //\r
       return EFI_SUCCESS;\r

-    } else {    \r
+    } else {\r

       *OptionString = AllocateZeroPool (BufferSize);\r
       ASSERT (*OptionString);\r
 \r
       *OptionString = AllocateZeroPool (BufferSize);\r
       ASSERT (*OptionString);\r
 \r


@@ -1364,7 +1364,7 @@ ProcessOptions (
         FreePool (StringPtr);\r
         return Status;\r
       }\r
         FreePool (StringPtr);\r
         return Status;\r
       }\r

-      \r
+\r

       gUserInput->InputValue.Buffer = AllocateCopyPool (Question->CurrentValue.BufferLen, StringPtr);\r
       gUserInput->InputValue.BufferLen = Question->CurrentValue.BufferLen;\r
       gUserInput->InputValue.Type = Question->CurrentValue.Type;\r
       gUserInput->InputValue.Buffer = AllocateCopyPool (Question->CurrentValue.BufferLen, StringPtr);\r
       gUserInput->InputValue.BufferLen = Question->CurrentValue.BufferLen;\r
       gUserInput->InputValue.Type = Question->CurrentValue.Type;\r


@@ -1466,5 +1466,5 @@ ProcessHelpString (
     FreePool (OutputString);\r
   }\r
 \r
     FreePool (OutputString);\r
   }\r
 \r

-  return TotalRowNum; \r
+  return TotalRowNum;\r

 }\r
 }\r

diff --git a/MdeModulePkg/Universal/DriverHealthManagerDxe/DriverHealthManagerDxe.c b/MdeModulePkg/Universal/DriverHealthManagerDxe/DriverHealthManagerDxe.c
index 3f9c24036d43f6810d209c8027de5905afed5853..97843631404cdd5c8826d0c5fe3d8e86edcf3713 100644 (file)
--- a/MdeModulePkg/Universal/DriverHealthManagerDxe/DriverHealthManagerDxe.c
+++ b/MdeModulePkg/Universal/DriverHealthManagerDxe/DriverHealthManagerDxe.c
@@ -4,7 +4,7 @@
   driver health instances, the other will be automatically included by\r
   firmware setup (UI).\r
 \r
   driver health instances, the other will be automatically included by\r
   firmware setup (UI).\r
 \r

-Copyright (c) 2013 - 2015, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2013 - 2018, Intel Corporation. All rights reserved.<BR>\r

 (C) Copyright 2018 Hewlett Packard Enterprise Development LP<BR>\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 (C) Copyright 2018 Hewlett Packard Enterprise Development LP<BR>\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r


@@ -588,7 +588,7 @@ DriverHealthManagerGetFormsetId (
       //\r
       // Search FormSet in this Form Package\r
       //\r
       //\r
       // Search FormSet in this Form Package\r
       //\r

-      \r
+\r

       for (Offset2 = sizeof (EFI_HII_PACKAGE_HEADER); Offset2 < PackageHeader.Length; Offset2 += ((EFI_IFR_OP_HEADER *) OpCodeData)->Length) {\r
         OpCodeData = Package + Offset2;\r
 \r
       for (Offset2 = sizeof (EFI_HII_PACKAGE_HEADER); Offset2 < PackageHeader.Length; Offset2 += ((EFI_IFR_OP_HEADER *) OpCodeData)->Length) {\r
         OpCodeData = Package + Offset2;\r
 \r

diff --git a/MdeModulePkg/Universal/DriverHealthManagerDxe/DriverHealthManagerDxe.inf b/MdeModulePkg/Universal/DriverHealthManagerDxe/DriverHealthManagerDxe.inf
index 482981c143d4043a8dc81a67a30d2abbe8dbd29d..d84c7cee15976dc4d3c6df07f96f7c1500020692 100644 (file)
--- a/MdeModulePkg/Universal/DriverHealthManagerDxe/DriverHealthManagerDxe.inf
+++ b/MdeModulePkg/Universal/DriverHealthManagerDxe/DriverHealthManagerDxe.inf
@@ -6,15 +6,15 @@
 #  driver health instances, the other will be automatically included by\r
 #  firmware setup (UI).\r
 #\r
 #  driver health instances, the other will be automatically included by\r
 #  firmware setup (UI).\r
 #\r

-#  Copyright (c) 2013 - 2015, Intel Corporation. All rights reserved.<BR>\r
+#  Copyright (c) 2013 - 2018, Intel Corporation. All rights reserved.<BR>\r

 #  This program and the accompanying materials\r
 #  are licensed and made available under the terms and conditions of the BSD License\r
 #  which accompanies this distribution.  The full text of the license may be found at\r
 #  http://opensource.org/licenses/bsd-license.php\r
 #  This program and the accompanying materials\r
 #  are licensed and made available under the terms and conditions of the BSD License\r
 #  which accompanies this distribution.  The full text of the license may be found at\r
 #  http://opensource.org/licenses/bsd-license.php\r

-#  \r
+#\r

 #  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 #  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 #  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 #  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r

-#  \r
+#\r

 ##\r
 ################################################################################\r
 #\r
 ##\r
 ################################################################################\r
 #\r

diff --git a/MdeModulePkg/Universal/DriverHealthManagerDxe/DriverHealthManagerDxe.uni b/MdeModulePkg/Universal/DriverHealthManagerDxe/DriverHealthManagerDxe.uni
index 3389ff50ae0298346315832c966ed90366620483..dcb1750985d49ab3931aaaa6dfec36570a68186c 100644 (file)
--- a/MdeModulePkg/Universal/DriverHealthManagerDxe/DriverHealthManagerDxe.uni
+++ b/MdeModulePkg/Universal/DriverHealthManagerDxe/DriverHealthManagerDxe.uni
@@ -6,12 +6,12 @@
 // driver health instances, the other will be automatically included by\r
 // firmware setup (UI).\r
 //\r
 // driver health instances, the other will be automatically included by\r
 // firmware setup (UI).\r
 //\r

-// Copyright (c) 2015, Intel Corporation. All rights reserved.<BR>\r
+// Copyright (c) 2015 - 2018, Intel Corporation. All rights reserved.<BR>\r

 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r
 // which accompanies this distribution.  The full text of the license may be found at\r
 // http://opensource.org/licenses/bsd-license.php\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r
 // which accompanies this distribution.  The full text of the license may be found at\r
 // http://opensource.org/licenses/bsd-license.php\r

-// \r
+//\r

 // THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 // WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 //\r
 // THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 // WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 //\r

diff --git a/MdeModulePkg/Universal/DriverHealthManagerDxe/DriverHealthManagerDxeExtra.uni b/MdeModulePkg/Universal/DriverHealthManagerDxe/DriverHealthManagerDxeExtra.uni
index 740461b6afd14ca824b7fd1672c006c7bbb66f3d..597ddae5d433e1fbacbb5e4f47412bb3e4a28a4e 100644 (file)
--- a/MdeModulePkg/Universal/DriverHealthManagerDxe/DriverHealthManagerDxeExtra.uni
+++ b/MdeModulePkg/Universal/DriverHealthManagerDxe/DriverHealthManagerDxeExtra.uni
@@ -6,7 +6,7 @@
 // driver health instances, the other will be automatically included by\r
 // firmware setup (UI).\r
 //\r
 // driver health instances, the other will be automatically included by\r
 // firmware setup (UI).\r
 //\r

-// Copyright (c) 2015, Intel Corporation. All rights reserved.<BR>\r
+// Copyright (c) 2015 - 2018, Intel Corporation. All rights reserved.<BR>\r

 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r
 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r


@@ -18,8 +18,8 @@
 //\r
 // **/\r
 \r
 //\r
 // **/\r
 \r

-#string STR_PROPERTIES_MODULE_NAME \r
-#language en-US \r
+#string STR_PROPERTIES_MODULE_NAME\r
+#language en-US\r

 "Driver Health Manager DXE driver"\r
 \r
 \r
 "Driver Health Manager DXE driver"\r
 \r
 \r

diff --git a/MdeModulePkg/Universal/DriverHealthManagerDxe/DriverHealthManagerStrings.uni b/MdeModulePkg/Universal/DriverHealthManagerDxe/DriverHealthManagerStrings.uni
index 3c1a4f0d2a1511f65c8e23b846442085089a6531..e6751390dd927f708550fd54043ec61f2b971dea 100644 (file)
--- a/MdeModulePkg/Universal/DriverHealthManagerDxe/DriverHealthManagerStrings.uni
+++ b/MdeModulePkg/Universal/DriverHealthManagerDxe/DriverHealthManagerStrings.uni
@@ -1,13 +1,13 @@
 ///** @file\r
 ///** @file\r

-//  \r
+//\r

 //    String definitions for the DriverHealthManager.\r
 //    String definitions for the DriverHealthManager.\r

-//  \r
-//  Copyright (c) 2013 - 2015, Intel Corporation. All rights reserved.<BR>\r
+//\r
+//  Copyright (c) 2013 - 2018, Intel Corporation. All rights reserved.<BR>\r

 //  This program and the accompanying materials\r
 //  are licensed and made available under the terms and conditions of the BSD License\r
 //  which accompanies this distribution.  The full text of the license may be found at\r
 //  http://opensource.org/licenses/bsd-license.php\r
 //  This program and the accompanying materials\r
 //  are licensed and made available under the terms and conditions of the BSD License\r
 //  which accompanies this distribution.  The full text of the license may be found at\r
 //  http://opensource.org/licenses/bsd-license.php\r

-//  \r
+//\r

 //  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 //  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 \r
 //  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 //  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 \r

diff --git a/MdeModulePkg/Universal/DriverHealthManagerDxe/DriverHealthManagerVfr.h b/MdeModulePkg/Universal/DriverHealthManagerDxe/DriverHealthManagerVfr.h
index 61ca04af118405556284cf6a7f6c5132a8acb9ca..35b8a2752664f63e94e8495799271daffd5e1546 100644 (file)
--- a/MdeModulePkg/Universal/DriverHealthManagerDxe/DriverHealthManagerVfr.h
+++ b/MdeModulePkg/Universal/DriverHealthManagerDxe/DriverHealthManagerVfr.h
@@ -1,7 +1,7 @@
 /** @file\r
   Definition shared by VFR file and C file.\r
 \r
 /** @file\r
   Definition shared by VFR file and C file.\r
 \r

-Copyright (c) 2013 - 2015, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2013 - 2018, Intel Corporation. All rights reserved.<BR>\r

 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r


@@ -16,8 +16,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #define _DRIVER_HEALTH_VFR_H_\r
 #include <Guid/HiiPlatformSetupFormset.h>\r
 \r
 #define _DRIVER_HEALTH_VFR_H_\r
 #include <Guid/HiiPlatformSetupFormset.h>\r
 \r

-#define DRIVER_HEALTH_MANAGER_FORMSET_GUID         { 0xcfb3b000, 0x0b63, 0x444b, { 0xb1, 0xd1, 0x12, 0xd5, 0xd9, 0x5d, 0xc4, 0xfc } } \r
-#define DRIVER_HEALTH_CONFIGURE_FORMSET_GUID       { 0x4296d9f4, 0xf6fc, 0x4dde, { 0x86, 0x85, 0x8c, 0xe2, 0xd7, 0x9d, 0x90, 0xf0 } } \r
+#define DRIVER_HEALTH_MANAGER_FORMSET_GUID         { 0xcfb3b000, 0x0b63, 0x444b, { 0xb1, 0xd1, 0x12, 0xd5, 0xd9, 0x5d, 0xc4, 0xfc } }\r
+#define DRIVER_HEALTH_CONFIGURE_FORMSET_GUID       { 0x4296d9f4, 0xf6fc, 0x4dde, { 0x86, 0x85, 0x8c, 0xe2, 0xd7, 0x9d, 0x90, 0xf0 } }\r

 \r
 #define LABEL_BEGIN                        0x2000\r
 #define LABEL_END                          0x2001\r
 \r
 #define LABEL_BEGIN                        0x2000\r
 #define LABEL_END                          0x2001\r

diff --git a/MdeModulePkg/Universal/DriverSampleDxe/DriverSample.c b/MdeModulePkg/Universal/DriverSampleDxe/DriverSample.c
index af31615a61b612a1d4e080d6b049250167fbb7ad..36ed734e382e0beef64945017c21c19cfd62ff09 100644 (file)
--- 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\r
 later utilized by the Setup Protocol\r
 \r
 This is an example of how a driver might export data to the HII protocol to be\r
 later utilized by the Setup Protocol\r
 \r

-Copyright (c) 2004 - 2017, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2004 - 2018, Intel Corporation. All rights reserved.<BR>\r

 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r


@@ -127,12 +127,12 @@ NotificationFunction(
   )\r
 {\r
   gBS->SignalEvent (mEvent);\r
   )\r
 {\r
   gBS->SignalEvent (mEvent);\r

-  \r
+\r

   return EFI_SUCCESS;\r
 }\r
 \r
 /**\r
   return EFI_SUCCESS;\r
 }\r
 \r
 /**\r

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

 \r
   @retval EFI_SUCCESS           The feature is enabled.\r
   @retval EFI_OUT_OF_RESOURCES  There is not enough mnemory available.\r
 \r
   @retval EFI_SUCCESS           The feature is enabled.\r
   @retval EFI_OUT_OF_RESOURCES  There is not enough mnemory available.\r


@@ -175,7 +175,7 @@ InternalStartMonitor(
     if (EFI_ERROR (Status)) {\r
       break;\r
     }\r
     if (EFI_ERROR (Status)) {\r
       break;\r
     }\r

-    \r
+\r

     KeyData.KeyState.KeyShiftState  = EFI_SHIFT_STATE_VALID|EFI_RIGHT_CONTROL_PRESSED;\r
     Status = SimpleEx->RegisterKeyNotify(\r
       SimpleEx,\r
     KeyData.KeyState.KeyShiftState  = EFI_SHIFT_STATE_VALID|EFI_RIGHT_CONTROL_PRESSED;\r
     Status = SimpleEx->RegisterKeyNotify(\r
       SimpleEx,\r


@@ -191,7 +191,7 @@ InternalStartMonitor(
 }\r
 \r
 /**\r
 }\r
 \r
 /**\r

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

 \r
   @retval EFI_SUCCESS           The feature is enabled.\r
   @retval EFI_OUT_OF_RESOURCES  There is not enough mnemory available.\r
 \r
   @retval EFI_SUCCESS           The feature is enabled.\r
   @retval EFI_OUT_OF_RESOURCES  There is not enough mnemory available.\r


@@ -205,7 +205,7 @@ InternalStopMonitor(
   EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL *SimpleEx;\r
   EFI_STATUS                        Status;\r
   EFI_HANDLE                        *Handles;\r
   EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL *SimpleEx;\r
   EFI_STATUS                        Status;\r
   EFI_HANDLE                        *Handles;\r

-  EFI_KEY_DATA                      KeyData;  \r
+  EFI_KEY_DATA                      KeyData;\r

   UINTN                             HandleCount;\r
   UINTN                             HandleIndex;\r
   EFI_HANDLE                        NotifyHandle;\r
   UINTN                             HandleCount;\r
   UINTN                             HandleIndex;\r
   EFI_HANDLE                        NotifyHandle;\r


@@ -344,7 +344,7 @@ GetValueOfNumber (
     Status = EFI_OUT_OF_RESOURCES;\r
     goto Exit;\r
   }\r
     Status = EFI_OUT_OF_RESOURCES;\r
     goto Exit;\r
   }\r

-  \r
+\r

   Length = *Len;\r
   ZeroMem (TemStr, sizeof (TemStr));\r
   for (Index = 0; Index < Length; Index ++) {\r
   Length = *Len;\r
   ZeroMem (TemStr, sizeof (TemStr));\r
   for (Index = 0; Index < Length; Index ++) {\r


@@ -369,7 +369,7 @@ Exit:
 }\r
 \r
 /**\r
 }\r
 \r
 /**\r

-  Create altcfg string. \r
+  Create altcfg string.\r

 \r
   @param  Result               The request result string.\r
   @param  ConfigHdr            The request head info. <ConfigHdr> format.\r
 \r
   @param  Result               The request result string.\r
   @param  ConfigHdr            The request head info. <ConfigHdr> format.\r


@@ -379,7 +379,7 @@ Exit:
 \r
   @retval  The string with altcfg info append at the end.\r
 **/\r
 \r
   @retval  The string with altcfg info append at the end.\r
 **/\r

-EFI_STRING \r
+EFI_STRING\r

 CreateAltCfgString (\r
   IN     EFI_STRING     Result,\r
   IN     EFI_STRING     ConfigHdr,\r
 CreateAltCfgString (\r
   IN     EFI_STRING     Result,\r
   IN     EFI_STRING     ConfigHdr,\r


@@ -404,60 +404,60 @@ CreateAltCfgString (
   TmpStr = StringPtr;\r
   if (Result != NULL) {\r
     StrCpyS (StringPtr, NewLen / sizeof (CHAR16), Result);\r
   TmpStr = StringPtr;\r
   if (Result != NULL) {\r
     StrCpyS (StringPtr, NewLen / sizeof (CHAR16), Result);\r

-    StringPtr += StrLen (Result);  \r
+    StringPtr += StrLen (Result);\r

     FreePool (Result);\r
   }\r
     FreePool (Result);\r
   }\r

-  \r
+\r

   UnicodeSPrint (\r
   UnicodeSPrint (\r

-  StringPtr, \r
-  (1 + StrLen (ConfigHdr) + 8 + 4 + 1) * sizeof (CHAR16), \r
-  L"&%s&ALTCFG=%04x", \r
-  ConfigHdr, \r
+  StringPtr,\r
+  (1 + StrLen (ConfigHdr) + 8 + 4 + 1) * sizeof (CHAR16),\r
+  L"&%s&ALTCFG=%04x",\r
+  ConfigHdr,\r

   EFI_HII_DEFAULT_CLASS_STANDARD\r
   );\r
   StringPtr += StrLen (StringPtr);\r
 \r
   UnicodeSPrint (\r
   EFI_HII_DEFAULT_CLASS_STANDARD\r
   );\r
   StringPtr += StrLen (StringPtr);\r
 \r
   UnicodeSPrint (\r

-    StringPtr, \r
+    StringPtr,\r

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

-    L"&OFFSET=%04x&WIDTH=%04x&VALUE=%04x", \r
-    Offset, \r
+    L"&OFFSET=%04x&WIDTH=%04x&VALUE=%04x",\r
+    Offset,\r

     Width,\r
     DEFAULT_CLASS_STANDARD_VALUE\r
     );\r
     Width,\r
     DEFAULT_CLASS_STANDARD_VALUE\r
     );\r

-  StringPtr += StrLen (StringPtr);  \r
+  StringPtr += StrLen (StringPtr);\r

 \r
   UnicodeSPrint (\r
 \r
   UnicodeSPrint (\r

-  StringPtr, \r
-  (1 + StrLen (ConfigHdr) + 8 + 4 + 1) * sizeof (CHAR16), \r
-  L"&%s&ALTCFG=%04x", \r
-  ConfigHdr, \r
+  StringPtr,\r
+  (1 + StrLen (ConfigHdr) + 8 + 4 + 1) * sizeof (CHAR16),\r
+  L"&%s&ALTCFG=%04x",\r
+  ConfigHdr,\r

   EFI_HII_DEFAULT_CLASS_MANUFACTURING\r
   );\r
   StringPtr += StrLen (StringPtr);\r
 \r
   UnicodeSPrint (\r
   EFI_HII_DEFAULT_CLASS_MANUFACTURING\r
   );\r
   StringPtr += StrLen (StringPtr);\r
 \r
   UnicodeSPrint (\r

-    StringPtr, \r
+    StringPtr,\r

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

-    L"&OFFSET=%04x&WIDTH=%04x&VALUE=%04x", \r
-    Offset, \r
+    L"&OFFSET=%04x&WIDTH=%04x&VALUE=%04x",\r
+    Offset,\r

     Width,\r
     DEFAULT_CLASS_MANUFACTURING_VALUE\r
     );\r
     Width,\r
     DEFAULT_CLASS_MANUFACTURING_VALUE\r
     );\r

-  StringPtr += StrLen (StringPtr); \r
+  StringPtr += StrLen (StringPtr);\r

 \r
   return TmpStr;\r
 }\r
 \r
 /**\r
 \r
   return TmpStr;\r
 }\r
 \r
 /**\r

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

   string.\r
 \r
   @param  RequestResult              The request result string.\r
   @param  ConfigRequestHdr           The request head info. <ConfigHdr> format.\r
 \r
 **/\r
   string.\r
 \r
   @param  RequestResult              The request result string.\r
   @param  ConfigRequestHdr           The request head info. <ConfigHdr> format.\r
 \r
 **/\r

-VOID \r
+VOID\r

 AppendAltCfgString (\r
   IN OUT EFI_STRING                       *RequestResult,\r
   IN     EFI_STRING                       ConfigRequestHdr\r
 AppendAltCfgString (\r
   IN OUT EFI_STRING                       *RequestResult,\r
   IN     EFI_STRING                       ConfigRequestHdr\r


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

-    \r
+\r

     Status = EFI_SUCCESS;\r
   } else {\r
     //\r
     Status = EFI_SUCCESS;\r
   } else {\r
     //\r


@@ -1209,7 +1209,7 @@ DriverCallback (
       }\r
     }\r
     break;\r
       }\r
     }\r
     break;\r

-    \r
+\r

   case EFI_BROWSER_ACTION_RETRIEVE:\r
     {\r
       switch (QuestionId ) {\r
   case EFI_BROWSER_ACTION_RETRIEVE:\r
     {\r
       switch (QuestionId ) {\r


@@ -1255,7 +1255,7 @@ DriverCallback (
           EFI_IFR_FLAG_CALLBACK,            // Question flag\r
           0                                 // Action String ID\r
         );\r
           EFI_IFR_FLAG_CALLBACK,            // Question flag\r
           0                                 // Action String ID\r
         );\r

-      \r
+\r

         HiiUpdateForm (\r
           PrivateData->HiiHandle[0],        // HII handle\r
           &gDriverSampleFormSetGuid,        // Formset GUID\r
         HiiUpdateForm (\r
           PrivateData->HiiHandle[0],        // HII handle\r
           &gDriverSampleFormSetGuid,        // Formset GUID\r


@@ -1336,7 +1336,7 @@ DriverCallback (
         break;\r
 \r
       default:\r
         break;\r
 \r
       default:\r

-        Status = EFI_UNSUPPORTED;      \r
+        Status = EFI_UNSUPPORTED;\r

       break;\r
       }\r
     }\r
       break;\r
       }\r
     }\r


@@ -1537,14 +1537,14 @@ DriverCallback (
         //\r
         *ActionRequest = EFI_BROWSER_ACTION_REQUEST_EXIT;\r
         break;\r
         //\r
         *ActionRequest = EFI_BROWSER_ACTION_REQUEST_EXIT;\r
         break;\r

-      \r
+\r

       case 0x1238:\r
         //\r
         // User press "Save now", request Browser to save the uncommitted data.\r
         //\r
         *ActionRequest = EFI_BROWSER_ACTION_REQUEST_SUBMIT;\r
         break;\r
       case 0x1238:\r
         //\r
         // User press "Save now", request Browser to save the uncommitted data.\r
         //\r
         *ActionRequest = EFI_BROWSER_ACTION_REQUEST_SUBMIT;\r
         break;\r

-      \r
+\r

       case 0x1241:\r
       case 0x1246:\r
         //\r
       case 0x1241:\r
       case 0x1246:\r
         //\r


@@ -1552,21 +1552,21 @@ DriverCallback (
         //\r
         *ActionRequest = EFI_BROWSER_ACTION_REQUEST_FORM_SUBMIT_EXIT;\r
         break;\r
         //\r
         *ActionRequest = EFI_BROWSER_ACTION_REQUEST_FORM_SUBMIT_EXIT;\r
         break;\r

-      \r
+\r

       case 0x1242:\r
         //\r
         // User press "Discard current form now", request Browser to discard the uncommitted data.\r
         //\r
         *ActionRequest = EFI_BROWSER_ACTION_REQUEST_FORM_DISCARD;\r
         break;\r
       case 0x1242:\r
         //\r
         // User press "Discard current form now", request Browser to discard the uncommitted data.\r
         //\r
         *ActionRequest = EFI_BROWSER_ACTION_REQUEST_FORM_DISCARD;\r
         break;\r

-      \r
+\r

       case 0x1243:\r
         //\r
         // User press "Submit current form now", request Browser to save the uncommitted data.\r
         //\r
         *ActionRequest = EFI_BROWSER_ACTION_REQUEST_FORM_APPLY;\r
         break;\r
       case 0x1243:\r
         //\r
         // User press "Submit current form now", request Browser to save the uncommitted data.\r
         //\r
         *ActionRequest = EFI_BROWSER_ACTION_REQUEST_FORM_APPLY;\r
         break;\r

-      \r
+\r

       case 0x1244:\r
       case 0x1245:\r
         //\r
       case 0x1244:\r
       case 0x1245:\r
         //\r


@@ -1606,7 +1606,7 @@ DriverCallback (
         //\r
         // 2. If system support this keyword, just try to change value.\r
         //\r
         //\r
         // 2. If system support this keyword, just try to change value.\r
         //\r

-        \r
+\r

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


@@ -2114,7 +2114,7 @@ DriverSampleInit (
   FreePool (ConfigRequestHdr);\r
 \r
   Status = gBS->CreateEventEx (\r
   FreePool (ConfigRequestHdr);\r
 \r
   Status = gBS->CreateEventEx (\r

-        EVT_NOTIFY_SIGNAL, \r
+        EVT_NOTIFY_SIGNAL,\r

         TPL_NOTIFY,\r
         EfiEventEmptyFunction,\r
         NULL,\r
         TPL_NOTIFY,\r
         EfiEventEmptyFunction,\r
         NULL,\r


@@ -2125,7 +2125,7 @@ DriverSampleInit (
 \r
   //\r
   // Example of how to use BrowserEx protocol to register HotKey.\r
 \r
   //\r
   // Example of how to use BrowserEx protocol to register HotKey.\r

-  // \r
+  //\r

   Status = gBS->LocateProtocol (&gEdkiiFormBrowserExProtocolGuid, NULL, (VOID **) &FormBrowserEx);\r
   if (!EFI_ERROR (Status)) {\r
     //\r
   Status = gBS->LocateProtocol (&gEdkiiFormBrowserExProtocolGuid, NULL, (VOID **) &FormBrowserEx);\r
   if (!EFI_ERROR (Status)) {\r
     //\r


@@ -2136,7 +2136,7 @@ DriverSampleInit (
     FormBrowserEx->RegisterHotKey (&HotKey, 0, 0, NULL);\r
     HotKey.ScanCode    = SCAN_F10;\r
     FormBrowserEx->RegisterHotKey (&HotKey, 0, 0, NULL);\r
     FormBrowserEx->RegisterHotKey (&HotKey, 0, 0, NULL);\r
     HotKey.ScanCode    = SCAN_F10;\r
     FormBrowserEx->RegisterHotKey (&HotKey, 0, 0, NULL);\r

-    \r
+\r

     //\r
     // Register the default HotKey F9 and F10 again.\r
     //\r
     //\r
     // Register the default HotKey F9 and F10 again.\r
     //\r

diff --git a/MdeModulePkg/Universal/DriverSampleDxe/DriverSample.uni b/MdeModulePkg/Universal/DriverSampleDxe/DriverSample.uni
index 91ee7136a83616272889b6319bf1399ab6477e84..5f8d99bd56379c13b4b67fb0a54f0aedbea6d6f5 100644 (file)
--- 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\r
 // driver which can be dipslayed and configured by a UEFI HII Form Browser.\r
 //\r
 // This driver shows how HII protocol, VFR and UNI files are used to create a HII\r
 // driver which can be dipslayed and configured by a UEFI HII Form Browser.\r
 //\r

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

 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r
 // which accompanies this distribution. The full text of the license may be found at\r
 // http://opensource.org/licenses/bsd-license.php\r
 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r
 // which accompanies this distribution. The full text of the license may be found at\r
 // http://opensource.org/licenses/bsd-license.php\r

-// \r
+//\r

 // THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 // WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 //\r
 // THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 // WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 //\r

diff --git a/MdeModulePkg/Universal/DriverSampleDxe/DriverSampleDxe.inf b/MdeModulePkg/Universal/DriverSampleDxe/DriverSampleDxe.inf
index bfd74845181b8c067a78b7755a2fcb0daf907185..f856efebc77bc78ddb638863122e7af76b8333c5 100644 (file)
--- a/MdeModulePkg/Universal/DriverSampleDxe/DriverSampleDxe.inf
+++ b/MdeModulePkg/Universal/DriverSampleDxe/DriverSampleDxe.inf
@@ -1,16 +1,16 @@
 ## @file\r
 ## @file\r

-# This is a sample HII driver. \r
+# This is a sample HII driver.\r

 #\r
 #\r

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

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

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

 #\r
 #  This program and the accompanying materials\r
 #  are licensed and made available under the terms and conditions of the BSD License\r
 #  which accompanies this distribution. The full text of the license may be found at\r
 #  http://opensource.org/licenses/bsd-license.php\r
 #\r
 #  This program and the accompanying materials\r
 #  are licensed and made available under the terms and conditions of the BSD License\r
 #  which accompanies this distribution. The full text of the license may be found at\r
 #  http://opensource.org/licenses/bsd-license.php\r

-#  \r
+#\r

 #  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 #  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 #\r
 #  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 #  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 #\r

diff --git a/MdeModulePkg/Universal/DriverSampleDxe/DriverSampleExtra.uni b/MdeModulePkg/Universal/DriverSampleDxe/DriverSampleExtra.uni
index 1f34d2d6c263fe4b7cd40efcd2f5affae77a5909..644c221294585fbfae1f670db7653feafeabaa23 100644 (file)
--- a/MdeModulePkg/Universal/DriverSampleDxe/DriverSampleExtra.uni
+++ b/MdeModulePkg/Universal/DriverSampleDxe/DriverSampleExtra.uni
@@ -1,7 +1,7 @@
 // /** @file\r
 // DriverSample Localized Strings and Content\r
 //\r
 // /** @file\r
 // DriverSample Localized Strings and Content\r
 //\r

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

 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r
 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r


@@ -13,8 +13,8 @@
 //\r
 // **/\r
 \r
 //\r
 // **/\r
 \r

-#string STR_PROPERTIES_MODULE_NAME \r
-#language en-US \r
+#string STR_PROPERTIES_MODULE_NAME\r
+#language en-US\r

 "HII Sample DXE Driver"\r
 \r
 \r
 "HII Sample DXE Driver"\r
 \r
 \r

diff --git a/MdeModulePkg/Universal/DriverSampleDxe/Inventory.vfr b/MdeModulePkg/Universal/DriverSampleDxe/Inventory.vfr
index daa2577383c18b1c77d652f414d0f59a17dbf542..bcdc8e858383c6fe6df3a2959eceddbc9413759b 100644 (file)
--- a/MdeModulePkg/Universal/DriverSampleDxe/Inventory.vfr
+++ b/MdeModulePkg/Universal/DriverSampleDxe/Inventory.vfr
@@ -2,7 +2,7 @@
 //\r
 //    Sample Inventory Data\r
 //\r
 //\r
 //    Sample Inventory Data\r
 //\r

-//  Copyright (c) 2004 - 2015, Intel Corporation. All rights reserved.<BR>\r
+//  Copyright (c) 2004 - 2018, Intel Corporation. All rights reserved.<BR>\r

 //  This program and the accompanying materials\r
 //  are licensed and made available under the terms and conditions of the BSD License\r
 //  which accompanies this distribution.  The full text of the license may be found at\r
 //  This program and the accompanying materials\r
 //  are licensed and made available under the terms and conditions of the BSD License\r
 //  which accompanies this distribution.  The full text of the license may be found at\r


@@ -23,82 +23,82 @@ formset
   form formid = 1,\r
        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\r
 \r
   form formid = 1,\r
        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\r
 \r

-       text\r
+    text\r

       help   = STRING_TOKEN(STR_INV_VERSION_HELP),\r
       text   = STRING_TOKEN(STR_INV_VERSION_TEXT),\r
       help   = STRING_TOKEN(STR_INV_VERSION_HELP),\r
       text   = STRING_TOKEN(STR_INV_VERSION_TEXT),\r

-           text   = STRING_TOKEN(STR_INV_EMPTY_STRING),\r
+      text   = STRING_TOKEN(STR_INV_EMPTY_STRING),\r

       flags  = 0,\r
       key    = 0;\r
 \r
       flags  = 0,\r
       key    = 0;\r
 \r

-       text\r
+    text\r

       help   = STRING_TOKEN(STR_INV_EMPTY_STRING),\r
       text   = STRING_TOKEN(STR_INV_VERSION_TEXT2),\r
       help   = STRING_TOKEN(STR_INV_EMPTY_STRING),\r
       text   = STRING_TOKEN(STR_INV_VERSION_TEXT2),\r

-           text   = STRING_TOKEN(STR_INV_EMPTY_STRING),\r
+      text   = STRING_TOKEN(STR_INV_EMPTY_STRING),\r

       flags  = 0,\r
       key    = 0;\r
 \r
       flags  = 0,\r
       key    = 0;\r
 \r

-       text\r
+    text\r

       help   = STRING_TOKEN(STR_INV_EMPTY_STRING),\r
       text   = STRING_TOKEN(STR_INV_VERSION_TEXT3),\r
       help   = STRING_TOKEN(STR_INV_EMPTY_STRING),\r
       text   = STRING_TOKEN(STR_INV_VERSION_TEXT3),\r

-           text   = STRING_TOKEN(STR_INV_EMPTY_STRING),\r
+      text   = STRING_TOKEN(STR_INV_EMPTY_STRING),\r

       flags  = 0,\r
       key    = 0;\r
 \r
       flags  = 0,\r
       key    = 0;\r
 \r

-       text\r
+    text\r

       help   = STRING_TOKEN(STR_INV_EMPTY_STRING),\r
       text   = STRING_TOKEN(STR_INV_VERSION_TEXT4),\r
       help   = STRING_TOKEN(STR_INV_EMPTY_STRING),\r
       text   = STRING_TOKEN(STR_INV_VERSION_TEXT4),\r

-           text   = STRING_TOKEN(STR_INV_EMPTY_STRING),\r
+      text   = STRING_TOKEN(STR_INV_EMPTY_STRING),\r

       flags  = 0,\r
       key    = 0;\r
 \r
     subtitle text = STRING_TOKEN(STR_INV_EMPTY_STRING);\r
 \r
       flags  = 0,\r
       key    = 0;\r
 \r
     subtitle text = STRING_TOKEN(STR_INV_EMPTY_STRING);\r
 \r

-       text\r
+    text\r

       help   = STRING_TOKEN(STR_INV_EMPTY_STRING),\r
       text   = STRING_TOKEN(STR_INV_VERSION_TEXT5),\r
       help   = STRING_TOKEN(STR_INV_EMPTY_STRING),\r
       text   = STRING_TOKEN(STR_INV_VERSION_TEXT5),\r

-           text   = STRING_TOKEN(STR_INV_EMPTY_STRING),\r
+      text   = STRING_TOKEN(STR_INV_EMPTY_STRING),\r

       flags  = 0,\r
       key    = 0;\r
 \r
       flags  = 0,\r
       key    = 0;\r
 \r

-       text\r
+    text\r

       help   = STRING_TOKEN(STR_INV_EMPTY_STRING),\r
       text   = STRING_TOKEN(STR_INV_VERSION_TEXT6),\r
       help   = STRING_TOKEN(STR_INV_EMPTY_STRING),\r
       text   = STRING_TOKEN(STR_INV_VERSION_TEXT6),\r

-           text   = STRING_TOKEN(STR_INV_EMPTY_STRING),\r
+      text   = STRING_TOKEN(STR_INV_EMPTY_STRING),\r

       flags  = 0,\r
       key    = 0;\r
 \r
       flags  = 0,\r
       key    = 0;\r
 \r

-       text\r
+    text\r

       help   = STRING_TOKEN(STR_INV_EMPTY_STRING),\r
       text   = STRING_TOKEN(STR_INV_VERSION_TEXT7),\r
       help   = STRING_TOKEN(STR_INV_EMPTY_STRING),\r
       text   = STRING_TOKEN(STR_INV_VERSION_TEXT7),\r

-           text   = STRING_TOKEN(STR_INV_EMPTY_STRING),\r
+      text   = STRING_TOKEN(STR_INV_EMPTY_STRING),\r

       flags  = 0,\r
       key    = 0;\r
 \r
       flags  = 0,\r
       key    = 0;\r
 \r

-       text\r
+    text\r

       help   = STRING_TOKEN(STR_INV_EMPTY_STRING),\r
       text   = STRING_TOKEN(STR_INV_VERSION_TEXT8),\r
       help   = STRING_TOKEN(STR_INV_EMPTY_STRING),\r
       text   = STRING_TOKEN(STR_INV_VERSION_TEXT8),\r

-           text   = STRING_TOKEN(STR_INV_EMPTY_STRING),\r
+      text   = STRING_TOKEN(STR_INV_EMPTY_STRING),\r

       flags  = 0,\r
       key    = 0;\r
 \r
       flags  = 0,\r
       key    = 0;\r
 \r

-       text\r
+    text\r

       help   = STRING_TOKEN(STR_INV_EMPTY_STRING),\r
       text   = STRING_TOKEN(STR_INV_VERSION_TEXT9),\r
       help   = STRING_TOKEN(STR_INV_EMPTY_STRING),\r
       text   = STRING_TOKEN(STR_INV_VERSION_TEXT9),\r

-           text   = STRING_TOKEN(STR_INV_EMPTY_STRING),\r
+      text   = STRING_TOKEN(STR_INV_EMPTY_STRING),\r

       flags  = 0,\r
       key    = 0;\r
 \r
       flags  = 0,\r
       key    = 0;\r
 \r

-       text\r
+    text\r

       help   = STRING_TOKEN(STR_INV_EMPTY_STRING),\r
       text   = STRING_TOKEN(STR_INV_VERSION_TEXT10),\r
       help   = STRING_TOKEN(STR_INV_EMPTY_STRING),\r
       text   = STRING_TOKEN(STR_INV_VERSION_TEXT10),\r

-           text   = STRING_TOKEN(STR_INV_EMPTY_STRING),\r
+      text   = STRING_TOKEN(STR_INV_EMPTY_STRING),\r

       flags  = 0,\r
       key    = 0;\r
 \r
       flags  = 0,\r
       key    = 0;\r
 \r

-       text\r
+    text\r

       help   = STRING_TOKEN(STR_INV_EMPTY_STRING),\r
       text   = STRING_TOKEN(STR_INV_VERSION_TEXT11),\r
       help   = STRING_TOKEN(STR_INV_EMPTY_STRING),\r
       text   = STRING_TOKEN(STR_INV_VERSION_TEXT11),\r

-           text   = STRING_TOKEN(STR_INV_EMPTY_STRING),\r
+      text   = STRING_TOKEN(STR_INV_EMPTY_STRING),\r

       flags  = 0,\r
       key    = 0;\r
 \r
       flags  = 0,\r
       key    = 0;\r
 \r

diff --git a/MdeModulePkg/Universal/DriverSampleDxe/InventoryStrings.uni b/MdeModulePkg/Universal/DriverSampleDxe/InventoryStrings.uni
index 01afcd5cae4a1658ecb0ca866b854247cfa5b226..9336b4a946a199faec8ad63c947755ec939fd772 100644 (file)
--- a/MdeModulePkg/Universal/DriverSampleDxe/InventoryStrings.uni
+++ b/MdeModulePkg/Universal/DriverSampleDxe/InventoryStrings.uni
@@ -1,24 +1,24 @@
 // *++\r
 //\r
 // *++\r
 //\r

-// Copyright (c) 2007, Intel Corporation. All rights reserved.<BR>\r
-// This program and the accompanying materials                          \r
-// are licensed and made available under the terms and conditions of the BSD License         \r
-// which accompanies this distribution.  The full text of the license may be found at        \r
-// http://opensource.org/licenses/bsd-license.php                                            \r
-//                                                                                           \r
-// THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     \r
-// WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             \r
-// \r
+// Copyright (c) 2007 - 2018, Intel Corporation. All rights reserved.<BR>\r
+// This program and the accompanying materials\r
+// are licensed and made available under the terms and conditions of the BSD License\r
+// which accompanies this distribution.  The full text of the license may be found at\r
+// http://opensource.org/licenses/bsd-license.php\r
+//\r
+// THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
+// WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
+//\r

 // Module Name:\r
 //\r
 //   InventoryStrings.uni\r
 // Module Name:\r
 //\r
 //   InventoryStrings.uni\r

-// \r
+//\r

 // Abstract:\r
 // Abstract:\r

-// \r
+//\r

 //   String definitions for Inventory file.\r
 //   String definitions for Inventory file.\r

-// \r
+//\r

 // Revision History:\r
 // Revision History:\r

-// \r
+//\r

 // --*/\r
 \r
 \r
 // --*/\r
 \r
 \r

diff --git a/MdeModulePkg/Universal/DriverSampleDxe/Vfr.vfr b/MdeModulePkg/Universal/DriverSampleDxe/Vfr.vfr
index 9d99dcf205e3b078f36e9bb273b2b150c3fb9894..d005e7feedb533242c5565669b198170b33b4820 100644 (file)
--- a/MdeModulePkg/Universal/DriverSampleDxe/Vfr.vfr
+++ b/MdeModulePkg/Universal/DriverSampleDxe/Vfr.vfr
@@ -54,16 +54,16 @@ formset
   title     = STRING_TOKEN(STR_FORM_SET_TITLE),\r
   help      = STRING_TOKEN(STR_FORM_SET_TITLE_HELP),\r
   classguid = EFI_HII_PLATFORM_SETUP_FORMSET_GUID,\r
   title     = STRING_TOKEN(STR_FORM_SET_TITLE),\r
   help      = STRING_TOKEN(STR_FORM_SET_TITLE_HELP),\r
   classguid = EFI_HII_PLATFORM_SETUP_FORMSET_GUID,\r

-  \r
+\r

   //\r
   //\r

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

   // after the formset declaration.    >00000040: 5C 06 00 00 00 00.\r
   // So we don't need to declare the Standard Default.\r
   // Please check the vfr.lst file for details.\r
   // To enable list file for VFR, add "-l" to VfrCompile <Command> in [Build.Visual-Form-Representation-File] as follows:\r
   //          VfrCompile -l --no-pre-processing --output-directory ${d_path} $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.iii\r
   //\r
   // after the formset declaration.    >00000040: 5C 06 00 00 00 00.\r
   // So we don't need to declare the Standard Default.\r
   // Please check the vfr.lst file for details.\r
   // To enable list file for VFR, add "-l" to VfrCompile <Command> in [Build.Visual-Form-Representation-File] as follows:\r
   //          VfrCompile -l --no-pre-processing --output-directory ${d_path} $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.iii\r
   //\r

-  \r
+\r

    //\r
   // Define a Buffer Storage (EFI_IFR_VARSTORE)\r
   //\r
    //\r
   // Define a Buffer Storage (EFI_IFR_VARSTORE)\r
   //\r


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

-    attribute = EFI_VARIABLE_BOOTSERVICE_ACCESS | EFI_VARIABLE_NON_VOLATILE,  // EFI variable attribures  \r
+    attribute = EFI_VARIABLE_BOOTSERVICE_ACCESS | EFI_VARIABLE_NON_VOLATILE,  // EFI variable attribures\r

     name  = MyEfiVar,\r
     guid  = DRIVER_SAMPLE_FORMSET_GUID;\r
 \r
     name  = MyEfiVar,\r
     guid  = DRIVER_SAMPLE_FORMSET_GUID;\r
 \r


@@ -415,7 +415,7 @@ formset
               step    = 1,\r
               default = 18, defaultstore = MyStandardDefault,     // This is standard default value\r
               default = 19, defaultstore = MyManufactureDefault,  // This is manufacture default value\r
               step    = 1,\r
               default = 18, defaultstore = MyStandardDefault,     // This is standard default value\r
               default = 19, defaultstore = MyManufactureDefault,  // This is manufacture default value\r

-        \r
+\r

       endnumeric;\r
     endif;\r
 \r
       endnumeric;\r
     endif;\r
 \r


@@ -423,7 +423,7 @@ formset
             questionid = 0x1239,\r
             prompt  = STRING_TOKEN(STR_DEFAULT_VALUE_FROM_ACCESS_PROMPT),\r
             help    = STRING_TOKEN(STR_DEFAULT_VALUE_FROM_ACCESS_HELP),\r
             questionid = 0x1239,\r
             prompt  = STRING_TOKEN(STR_DEFAULT_VALUE_FROM_ACCESS_PROMPT),\r
             help    = STRING_TOKEN(STR_DEFAULT_VALUE_FROM_ACCESS_HELP),\r

-            flags   = DISPLAY_UINT_HEX | INTERACTIVE, \r
+            flags   = DISPLAY_UINT_HEX | INTERACTIVE,\r

             minimum = 0,\r
             maximum = 255,\r
             step    = 1,\r
             minimum = 0,\r
             maximum = 255,\r
             step    = 1,\r


@@ -434,7 +434,7 @@ formset
             questionid = 0x1240,\r
             prompt  = STRING_TOKEN(STR_DEFAULT_VALUE_FROM_CALLBACK_PROMPT),\r
             help    = STRING_TOKEN(STR_DEFAULT_VALUE_FROM_CALLBACK_HELP),\r
             questionid = 0x1240,\r
             prompt  = STRING_TOKEN(STR_DEFAULT_VALUE_FROM_CALLBACK_PROMPT),\r
             help    = STRING_TOKEN(STR_DEFAULT_VALUE_FROM_CALLBACK_HELP),\r

-            flags   = DISPLAY_UINT_HEX | INTERACTIVE, \r
+            flags   = DISPLAY_UINT_HEX | INTERACTIVE,\r

             minimum = 0,\r
             maximum = 255,\r
             step    = 1,\r
             minimum = 0,\r
             maximum = 255,\r
             step    = 1,\r


@@ -451,13 +451,13 @@ formset
         option text = STRING_TOKEN(STR_ONE_OF_TEXT2), value = 2, flags = 0;\r
         option text = STRING_TOKEN(STR_ONE_OF_TEXT3), value = 3, flags = 0;\r
     endlist;\r
         option text = STRING_TOKEN(STR_ONE_OF_TEXT2), value = 2, flags = 0;\r
         option text = STRING_TOKEN(STR_ONE_OF_TEXT3), value = 3, flags = 0;\r
     endlist;\r

-        \r
+\r

     resetbutton\r
       defaultstore = MyStandardDefault,\r
       prompt   = STRING_TOKEN(STR_STANDARD_DEFAULT_PROMPT),\r
       help     = STRING_TOKEN(STR_STANDARD_DEFAULT_HELP),\r
     endresetbutton;\r
     resetbutton\r
       defaultstore = MyStandardDefault,\r
       prompt   = STRING_TOKEN(STR_STANDARD_DEFAULT_PROMPT),\r
       help     = STRING_TOKEN(STR_STANDARD_DEFAULT_HELP),\r
     endresetbutton;\r

-    \r
+\r

     resetbutton\r
       defaultstore = MyManufactureDefault,\r
       prompt   = STRING_TOKEN(STR_MANUFACTURE_DEFAULT_PROMPT),\r
     resetbutton\r
       defaultstore = MyManufactureDefault,\r
       prompt   = STRING_TOKEN(STR_MANUFACTURE_DEFAULT_PROMPT),\r


@@ -504,24 +504,24 @@ formset
     goto 5,\r
       prompt = STRING_TOKEN(STR_GOTO_FORM5), //FifthSetupPage  // this too has no end-op and basically it's a jump to a form ONLY\r
       help   = STRING_TOKEN(STR_GOTO_FORM5_HELP);\r
     goto 5,\r
       prompt = STRING_TOKEN(STR_GOTO_FORM5), //FifthSetupPage  // this too has no end-op and basically it's a jump to a form ONLY\r
       help   = STRING_TOKEN(STR_GOTO_FORM5_HELP);\r

-      \r
+\r

     goto 6,\r
       prompt = STRING_TOKEN(STR_GOTO_FORM6), //SixthSetupPage  // this too has no end-op and basically it's a jump to a form ONLY\r
       help   = STRING_TOKEN(STR_GOTO_HELP);\r
 \r
     goto 6,\r
       prompt = STRING_TOKEN(STR_GOTO_FORM6), //SixthSetupPage  // this too has no end-op and basically it's a jump to a form ONLY\r
       help   = STRING_TOKEN(STR_GOTO_HELP);\r
 \r

-    goto \r
+    goto\r

       formsetguid = DRIVER_SAMPLE_INVENTORY_GUID,\r
       formid  = 0x1,\r
       question = 0x1,\r
       prompt  = STRING_TOKEN(STR_GOTO_ANOTHER_FORMSET),\r
       help    = STRING_TOKEN(STR_GOTO_ANOTHER_FORMSET_HELP);\r
 \r
       formsetguid = DRIVER_SAMPLE_INVENTORY_GUID,\r
       formid  = 0x1,\r
       question = 0x1,\r
       prompt  = STRING_TOKEN(STR_GOTO_ANOTHER_FORMSET),\r
       help    = STRING_TOKEN(STR_GOTO_ANOTHER_FORMSET_HELP);\r
 \r

-    guidop \r
+    guidop\r

       guid = DRIVER_SAMPLE_FORMSET_GUID,\r
       datatype = MY_EFI_VARSTORE_DATA,\r
       guid = DRIVER_SAMPLE_FORMSET_GUID,\r
       datatype = MY_EFI_VARSTORE_DATA,\r

-        data.Field8  = 0x21, \r
+        data.Field8  = 0x21,\r

         data.Field16 = 0x2121,\r
         data.Field16 = 0x2121,\r

-        data.OrderedList[0] = 0x21,        \r
+        data.OrderedList[0] = 0x21,\r

     endguidop;\r
 \r
      goto 7,\r
     endguidop;\r
 \r
      goto 7,\r


@@ -587,16 +587,16 @@ formset
         help    = STRING_TOKEN(STR_TIME_HELP),\r
         flags   = STORAGE_TIME,\r
       endtime;\r
         help    = STRING_TOKEN(STR_TIME_HELP),\r
         flags   = STORAGE_TIME,\r
       endtime;\r

-      \r
-      time \r
-            name    = MyTime, \r
-            varid   = MyIfrNVData.Time, \r
-            prompt  = STRING_TOKEN(STR_TIME_PROMPT), \r
-            help    = STRING_TOKEN(STR_TIME_PROMPT), \r
+\r
+      time\r
+            name    = MyTime,\r
+            varid   = MyIfrNVData.Time,\r
+            prompt  = STRING_TOKEN(STR_TIME_PROMPT),\r
+            help    = STRING_TOKEN(STR_TIME_PROMPT),\r

             flags   = STORAGE_NORMAL | SECOND_SUPPRESS,\r
             flags   = STORAGE_NORMAL | SECOND_SUPPRESS,\r

-            default = 15:33:33, \r
+            default = 15:33:33,\r

       endtime;\r
       endtime;\r

-      \r
+\r

       checkbox varid   = MyIfrNVData.ChooseToActivateNuclearWeaponry,\r
               prompt   = STRING_TOKEN(STR_CHECK_BOX_PROMPT),\r
               help     = STRING_TOKEN(STR_CHECK_BOX_HELP),\r
       checkbox varid   = MyIfrNVData.ChooseToActivateNuclearWeaponry,\r
               prompt   = STRING_TOKEN(STR_CHECK_BOX_PROMPT),\r
               help     = STRING_TOKEN(STR_CHECK_BOX_HELP),\r


@@ -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\r
         help   = STRING_TOKEN(STR_GOTO_HELP);\r
 \r
         prompt = STRING_TOKEN(STR_GOTO_FORM1), //MainSetupPage  // this too has no end-op and basically it's a jump to a form ONLY\r
         help   = STRING_TOKEN(STR_GOTO_HELP);\r
 \r

-    goto \r
+    goto\r

       varid   = MyIfrNVData.RefData,\r
       prompt  = STRING_TOKEN(STR_GOTO_DYNAMIC3),\r
       help    = STRING_TOKEN(STR_GOTO_DYNAMIC3_HELP),\r
       varid   = MyIfrNVData.RefData,\r
       prompt  = STRING_TOKEN(STR_GOTO_DYNAMIC3),\r
       help    = STRING_TOKEN(STR_GOTO_DYNAMIC3_HELP),\r


@@ -625,15 +625,15 @@ formset
       //\r
       // Set the defult value, format is QuestionId; FormId; FormsetGuid; Device Path String Token\r
       //\r
       //\r
       // Set the defult value, format is QuestionId; FormId; FormsetGuid; Device Path String Token\r
       //\r

-      default = 0;0;ZERO_GUID;STRING_TOKEN(STR_NULL_STRING),  \r
+      default = 0;0;ZERO_GUID;STRING_TOKEN(STR_NULL_STRING),\r

     ;                                                         // goto opcode end flag.\r
 \r
     ;                                                         // goto opcode end flag.\r
 \r

-    goto \r
+    goto\r

       prompt  = STRING_TOKEN(STR_GOTO_DYNAMIC4),\r
       help    = STRING_TOKEN(STR_GOTO_DYNAMIC4_HELP),\r
       flags   = INTERACTIVE,\r
       key     = 0x1249;\r
       prompt  = STRING_TOKEN(STR_GOTO_DYNAMIC4),\r
       help    = STRING_TOKEN(STR_GOTO_DYNAMIC4_HELP),\r
       flags   = INTERACTIVE,\r
       key     = 0x1249;\r

-      \r
+\r

     endform;\r
   endif;\r
 \r
     endform;\r
   endif;\r
 \r


@@ -662,7 +662,7 @@ formset
     endnumeric;\r
 \r
     grayoutif  match2 (stringref(STRING_TOKEN(STR_PATTERN)), stringref(STRING_TOKEN(STR_STRING)), PERL_GUID);\r
     endnumeric;\r
 \r
     grayoutif  match2 (stringref(STRING_TOKEN(STR_PATTERN)), stringref(STRING_TOKEN(STR_STRING)), PERL_GUID);\r

-      numeric \r
+      numeric\r

         varid   = MyIfrNVData.Match2,\r
         prompt  = STRING_TOKEN(STR_MATCH2_PROMPT),\r
         help    = STRING_TOKEN(STR_MATCH2_HELP),\r
         varid   = MyIfrNVData.Match2,\r
         prompt  = STRING_TOKEN(STR_MATCH2_PROMPT),\r
         help    = STRING_TOKEN(STR_MATCH2_HELP),\r


@@ -676,19 +676,19 @@ formset
 \r
   endform;\r
 \r
 \r
   endform;\r
 \r

-  formmap formid = 4,            \r
-    maptitle = STRING_TOKEN(STR_SAMPL_MAP_METHOD);  \r
+  formmap formid = 4,\r
+    maptitle = STRING_TOKEN(STR_SAMPL_MAP_METHOD);\r

     mapguid  = DRIVER_SAMPLE_FORMSET_GUID;\r
     mapguid  = DRIVER_SAMPLE_FORMSET_GUID;\r

-    maptitle = STRING_TOKEN(STR_STANDARD_MAP_METHOD);  \r
+    maptitle = STRING_TOKEN(STR_STANDARD_MAP_METHOD);\r

     mapguid  = EFI_HII_STANDARD_FORM_GUID;\r
 \r
     mapguid  = EFI_HII_STANDARD_FORM_GUID;\r
 \r

-    oneof varid = MyIfrNVData.SerialPortNo,    \r
+    oneof varid = MyIfrNVData.SerialPortNo,\r

       prompt  = STRING_TOKEN(STR_SERIAL_PORT),\r
       help    = STRING_TOKEN(STR_ONE_OF_HELP),\r
 \r
       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;)));\r
       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;));\r
       prompt  = STRING_TOKEN(STR_SERIAL_PORT),\r
       help    = STRING_TOKEN(STR_ONE_OF_HELP),\r
 \r
       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;)));\r
       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;));\r

-      \r
+\r

       option text = STRING_TOKEN(STR_SERIAL_PORT_DISABLE), value = 0x0, flags = DEFAULT;\r
       option text = STRING_TOKEN(STR_SERIAL_PORT1), value = 0x1, flags = 0;\r
       option text = STRING_TOKEN(STR_SERIAL_PORT2), value = 0x2, flags = 0;\r
       option text = STRING_TOKEN(STR_SERIAL_PORT_DISABLE), value = 0x0, flags = DEFAULT;\r
       option text = STRING_TOKEN(STR_SERIAL_PORT1), value = 0x1, flags = 0;\r
       option text = STRING_TOKEN(STR_SERIAL_PORT2), value = 0x2, flags = 0;\r


@@ -705,10 +705,10 @@ formset
 \r
     grayoutif TRUE;\r
       suppressif ideqval MyIfrNVData.SerialPortStatus == 0;\r
 \r
     grayoutif TRUE;\r
       suppressif ideqval MyIfrNVData.SerialPortStatus == 0;\r

-        oneof varid = MyIfrNVData.SerialPortIo,    \r
+        oneof varid = MyIfrNVData.SerialPortIo,\r

           prompt  = STRING_TOKEN(STR_SERIAL_PORT_IO_ADDRESS),\r
           help    = STRING_TOKEN(STR_ONE_OF_HELP),\r
           prompt  = STRING_TOKEN(STR_SERIAL_PORT_IO_ADDRESS),\r
           help    = STRING_TOKEN(STR_ONE_OF_HELP),\r

-          \r
+\r

           option text = STRING_TOKEN(STR_SERIAL_PORT1_IOADDR), value = 0x3F8, flags = DEFAULT;\r
           option text = STRING_TOKEN(STR_SERIAL_PORT2_IOADDR), value = 0x2F8, flags = 0;\r
           option text = STRING_TOKEN(STR_SERIAL_PORT3_IOADDR), value = 0x3E8, flags = 0;\r
           option text = STRING_TOKEN(STR_SERIAL_PORT1_IOADDR), value = 0x3F8, flags = DEFAULT;\r
           option text = STRING_TOKEN(STR_SERIAL_PORT2_IOADDR), value = 0x2F8, flags = 0;\r
           option text = STRING_TOKEN(STR_SERIAL_PORT3_IOADDR), value = 0x3E8, flags = 0;\r


@@ -719,10 +719,10 @@ formset
 \r
     grayoutif TRUE;\r
       suppressif ideqval MyIfrNVData.SerialPortStatus == 0;\r
 \r
     grayoutif TRUE;\r
       suppressif ideqval MyIfrNVData.SerialPortStatus == 0;\r

-        oneof varid = MyIfrNVData.SerialPortIrq,    \r
+        oneof varid = MyIfrNVData.SerialPortIrq,\r

           prompt  = STRING_TOKEN(STR_SERIAL_PORT_IRQ),\r
           help    = STRING_TOKEN(STR_ONE_OF_HELP),\r
           prompt  = STRING_TOKEN(STR_SERIAL_PORT_IRQ),\r
           help    = STRING_TOKEN(STR_ONE_OF_HELP),\r

-          \r
+\r

           option text = STRING_TOKEN(STR_SERIAL_PORT13_IRQ), value = 0x4, flags = DEFAULT;\r
           option text = STRING_TOKEN(STR_SERIAL_PORT24_IRQ), value = 0x3, flags = 0;\r
         endoneof;\r
           option text = STRING_TOKEN(STR_SERIAL_PORT13_IRQ), value = 0x4, flags = DEFAULT;\r
           option text = STRING_TOKEN(STR_SERIAL_PORT24_IRQ), value = 0x3, flags = 0;\r
         endoneof;\r


@@ -755,7 +755,7 @@ formset
   endform;\r
 \r
   form formid = 6,            // Form to show the refresh guid group op-code\r
   endform;\r
 \r
   form formid = 6,            // Form to show the refresh guid group op-code\r

-       title = STRING_TOKEN(STR_FORM6_TITLE); \r
+       title = STRING_TOKEN(STR_FORM6_TITLE);\r

 \r
     text\r
       help   = STRING_TOKEN(STR_TEXT_REFRESH_GUID),\r
 \r
     text\r
       help   = STRING_TOKEN(STR_TEXT_REFRESH_GUID),\r

diff --git a/MdeModulePkg/Universal/DriverSampleDxe/VfrStrings.uni b/MdeModulePkg/Universal/DriverSampleDxe/VfrStrings.uni
index 2215c08c5ac10318e281c190c92f0f91de1889ca..e223bb6075b92a95c875499d4241160f86c499aa 100644 (file)
--- a/MdeModulePkg/Universal/DriverSampleDxe/VfrStrings.uni
+++ b/MdeModulePkg/Universal/DriverSampleDxe/VfrStrings.uni
@@ -1,24 +1,24 @@
 // *++\r
 // *++\r

-       //\r
+  //\r

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

-// This program and the accompanying materials                          \r
-// are licensed and made available under the terms and conditions of the BSD License         \r
-// which accompanies this distribution.  The full text of the license may be found at        \r
-// http://opensource.org/licenses/bsd-license.php                                            \r
-//                                                                                           \r
-// THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     \r
-// WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             \r
-// \r
+// This program and the accompanying materials\r
+// are licensed and made available under the terms and conditions of the BSD License\r
+// which accompanies this distribution.  The full text of the license may be found at\r
+// http://opensource.org/licenses/bsd-license.php\r
+//\r
+// THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
+// WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
+//\r

 // Module Name:\r
 //\r
 //   VfrStrings.vfr\r
 // Module Name:\r
 //\r
 //   VfrStrings.vfr\r

-// \r
+//\r

 // Abstract:\r
 // Abstract:\r

-// \r
+//\r

 //   String definitions for Sample Setup formset.\r
 //   String definitions for Sample Setup formset.\r

-// \r
+//\r

 // Revision History:\r
 // Revision History:\r

-// \r
+//\r

 // --*/\r
 \r
 \r
 // --*/\r
 \r
 \r


@@ -52,9 +52,9 @@
 #string STR_CPU_STRING2                #language en-US " "\r
                                        #language fr-FR " "\r
 #string STR_NUMERIC_NUM_PROMPT         #language en-US "Please select the number"\r
 #string STR_CPU_STRING2                #language en-US " "\r
                                        #language fr-FR " "\r
 #string STR_NUMERIC_NUM_PROMPT         #language en-US "Please select the number"\r

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

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

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

 #string STR_ONE_OF_PROMPT              #language en-US "My one-of prompt #1"\r
                                        #language fr-FR "Mi uno- de guía # 1"\r
 #string STR_ONE_OF_PROMPT_KEYWORD      #language en-US "My Keyword Namespace Test"\r
 #string STR_ONE_OF_PROMPT              #language en-US "My one-of prompt #1"\r
                                        #language fr-FR "Mi uno- de guía # 1"\r
 #string STR_ONE_OF_PROMPT_KEYWORD      #language en-US "My Keyword Namespace Test"\r


@@ -142,7 +142,7 @@
 #string STR_GOTO_DYNAMIC3_HELP         #language en-US "Update the destination through "retrieve" call back type before user select it."\r
                                        #language fr-FR "Update the destination through "retrieve" call back type before user select it."\r
 #string STR_GOTO_DYNAMIC4_HELP         #language en-US "Update the destination through "changing" call back type when user select it."\r
 #string STR_GOTO_DYNAMIC3_HELP         #language en-US "Update the destination through "retrieve" call back type before user select it."\r
                                        #language fr-FR "Update the destination through "retrieve" call back type before user select it."\r
 #string STR_GOTO_DYNAMIC4_HELP         #language en-US "Update the destination through "changing" call back type when user select it."\r

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

 #string STR_ERROR_INCONSISTENT         #language en-US "This is my inconsistent error message"\r
                                        #language fr-FR "Éste es mi mensaje de error contrario."\r
 #string STR_ERROR_POPUP                #language en-US "You typed in something bad!"\r
 #string STR_ERROR_INCONSISTENT         #language en-US "This is my inconsistent error message"\r
                                        #language fr-FR "Éste es mi mensaje de error contrario."\r
 #string STR_ERROR_POPUP                #language en-US "You typed in something bad!"\r


@@ -240,7 +240,7 @@
 #string STR_STRING_CHECK_ERROR_POPUP   #language en-US "String you typed in is not correct!"\r
                                        #language fr-FR "String you typed in is not correct!"\r
 #string STR_TEXT_REFRESH_GUID          #language en-US "Add new menu by press "Ctrl + C""\r
 #string STR_STRING_CHECK_ERROR_POPUP   #language en-US "String you typed in is not correct!"\r
                                        #language fr-FR "String you typed in is not correct!"\r
 #string STR_TEXT_REFRESH_GUID          #language en-US "Add new menu by press "Ctrl + C""\r

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

 #string STR_TEXT_REFRESH_GUID_COUNT    #language en-US "Refresh guid event count"\r
                                        #language fr-FR "Refresh guid event count"\r
 #string STR_MODAL_FORM_TITLE           #language en-US "First Modal Form"\r
 #string STR_TEXT_REFRESH_GUID_COUNT    #language en-US "Refresh guid event count"\r
                                        #language fr-FR "Refresh guid event count"\r
 #string STR_MODAL_FORM_TITLE           #language en-US "First Modal Form"\r


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

-                                                     #language fr-FR ""                                                                                                           \r
+                                                     #language fr-FR ""\r

 #string STR_SUBMITTED_CALLBACK_TEST_PROMPT           #language en-US "Submitted callback test"\r
                                                      #language fr-FR "Submitted callback test"\r
 #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"\r
 #string STR_SUBMITTED_CALLBACK_TEST_PROMPT           #language en-US "Submitted callback test"\r
                                                      #language fr-FR "Submitted callback test"\r
 #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"\r


@@ -346,7 +346,7 @@
                                        #language fr-FR "Manufacture Default"\r
 \r
 #string STR_DEFAULTSTORE_SAFE          #language en-US "Safe Default"\r
                                        #language fr-FR "Manufacture Default"\r
 \r
 #string STR_DEFAULTSTORE_SAFE          #language en-US "Safe Default"\r

-                                       #language fr-FR "Safe Default"                                       \r
+                                       #language fr-FR "Safe Default"\r

 \r
 #string STR_STANDARD_DEFAULT_PROMPT    #language en-US "Standard Default"\r
                                        #language fr-FR "Standard Default"\r
 \r
 #string STR_STANDARD_DEFAULT_PROMPT    #language en-US "Standard Default"\r
                                        #language fr-FR "Standard Default"\r


@@ -370,7 +370,7 @@
 #string STR_STANDARD_MAP_METHOD        #language en-US "UEFI Standard Map Form"\r
                                        #language fr-FR "UEFI Standard Map Form"\r
 //\r
 #string STR_STANDARD_MAP_METHOD        #language en-US "UEFI Standard Map Form"\r
                                        #language fr-FR "UEFI Standard Map Form"\r
 //\r

-// Serial Port \r
+// Serial Port\r

 //\r
 #string STR_SERIAL_PORT                #language en-US "Serial port number"\r
                                        #language fr-FR "Serial port number"\r
 //\r
 #string STR_SERIAL_PORT                #language en-US "Serial port number"\r
                                        #language fr-FR "Serial port number"\r


@@ -431,4 +431,4 @@
 #string STR_STRING                     #language en-US  "Match2 Test"\r
                                        #language fr-FR  "Match2 Test"\r
 #string STR_PATTERN                    #language en-US  "Match2"\r
 #string STR_STRING                     #language en-US  "Match2 Test"\r
                                        #language fr-FR  "Match2 Test"\r
 #string STR_PATTERN                    #language en-US  "Match2"\r

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

diff --git a/MdeModulePkg/Universal/EbcDxe/EbcDxe.inf b/MdeModulePkg/Universal/EbcDxe/EbcDxe.inf
index 197a9a754f8788b69537939094cdb6d3308139e4..8f128b121d0ba92a5e4b4a43fc37cedbcedb8c18 100644 (file)
--- a/MdeModulePkg/Universal/EbcDxe/EbcDxe.inf
+++ b/MdeModulePkg/Universal/EbcDxe/EbcDxe.inf
@@ -1,7 +1,7 @@
 ## @file\r
 #  Module that produces EBC Interprete and EBC Debug Support protocols.\r
 ## @file\r
 #  Module that produces EBC Interprete and EBC Debug Support protocols.\r

-#  \r
-#  This module implements EFI Byte Code (EBC) Virtual Machine that can provide \r
+#\r
+#  This module implements EFI Byte Code (EBC) Virtual Machine that can provide\r

 #  platform and processor-independent mechanisms for loading and executing EFI\r
 #  device drivers.\r
 #\r
 #  platform and processor-independent mechanisms for loading and executing EFI\r
 #  device drivers.\r
 #\r


@@ -11,10 +11,10 @@
 #  are licensed and made available under the terms and conditions of the BSD License\r
 #  which accompanies this distribution.  The full text of the license may be found at\r
 #  http://opensource.org/licenses/bsd-license.php\r
 #  are licensed and made available under the terms and conditions of the BSD License\r
 #  which accompanies this distribution.  The full text of the license may be found at\r
 #  http://opensource.org/licenses/bsd-license.php\r

-#  \r
+#\r

 #  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 #  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 #  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 #  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r

-#  \r
+#\r

 ##\r
 \r
 [Defines]\r
 ##\r
 \r
 [Defines]\r

diff --git a/MdeModulePkg/Universal/EbcDxe/EbcDxe.uni b/MdeModulePkg/Universal/EbcDxe/EbcDxe.uni
index 9ee429f87a7561f8648a2b9cf69a2e81c72293f4..fbdfe2fa1c59c44db419483713a8e1bffa310e52 100644 (file)
--- a/MdeModulePkg/Universal/EbcDxe/EbcDxe.uni
+++ b/MdeModulePkg/Universal/EbcDxe/EbcDxe.uni
@@ -5,13 +5,13 @@
 // platform and processor-independent mechanisms for loading and executing EFI\r
 // device drivers.\r
 //\r
 // platform and processor-independent mechanisms for loading and executing EFI\r
 // device drivers.\r
 //\r

-// Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.<BR>\r
+// Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r

 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r
 // which accompanies this distribution.  The full text of the license may be found at\r
 // http://opensource.org/licenses/bsd-license.php\r
 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r
 // which accompanies this distribution.  The full text of the license may be found at\r
 // http://opensource.org/licenses/bsd-license.php\r

-// \r
+//\r

 // THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 // WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 //\r
 // THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 // WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 //\r

diff --git a/MdeModulePkg/Universal/EbcDxe/EbcDxeExtra.uni b/MdeModulePkg/Universal/EbcDxe/EbcDxeExtra.uni
index ef917c961defd4a646572d33a460f816515616a2..a421455884a80b46618e7c84128e04f58c2599b0 100644 (file)
--- a/MdeModulePkg/Universal/EbcDxe/EbcDxeExtra.uni
+++ b/MdeModulePkg/Universal/EbcDxe/EbcDxeExtra.uni
@@ -1,7 +1,7 @@
 // /** @file\r
 // EbcDxe Localized Strings and Content\r
 //\r
 // /** @file\r
 // EbcDxe Localized Strings and Content\r
 //\r

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

 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r
 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r


@@ -13,8 +13,8 @@
 //\r
 // **/\r
 \r
 //\r
 // **/\r
 \r

-#string STR_PROPERTIES_MODULE_NAME \r
-#language en-US \r
+#string STR_PROPERTIES_MODULE_NAME\r
+#language en-US\r

 "EFI Byte Code DXE Interpreter"\r
 \r
 \r
 "EFI Byte Code DXE Interpreter"\r
 \r
 \r

diff --git a/MdeModulePkg/Universal/EbcDxe/EbcExecute.c b/MdeModulePkg/Universal/EbcDxe/EbcExecute.c
index 2dfed8ecf54fcebf1ff9782cef21ae192c7b173c..3418936c1012ae5dc7fb832a148faee836f87fc3 100644 (file)
--- a/MdeModulePkg/Universal/EbcDxe/EbcExecute.c
+++ b/MdeModulePkg/Universal/EbcDxe/EbcExecute.c
@@ -1,7 +1,7 @@
 /** @file\r
   Contains code that implements the virtual machine.\r
 \r
 /** @file\r
   Contains code that implements the virtual machine.\r
 \r

-Copyright (c) 2006 - 2017, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r

 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r


@@ -1333,11 +1333,11 @@ CONST VM_TABLE_ENTRY           mVmOpcodeTable[] = {
   { ExecuteMOVIn },             // opcode 0x38 - mov immediate natural\r
   { ExecuteMOVREL },            // opcode 0x39 - move data relative to PC\r
   { NULL },                     // opcode 0x3a\r
   { ExecuteMOVIn },             // opcode 0x38 - mov immediate natural\r
   { ExecuteMOVREL },            // opcode 0x39 - move data relative to PC\r
   { NULL },                     // opcode 0x3a\r

-  { NULL },                     // opcode 0x3b \r
-  { NULL },                     // opcode 0x3c \r
-  { NULL },                     // opcode 0x3d \r
-  { NULL },                     // opcode 0x3e \r
-  { NULL }                      // opcode 0x3f \r
+  { NULL },                     // opcode 0x3b\r
+  { NULL },                     // opcode 0x3c\r
+  { NULL },                     // opcode 0x3d\r
+  { NULL },                     // opcode 0x3e\r
+  { NULL }                      // opcode 0x3f\r

 };\r
 \r
 //\r
 };\r
 \r
 //\r

diff --git a/MdeModulePkg/Universal/EbcDxe/Ia32/EbcSupport.c b/MdeModulePkg/Universal/EbcDxe/Ia32/EbcSupport.c
index a825846f89c333ce34a5793bf14092d5f58cc168..944179ba69271e361bd8874843ac33664cc9f479 100644 (file)
--- a/MdeModulePkg/Universal/EbcDxe/Ia32/EbcSupport.c
+++ b/MdeModulePkg/Universal/EbcDxe/Ia32/EbcSupport.c
@@ -2,7 +2,7 @@
   This module contains EBC support routines that are customized based on\r
   the target ia32 processor.\r
 \r
   This module contains EBC support routines that are customized based on\r
   the target ia32 processor.\r
 \r

-Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r

 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r


@@ -44,7 +44,7 @@ UINT8  mInstructionBufferTemplate[] = {
   // These 4 bytes of the thunk entry is the address of the EBC\r
   // entry point.\r
   //\r
   // These 4 bytes of the thunk entry is the address of the EBC\r
   // entry point.\r
   //\r

-  0xB8, \r
+  0xB8,\r

     (UINT8)(EBC_ENTRYPOINT_SIGNATURE & 0xFF),\r
     (UINT8)((EBC_ENTRYPOINT_SIGNATURE >> 8) & 0xFF),\r
     (UINT8)((EBC_ENTRYPOINT_SIGNATURE >> 16) & 0xFF),\r
     (UINT8)(EBC_ENTRYPOINT_SIGNATURE & 0xFF),\r
     (UINT8)((EBC_ENTRYPOINT_SIGNATURE >> 8) & 0xFF),\r
     (UINT8)((EBC_ENTRYPOINT_SIGNATURE >> 16) & 0xFF),\r

diff --git a/MdeModulePkg/Universal/EbcDxe/X64/EbcSupport.c b/MdeModulePkg/Universal/EbcDxe/X64/EbcSupport.c
index 33a174917b6936e414b6684842785d68feb13dbe..15429209e56f4c895bb0c353e197ed814c88bddd 100644 (file)
--- a/MdeModulePkg/Universal/EbcDxe/X64/EbcSupport.c
+++ b/MdeModulePkg/Universal/EbcDxe/X64/EbcSupport.c
@@ -2,7 +2,7 @@
   This module contains EBC support routines that are customized based on\r
   the target x64 processor.\r
 \r
   This module contains EBC support routines that are customized based on\r
   the target x64 processor.\r
 \r

-Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r

 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r


@@ -44,7 +44,7 @@ UINT8  mInstructionBufferTemplate[] = {
   // These 8 bytes of the thunk entry is the address of the EBC\r
   // entry point.\r
   //\r
   // These 8 bytes of the thunk entry is the address of the EBC\r
   // entry point.\r
   //\r

-  0x49, 0xBA, \r
+  0x49, 0xBA,\r

     (UINT8)(EBC_ENTRYPOINT_SIGNATURE & 0xFF),\r
     (UINT8)((EBC_ENTRYPOINT_SIGNATURE >> 8) & 0xFF),\r
     (UINT8)((EBC_ENTRYPOINT_SIGNATURE >> 16) & 0xFF),\r
     (UINT8)(EBC_ENTRYPOINT_SIGNATURE & 0xFF),\r
     (UINT8)((EBC_ENTRYPOINT_SIGNATURE >> 8) & 0xFF),\r
     (UINT8)((EBC_ENTRYPOINT_SIGNATURE >> 16) & 0xFF),\r

diff --git a/MdeModulePkg/Universal/EsrtDxe/EsrtDxe.c b/MdeModulePkg/Universal/EsrtDxe/EsrtDxe.c
index 16b18e0a54dea7545ea4c005c165d5ed57435743..cab8d69e35ad9ce136ca988f6e1b18851de4d901 100644 (file)
--- a/MdeModulePkg/Universal/EsrtDxe/EsrtDxe.c
+++ b/MdeModulePkg/Universal/EsrtDxe/EsrtDxe.c
@@ -1,7 +1,7 @@
 /** @file\r
   Esrt management module.\r
 \r
 /** @file\r
   Esrt management module.\r
 \r

-Copyright (c) 2015, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2015 - 2018, Intel Corporation. All rights reserved.<BR>\r

 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r


@@ -20,7 +20,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 \r
 ESRT_PRIVATE_DATA mPrivate;\r
 \r
 \r
 ESRT_PRIVATE_DATA mPrivate;\r
 \r

-ESRT_MANAGEMENT_PROTOCOL  mEsrtManagementProtocolTemplate = { \r
+ESRT_MANAGEMENT_PROTOCOL  mEsrtManagementProtocolTemplate = {\r

                             EsrtDxeGetEsrtEntry,\r
                             EsrtDxeUpdateEsrtEntry,\r
                             EsrtDxeRegisterEsrtEntry,\r
                             EsrtDxeGetEsrtEntry,\r
                             EsrtDxeUpdateEsrtEntry,\r
                             EsrtDxeRegisterEsrtEntry,\r


@@ -30,11 +30,11 @@ ESRT_MANAGEMENT_PROTOCOL  mEsrtManagementProtocolTemplate = {
                             };\r
 \r
 /**\r
                             };\r
 \r
 /**\r

-  Get ESRT entry from ESRT Cache by FwClass Guid \r
+  Get ESRT entry from ESRT Cache by FwClass Guid\r
+\r
+  @param[in]       FwClass                FwClass of Esrt entry to get\r
+  @param[in, out]  Entry                  Esrt entry returned\r

 \r
 \r

-  @param[in]       FwClass                FwClass of Esrt entry to get  \r
-  @param[in, out]  Entry                  Esrt entry returned \r
-  \r

   @retval EFI_SUCCESS                   The variable saving this Esrt Entry exists.\r
   @retval EF_NOT_FOUND                  No correct variable found.\r
   @retval EFI_WRITE_PROTECTED           ESRT Cache repository is locked\r
   @retval EFI_SUCCESS                   The variable saving this Esrt Entry exists.\r
   @retval EF_NOT_FOUND                  No correct variable found.\r
   @retval EFI_WRITE_PROTECTED           ESRT Cache repository is locked\r


@@ -94,7 +94,7 @@ EsrtDxeGetEsrtEntry(
   Update one ESRT entry in ESRT Cache.\r
 \r
   @param[in]  Entry                         Esrt entry to be updated\r
   Update one ESRT entry in ESRT Cache.\r
 \r
   @param[in]  Entry                         Esrt entry to be updated\r

-  \r
+\r

   @retval EFI_SUCCESS                   Successfully update an ESRT entry in cache.\r
   @retval EFI_INVALID_PARAMETER         Entry does't exist in ESRT Cache\r
   @retval EFI_WRITE_PROTECTED           ESRT Cache repositoy is locked\r
   @retval EFI_SUCCESS                   Successfully update an ESRT entry in cache.\r
   @retval EFI_INVALID_PARAMETER         Entry does't exist in ESRT Cache\r
   @retval EFI_WRITE_PROTECTED           ESRT Cache repositoy is locked\r


@@ -107,7 +107,7 @@ EsrtDxeUpdateEsrtEntry(
   )\r
 {\r
   EFI_STATUS                Status;\r
   )\r
 {\r
   EFI_STATUS                Status;\r

-  \r
+\r

   if (Entry == NULL) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
   if (Entry == NULL) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r


@@ -139,11 +139,11 @@ EsrtDxeUpdateEsrtEntry(
 }\r
 \r
 /**\r
 }\r
 \r
 /**\r

-  Non-FMP instance to unregister Esrt Entry from ESRT Cache. \r
+  Non-FMP instance to unregister Esrt Entry from ESRT Cache.\r

 \r
 \r

-  @param[in]    FwClass                FwClass of Esrt entry to Unregister  \r
-  \r
-  @retval EFI_SUCCESS             Insert all entries Successfully \r
+  @param[in]    FwClass                FwClass of Esrt entry to Unregister\r
+\r
+  @retval EFI_SUCCESS             Insert all entries Successfully\r

   @retval EFI_NOT_FOUND           Entry of FwClass does not exsit\r
 \r
 **/\r
   @retval EFI_NOT_FOUND           Entry of FwClass does not exsit\r
 \r
 **/\r


@@ -153,7 +153,7 @@ EsrtDxeUnRegisterEsrtEntry(
   IN  EFI_GUID        *FwClass\r
   )\r
 {\r
   IN  EFI_GUID        *FwClass\r
   )\r
 {\r

-  EFI_STATUS Status; \r
+  EFI_STATUS Status;\r

 \r
   if (FwClass == NULL) {\r
     return EFI_INVALID_PARAMETER;\r
 \r
   if (FwClass == NULL) {\r
     return EFI_INVALID_PARAMETER;\r


@@ -228,7 +228,7 @@ EFI_STATUS
 EFIAPI\r
 EsrtDxeSyncFmp(\r
   VOID\r
 EFIAPI\r
 EsrtDxeSyncFmp(\r
   VOID\r

-  ) \r
+  )\r

 {\r
   EFI_STATUS                                Status;\r
   UINTN                                     Index1;\r
 {\r
   EFI_STATUS                                Status;\r
   UINTN                                     Index1;\r


@@ -238,8 +238,8 @@ EsrtDxeSyncFmp(
   EFI_FIRMWARE_MANAGEMENT_PROTOCOL          **FmpBuf;\r
   UINTN                                     NumberOfHandles;\r
   UINTN                                     *DescriptorSizeBuf;\r
   EFI_FIRMWARE_MANAGEMENT_PROTOCOL          **FmpBuf;\r
   UINTN                                     NumberOfHandles;\r
   UINTN                                     *DescriptorSizeBuf;\r

-  EFI_FIRMWARE_IMAGE_DESCRIPTOR             **FmpImageInfoBuf;  \r
-  EFI_FIRMWARE_IMAGE_DESCRIPTOR             *TempFmpImageInfo;  \r
+  EFI_FIRMWARE_IMAGE_DESCRIPTOR             **FmpImageInfoBuf;\r
+  EFI_FIRMWARE_IMAGE_DESCRIPTOR             *TempFmpImageInfo;\r

   UINT8                                     *FmpImageInfoCountBuf;\r
   UINT32                                    *FmpImageInfoDescriptorVerBuf;\r
   UINTN                                     ImageInfoSize;\r
   UINT8                                     *FmpImageInfoCountBuf;\r
   UINT32                                    *FmpImageInfoDescriptorVerBuf;\r
   UINTN                                     ImageInfoSize;\r


@@ -270,11 +270,11 @@ EsrtDxeSyncFmp(
                   &HandleBuffer\r
                   );\r
 \r
                   &HandleBuffer\r
                   );\r
 \r

- \r
-  if (Status == EFI_NOT_FOUND) { \r
+\r
+  if (Status == EFI_NOT_FOUND) {\r

     EntryNumNew = 0;\r
     goto UPDATE_REPOSITORY;\r
     EntryNumNew = 0;\r
     goto UPDATE_REPOSITORY;\r

-  } else if (EFI_ERROR(Status)){ \r
+  } else if (EFI_ERROR(Status)){\r

     goto END;\r
   }\r
 \r
     goto END;\r
   }\r
 \r


@@ -295,7 +295,7 @@ EsrtDxeSyncFmp(
 \r
   FmpImageInfoBuf = AllocateZeroPool(sizeof(EFI_FIRMWARE_IMAGE_DESCRIPTOR *) * NumberOfHandles);\r
   if (FmpImageInfoBuf == NULL) {\r
 \r
   FmpImageInfoBuf = AllocateZeroPool(sizeof(EFI_FIRMWARE_IMAGE_DESCRIPTOR *) * NumberOfHandles);\r
   if (FmpImageInfoBuf == NULL) {\r

-    Status = EFI_OUT_OF_RESOURCES;    \r
+    Status = EFI_OUT_OF_RESOURCES;\r

     goto END;\r
   }\r
 \r
     goto END;\r
   }\r
 \r


@@ -380,14 +380,14 @@ EsrtDxeSyncFmp(
 \r
   //\r
   // Create new FMP cache repository based on FmpImageInfoBuf\r
 \r
   //\r
   // Create new FMP cache repository based on FmpImageInfoBuf\r

-  // \r
+  //\r

   for (Index2 = 0; Index2 < NumberOfHandles; Index2++){\r
     TempFmpImageInfo = FmpImageInfoBuf[Index2];\r
     for (Index3 = 0; Index3 < FmpImageInfoCountBuf[Index2]; Index3++){\r
   for (Index2 = 0; Index2 < NumberOfHandles; Index2++){\r
     TempFmpImageInfo = FmpImageInfoBuf[Index2];\r
     for (Index3 = 0; Index3 < FmpImageInfoCountBuf[Index2]; Index3++){\r

-      if ((TempFmpImageInfo->AttributesSupported & IMAGE_ATTRIBUTE_IN_USE) != 0 \r
+      if ((TempFmpImageInfo->AttributesSupported & IMAGE_ATTRIBUTE_IN_USE) != 0\r

       && (TempFmpImageInfo->AttributesSetting & IMAGE_ATTRIBUTE_IN_USE) != 0){\r
         //\r
       && (TempFmpImageInfo->AttributesSetting & IMAGE_ATTRIBUTE_IN_USE) != 0){\r
         //\r

-        // Always put the first smallest version of Image info into ESRT cache \r
+        // Always put the first smallest version of Image info into ESRT cache\r

         //\r
         for(Index1 = 0; Index1 < EntryNumNew; Index1++) {\r
           if (CompareGuid(&EsrtRepositoryNew[Index1].FwClass, &TempFmpImageInfo->ImageTypeId)) {\r
         //\r
         for(Index1 = 0; Index1 < EntryNumNew; Index1++) {\r
           if (CompareGuid(&EsrtRepositoryNew[Index1].FwClass, &TempFmpImageInfo->ImageTypeId)) {\r


@@ -402,7 +402,7 @@ EsrtDxeSyncFmp(
         //\r
         if (Index1 == EntryNumNew){\r
           SetEsrtEntryFromFmpInfo(&EsrtRepositoryNew[EntryNumNew], TempFmpImageInfo, FmpImageInfoDescriptorVerBuf[Index2]);\r
         //\r
         if (Index1 == EntryNumNew){\r
           SetEsrtEntryFromFmpInfo(&EsrtRepositoryNew[EntryNumNew], TempFmpImageInfo, FmpImageInfoDescriptorVerBuf[Index2]);\r

-          EntryNumNew++; \r
+          EntryNumNew++;\r

           if (EntryNumNew >= PcdGet32(PcdMaxFmpEsrtCacheNum)) {\r
             break;\r
           }\r
           if (EntryNumNew >= PcdGet32(PcdMaxFmpEsrtCacheNum)) {\r
             break;\r
           }\r


@@ -471,10 +471,10 @@ END:
 }\r
 \r
 /**\r
 }\r
 \r
 /**\r

-  This function locks up Esrt repository to be readonly. It should be called \r
+  This function locks up Esrt repository to be readonly. It should be called\r

   before gEfiEndOfDxeEventGroupGuid event signaled\r
 \r
   before gEfiEndOfDxeEventGroupGuid event signaled\r
 \r

-  @retval EFI_SUCCESS              Locks up FMP Non-FMP repository successfully \r
+  @retval EFI_SUCCESS              Locks up FMP Non-FMP repository successfully\r

 \r
 **/\r
 EFI_STATUS\r
 \r
 **/\r
 EFI_STATUS\r


@@ -514,14 +514,14 @@ EsrtReadyToBootEventNotify (
   IN EFI_EVENT        Event,\r
   IN VOID             *Context\r
   )\r
   IN EFI_EVENT        Event,\r
   IN VOID             *Context\r
   )\r

-{  \r
+{\r

   EFI_STATUS                 Status;\r
   EFI_SYSTEM_RESOURCE_TABLE  *EsrtTable;\r
   EFI_SYSTEM_RESOURCE_ENTRY  *FmpEsrtRepository;\r
   EFI_SYSTEM_RESOURCE_ENTRY  *NonFmpEsrtRepository;\r
   UINTN                      FmpRepositorySize;\r
   UINTN                      NonFmpRepositorySize;\r
   EFI_STATUS                 Status;\r
   EFI_SYSTEM_RESOURCE_TABLE  *EsrtTable;\r
   EFI_SYSTEM_RESOURCE_ENTRY  *FmpEsrtRepository;\r
   EFI_SYSTEM_RESOURCE_ENTRY  *NonFmpEsrtRepository;\r
   UINTN                      FmpRepositorySize;\r
   UINTN                      NonFmpRepositorySize;\r

-  \r
+\r

 \r
   FmpEsrtRepository    = NULL;\r
   NonFmpEsrtRepository = NULL;\r
 \r
   FmpEsrtRepository    = NULL;\r
   NonFmpEsrtRepository = NULL;\r


@@ -583,8 +583,8 @@ EsrtReadyToBootEventNotify (
     goto EXIT;\r
   }\r
 \r
     goto EXIT;\r
   }\r
 \r

-  EsrtTable->FwResourceVersion  = EFI_SYSTEM_RESOURCE_TABLE_FIRMWARE_RESOURCE_VERSION;                                            \r
-  EsrtTable->FwResourceCount    = (UINT32)((NonFmpRepositorySize + FmpRepositorySize) / sizeof(EFI_SYSTEM_RESOURCE_ENTRY));  \r
+  EsrtTable->FwResourceVersion  = EFI_SYSTEM_RESOURCE_TABLE_FIRMWARE_RESOURCE_VERSION;\r
+  EsrtTable->FwResourceCount    = (UINT32)((NonFmpRepositorySize + FmpRepositorySize) / sizeof(EFI_SYSTEM_RESOURCE_ENTRY));\r

   EsrtTable->FwResourceCountMax = PcdGet32(PcdMaxNonFmpEsrtCacheNum) + PcdGet32(PcdMaxFmpEsrtCacheNum);\r
 \r
   if (NonFmpRepositorySize != 0 && NonFmpEsrtRepository != NULL) {\r
   EsrtTable->FwResourceCountMax = PcdGet32(PcdMaxNonFmpEsrtCacheNum) + PcdGet32(PcdMaxFmpEsrtCacheNum);\r
 \r
   if (NonFmpRepositorySize != 0 && NonFmpEsrtRepository != NULL) {\r


@@ -617,7 +617,7 @@ EXIT:
 }\r
 \r
 /**\r
 }\r
 \r
 /**\r

-  The module Entry Point of the Esrt DXE driver that manages cached ESRT repository \r
+  The module Entry Point of the Esrt DXE driver that manages cached ESRT repository\r

   & publishes ESRT table\r
 \r
   @param[in]  ImageHandle    The firmware allocated handle for the EFI image.\r
   & publishes ESRT table\r
 \r
   @param[in]  ImageHandle    The firmware allocated handle for the EFI image.\r


@@ -633,7 +633,7 @@ EsrtDxeEntryPoint (
   IN EFI_HANDLE         ImageHandle,\r
   IN EFI_SYSTEM_TABLE   *SystemTable\r
   )\r
   IN EFI_HANDLE         ImageHandle,\r
   IN EFI_SYSTEM_TABLE   *SystemTable\r
   )\r

-{  \r
+{\r

   EFI_STATUS                    Status;\r
 \r
   EfiInitializeLock (&mPrivate.FmpLock,    TPL_CALLBACK);\r
   EFI_STATUS                    Status;\r
 \r
   EfiInitializeLock (&mPrivate.FmpLock,    TPL_CALLBACK);\r

diff --git a/MdeModulePkg/Universal/EsrtDxe/EsrtDxe.inf b/MdeModulePkg/Universal/EsrtDxe/EsrtDxe.inf
index 06b3a08e786a98671dc1232dd03b1eda836869f9..5eb7ef924aa55fb6b9977f5dffe073c755bd1a15 100644 (file)
--- a/MdeModulePkg/Universal/EsrtDxe/EsrtDxe.inf
+++ b/MdeModulePkg/Universal/EsrtDxe/EsrtDxe.inf
@@ -4,15 +4,15 @@
 #  This driver produces EsrtManagement protocol to manage cache ESRT repository for FMP/Non-FMP instances.\r
 #  ESRT table based on repository is published on gEfiEventReadyToBootGuid.\r
 #\r
 #  This driver produces EsrtManagement protocol to manage cache ESRT repository for FMP/Non-FMP instances.\r
 #  ESRT table based on repository is published on gEfiEventReadyToBootGuid.\r
 #\r

-#  Copyright (c) 2015 - 2016, Intel Corporation. All rights reserved.<BR>\r
+#  Copyright (c) 2015 - 2018, Intel Corporation. All rights reserved.<BR>\r

 #  This program and the accompanying materials\r
 #  are licensed and made available under the terms and conditions of the BSD License\r
 #  which accompanies this distribution.  The full text of the license may be found at\r
 #  http://opensource.org/licenses/bsd-license.php\r
 #  This program and the accompanying materials\r
 #  are licensed and made available under the terms and conditions of the BSD License\r
 #  which accompanies this distribution.  The full text of the license may be found at\r
 #  http://opensource.org/licenses/bsd-license.php\r

-#  \r
+#\r

 #  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 #  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 #  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 #  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r

-#  \r
+#\r

 ##\r
 \r
 [Defines]\r
 ##\r
 \r
 [Defines]\r

diff --git a/MdeModulePkg/Universal/EsrtDxe/EsrtDxe.uni b/MdeModulePkg/Universal/EsrtDxe/EsrtDxe.uni
index d47caf3a7e504b8660dd7807a018343cdf557bd7..c65f3545d3d966a1e97fadff86ab7350c4ab7c80 100644 (file)
--- a/MdeModulePkg/Universal/EsrtDxe/EsrtDxe.uni
+++ b/MdeModulePkg/Universal/EsrtDxe/EsrtDxe.uni
@@ -4,13 +4,13 @@
 // This driver produces EsrtManagement protocol to manage cache ESRT repository for FMP/Non-FMP instances.\r
 // ESRT table based on repository is published on gEfiEventReadyToBootGuid.\r
 //\r
 // This driver produces EsrtManagement protocol to manage cache ESRT repository for FMP/Non-FMP instances.\r
 // ESRT table based on repository is published on gEfiEventReadyToBootGuid.\r
 //\r

-// Copyright (c) 2015, Intel Corporation. All rights reserved.<BR>\r
+// Copyright (c) 2015 - 2018, Intel Corporation. All rights reserved.<BR>\r

 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r
 // which accompanies this distribution.  The full text of the license may be found at\r
 // http://opensource.org/licenses/bsd-license.php\r
 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r
 // which accompanies this distribution.  The full text of the license may be found at\r
 // http://opensource.org/licenses/bsd-license.php\r

-// \r
+//\r

 // THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 // WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 //\r
 // THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 // WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 //\r

diff --git a/MdeModulePkg/Universal/EsrtDxe/EsrtDxeExtra.uni b/MdeModulePkg/Universal/EsrtDxe/EsrtDxeExtra.uni
index ebd0c3b998fe1a3636f55849e0c66cec295ae77e..e969952c43abcd9ecb4ef67026af4c9f0dc652aa 100644 (file)
--- a/MdeModulePkg/Universal/EsrtDxe/EsrtDxeExtra.uni
+++ b/MdeModulePkg/Universal/EsrtDxe/EsrtDxeExtra.uni
@@ -1,7 +1,7 @@
 // /** @file\r
 // EsrtDxe Localized Strings and Content\r
 //\r
 // /** @file\r
 // EsrtDxe Localized Strings and Content\r
 //\r

-// Copyright (c) 2015, Intel Corporation. All rights reserved.<BR>\r
+// Copyright (c) 2015 - 2018, Intel Corporation. All rights reserved.<BR>\r

 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r
 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r


@@ -13,8 +13,8 @@
 //\r
 // **/\r
 \r
 //\r
 // **/\r
 \r

-#string STR_PROPERTIES_MODULE_NAME \r
-#language en-US \r
+#string STR_PROPERTIES_MODULE_NAME\r
+#language en-US\r

 "Esrt DXE Driver"\r
 \r
 \r
 "Esrt DXE Driver"\r
 \r
 \r

diff --git a/MdeModulePkg/Universal/EsrtDxe/EsrtImpl.c b/MdeModulePkg/Universal/EsrtDxe/EsrtImpl.c
index 35a237e3cce039d2958aee38077160ef6e486a13..1ed0250090588b6d1905df0fdde15d7ff46fd2c2 100644 (file)
--- a/MdeModulePkg/Universal/EsrtDxe/EsrtImpl.c
+++ b/MdeModulePkg/Universal/EsrtDxe/EsrtImpl.c
@@ -1,7 +1,7 @@
 /** @file\r
   Esrt management implementation.\r
 \r
 /** @file\r
   Esrt management implementation.\r
 \r

-Copyright (c) 2015 - 2016, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2015 - 2018, Intel Corporation. All rights reserved.<BR>\r

 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r


@@ -15,12 +15,12 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #include "EsrtImpl.h"\r
 \r
 /**\r
 #include "EsrtImpl.h"\r
 \r
 /**\r

-  Find Esrt Entry stored in ESRT repository. \r
+  Find Esrt Entry stored in ESRT repository.\r

 \r
   @param[in]     FwClass           Firmware class guid in Esrt entry\r
   @param[in]     Attribute         Esrt from Non FMP or FMP instance\r
   @param[out]    Entry             Esrt entry returned\r
 \r
   @param[in]     FwClass           Firmware class guid in Esrt entry\r
   @param[in]     Attribute         Esrt from Non FMP or FMP instance\r
   @param[out]    Entry             Esrt entry returned\r

-  \r
+\r

   @retval EFI_SUCCESS            Successfully find an Esrt entry\r
   @retval EF_NOT_FOUND           No Esrt entry found\r
 \r
   @retval EFI_SUCCESS            Successfully find an Esrt entry\r
   @retval EF_NOT_FOUND           No Esrt entry found\r
 \r


@@ -49,7 +49,7 @@ GetEsrtEntry (
   } else {\r
     VariableName = EFI_ESRT_NONFMP_VARIABLE_NAME;\r
   }\r
   } else {\r
     VariableName = EFI_ESRT_NONFMP_VARIABLE_NAME;\r
   }\r

-  \r
+\r

   Status = GetVariable2 (\r
              VariableName,\r
              &gEfiCallerIdGuid,\r
   Status = GetVariable2 (\r
              VariableName,\r
              &gEfiCallerIdGuid,\r


@@ -90,7 +90,7 @@ EXIT:
 \r
   @param[in]  Entry                Esrt entry to be set\r
   @param[in]  Attribute            Esrt from Esrt private protocol or FMP instance\r
 \r
   @param[in]  Entry                Esrt entry to be set\r
   @param[in]  Attribute            Esrt from Esrt private protocol or FMP instance\r

-  \r
+\r

   @retval EFI_SUCCESS          Successfully set a variable.\r
 \r
 **/\r
   @retval EFI_SUCCESS          Successfully set a variable.\r
 \r
 **/\r


@@ -201,21 +201,21 @@ EXIT:
 }\r
 \r
 /**\r
 }\r
 \r
 /**\r

-  Delete ESRT Entry from ESRT repository. \r
+  Delete ESRT Entry from ESRT repository.\r

 \r
 \r

-  @param[in]    FwClass              FwClass of Esrt entry to delete  \r
+  @param[in]    FwClass              FwClass of Esrt entry to delete\r

   @param[in]    Attribute            Esrt from Esrt private protocol or FMP instance\r
   @param[in]    Attribute            Esrt from Esrt private protocol or FMP instance\r

-  \r
-  @retval EFI_SUCCESS         Insert all entries Successfully \r
+\r
+  @retval EFI_SUCCESS         Insert all entries Successfully\r

   @retval EFI_NOT_FOUND       ESRT entry with FwClass doesn't exsit\r
   @retval EFI_NOT_FOUND       ESRT entry with FwClass doesn't exsit\r

-  \r
+\r

 **/\r
 EFI_STATUS\r
 DeleteEsrtEntry(\r
   IN  EFI_GUID        *FwClass,\r
   IN  UINTN           Attribute\r
   )\r
 **/\r
 EFI_STATUS\r
 DeleteEsrtEntry(\r
   IN  EFI_GUID        *FwClass,\r
   IN  UINTN           Attribute\r
   )\r

-{  \r
+{\r

   EFI_STATUS                 Status;\r
   CHAR16                     *VariableName;\r
   EFI_SYSTEM_RESOURCE_ENTRY  *EsrtRepository;\r
   EFI_STATUS                 Status;\r
   CHAR16                     *VariableName;\r
   EFI_SYSTEM_RESOURCE_ENTRY  *EsrtRepository;\r


@@ -224,7 +224,7 @@ DeleteEsrtEntry(
   UINTN                      EsrtNum;\r
 \r
   EsrtRepository = NULL;\r
   UINTN                      EsrtNum;\r
 \r
   EsrtRepository = NULL;\r

-  \r
+\r

   //\r
   // Get Esrt index buffer\r
   //\r
   //\r
   // Get Esrt index buffer\r
   //\r


@@ -233,7 +233,7 @@ DeleteEsrtEntry(
   } else {\r
     VariableName = EFI_ESRT_NONFMP_VARIABLE_NAME;\r
   }\r
   } else {\r
     VariableName = EFI_ESRT_NONFMP_VARIABLE_NAME;\r
   }\r

-  \r
+\r

   Status = GetVariable2 (\r
              VariableName,\r
              &gEfiCallerIdGuid,\r
   Status = GetVariable2 (\r
              VariableName,\r
              &gEfiCallerIdGuid,\r


@@ -302,7 +302,7 @@ EXIT:
 \r
   @param[in]    Entry                Esrt entry to be set\r
   @param[in]    Attribute            Esrt from Non Esrt or FMP instance\r
 \r
   @param[in]    Entry                Esrt entry to be set\r
   @param[in]    Attribute            Esrt from Non Esrt or FMP instance\r

-  \r
+\r

   @retval EFI_SUCCESS          Successfully Update a variable.\r
   @retval EFI_NOT_FOUND        The Esrt enry doesn't exist\r
 \r
   @retval EFI_SUCCESS          Successfully Update a variable.\r
   @retval EFI_NOT_FOUND        The Esrt enry doesn't exist\r
 \r


@@ -425,9 +425,9 @@ IsSystemFmp (
   @param[in, out]     EsrtEntry            Esrt entry to be Init\r
   @param[in]          FmpImageInfo         FMP image info descriptor\r
   @param[in]          DescriptorVersion    FMP Image info descriptor version\r
   @param[in, out]     EsrtEntry            Esrt entry to be Init\r
   @param[in]          FmpImageInfo         FMP image info descriptor\r
   @param[in]          DescriptorVersion    FMP Image info descriptor version\r

-  \r
+\r

 **/\r
 **/\r

-VOID \r
+VOID\r

 SetEsrtEntryFromFmpInfo (\r
   IN OUT EFI_SYSTEM_RESOURCE_ENTRY   *EsrtEntry,\r
   IN EFI_FIRMWARE_IMAGE_DESCRIPTOR   *FmpImageInfo,\r
 SetEsrtEntryFromFmpInfo (\r
   IN OUT EFI_SYSTEM_RESOURCE_ENTRY   *EsrtEntry,\r
   IN EFI_FIRMWARE_IMAGE_DESCRIPTOR   *FmpImageInfo,\r


@@ -451,7 +451,7 @@ SetEsrtEntryFromFmpInfo (
     // LowestSupportedImageVersion only available in FMP V2 or higher\r
     //\r
     EsrtEntry->LowestSupportedFwVersion = FmpImageInfo->LowestSupportedImageVersion;\r
     // LowestSupportedImageVersion only available in FMP V2 or higher\r
     //\r
     EsrtEntry->LowestSupportedFwVersion = FmpImageInfo->LowestSupportedImageVersion;\r

-  } \r
+  }\r

 \r
   if (DescriptorVersion >= 3) {\r
     //\r
 \r
   if (DescriptorVersion >= 3) {\r
     //\r


@@ -459,7 +459,7 @@ SetEsrtEntryFromFmpInfo (
     //\r
     EsrtEntry->LastAttemptVersion = FmpImageInfo->LastAttemptVersion;\r
     EsrtEntry->LastAttemptStatus  = FmpImageInfo->LastAttemptStatus;\r
     //\r
     EsrtEntry->LastAttemptVersion = FmpImageInfo->LastAttemptVersion;\r
     EsrtEntry->LastAttemptStatus  = FmpImageInfo->LastAttemptStatus;\r

-  } \r
+  }\r

 \r
   //\r
   // Set capsule customized flag\r
 \r
   //\r
   // Set capsule customized flag\r

diff --git a/MdeModulePkg/Universal/EsrtDxe/EsrtImpl.h b/MdeModulePkg/Universal/EsrtDxe/EsrtImpl.h
index a238dfb8f78eab21f1bcdf2ebdd53b7deb46b818..e0e9673c7087f4e9d2fc39f761d39996666d57f4 100644 (file)
--- a/MdeModulePkg/Universal/EsrtDxe/EsrtImpl.h
+++ b/MdeModulePkg/Universal/EsrtDxe/EsrtImpl.h
@@ -1,7 +1,7 @@
 /** @file\r
   Esrt management implementation head file.\r
 \r
 /** @file\r
   Esrt management implementation head file.\r
 \r

-Copyright (c) 2015, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2015 - 2018, Intel Corporation. All rights reserved.<BR>\r

 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r


@@ -36,12 +36,12 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 \r
 //\r
 // Name of  Variable for Non-FMP ESRT Repository\r
 \r
 //\r
 // Name of  Variable for Non-FMP ESRT Repository\r

-// \r
+//\r

 #define EFI_ESRT_NONFMP_VARIABLE_NAME    L"EsrtNonFmp"\r
 \r
 //\r
 // Name of Variable for FMP\r
 #define EFI_ESRT_NONFMP_VARIABLE_NAME    L"EsrtNonFmp"\r
 \r
 //\r
 // Name of Variable for FMP\r

-// \r
+//\r

 #define EFI_ESRT_FMP_VARIABLE_NAME       L"EsrtFmp"\r
 \r
 //\r
 #define EFI_ESRT_FMP_VARIABLE_NAME       L"EsrtFmp"\r
 \r
 //\r


@@ -56,7 +56,7 @@ typedef struct {
   // Ready to boot event\r
   //\r
   EFI_EVENT             Event;\r
   // Ready to boot event\r
   //\r
   EFI_EVENT             Event;\r

-  \r
+\r

   //\r
   // Updates to Fmp storage must be locked.\r
   //\r
   //\r
   // Updates to Fmp storage must be locked.\r
   //\r


@@ -70,12 +70,12 @@ typedef struct {
 \r
 \r
 /**\r
 \r
 \r
 /**\r

-  Find Esrt Entry stored in ESRT repository. \r
+  Find Esrt Entry stored in ESRT repository.\r

 \r
   @param[in]     FwClass           Firmware class guid in Esrt entry\r
   @param[in]     Attribute         Esrt from Non FMP or FMP instance\r
   @param[out]    Entry             Esrt entry returned\r
 \r
   @param[in]     FwClass           Firmware class guid in Esrt entry\r
   @param[in]     Attribute         Esrt from Non FMP or FMP instance\r
   @param[out]    Entry             Esrt entry returned\r

-  \r
+\r

   @retval EFI_SUCCESS            Successfully find an Esrt entry\r
   @retval EF_NOT_FOUND           No Esrt entry found\r
 \r
   @retval EFI_SUCCESS            Successfully find an Esrt entry\r
   @retval EF_NOT_FOUND           No Esrt entry found\r
 \r


@@ -92,7 +92,7 @@ GetEsrtEntry (
 \r
   @param[in]  Entry                Esrt entry to be set\r
   @param[in]  Attribute            Esrt from Esrt private protocol or FMP instance\r
 \r
   @param[in]  Entry                Esrt entry to be set\r
   @param[in]  Attribute            Esrt from Esrt private protocol or FMP instance\r

-  \r
+\r

   @retval EFI_SUCCESS          Successfully set a variable.\r
 \r
 **/\r
   @retval EFI_SUCCESS          Successfully set a variable.\r
 \r
 **/\r


@@ -103,14 +103,14 @@ InsertEsrtEntry(
   );\r
 \r
 /**\r
   );\r
 \r
 /**\r

-  Delete ESRT Entry from ESRT repository. \r
+  Delete ESRT Entry from ESRT repository.\r

 \r
 \r

-  @param[in]    FwClass              FwClass of Esrt entry to delete  \r
+  @param[in]    FwClass              FwClass of Esrt entry to delete\r

   @param[in]    Attribute            Esrt from Esrt private protocol or FMP instance\r
   @param[in]    Attribute            Esrt from Esrt private protocol or FMP instance\r

-  \r
-  @retval EFI_SUCCESS         Insert all entries Successfully \r
+\r
+  @retval EFI_SUCCESS         Insert all entries Successfully\r

   @retval EFI_NOT_FOUND       ESRT entry with FwClass doesn't exsit\r
   @retval EFI_NOT_FOUND       ESRT entry with FwClass doesn't exsit\r

-  \r
+\r

 **/\r
 EFI_STATUS\r
 DeleteEsrtEntry(\r
 **/\r
 EFI_STATUS\r
 DeleteEsrtEntry(\r


@@ -123,7 +123,7 @@ DeleteEsrtEntry(
 \r
   @param[in]    Entry                Esrt entry to be set\r
   @param[in]    Attribute            Esrt from Non Esrt or FMP instance\r
 \r
   @param[in]    Entry                Esrt entry to be set\r
   @param[in]    Attribute            Esrt from Non Esrt or FMP instance\r

-  \r
+\r

   @retval EFI_SUCCESS          Successfully Update a variable.\r
   @retval EFI_NOT_FOUND        The Esrt enry doesn't exist\r
 \r
   @retval EFI_SUCCESS          Successfully Update a variable.\r
   @retval EFI_NOT_FOUND        The Esrt enry doesn't exist\r
 \r


@@ -140,9 +140,9 @@ UpdateEsrtEntry(
   @param[in, out]    EsrtEntry             Esrt entry to be Init\r
   @param[in]         FmpImageInfo          FMP image info descriptor\r
   @param[in]         DescriptorVersion     FMP Image info descriptor version\r
   @param[in, out]    EsrtEntry             Esrt entry to be Init\r
   @param[in]         FmpImageInfo          FMP image info descriptor\r
   @param[in]         DescriptorVersion     FMP Image info descriptor version\r

-  \r
+\r

 **/\r
 **/\r

-VOID \r
+VOID\r

 SetEsrtEntryFromFmpInfo (\r
   IN OUT EFI_SYSTEM_RESOURCE_ENTRY   *EsrtEntry,\r
   IN EFI_FIRMWARE_IMAGE_DESCRIPTOR   *FmpImageInfo,\r
 SetEsrtEntryFromFmpInfo (\r
   IN OUT EFI_SYSTEM_RESOURCE_ENTRY   *EsrtEntry,\r
   IN EFI_FIRMWARE_IMAGE_DESCRIPTOR   *FmpImageInfo,\r


@@ -150,11 +150,11 @@ SetEsrtEntryFromFmpInfo (
   );\r
 \r
 /**\r
   );\r
 \r
 /**\r

-  Get ESRT entry from ESRT Cache by FwClass Guid \r
+  Get ESRT entry from ESRT Cache by FwClass Guid\r
+\r
+  @param[in]       FwClass                FwClass of Esrt entry to get\r
+  @param[in, out]  Entry                  Esrt entry returned\r

 \r
 \r

-  @param[in]       FwClass                FwClass of Esrt entry to get  \r
-  @param[in, out]  Entry                  Esrt entry returned \r
-  \r

   @retval EFI_SUCCESS                   The variable saving this Esrt Entry exists.\r
   @retval EF_NOT_FOUND                  No correct variable found.\r
   @retval EFI_WRITE_PROTECTED           ESRT Cache repository is locked\r
   @retval EFI_SUCCESS                   The variable saving this Esrt Entry exists.\r
   @retval EF_NOT_FOUND                  No correct variable found.\r
   @retval EFI_WRITE_PROTECTED           ESRT Cache repository is locked\r


@@ -171,7 +171,7 @@ EsrtDxeGetEsrtEntry(
   Update one ESRT entry in ESRT Cache.\r
 \r
   @param[in]  Entry                         Esrt entry to be updated\r
   Update one ESRT entry in ESRT Cache.\r
 \r
   @param[in]  Entry                         Esrt entry to be updated\r

-  \r
+\r

   @retval EFI_SUCCESS                   Successfully update an ESRT entry in cache.\r
   @retval EFI_INVALID_PARAMETER  Entry does't exist in ESRT Cache\r
   @retval EFI_WRITE_PROTECTED     ESRT Cache is locked\r
   @retval EFI_SUCCESS                   Successfully update an ESRT entry in cache.\r
   @retval EFI_INVALID_PARAMETER  Entry does't exist in ESRT Cache\r
   @retval EFI_WRITE_PROTECTED     ESRT Cache is locked\r


@@ -184,11 +184,11 @@ EsrtDxeUpdateEsrtEntry(
   );\r
 \r
 /**\r
   );\r
 \r
 /**\r

-  Non-FMP instance to unregister Esrt Entry from ESRT Cache. \r
+  Non-FMP instance to unregister Esrt Entry from ESRT Cache.\r
+\r
+  @param[in]    FwClass                FwClass of Esrt entry to Unregister\r

 \r
 \r

-  @param[in]    FwClass                FwClass of Esrt entry to Unregister  \r
-  \r
-  @retval EFI_SUCCESS             Insert all entries Successfully \r
+  @retval EFI_SUCCESS             Insert all entries Successfully\r

   @retval EFI_NOT_FOUND           Entry of FwClass does not exsit\r
 \r
 **/\r
   @retval EFI_NOT_FOUND           Entry of FwClass does not exsit\r
 \r
 **/\r


@@ -229,10 +229,10 @@ EsrtDxeSyncFmp(
   );\r
 \r
 /**\r
   );\r
 \r
 /**\r

-  This function locks up Esrt repository to be readonly. It should be called \r
+  This function locks up Esrt repository to be readonly. It should be called\r

   before gEfiEndOfDxeEventGroupGuid event signaled\r
 \r
   before gEfiEndOfDxeEventGroupGuid event signaled\r
 \r

-  @retval EFI_SUCCESS              Locks up FMP Non-FMP repository successfully \r
+  @retval EFI_SUCCESS              Locks up FMP Non-FMP repository successfully\r

 \r
 **/\r
 EFI_STATUS\r
 \r
 **/\r
 EFI_STATUS\r

diff --git a/MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWrite.c b/MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWrite.c
index 49e747b9016bd41fe2894d875ca4edc98d0cf6ea..65fdc070897a466b86361364125c44c6693044e2 100644 (file)
--- a/MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWrite.c
+++ b/MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWrite.c
@@ -1,16 +1,16 @@
 /** @file\r
 \r
 /** @file\r
 \r

-  These are the common Fault Tolerant Write (FTW) functions that are shared \r
+  These are the common Fault Tolerant Write (FTW) functions that are shared\r

   by DXE FTW driver and SMM FTW driver.\r
 \r
   by DXE FTW driver and SMM FTW driver.\r
 \r

-Copyright (c) 2006 - 2017, Intel Corporation. All rights reserved.<BR>\r
-This program and the accompanying materials                          \r
-are licensed and made available under the terms and conditions of the BSD License         \r
-which accompanies this distribution.  The full text of the license may be found at        \r
-http://opensource.org/licenses/bsd-license.php                                            \r
-                                                                                          \r
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     \r
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.  \r
+Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r
+This program and the accompanying materials\r
+are licensed and made available under the terms and conditions of the BSD License\r
+which accompanies this distribution.  The full text of the license may be found at\r
+http://opensource.org/licenses/bsd-license.php\r
+\r
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r

 \r
 **/\r
 \r
 \r
 **/\r
 \r


@@ -23,7 +23,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   Query the largest block that may be updated in a fault tolerant manner.\r
 \r
 \r
   Query the largest block that may be updated in a fault tolerant manner.\r
 \r
 \r

-  @param This            The pointer to this protocol instance. \r
+  @param This            The pointer to this protocol instance.\r

   @param BlockSize       A pointer to a caller allocated UINTN that is updated to\r
                          indicate the size of the largest block that can be updated.\r
 \r
   @param BlockSize       A pointer to a caller allocated UINTN that is updated to\r
                          indicate the size of the largest block that can be updated.\r
 \r


@@ -59,7 +59,7 @@ FtwGetMaxBlockSize (
 \r
   All writes must be completed or aborted before another fault tolerant write can occur.\r
 \r
 \r
   All writes must be completed or aborted before another fault tolerant write can occur.\r
 \r

-  @param This            The pointer to this protocol instance. \r
+  @param This            The pointer to this protocol instance.\r

   @param CallerId        The GUID identifying the write.\r
   @param PrivateDataSize The size of the caller's private data\r
                          that must be recorded for each write.\r
   @param CallerId        The GUID identifying the write.\r
   @param PrivateDataSize The size of the caller's private data\r
                          that must be recorded for each write.\r


@@ -174,7 +174,7 @@ FtwAllocate (
   Since the content has already backuped in spare block, the write is\r
   guaranteed to be completed with fault tolerant manner.\r
 \r
   Since the content has already backuped in spare block, the write is\r
   guaranteed to be completed with fault tolerant manner.\r
 \r

-  @param This            The pointer to this protocol instance. \r
+  @param This            The pointer to this protocol instance.\r

   @param Fvb             The FVB protocol that provides services for\r
                          reading, writing, and erasing the target block.\r
   @param BlockSize       The size of the block.\r
   @param Fvb             The FVB protocol that provides services for\r
                          reading, writing, and erasing the target block.\r
   @param BlockSize       The size of the block.\r


@@ -289,7 +289,7 @@ FtwWriteRecord (
   manner, ensuring at all times that either the original contents or\r
   the modified contents are available.\r
 \r
   manner, ensuring at all times that either the original contents or\r
   the modified contents are available.\r
 \r

-  @param This            The pointer to this protocol instance. \r
+  @param This            The pointer to this protocol instance.\r

   @param Lba             The logical block address of the target block.\r
   @param Offset          The offset within the target block to place the data.\r
   @param Length          The number of bytes to write to the target block.\r
   @param Lba             The logical block address of the target block.\r
   @param Offset          The offset within the target block to place the data.\r
   @param Length          The number of bytes to write to the target block.\r


@@ -299,11 +299,11 @@ FtwWriteRecord (
                          reading, writing, and erasing the target block.\r
   @param Buffer          The data to write.\r
 \r
                          reading, writing, and erasing the target block.\r
   @param Buffer          The data to write.\r
 \r

-  @retval EFI_SUCCESS          The function completed successfully \r
-  @retval EFI_ABORTED          The function could not complete successfully. \r
-  @retval EFI_BAD_BUFFER_SIZE  The input data can't fit within the spare block. \r
+  @retval EFI_SUCCESS          The function completed successfully\r
+  @retval EFI_ABORTED          The function could not complete successfully.\r
+  @retval EFI_BAD_BUFFER_SIZE  The input data can't fit within the spare block.\r

                                Offset + *NumBytes > SpareAreaLength.\r
                                Offset + *NumBytes > SpareAreaLength.\r

-  @retval EFI_ACCESS_DENIED    No writes have been allocated. \r
+  @retval EFI_ACCESS_DENIED    No writes have been allocated.\r

   @retval EFI_OUT_OF_RESOURCES Cannot allocate enough memory resource.\r
   @retval EFI_NOT_FOUND        Cannot find FVB protocol by handle.\r
 \r
   @retval EFI_OUT_OF_RESOURCES Cannot allocate enough memory resource.\r
   @retval EFI_NOT_FOUND        Cannot find FVB protocol by handle.\r
 \r


@@ -348,7 +348,7 @@ FtwWrite (
 \r
   Header  = FtwDevice->FtwLastWriteHeader;\r
   Record  = FtwDevice->FtwLastWriteRecord;\r
 \r
   Header  = FtwDevice->FtwLastWriteHeader;\r
   Record  = FtwDevice->FtwLastWriteRecord;\r

-  \r
+\r

   if (IsErasedFlashBuffer ((UINT8 *) Header, sizeof (EFI_FAULT_TOLERANT_WRITE_HEADER))) {\r
     if (PrivateData == NULL) {\r
       //\r
   if (IsErasedFlashBuffer ((UINT8 *) Header, sizeof (EFI_FAULT_TOLERANT_WRITE_HEADER))) {\r
     if (PrivateData == NULL) {\r
       //\r


@@ -631,7 +631,7 @@ FtwWrite (
   Restarts a previously interrupted write. The caller must provide the\r
   block protocol needed to complete the interrupted write.\r
 \r
   Restarts a previously interrupted write. The caller must provide the\r
   block protocol needed to complete the interrupted write.\r
 \r

-  @param This            The pointer to this protocol instance. \r
+  @param This            The pointer to this protocol instance.\r

   @param FvBlockHandle   The handle of FVB protocol that provides services for\r
                          reading, writing, and erasing the target block.\r
 \r
   @param FvBlockHandle   The handle of FVB protocol that provides services for\r
                          reading, writing, and erasing the target block.\r
 \r


@@ -727,7 +727,7 @@ FtwRestart (
 /**\r
   Aborts all previous allocated writes.\r
 \r
 /**\r
   Aborts all previous allocated writes.\r
 \r

-  @param This                  The pointer to this protocol instance. \r
+  @param This                  The pointer to this protocol instance.\r

 \r
   @retval EFI_SUCCESS          The function completed successfully\r
   @retval EFI_ABORTED          The function could not complete successfully.\r
 \r
   @retval EFI_SUCCESS          The function completed successfully\r
   @retval EFI_ABORTED          The function could not complete successfully.\r


@@ -785,7 +785,7 @@ FtwAbort (
   manner, ensuring at all times that either the original contents or\r
   the modified contents are available.\r
 \r
   manner, ensuring at all times that either the original contents or\r
   the modified contents are available.\r
 \r

-  @param This            The pointer to this protocol instance. \r
+  @param This            The pointer to this protocol instance.\r

   @param CallerId        The GUID identifying the last write.\r
   @param Lba             The logical block address of the last write.\r
   @param Offset          The offset within the block of the last write.\r
   @param CallerId        The GUID identifying the last write.\r
   @param Lba             The logical block address of the last write.\r
   @param Offset          The offset within the block of the last write.\r

diff --git a/MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWrite.h b/MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWrite.h
index be6929c6545fa38da90bb9a21dfbb3da60670f53..844cf3bee04db2214d1c1f8dd93e9b7417e4aa91 100644 (file)
--- a/MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWrite.h
+++ b/MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWrite.h
@@ -3,14 +3,14 @@
   The internal header file includes the common header files, defines\r
   internal structure and functions used by Ftw module.\r
 \r
   The internal header file includes the common header files, defines\r
   internal structure and functions used by Ftw module.\r
 \r

-Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.<BR>\r
-This program and the accompanying materials                          \r
-are licensed and made available under the terms and conditions of the BSD License         \r
-which accompanies this distribution.  The full text of the license may be found at        \r
-http://opensource.org/licenses/bsd-license.php                                            \r
-                                                                                          \r
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     \r
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. \r
+Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r
+This program and the accompanying materials\r
+are licensed and made available under the terms and conditions of the BSD License\r
+which accompanies this distribution.  The full text of the license may be found at\r
+http://opensource.org/licenses/bsd-license.php\r
+\r
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r

 \r
 **/\r
 \r
 \r
 **/\r
 \r


@@ -82,7 +82,7 @@ typedef struct {
   UINTN                                   FtwWorkSpaceSize;   // Size of working space range that stores write record.\r
   EFI_LBA                                 FtwWorkSpaceLbaInSpare; // Start LBA of working space in spare block.\r
   UINTN                                   FtwWorkSpaceBaseInSpare;// Offset into the FtwWorkSpaceLbaInSpare block.\r
   UINTN                                   FtwWorkSpaceSize;   // Size of working space range that stores write record.\r
   EFI_LBA                                 FtwWorkSpaceLbaInSpare; // Start LBA of working space in spare block.\r
   UINTN                                   FtwWorkSpaceBaseInSpare;// Offset into the FtwWorkSpaceLbaInSpare block.\r

-  UINT8                                   *FtwWorkSpace;      // Point to Work Space in memory buffer \r
+  UINT8                                   *FtwWorkSpace;      // Point to Work Space in memory buffer\r

   //\r
   // Following a buffer of FtwWorkSpace[FTW_WORK_SPACE_SIZE],\r
   // Allocated with EFI_FTW_DEVICE.\r
   //\r
   // Following a buffer of FtwWorkSpace[FTW_WORK_SPACE_SIZE],\r
   // Allocated with EFI_FTW_DEVICE.\r


@@ -183,11 +183,11 @@ FtwAllocate (
                          reading, writing, and erasing the target block.\r
   @param Buffer          The data to write.\r
 \r
                          reading, writing, and erasing the target block.\r
   @param Buffer          The data to write.\r
 \r

-  @retval EFI_SUCCESS          The function completed successfully \r
-  @retval EFI_ABORTED          The function could not complete successfully. \r
-  @retval EFI_BAD_BUFFER_SIZE  The input data can't fit within the spare block. \r
+  @retval EFI_SUCCESS          The function completed successfully\r
+  @retval EFI_ABORTED          The function could not complete successfully.\r
+  @retval EFI_BAD_BUFFER_SIZE  The input data can't fit within the spare block.\r

                                Offset + *NumBytes > SpareAreaLength.\r
                                Offset + *NumBytes > SpareAreaLength.\r

-  @retval EFI_ACCESS_DENIED    No writes have been allocated. \r
+  @retval EFI_ACCESS_DENIED    No writes have been allocated.\r

   @retval EFI_OUT_OF_RESOURCES Cannot allocate enough memory resource.\r
   @retval EFI_NOT_FOUND        Cannot find FVB protocol by handle.\r
 \r
   @retval EFI_OUT_OF_RESOURCES Cannot allocate enough memory resource.\r
   @retval EFI_NOT_FOUND        Cannot find FVB protocol by handle.\r
 \r


@@ -290,7 +290,7 @@ FtwGetLastWrite (
                                 partially erased.\r
   @retval EFI_INVALID_PARAMETER One or more of the LBAs listed\r
                                 in the variable argument list do\r
                                 partially erased.\r
   @retval EFI_INVALID_PARAMETER One or more of the LBAs listed\r
                                 in the variable argument list do\r

-                                not exist in the firmware volume.  \r
+                                not exist in the firmware volume.\r

 \r
 \r
 **/\r
 \r
 \r
 **/\r


@@ -654,10 +654,10 @@ EFI_STATUS
 FtwGetSarProtocol (\r
   OUT VOID                                **SarProtocol\r
   );\r
 FtwGetSarProtocol (\r
   OUT VOID                                **SarProtocol\r
   );\r

-  \r
+\r

 /**\r
   Function returns an array of handles that support the FVB protocol\r
 /**\r
   Function returns an array of handles that support the FVB protocol\r

-  in a buffer allocated from pool. \r
+  in a buffer allocated from pool.\r

 \r
   @param[out]  NumberHandles    The number of handles returned in Buffer.\r
   @param[out]  Buffer           A pointer to the buffer to return the requested\r
 \r
   @param[out]  NumberHandles    The number of handles returned in Buffer.\r
   @param[out]  Buffer           A pointer to the buffer to return the requested\r


@@ -689,7 +689,7 @@ GetFvbCountAndBuffer (
 **/\r
 EFI_STATUS\r
 InitFtwDevice (\r
 **/\r
 EFI_STATUS\r
 InitFtwDevice (\r

-  OUT EFI_FTW_DEVICE               **FtwData \r
+  OUT EFI_FTW_DEVICE               **FtwData\r

   );\r
 \r
 \r
   );\r
 \r
 \r


@@ -700,7 +700,7 @@ InitFtwDevice (
 \r
   @retval EFI_SUCCESS           Initialize the FTW protocol successfully.\r
   @retval EFI_NOT_FOUND         No proper FVB protocol was found.\r
 \r
   @retval EFI_SUCCESS           Initialize the FTW protocol successfully.\r
   @retval EFI_NOT_FOUND         No proper FVB protocol was found.\r

-  \r
+\r

 **/\r
 EFI_STATUS\r
 InitFtwProtocol (\r
 **/\r
 EFI_STATUS\r
 InitFtwProtocol (\r

diff --git a/MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteDxe.c b/MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteDxe.c
index 3fa5431cab35cb3763035d37b3fb71df4060abf2..094e40f9d86cb782be6772d793c60a105125e6cc 100644 (file)
--- a/MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteDxe.c
+++ b/MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteDxe.c
@@ -2,18 +2,18 @@
 \r
   This is a simple fault tolerant write driver.\r
 \r
 \r
   This is a simple fault tolerant write driver.\r
 \r

-  This boot service protocol only provides fault tolerant write capability for \r
-  block devices.  The protocol has internal non-volatile intermediate storage \r
-  of the data and private information. It should be able to recover \r
-  automatically from a critical fault, such as power failure. \r
+  This boot service protocol only provides fault tolerant write capability for\r
+  block devices.  The protocol has internal non-volatile intermediate storage\r
+  of the data and private information. It should be able to recover\r
+  automatically from a critical fault, such as power failure.\r

 \r
 \r

-  The implementation uses an FTW (Fault Tolerant Write) Work Space. \r
+  The implementation uses an FTW (Fault Tolerant Write) Work Space.\r

   This work space is a memory copy of the work space on the Working Block,\r
   the size of the work space is the FTW_WORK_SPACE_SIZE bytes.\r
   This work space is a memory copy of the work space on the Working Block,\r
   the size of the work space is the FTW_WORK_SPACE_SIZE bytes.\r

-  \r
+\r

   The work space stores each write record as EFI_FTW_RECORD structure.\r
   The spare block stores the write buffer before write to the target block.\r
   The work space stores each write record as EFI_FTW_RECORD structure.\r
   The spare block stores the write buffer before write to the target block.\r

-  \r
+\r

   The write record has three states to specify the different phase of write operation.\r
   1) WRITE_ALLOCATED is that the record is allocated in write space.\r
      The information of write operation is stored in write record structure.\r
   The write record has three states to specify the different phase of write operation.\r
   1) WRITE_ALLOCATED is that the record is allocated in write space.\r
      The information of write operation is stored in write record structure.\r


@@ -27,27 +27,27 @@
   Final copy the data from the spare block to the target block.\r
 \r
   To make this drive work well, the following conditions must be satisfied:\r
   Final copy the data from the spare block to the target block.\r
 \r
   To make this drive work well, the following conditions must be satisfied:\r

-  1. The write NumBytes data must be fit within Spare area. \r
+  1. The write NumBytes data must be fit within Spare area.\r

      Offset + NumBytes <= SpareAreaLength\r
   2. The whole flash range has the same block size.\r
   3. Working block is an area which contains working space in its last block and has the same size as spare block.\r
      Offset + NumBytes <= SpareAreaLength\r
   2. The whole flash range has the same block size.\r
   3. Working block is an area which contains working space in its last block and has the same size as spare block.\r

-  4. Working Block area must be in the single one Firmware Volume Block range which FVB protocol is produced on.  \r
+  4. Working Block area must be in the single one Firmware Volume Block range which FVB protocol is produced on.\r

   5. Spare area must be in the single one Firmware Volume Block range which FVB protocol is produced on.\r
   5. Spare area must be in the single one Firmware Volume Block range which FVB protocol is produced on.\r

-  6. Any write data area (SpareAreaLength Area) which the data will be written into must be \r
+  6. Any write data area (SpareAreaLength Area) which the data will be written into must be\r

      in the single one Firmware Volume Block range which FVB protocol is produced on.\r
   7. If write data area (such as Variable range) is enlarged, the spare area range must be enlarged.\r
      The spare area must be enough large to store the write data before write them into the target range.\r
   If one of them is not satisfied, FtwWrite may fail.\r
   Usually, Spare area only takes one block. That's SpareAreaLength = BlockSize, NumberOfSpareBlock = 1.\r
 \r
      in the single one Firmware Volume Block range which FVB protocol is produced on.\r
   7. If write data area (such as Variable range) is enlarged, the spare area range must be enlarged.\r
      The spare area must be enough large to store the write data before write them into the target range.\r
   If one of them is not satisfied, FtwWrite may fail.\r
   Usually, Spare area only takes one block. That's SpareAreaLength = BlockSize, NumberOfSpareBlock = 1.\r
 \r

-Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.<BR>\r
-This program and the accompanying materials                          \r
-are licensed and made available under the terms and conditions of the BSD License         \r
-which accompanies this distribution.  The full text of the license may be found at        \r
-http://opensource.org/licenses/bsd-license.php                                            \r
-                                                                                          \r
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     \r
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.  \r
+Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r
+This program and the accompanying materials\r
+are licensed and made available under the terms and conditions of the BSD License\r
+which accompanies this distribution.  The full text of the license may be found at\r
+http://opensource.org/licenses/bsd-license.php\r
+\r
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r

 \r
 **/\r
 \r
 \r
 **/\r
 \r


@@ -65,7 +65,7 @@ EFI_EVENT                                 mFvbRegistration = NULL;
   @retval EFI_SUCCESS           The interface information for the specified protocol was returned.\r
   @retval EFI_UNSUPPORTED       The device does not support the FVB protocol.\r
   @retval EFI_INVALID_PARAMETER FvBlockHandle is not a valid EFI_HANDLE or FvBlock is NULL.\r
   @retval EFI_SUCCESS           The interface information for the specified protocol was returned.\r
   @retval EFI_UNSUPPORTED       The device does not support the FVB protocol.\r
   @retval EFI_INVALID_PARAMETER FvBlockHandle is not a valid EFI_HANDLE or FvBlock is NULL.\r

-  \r
+\r

 **/\r
 EFI_STATUS\r
 FtwGetFvbByHandle (\r
 **/\r
 EFI_STATUS\r
 FtwGetFvbByHandle (\r


@@ -104,8 +104,8 @@ FtwGetSarProtocol (
   // Locate Swap Address Range protocol\r
   //\r
   Status = gBS->LocateProtocol (\r
   // Locate Swap Address Range protocol\r
   //\r
   Status = gBS->LocateProtocol (\r

-                  &gEfiSwapAddressRangeProtocolGuid, \r
-                  NULL, \r
+                  &gEfiSwapAddressRangeProtocolGuid,\r
+                  NULL,\r

                   SarProtocol\r
                   );\r
   return Status;\r
                   SarProtocol\r
                   );\r
   return Status;\r


@@ -113,7 +113,7 @@ FtwGetSarProtocol (
 \r
 /**\r
   Function returns an array of handles that support the FVB protocol\r
 \r
 /**\r
   Function returns an array of handles that support the FVB protocol\r

-  in a buffer allocated from pool. \r
+  in a buffer allocated from pool.\r

 \r
   @param[out]  NumberHandles    The number of handles returned in Buffer.\r
   @param[out]  Buffer           A pointer to the buffer to return the requested\r
 \r
   @param[out]  NumberHandles    The number of handles returned in Buffer.\r
   @param[out]  Buffer           A pointer to the buffer to return the requested\r


@@ -124,7 +124,7 @@ FtwGetSarProtocol (
   @retval EFI_NOT_FOUND         No FVB handle was found.\r
   @retval EFI_OUT_OF_RESOURCES  There is not enough pool memory to store the matching results.\r
   @retval EFI_INVALID_PARAMETER NumberHandles is NULL or Buffer is NULL.\r
   @retval EFI_NOT_FOUND         No FVB handle was found.\r
   @retval EFI_OUT_OF_RESOURCES  There is not enough pool memory to store the matching results.\r
   @retval EFI_INVALID_PARAMETER NumberHandles is NULL or Buffer is NULL.\r

-  \r
+\r

 **/\r
 EFI_STATUS\r
 GetFvbCountAndBuffer (\r
 **/\r
 EFI_STATUS\r
 GetFvbCountAndBuffer (\r


@@ -169,10 +169,10 @@ FvbNotificationEvent (
   //\r
   // Just return to avoid installing FaultTolerantWriteProtocol again\r
   // if Fault Tolerant Write protocol has been installed.\r
   //\r
   // Just return to avoid installing FaultTolerantWriteProtocol again\r
   // if Fault Tolerant Write protocol has been installed.\r

-  //  \r
+  //\r

   Status = gBS->LocateProtocol (\r
   Status = gBS->LocateProtocol (\r

-                  &gEfiFaultTolerantWriteProtocolGuid, \r
-                  NULL, \r
+                  &gEfiFaultTolerantWriteProtocolGuid,\r
+                  NULL,\r

                   (VOID **) &FtwProtocol\r
                   );\r
   if (!EFI_ERROR (Status)) {\r
                   (VOID **) &FtwProtocol\r
                   );\r
   if (!EFI_ERROR (Status)) {\r


@@ -186,8 +186,8 @@ FvbNotificationEvent (
   Status = InitFtwProtocol (FtwDevice);\r
   if (EFI_ERROR(Status)) {\r
     return ;\r
   Status = InitFtwProtocol (FtwDevice);\r
   if (EFI_ERROR(Status)) {\r
     return ;\r

-  }                          \r
-    \r
+  }\r
+\r

   //\r
   // Install protocol interface\r
   //\r
   //\r
   // Install protocol interface\r
   //\r


@@ -198,10 +198,10 @@ FvbNotificationEvent (
                   &FtwDevice->FtwInstance\r
                   );\r
   ASSERT_EFI_ERROR (Status);\r
                   &FtwDevice->FtwInstance\r
                   );\r
   ASSERT_EFI_ERROR (Status);\r

-  \r
+\r

   Status = gBS->CloseEvent (Event);\r
   ASSERT_EFI_ERROR (Status);\r
   Status = gBS->CloseEvent (Event);\r
   ASSERT_EFI_ERROR (Status);\r

-  \r
+\r

   return;\r
 }\r
 \r
   return;\r
 }\r
 \r


@@ -215,7 +215,7 @@ FvbNotificationEvent (
   @retval EFI_SUCCESS           The initialization finished successfully.\r
   @retval EFI_OUT_OF_RESOURCES  Allocate memory error\r
   @retval EFI_INVALID_PARAMETER Workspace or Spare block does not exist\r
   @retval EFI_SUCCESS           The initialization finished successfully.\r
   @retval EFI_OUT_OF_RESOURCES  Allocate memory error\r
   @retval EFI_INVALID_PARAMETER Workspace or Spare block does not exist\r

-  \r
+\r

 **/\r
 EFI_STATUS\r
 EFIAPI\r
 **/\r
 EFI_STATUS\r
 EFIAPI\r


@@ -239,7 +239,7 @@ FaultTolerantWriteInitialize (
 \r
   //\r
   // Register FvbNotificationEvent () notify function.\r
 \r
   //\r
   // Register FvbNotificationEvent () notify function.\r

-  // \r
+  //\r

   EfiCreateProtocolNotifyEvent (\r
     &gEfiFirmwareVolumeBlockProtocolGuid,\r
     TPL_CALLBACK,\r
   EfiCreateProtocolNotifyEvent (\r
     &gEfiFirmwareVolumeBlockProtocolGuid,\r
     TPL_CALLBACK,\r


@@ -247,6 +247,6 @@ FaultTolerantWriteInitialize (
     (VOID *)FtwDevice,\r
     &mFvbRegistration\r
     );\r
     (VOID *)FtwDevice,\r
     &mFvbRegistration\r
     );\r

-  \r
+\r

   return EFI_SUCCESS;\r
 }\r
   return EFI_SUCCESS;\r
 }\r

diff --git a/MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteDxe.inf b/MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteDxe.inf
index 5649241f71bea2e7c454f9d1306a46a327f5925b..30a765c807c2bf275adc659c166ad60e5500b995 100644 (file)
--- a/MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteDxe.inf
+++ b/MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteDxe.inf
@@ -1,11 +1,11 @@
 ## @file\r
 # Fault Tolerant Write Dxe Driver.\r
 #\r
 ## @file\r
 # Fault Tolerant Write Dxe Driver.\r
 #\r

-# This driver installs Fault Tolerant Write (FTW) protocol, \r
+# This driver installs Fault Tolerant Write (FTW) protocol,\r

 # which provides fault tolerant write capability for block devices.\r
 # Its implementation depends on the full functionality FVB protocol that support read, write/erase flash access.\r
 #\r
 # which provides fault tolerant write capability for block devices.\r
 # Its implementation depends on the full functionality FVB protocol that support read, write/erase flash access.\r
 #\r

-# Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.<BR>\r
+# Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r

 #\r
 #  This program and the accompanying materials\r
 #  are licensed and made available under the terms and conditions of the BSD License\r
 #\r
 #  This program and the accompanying materials\r
 #  are licensed and made available under the terms and conditions of the BSD License\r

diff --git a/MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteDxeExtra.uni b/MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteDxeExtra.uni
index 9852e426997946498ae38b46f057eb5f8752ae83..f06f84efb3a7f56f651a10938be97a77958f69ce 100644 (file)
--- a/MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteDxeExtra.uni
+++ b/MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteDxeExtra.uni
@@ -1,7 +1,7 @@
 // /** @file\r
 // FaultTolerantWriteDxe Localized Strings and Content\r
 //\r
 // /** @file\r
 // FaultTolerantWriteDxe Localized Strings and Content\r
 //\r

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

 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r
 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r


@@ -12,8 +12,8 @@
 //\r
 // **/\r
 \r
 //\r
 // **/\r
 \r

-#string STR_PROPERTIES_MODULE_NAME \r
-#language en-US \r
+#string STR_PROPERTIES_MODULE_NAME\r
+#language en-US\r

 "Fault Tolerant Flash Write DXE Driver"\r
 \r
 \r
 "Fault Tolerant Flash Write DXE Driver"\r
 \r
 \r

diff --git a/MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteSmm.c b/MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteSmm.c
index 1e75328f9b9057dbb4896bd13a26a849fafe180d..632313f07640f95b2df0b295fc86ad991b6aee89 100644 (file)
--- a/MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteSmm.c
+++ b/MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteSmm.c
@@ -2,18 +2,18 @@
 \r
   This is a simple fault tolerant write driver that is intended to use in the SMM environment.\r
 \r
 \r
   This is a simple fault tolerant write driver that is intended to use in the SMM environment.\r
 \r

-  This boot service protocol only provides fault tolerant write capability for \r
-  block devices.  The protocol has internal non-volatile intermediate storage \r
-  of the data and private information. It should be able to recover \r
-  automatically from a critical fault, such as power failure. \r
+  This boot service protocol only provides fault tolerant write capability for\r
+  block devices.  The protocol has internal non-volatile intermediate storage\r
+  of the data and private information. It should be able to recover\r
+  automatically from a critical fault, such as power failure.\r

 \r
 \r

-  The implementation uses an FTW (Fault Tolerant Write) Work Space. \r
+  The implementation uses an FTW (Fault Tolerant Write) Work Space.\r

   This work space is a memory copy of the work space on the Working Block,\r
   the size of the work space is the FTW_WORK_SPACE_SIZE bytes.\r
   This work space is a memory copy of the work space on the Working Block,\r
   the size of the work space is the FTW_WORK_SPACE_SIZE bytes.\r

-  \r
+\r

   The work space stores each write record as EFI_FTW_RECORD structure.\r
   The spare block stores the write buffer before write to the target block.\r
   The work space stores each write record as EFI_FTW_RECORD structure.\r
   The spare block stores the write buffer before write to the target block.\r

-  \r
+\r

   The write record has three states to specify the different phase of write operation.\r
   1) WRITE_ALLOCATED is that the record is allocated in write space.\r
      The information of write operation is stored in write record structure.\r
   The write record has three states to specify the different phase of write operation.\r
   1) WRITE_ALLOCATED is that the record is allocated in write space.\r
      The information of write operation is stored in write record structure.\r


@@ -27,13 +27,13 @@
   Final copy the data from the spare block to the target block.\r
 \r
   To make this drive work well, the following conditions must be satisfied:\r
   Final copy the data from the spare block to the target block.\r
 \r
   To make this drive work well, the following conditions must be satisfied:\r

-  1. The write NumBytes data must be fit within Spare area. \r
+  1. The write NumBytes data must be fit within Spare area.\r

      Offset + NumBytes <= SpareAreaLength\r
   2. The whole flash range has the same block size.\r
   3. Working block is an area which contains working space in its last block and has the same size as spare block.\r
      Offset + NumBytes <= SpareAreaLength\r
   2. The whole flash range has the same block size.\r
   3. Working block is an area which contains working space in its last block and has the same size as spare block.\r

-  4. Working Block area must be in the single one Firmware Volume Block range which FVB protocol is produced on.  \r
+  4. Working Block area must be in the single one Firmware Volume Block range which FVB protocol is produced on.\r

   5. Spare area must be in the single one Firmware Volume Block range which FVB protocol is produced on.\r
   5. Spare area must be in the single one Firmware Volume Block range which FVB protocol is produced on.\r

-  6. Any write data area (SpareAreaLength Area) which the data will be written into must be \r
+  6. Any write data area (SpareAreaLength Area) which the data will be written into must be\r

      in the single one Firmware Volume Block range which FVB protocol is produced on.\r
   7. If write data area (such as Variable range) is enlarged, the spare area range must be enlarged.\r
      The spare area must be enough large to store the write data before write them into the target range.\r
      in the single one Firmware Volume Block range which FVB protocol is produced on.\r
   7. If write data area (such as Variable range) is enlarged, the spare area range must be enlarged.\r
      The spare area must be enough large to store the write data before write them into the target range.\r


@@ -41,16 +41,16 @@
   Usually, Spare area only takes one block. That's SpareAreaLength = BlockSize, NumberOfSpareBlock = 1.\r
 \r
   Caution: This module requires additional review when modified.\r
   Usually, Spare area only takes one block. That's SpareAreaLength = BlockSize, NumberOfSpareBlock = 1.\r
 \r
   Caution: This module requires additional review when modified.\r

-  This driver need to make sure the CommBuffer is not in the SMRAM range. \r
+  This driver need to make sure the CommBuffer is not in the SMRAM range.\r
+\r
+Copyright (c) 2010 - 2018, Intel Corporation. All rights reserved.<BR>\r
+This program and the accompanying materials\r
+are licensed and made available under the terms and conditions of the BSD License\r
+which accompanies this distribution.  The full text of the license may be found at\r
+http://opensource.org/licenses/bsd-license.php\r

 \r
 \r

-Copyright (c) 2010 - 2015, Intel Corporation. All rights reserved.<BR>\r
-This program and the accompanying materials                          \r
-are licensed and made available under the terms and conditions of the BSD License         \r
-which accompanies this distribution.  The full text of the license may be found at        \r
-http://opensource.org/licenses/bsd-license.php                                            \r
-                                                                                          \r
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     \r
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.  \r
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r

 \r
 **/\r
 \r
 \r
 **/\r
 \r


@@ -119,8 +119,8 @@ FtwGetSarProtocol (
   // Locate Smm Swap Address Range protocol\r
   //\r
   Status = gSmst->SmmLocateProtocol (\r
   // Locate Smm Swap Address Range protocol\r
   //\r
   Status = gSmst->SmmLocateProtocol (\r

-                    &gEfiSmmSwapAddressRangeProtocolGuid, \r
-                    NULL, \r
+                    &gEfiSmmSwapAddressRangeProtocolGuid,\r
+                    NULL,\r

                     SarProtocol\r
                     );\r
   return Status;\r
                     SarProtocol\r
                     );\r
   return Status;\r


@@ -128,7 +128,7 @@ FtwGetSarProtocol (
 \r
 /**\r
   Function returns an array of handles that support the SMM FVB protocol\r
 \r
 /**\r
   Function returns an array of handles that support the SMM FVB protocol\r

-  in a buffer allocated from pool. \r
+  in a buffer allocated from pool.\r

 \r
   @param[out]  NumberHandles    The number of handles returned in Buffer.\r
   @param[out]  Buffer           A pointer to the buffer to return the requested\r
 \r
   @param[out]  NumberHandles    The number of handles returned in Buffer.\r
   @param[out]  Buffer           A pointer to the buffer to return the requested\r


@@ -227,7 +227,7 @@ GetFvbByAddressAndAttribute (
   if (EFI_ERROR (Status)) {\r
     return EFI_ABORTED;\r
   }\r
   if (EFI_ERROR (Status)) {\r
     return EFI_ABORTED;\r
   }\r

-  \r
+\r

   //\r
   // Find the proper SMM Fvb handle by the address and attributes.\r
   //\r
   //\r
   // Find the proper SMM Fvb handle by the address and attributes.\r
   //\r


@@ -276,8 +276,8 @@ GetFvbByAddressAndAttribute (
   This SMI handler provides services for the fault tolerant write wrapper driver.\r
 \r
   Caution: This function requires additional review when modified.\r
   This SMI handler provides services for the fault tolerant write wrapper driver.\r
 \r
   Caution: This function requires additional review when modified.\r

-  This driver need to make sure the CommBuffer is not in the SMRAM range. \r
-  Also in FTW_FUNCTION_GET_LAST_WRITE case, check SmmFtwGetLastWriteHeader->Data + \r
+  This driver need to make sure the CommBuffer is not in the SMRAM range.\r
+  Also in FTW_FUNCTION_GET_LAST_WRITE case, check SmmFtwGetLastWriteHeader->Data +\r

   SmmFtwGetLastWriteHeader->PrivateDataSize within communication buffer.\r
 \r
   @param[in]     DispatchHandle  The unique handle assigned to this handler by SmiHandlerRegister().\r
   SmmFtwGetLastWriteHeader->PrivateDataSize within communication buffer.\r
 \r
   @param[in]     DispatchHandle  The unique handle assigned to this handler by SmiHandlerRegister().\r


@@ -287,14 +287,14 @@ GetFvbByAddressAndAttribute (
                                  from a non-SMM environment into an SMM environment.\r
   @param[in, out] CommBufferSize The size of the CommBuffer.\r
 \r
                                  from a non-SMM environment into an SMM environment.\r
   @param[in, out] CommBufferSize The size of the CommBuffer.\r
 \r

-  @retval EFI_SUCCESS                         The interrupt was handled and quiesced. No other handlers \r
+  @retval EFI_SUCCESS                         The interrupt was handled and quiesced. No other handlers\r

                                               should still be called.\r
                                               should still be called.\r

-  @retval EFI_WARN_INTERRUPT_SOURCE_QUIESCED  The interrupt has been quiesced but other handlers should \r
+  @retval EFI_WARN_INTERRUPT_SOURCE_QUIESCED  The interrupt has been quiesced but other handlers should\r

                                               still be called.\r
                                               still be called.\r

-  @retval EFI_WARN_INTERRUPT_SOURCE_PENDING   The interrupt is still pending and other handlers should still \r
+  @retval EFI_WARN_INTERRUPT_SOURCE_PENDING   The interrupt is still pending and other handlers should still\r

                                               be called.\r
   @retval EFI_INTERRUPT_PENDING               The interrupt could not be quiesced.\r
                                               be called.\r
   @retval EFI_INTERRUPT_PENDING               The interrupt could not be quiesced.\r

-  \r
+\r

 **/\r
 EFI_STATUS\r
 EFIAPI\r
 **/\r
 EFI_STATUS\r
 EFIAPI\r


@@ -364,7 +364,7 @@ SmmFaultTolerantWriteHandler (
                  &SmmGetMaxBlockSizeHeader->BlockSize\r
                  );\r
       break;\r
                  &SmmGetMaxBlockSizeHeader->BlockSize\r
                  );\r
       break;\r

-      \r
+\r

     case FTW_FUNCTION_ALLOCATE:\r
       if (CommBufferPayloadSize < sizeof (SMM_FTW_ALLOCATE_HEADER)) {\r
         DEBUG ((EFI_D_ERROR, "Allocate: SMM communication buffer size invalid!\n"));\r
     case FTW_FUNCTION_ALLOCATE:\r
       if (CommBufferPayloadSize < sizeof (SMM_FTW_ALLOCATE_HEADER)) {\r
         DEBUG ((EFI_D_ERROR, "Allocate: SMM communication buffer size invalid!\n"));\r


@@ -378,7 +378,7 @@ SmmFaultTolerantWriteHandler (
                  SmmFtwAllocateHeader->NumberOfWrites\r
                  );\r
       break;\r
                  SmmFtwAllocateHeader->NumberOfWrites\r
                  );\r
       break;\r

-      \r
+\r

     case FTW_FUNCTION_WRITE:\r
       if (CommBufferPayloadSize < OFFSET_OF (SMM_FTW_WRITE_HEADER, Data)) {\r
         DEBUG ((EFI_D_ERROR, "Write: SMM communication buffer size invalid!\n"));\r
     case FTW_FUNCTION_WRITE:\r
       if (CommBufferPayloadSize < OFFSET_OF (SMM_FTW_WRITE_HEADER, Data)) {\r
         DEBUG ((EFI_D_ERROR, "Write: SMM communication buffer size invalid!\n"));\r


@@ -412,7 +412,7 @@ SmmFaultTolerantWriteHandler (
         PrivateData = (VOID *)&SmmFtwWriteHeader->Data[Length];\r
       }\r
       Status = GetFvbByAddressAndAttribute (\r
         PrivateData = (VOID *)&SmmFtwWriteHeader->Data[Length];\r
       }\r
       Status = GetFvbByAddressAndAttribute (\r

-                 SmmFtwWriteHeader->FvbBaseAddress, \r
+                 SmmFtwWriteHeader->FvbBaseAddress,\r

                  SmmFtwWriteHeader->FvbAttributes,\r
                  &SmmFvbHandle\r
                  );\r
                  SmmFtwWriteHeader->FvbAttributes,\r
                  &SmmFvbHandle\r
                  );\r


@@ -428,7 +428,7 @@ SmmFaultTolerantWriteHandler (
                    );\r
       }\r
       break;\r
                    );\r
       }\r
       break;\r

-      \r
+\r

     case FTW_FUNCTION_RESTART:\r
       if (CommBufferPayloadSize < sizeof (SMM_FTW_RESTART_HEADER)) {\r
         DEBUG ((EFI_D_ERROR, "Restart: SMM communication buffer size invalid!\n"));\r
     case FTW_FUNCTION_RESTART:\r
       if (CommBufferPayloadSize < sizeof (SMM_FTW_RESTART_HEADER)) {\r
         DEBUG ((EFI_D_ERROR, "Restart: SMM communication buffer size invalid!\n"));\r


@@ -436,10 +436,10 @@ SmmFaultTolerantWriteHandler (
       }\r
       SmmFtwRestartHeader = (SMM_FTW_RESTART_HEADER *) SmmFtwFunctionHeader->Data;\r
       Status = GetFvbByAddressAndAttribute (\r
       }\r
       SmmFtwRestartHeader = (SMM_FTW_RESTART_HEADER *) SmmFtwFunctionHeader->Data;\r
       Status = GetFvbByAddressAndAttribute (\r

-                 SmmFtwRestartHeader->FvbBaseAddress, \r
+                 SmmFtwRestartHeader->FvbBaseAddress,\r

                  SmmFtwRestartHeader->FvbAttributes,\r
                  &SmmFvbHandle\r
                  SmmFtwRestartHeader->FvbAttributes,\r
                  &SmmFvbHandle\r

-                 );      \r
+                 );\r

       if (!EFI_ERROR (Status)) {\r
         Status = FtwRestart (&mFtwDevice->FtwInstance, SmmFvbHandle);\r
       }\r
       if (!EFI_ERROR (Status)) {\r
         Status = FtwRestart (&mFtwDevice->FtwInstance, SmmFvbHandle);\r
       }\r


@@ -448,7 +448,7 @@ SmmFaultTolerantWriteHandler (
     case FTW_FUNCTION_ABORT:\r
       Status = FtwAbort (&mFtwDevice->FtwInstance);\r
       break;\r
     case FTW_FUNCTION_ABORT:\r
       Status = FtwAbort (&mFtwDevice->FtwInstance);\r
       break;\r

-      \r
+\r

     case FTW_FUNCTION_GET_LAST_WRITE:\r
       if (CommBufferPayloadSize < OFFSET_OF (SMM_FTW_GET_LAST_WRITE_HEADER, Data)) {\r
         DEBUG ((EFI_D_ERROR, "GetLastWrite: SMM communication buffer size invalid!\n"));\r
     case FTW_FUNCTION_GET_LAST_WRITE:\r
       if (CommBufferPayloadSize < OFFSET_OF (SMM_FTW_GET_LAST_WRITE_HEADER, Data)) {\r
         DEBUG ((EFI_D_ERROR, "GetLastWrite: SMM communication buffer size invalid!\n"));\r


@@ -499,13 +499,13 @@ SmmFaultTolerantWriteHandler (
 \r
 /**\r
   SMM Firmware Volume Block Protocol notification event handler.\r
 \r
 /**\r
   SMM Firmware Volume Block Protocol notification event handler.\r

-  \r
+\r

   @param[in]  Protocol      Points to the protocol's unique identifier\r
   @param[in]  Interface     Points to the interface instance\r
   @param[in]  Handle        The handle on which the interface was installed\r
 \r
   @retval EFI_SUCCESS       SmmEventCallback runs successfully\r
   @param[in]  Protocol      Points to the protocol's unique identifier\r
   @param[in]  Interface     Points to the interface instance\r
   @param[in]  Handle        The handle on which the interface was installed\r
 \r
   @retval EFI_SUCCESS       SmmEventCallback runs successfully\r

-  \r
+\r

  **/\r
 EFI_STATUS\r
 EFIAPI\r
  **/\r
 EFI_STATUS\r
 EFIAPI\r


@@ -519,14 +519,14 @@ FvbNotificationEvent (
   EFI_SMM_FAULT_TOLERANT_WRITE_PROTOCOL   *FtwProtocol;\r
   EFI_HANDLE                              SmmFtwHandle;\r
   EFI_HANDLE                              FtwHandle;\r
   EFI_SMM_FAULT_TOLERANT_WRITE_PROTOCOL   *FtwProtocol;\r
   EFI_HANDLE                              SmmFtwHandle;\r
   EFI_HANDLE                              FtwHandle;\r

-  \r
+\r

   //\r
   // Just return to avoid install SMM FaultTolerantWriteProtocol again\r
   // if SMM Fault Tolerant Write protocol had been installed.\r
   //\r
   // Just return to avoid install SMM FaultTolerantWriteProtocol again\r
   // if SMM Fault Tolerant Write protocol had been installed.\r

-  //  \r
+  //\r

   Status = gSmst->SmmLocateProtocol (\r
   Status = gSmst->SmmLocateProtocol (\r

-                    &gEfiSmmFaultTolerantWriteProtocolGuid, \r
-                    NULL, \r
+                    &gEfiSmmFaultTolerantWriteProtocolGuid,\r
+                    NULL,\r

                     (VOID **) &FtwProtocol\r
                     );\r
   if (!EFI_ERROR (Status)) {\r
                     (VOID **) &FtwProtocol\r
                     );\r
   if (!EFI_ERROR (Status)) {\r


@@ -550,7 +550,7 @@ FvbNotificationEvent (
                     EFI_NATIVE_INTERFACE,\r
                     &mFtwDevice->FtwInstance\r
                     );\r
                     EFI_NATIVE_INTERFACE,\r
                     &mFtwDevice->FtwInstance\r
                     );\r

-  ASSERT_EFI_ERROR (Status); \r
+  ASSERT_EFI_ERROR (Status);\r

 \r
   ///\r
   /// Register SMM FTW SMI handler\r
 \r
   ///\r
   /// Register SMM FTW SMI handler\r


@@ -569,13 +569,13 @@ FvbNotificationEvent (
                   NULL\r
                   );\r
   ASSERT_EFI_ERROR (Status);\r
                   NULL\r
                   );\r
   ASSERT_EFI_ERROR (Status);\r

-  \r
+\r

   return EFI_SUCCESS;\r
 }\r
 \r
 /**\r
   SMM END_OF_DXE protocol notification event handler.\r
   return EFI_SUCCESS;\r
 }\r
 \r
 /**\r
   SMM END_OF_DXE protocol notification event handler.\r

- \r
+\r

   @param  Protocol   Points to the protocol's unique identifier\r
   @param  Interface  Points to the interface instance\r
   @param  Handle     The handle on which the interface was installed\r
   @param  Protocol   Points to the protocol's unique identifier\r
   @param  Interface  Points to the interface instance\r
   @param  Handle     The handle on which the interface was installed\r


@@ -636,7 +636,7 @@ SmmFaultTolerantWriteInitialize (
 \r
   //\r
   // Register FvbNotificationEvent () notify function.\r
 \r
   //\r
   // Register FvbNotificationEvent () notify function.\r

-  // \r
+  //\r

   Status = gSmst->SmmRegisterProtocolNotify (\r
                     &gEfiSmmFirmwareVolumeBlockProtocolGuid,\r
                     FvbNotificationEvent,\r
   Status = gSmst->SmmRegisterProtocolNotify (\r
                     &gEfiSmmFirmwareVolumeBlockProtocolGuid,\r
                     FvbNotificationEvent,\r


@@ -645,6 +645,6 @@ SmmFaultTolerantWriteInitialize (
   ASSERT_EFI_ERROR (Status);\r
 \r
   FvbNotificationEvent (NULL, NULL, NULL);\r
   ASSERT_EFI_ERROR (Status);\r
 \r
   FvbNotificationEvent (NULL, NULL, NULL);\r

-  \r
+\r

   return EFI_SUCCESS;\r
 }\r
   return EFI_SUCCESS;\r
 }\r

diff --git a/MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteSmm.inf b/MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteSmm.inf
index 3b57c3cf640d5ad9b3e38993882385c58d9212db..85d109e8d9e1d74ebc33895dd15b065763ee521a 100644 (file)
--- a/MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteSmm.inf
+++ b/MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteSmm.inf
@@ -1,12 +1,12 @@
 ## @file\r
 #   Fault Tolerant Write Smm Driver.\r
 #\r
 ## @file\r
 #   Fault Tolerant Write Smm Driver.\r
 #\r

-#   This driver installs SMM Fault Tolerant Write (FTW) protocol, which provides fault \r
-#   tolerant write capability in SMM environment for block devices. Its implementation \r
-#   depends on the full functionality SMM FVB protocol that support read, write/erase \r
+#   This driver installs SMM Fault Tolerant Write (FTW) protocol, which provides fault\r
+#   tolerant write capability in SMM environment for block devices. Its implementation\r
+#   depends on the full functionality SMM FVB protocol that support read, write/erase\r

 #   flash access.\r
 #\r
 #   flash access.\r
 #\r

-# Copyright (c) 2010 - 2015, Intel Corporation. All rights reserved.<BR>\r
+# Copyright (c) 2010 - 2018, Intel Corporation. All rights reserved.<BR>\r

 #\r
 #  This program and the accompanying materials\r
 #  are licensed and made available under the terms and conditions of the BSD License\r
 #\r
 #  This program and the accompanying materials\r
 #  are licensed and made available under the terms and conditions of the BSD License\r

diff --git a/MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteSmmCommon.h b/MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteSmmCommon.h
index 061673bce2da05fcb785b4a635bcad787aeda374..8ad0015f3c9e5d6f26c0d81ead9e770b1c901efe 100644 (file)
--- a/MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteSmmCommon.h
+++ b/MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteSmmCommon.h
@@ -1,15 +1,15 @@
 /** @file\r
 \r
 /** @file\r
 \r

-  The common header file for SMM FTW module and SMM FTW DXE Module. \r
-\r
-Copyright (c) 2011, Intel Corporation. All rights reserved. <BR>\r
-This program and the accompanying materials                          \r
-are licensed and made available under the terms and conditions of the BSD License         \r
-which accompanies this distribution.  The full text of the license may be found at        \r
-http://opensource.org/licenses/bsd-license.php                                            \r
-                                                                                          \r
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     \r
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. \r
+  The common header file for SMM FTW module and SMM FTW DXE Module.\r
+\r
+Copyright (c) 2011 - 2018, Intel Corporation. All rights reserved. <BR>\r
+This program and the accompanying materials\r
+are licensed and made available under the terms and conditions of the BSD License\r
+which accompanies this distribution.  The full text of the license may be found at\r
+http://opensource.org/licenses/bsd-license.php\r
+\r
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r

 \r
 **/\r
 \r
 \r
 **/\r
 \r

diff --git a/MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteSmmDxe.c b/MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteSmmDxe.c
index 772d10dcd46cb18e6965c1743bf39156a62f72ca..259e9365f4831b60e029fe0676326bbd1ba38524 100644 (file)
--- a/MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteSmmDxe.c
+++ b/MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteSmmDxe.c
@@ -1,16 +1,16 @@
 /** @file\r
 \r
 /** @file\r
 \r

-  Implement the Fault Tolerant Write (FTW) protocol based on SMM FTW \r
+  Implement the Fault Tolerant Write (FTW) protocol based on SMM FTW\r

   module.\r
 \r
   module.\r
 \r

-Copyright (c) 2011 - 2013, Intel Corporation. All rights reserved. <BR>\r
-This program and the accompanying materials                          \r
-are licensed and made available under the terms and conditions of the BSD License         \r
-which accompanies this distribution.  The full text of the license may be found at        \r
-http://opensource.org/licenses/bsd-license.php                                            \r
-                                                                                          \r
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     \r
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. \r
+Copyright (c) 2011 - 2018, Intel Corporation. All rights reserved. <BR>\r
+This program and the accompanying materials\r
+are licensed and made available under the terms and conditions of the BSD License\r
+which accompanies this distribution.  The full text of the license may be found at\r
+http://opensource.org/licenses/bsd-license.php\r
+\r
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r

 \r
 **/\r
 \r
 \r
 **/\r
 \r


@@ -46,28 +46,28 @@ InitCommunicateBuffer (
   IN      UINTN                             Function\r
   )\r
 {\r
   IN      UINTN                             Function\r
   )\r
 {\r

-  EFI_SMM_COMMUNICATE_HEADER                *SmmCommunicateHeader;  \r
-  SMM_FTW_COMMUNICATE_FUNCTION_HEADER       *SmmFtwFunctionHeader; \r
+  EFI_SMM_COMMUNICATE_HEADER                *SmmCommunicateHeader;\r
+  SMM_FTW_COMMUNICATE_FUNCTION_HEADER       *SmmFtwFunctionHeader;\r

 \r
   //\r
   // The whole buffer size: SMM_COMMUNICATE_HEADER_SIZE + SMM_FTW_COMMUNICATE_HEADER_SIZE + DataSize.\r
   //\r
   SmmCommunicateHeader = AllocateZeroPool (DataSize + SMM_COMMUNICATE_HEADER_SIZE + SMM_FTW_COMMUNICATE_HEADER_SIZE);\r
   ASSERT (SmmCommunicateHeader != NULL);\r
 \r
   //\r
   // The whole buffer size: SMM_COMMUNICATE_HEADER_SIZE + SMM_FTW_COMMUNICATE_HEADER_SIZE + DataSize.\r
   //\r
   SmmCommunicateHeader = AllocateZeroPool (DataSize + SMM_COMMUNICATE_HEADER_SIZE + SMM_FTW_COMMUNICATE_HEADER_SIZE);\r
   ASSERT (SmmCommunicateHeader != NULL);\r

-   \r
+\r

   //\r
   // Prepare data buffer.\r
   //\r
   CopyGuid (&SmmCommunicateHeader->HeaderGuid, &gEfiSmmFaultTolerantWriteProtocolGuid);\r
   SmmCommunicateHeader->MessageLength = DataSize + SMM_FTW_COMMUNICATE_HEADER_SIZE;\r
   //\r
   // Prepare data buffer.\r
   //\r
   CopyGuid (&SmmCommunicateHeader->HeaderGuid, &gEfiSmmFaultTolerantWriteProtocolGuid);\r
   SmmCommunicateHeader->MessageLength = DataSize + SMM_FTW_COMMUNICATE_HEADER_SIZE;\r

- \r
+\r

   SmmFtwFunctionHeader = (SMM_FTW_COMMUNICATE_FUNCTION_HEADER *) SmmCommunicateHeader->Data;\r
   SmmFtwFunctionHeader->Function = Function;\r
 \r
   *CommunicateBuffer = SmmCommunicateHeader;\r
   if (DataPtr != NULL) {\r
     *DataPtr = SmmFtwFunctionHeader->Data;\r
   SmmFtwFunctionHeader = (SMM_FTW_COMMUNICATE_FUNCTION_HEADER *) SmmCommunicateHeader->Data;\r
   SmmFtwFunctionHeader->Function = Function;\r
 \r
   *CommunicateBuffer = SmmCommunicateHeader;\r
   if (DataPtr != NULL) {\r
     *DataPtr = SmmFtwFunctionHeader->Data;\r

-  }  \r
+  }\r

 }\r
 \r
 \r
 }\r
 \r
 \r


@@ -76,7 +76,7 @@ InitCommunicateBuffer (
 \r
   @param[in, out]  SmmCommunicateHeader    The communicate buffer.\r
   @param[in]       DataSize                The payload size.\r
 \r
   @param[in, out]  SmmCommunicateHeader    The communicate buffer.\r
   @param[in]       DataSize                The payload size.\r

-                      \r
+\r

 **/\r
 EFI_STATUS\r
 SendCommunicateBuffer (\r
 **/\r
 EFI_STATUS\r
 SendCommunicateBuffer (\r


@@ -86,8 +86,8 @@ SendCommunicateBuffer (
 {\r
   EFI_STATUS                                Status;\r
   UINTN                                     CommSize;\r
 {\r
   EFI_STATUS                                Status;\r
   UINTN                                     CommSize;\r

-  SMM_FTW_COMMUNICATE_FUNCTION_HEADER       *SmmFtwFunctionHeader; \r
- \r
+  SMM_FTW_COMMUNICATE_FUNCTION_HEADER       *SmmFtwFunctionHeader;\r
+\r

   CommSize = DataSize + SMM_COMMUNICATE_HEADER_SIZE + SMM_FTW_COMMUNICATE_HEADER_SIZE;\r
   Status = mSmmCommunication->Communicate (mSmmCommunication, SmmCommunicateHeader, &CommSize);\r
   ASSERT_EFI_ERROR (Status);\r
   CommSize = DataSize + SMM_COMMUNICATE_HEADER_SIZE + SMM_FTW_COMMUNICATE_HEADER_SIZE;\r
   Status = mSmmCommunication->Communicate (mSmmCommunication, SmmCommunicateHeader, &CommSize);\r
   ASSERT_EFI_ERROR (Status);\r


@@ -103,7 +103,7 @@ SendCommunicateBuffer (
   @param[in]   FvbHandle         The handle of FVB protocol that provides services.\r
   @param[out]  FvbBaseAddress    The base address of the FVB attached with FvbHandle.\r
   @param[out]  FvbAttributes     The attributes of the FVB attached with FvbHandle.\r
   @param[in]   FvbHandle         The handle of FVB protocol that provides services.\r
   @param[out]  FvbBaseAddress    The base address of the FVB attached with FvbHandle.\r
   @param[out]  FvbAttributes     The attributes of the FVB attached with FvbHandle.\r

-    \r
+\r

   @retval EFI_SUCCESS            The function completed successfully.\r
   @retval Others                 The function could not complete successfully.\r
 \r
   @retval EFI_SUCCESS            The function completed successfully.\r
   @retval Others                 The function could not complete successfully.\r
 \r


@@ -122,14 +122,14 @@ ConvertFvbHandle (
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r

-  \r
+\r

   Status = Fvb->GetPhysicalAddress (Fvb, FvbBaseAddress);\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
 \r
   Status = Fvb->GetAttributes (Fvb, FvbAttributes);\r
   Status = Fvb->GetPhysicalAddress (Fvb, FvbBaseAddress);\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
 \r
   Status = Fvb->GetAttributes (Fvb, FvbAttributes);\r

-  return Status;  \r
+  return Status;\r

 }\r
 \r
 \r
 }\r
 \r
 \r


@@ -154,7 +154,7 @@ FtwGetMaxBlockSize (
 {\r
   EFI_STATUS                                Status;\r
   UINTN                                     PayloadSize;\r
 {\r
   EFI_STATUS                                Status;\r
   UINTN                                     PayloadSize;\r

-  EFI_SMM_COMMUNICATE_HEADER                *SmmCommunicateHeader;  \r
+  EFI_SMM_COMMUNICATE_HEADER                *SmmCommunicateHeader;\r

   SMM_FTW_GET_MAX_BLOCK_SIZE_HEADER         *SmmFtwBlockSizeHeader;\r
 \r
   //\r
   SMM_FTW_GET_MAX_BLOCK_SIZE_HEADER         *SmmFtwBlockSizeHeader;\r
 \r
   //\r


@@ -162,7 +162,7 @@ FtwGetMaxBlockSize (
   //\r
   PayloadSize  = sizeof (SMM_FTW_GET_MAX_BLOCK_SIZE_HEADER);\r
   InitCommunicateBuffer ((VOID **)&SmmCommunicateHeader, (VOID **)&SmmFtwBlockSizeHeader, PayloadSize, FTW_FUNCTION_GET_MAX_BLOCK_SIZE);\r
   //\r
   PayloadSize  = sizeof (SMM_FTW_GET_MAX_BLOCK_SIZE_HEADER);\r
   InitCommunicateBuffer ((VOID **)&SmmCommunicateHeader, (VOID **)&SmmFtwBlockSizeHeader, PayloadSize, FTW_FUNCTION_GET_MAX_BLOCK_SIZE);\r

-    \r
+\r

   //\r
   // Send data to SMM.\r
   //\r
   //\r
   // Send data to SMM.\r
   //\r


@@ -171,9 +171,9 @@ FtwGetMaxBlockSize (
   //\r
   // Get data from SMM\r
   //\r
   //\r
   // Get data from SMM\r
   //\r

-  *BlockSize = SmmFtwBlockSizeHeader->BlockSize; \r
+  *BlockSize = SmmFtwBlockSizeHeader->BlockSize;\r

   FreePool (SmmCommunicateHeader);\r
   FreePool (SmmCommunicateHeader);\r

-  \r
+\r

   return Status;\r
 }\r
 \r
   return Status;\r
 }\r
 \r


@@ -210,7 +210,7 @@ FtwAllocate (
 {\r
   EFI_STATUS                                Status;\r
   UINTN                                     PayloadSize;\r
 {\r
   EFI_STATUS                                Status;\r
   UINTN                                     PayloadSize;\r

-  EFI_SMM_COMMUNICATE_HEADER                *SmmCommunicateHeader;  \r
+  EFI_SMM_COMMUNICATE_HEADER                *SmmCommunicateHeader;\r

   SMM_FTW_ALLOCATE_HEADER                   *SmmFtwAllocateHeader;\r
 \r
   //\r
   SMM_FTW_ALLOCATE_HEADER                   *SmmFtwAllocateHeader;\r
 \r
   //\r


@@ -220,8 +220,8 @@ FtwAllocate (
   InitCommunicateBuffer ((VOID **)&SmmCommunicateHeader, (VOID **)&SmmFtwAllocateHeader, PayloadSize, FTW_FUNCTION_ALLOCATE);\r
   CopyGuid (&SmmFtwAllocateHeader->CallerId, CallerId);\r
   SmmFtwAllocateHeader->PrivateDataSize = PrivateDataSize;\r
   InitCommunicateBuffer ((VOID **)&SmmCommunicateHeader, (VOID **)&SmmFtwAllocateHeader, PayloadSize, FTW_FUNCTION_ALLOCATE);\r
   CopyGuid (&SmmFtwAllocateHeader->CallerId, CallerId);\r
   SmmFtwAllocateHeader->PrivateDataSize = PrivateDataSize;\r

-  SmmFtwAllocateHeader->NumberOfWrites  = NumberOfWrites; \r
-    \r
+  SmmFtwAllocateHeader->NumberOfWrites  = NumberOfWrites;\r
+\r

   //\r
   // Send data to SMM.\r
   //\r
   //\r
   // Send data to SMM.\r
   //\r


@@ -276,7 +276,7 @@ FtwWrite (
 {\r
   EFI_STATUS                                Status;\r
   UINTN                                     PayloadSize;\r
 {\r
   EFI_STATUS                                Status;\r
   UINTN                                     PayloadSize;\r

-  EFI_SMM_COMMUNICATE_HEADER                *SmmCommunicateHeader;  \r
+  EFI_SMM_COMMUNICATE_HEADER                *SmmCommunicateHeader;\r

   SMM_FTW_WRITE_HEADER                      *SmmFtwWriteHeader;\r
 \r
   //\r
   SMM_FTW_WRITE_HEADER                      *SmmFtwWriteHeader;\r
 \r
   //\r


@@ -292,7 +292,7 @@ FtwWrite (
   InitCommunicateBuffer ((VOID **)&SmmCommunicateHeader, (VOID **)&SmmFtwWriteHeader, PayloadSize, FTW_FUNCTION_WRITE);\r
 \r
   //\r
   InitCommunicateBuffer ((VOID **)&SmmCommunicateHeader, (VOID **)&SmmFtwWriteHeader, PayloadSize, FTW_FUNCTION_WRITE);\r
 \r
   //\r

-  // FvBlockHandle can not be used in SMM environment. Here we get the FVB protocol first, then get FVB base address \r
+  // FvBlockHandle can not be used in SMM environment. Here we get the FVB protocol first, then get FVB base address\r

   // and its attribute. Send these information to SMM handler, the SMM handler will find the proper FVB to write data.\r
   //\r
   Status = ConvertFvbHandle (FvBlockHandle, &SmmFtwWriteHeader->FvbBaseAddress, &SmmFtwWriteHeader->FvbAttributes);\r
   // and its attribute. Send these information to SMM handler, the SMM handler will find the proper FVB to write data.\r
   //\r
   Status = ConvertFvbHandle (FvBlockHandle, &SmmFtwWriteHeader->FvbBaseAddress, &SmmFtwWriteHeader->FvbAttributes);\r


@@ -300,9 +300,9 @@ FtwWrite (
     FreePool (SmmCommunicateHeader);\r
     return EFI_ABORTED;\r
   }\r
     FreePool (SmmCommunicateHeader);\r
     return EFI_ABORTED;\r
   }\r

-  \r
+\r

   SmmFtwWriteHeader->Lba    = Lba;\r
   SmmFtwWriteHeader->Lba    = Lba;\r

-  SmmFtwWriteHeader->Offset = Offset; \r
+  SmmFtwWriteHeader->Offset = Offset;\r

   SmmFtwWriteHeader->Length = Length;\r
   CopyMem (SmmFtwWriteHeader->Data, Buffer, Length);\r
   if (PrivateData == NULL) {\r
   SmmFtwWriteHeader->Length = Length;\r
   CopyMem (SmmFtwWriteHeader->Data, Buffer, Length);\r
   if (PrivateData == NULL) {\r


@@ -316,7 +316,7 @@ FtwWrite (
   // Send data to SMM.\r
   //\r
   Status = SendCommunicateBuffer (SmmCommunicateHeader, PayloadSize);\r
   // Send data to SMM.\r
   //\r
   Status = SendCommunicateBuffer (SmmCommunicateHeader, PayloadSize);\r

-  FreePool (SmmCommunicateHeader);  \r
+  FreePool (SmmCommunicateHeader);\r

   return Status;\r
 }\r
 \r
   return Status;\r
 }\r
 \r


@@ -342,22 +342,22 @@ FtwRestart (
 {\r
   EFI_STATUS                                Status;\r
   UINTN                                     PayloadSize;\r
 {\r
   EFI_STATUS                                Status;\r
   UINTN                                     PayloadSize;\r

-  EFI_SMM_COMMUNICATE_HEADER                *SmmCommunicateHeader;  \r
+  EFI_SMM_COMMUNICATE_HEADER                *SmmCommunicateHeader;\r

   SMM_FTW_RESTART_HEADER                    *SmmFtwRestartHeader;\r
   SMM_FTW_RESTART_HEADER                    *SmmFtwRestartHeader;\r

- \r
+\r

   //\r
   // Initialize the communicate buffer.\r
   //\r
   PayloadSize  = sizeof (SMM_FTW_RESTART_HEADER);\r
   //\r
   // Initialize the communicate buffer.\r
   //\r
   PayloadSize  = sizeof (SMM_FTW_RESTART_HEADER);\r

-  InitCommunicateBuffer ((VOID **)&SmmCommunicateHeader, (VOID **)&SmmFtwRestartHeader, PayloadSize, FTW_FUNCTION_RESTART); \r
+  InitCommunicateBuffer ((VOID **)&SmmCommunicateHeader, (VOID **)&SmmFtwRestartHeader, PayloadSize, FTW_FUNCTION_RESTART);\r

 \r
   //\r
 \r
   //\r

-  // FvBlockHandle can not be used in SMM environment. Here we get the FVB protocol first, then get FVB base address \r
+  // FvBlockHandle can not be used in SMM environment. Here we get the FVB protocol first, then get FVB base address\r

   // and its attribute. Send these information to SMM handler, the SMM handler will find the proper FVB to write data.\r
   //\r
   Status = ConvertFvbHandle (FvBlockHandle, &SmmFtwRestartHeader->FvbBaseAddress, &SmmFtwRestartHeader->FvbAttributes);\r
   if (EFI_ERROR (Status)) {\r
   // and its attribute. Send these information to SMM handler, the SMM handler will find the proper FVB to write data.\r
   //\r
   Status = ConvertFvbHandle (FvBlockHandle, &SmmFtwRestartHeader->FvbBaseAddress, &SmmFtwRestartHeader->FvbAttributes);\r
   if (EFI_ERROR (Status)) {\r

-    FreePool (SmmCommunicateHeader); \r
+    FreePool (SmmCommunicateHeader);\r

     return EFI_ABORTED;\r
   }\r
 \r
     return EFI_ABORTED;\r
   }\r
 \r


@@ -365,7 +365,7 @@ FtwRestart (
   // Send data to SMM.\r
   //\r
   Status = SendCommunicateBuffer (SmmCommunicateHeader, PayloadSize);\r
   // Send data to SMM.\r
   //\r
   Status = SendCommunicateBuffer (SmmCommunicateHeader, PayloadSize);\r

-  FreePool (SmmCommunicateHeader);  \r
+  FreePool (SmmCommunicateHeader);\r

   return Status;\r
 }\r
 \r
   return Status;\r
 }\r
 \r


@@ -387,19 +387,19 @@ FtwAbort (
   )\r
 {\r
   EFI_STATUS                                Status;\r
   )\r
 {\r
   EFI_STATUS                                Status;\r

-  EFI_SMM_COMMUNICATE_HEADER                *SmmCommunicateHeader;  \r
- \r
+  EFI_SMM_COMMUNICATE_HEADER                *SmmCommunicateHeader;\r
+\r

   //\r
   // Initialize the communicate buffer.\r
   //\r
   InitCommunicateBuffer ((VOID **)&SmmCommunicateHeader, NULL, 0, FTW_FUNCTION_ABORT);\r
   //\r
   // Initialize the communicate buffer.\r
   //\r
   InitCommunicateBuffer ((VOID **)&SmmCommunicateHeader, NULL, 0, FTW_FUNCTION_ABORT);\r

- \r
+\r

   //\r
   // Send data to SMM.\r
   //\r
   Status = SendCommunicateBuffer (SmmCommunicateHeader, 0);\r
 \r
   //\r
   // Send data to SMM.\r
   //\r
   Status = SendCommunicateBuffer (SmmCommunicateHeader, 0);\r
 \r

-  FreePool (SmmCommunicateHeader);  \r
+  FreePool (SmmCommunicateHeader);\r

   return Status;\r
 }\r
 \r
   return Status;\r
 }\r
 \r


@@ -444,7 +444,7 @@ FtwGetLastWrite (
 {\r
   EFI_STATUS                                Status;\r
   UINTN                                     PayloadSize;\r
 {\r
   EFI_STATUS                                Status;\r
   UINTN                                     PayloadSize;\r

-  EFI_SMM_COMMUNICATE_HEADER                *SmmCommunicateHeader;  \r
+  EFI_SMM_COMMUNICATE_HEADER                *SmmCommunicateHeader;\r

   SMM_FTW_GET_LAST_WRITE_HEADER             *SmmFtwGetLastWriteHeader;\r
 \r
   //\r
   SMM_FTW_GET_LAST_WRITE_HEADER             *SmmFtwGetLastWriteHeader;\r
 \r
   //\r


@@ -465,7 +465,7 @@ FtwGetLastWrite (
   *PrivateDataSize = SmmFtwGetLastWriteHeader->PrivateDataSize;\r
   if (Status == EFI_SUCCESS || Status == EFI_BUFFER_TOO_SMALL) {\r
     *Lba      = SmmFtwGetLastWriteHeader->Lba;\r
   *PrivateDataSize = SmmFtwGetLastWriteHeader->PrivateDataSize;\r
   if (Status == EFI_SUCCESS || Status == EFI_BUFFER_TOO_SMALL) {\r
     *Lba      = SmmFtwGetLastWriteHeader->Lba;\r

-    *Offset   = SmmFtwGetLastWriteHeader->Offset; \r
+    *Offset   = SmmFtwGetLastWriteHeader->Offset;\r

     *Length   = SmmFtwGetLastWriteHeader->Length;\r
     *Complete = SmmFtwGetLastWriteHeader->Complete;\r
     CopyGuid (CallerId, &SmmFtwGetLastWriteHeader->CallerId);\r
     *Length   = SmmFtwGetLastWriteHeader->Length;\r
     *Complete = SmmFtwGetLastWriteHeader->Complete;\r
     CopyGuid (CallerId, &SmmFtwGetLastWriteHeader->CallerId);\r


@@ -476,7 +476,7 @@ FtwGetLastWrite (
     *Complete = SmmFtwGetLastWriteHeader->Complete;\r
   }\r
 \r
     *Complete = SmmFtwGetLastWriteHeader->Complete;\r
   }\r
 \r

-  FreePool (SmmCommunicateHeader);  \r
+  FreePool (SmmCommunicateHeader);\r

   return Status;\r
 }\r
 \r
   return Status;\r
 }\r
 \r


@@ -501,12 +501,12 @@ SmmFtwReady (
   //\r
   // Just return to avoid install SMM FaultTolerantWriteProtocol again\r
   // if Fault Tolerant Write protocol had been installed.\r
   //\r
   // Just return to avoid install SMM FaultTolerantWriteProtocol again\r
   // if Fault Tolerant Write protocol had been installed.\r

-  //  \r
+  //\r

   Status = gBS->LocateProtocol (&gEfiFaultTolerantWriteProtocolGuid, NULL, (VOID **)&FtwProtocol);\r
   if (!EFI_ERROR (Status)) {\r
     return;\r
   }\r
   Status = gBS->LocateProtocol (&gEfiFaultTolerantWriteProtocolGuid, NULL, (VOID **)&FtwProtocol);\r
   if (!EFI_ERROR (Status)) {\r
     return;\r
   }\r

-  \r
+\r

   Status = gBS->LocateProtocol (&gEfiSmmCommunicationProtocolGuid, NULL, (VOID **) &mSmmCommunication);\r
   ASSERT_EFI_ERROR (Status);\r
 \r
   Status = gBS->LocateProtocol (&gEfiSmmCommunicationProtocolGuid, NULL, (VOID **) &mSmmCommunication);\r
   ASSERT_EFI_ERROR (Status);\r
 \r


@@ -520,9 +520,9 @@ SmmFtwReady (
                   &mFaultTolerantWriteDriver\r
                   );\r
   ASSERT_EFI_ERROR (Status);\r
                   &mFaultTolerantWriteDriver\r
                   );\r
   ASSERT_EFI_ERROR (Status);\r

-  \r
+\r

   Status = gBS->CloseEvent (Event);\r
   Status = gBS->CloseEvent (Event);\r

-  ASSERT_EFI_ERROR (Status);  \r
+  ASSERT_EFI_ERROR (Status);\r

 }\r
 \r
 \r
 }\r
 \r
 \r


@@ -551,12 +551,12 @@ FaultTolerantWriteSmmInitialize (
   //\r
   EfiCreateProtocolNotifyEvent (\r
     &gEfiSmmFaultTolerantWriteProtocolGuid,\r
   //\r
   EfiCreateProtocolNotifyEvent (\r
     &gEfiSmmFaultTolerantWriteProtocolGuid,\r

-    TPL_CALLBACK, \r
-    SmmFtwReady, \r
-    NULL, \r
+    TPL_CALLBACK,\r
+    SmmFtwReady,\r
+    NULL,\r

     &SmmFtwRegistration\r
     );\r
     &SmmFtwRegistration\r
     );\r

-  \r
+\r

   return EFI_SUCCESS;\r
 }\r
 \r
   return EFI_SUCCESS;\r
 }\r
 \r

diff --git a/MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteSmmDxe.h b/MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteSmmDxe.h
index b4c20aee0f8b1af975ec0972e2602b11d3237b9a..ab8375a2e781fc3ce67cb473dc02ed345c1eff7a 100644 (file)
--- a/MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteSmmDxe.h
+++ b/MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteSmmDxe.h
@@ -3,14 +3,14 @@
   The internal header file includes the common header files, defines\r
   internal structure and functions used by FTW module.\r
 \r
   The internal header file includes the common header files, defines\r
   internal structure and functions used by FTW module.\r
 \r

-Copyright (c) 2011, Intel Corporation. All rights reserved. <BR>\r
-This program and the accompanying materials                          \r
-are licensed and made available under the terms and conditions of the BSD License         \r
-which accompanies this distribution.  The full text of the license may be found at        \r
-http://opensource.org/licenses/bsd-license.php                                            \r
-                                                                                          \r
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     \r
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. \r
+Copyright (c) 2011 - 2018, Intel Corporation. All rights reserved. <BR>\r
+This program and the accompanying materials\r
+are licensed and made available under the terms and conditions of the BSD License\r
+which accompanies this distribution.  The full text of the license may be found at\r
+http://opensource.org/licenses/bsd-license.php\r
+\r
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r

 \r
 **/\r
 \r
 \r
 **/\r
 \r

diff --git a/MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteSmmDxe.inf b/MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteSmmDxe.inf
index 82dd36c3203c5c700072b155382e0dce7a0ac7fa..df1e8dbcdb0e1609de7e1a21016fc77c55bf701b 100644 (file)
--- a/MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteSmmDxe.inf
+++ b/MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteSmmDxe.inf
@@ -6,7 +6,7 @@
 # the related operations in SMM handler in SMM FTW module. You can use the FTW protocol\r
 # before End Of Dxe or use FaultTolerantWriteDxe module instead if you really want to.\r
 #\r
 # the related operations in SMM handler in SMM FTW module. You can use the FTW protocol\r
 # before End Of Dxe or use FaultTolerantWriteDxe module instead if you really want to.\r
 #\r

-# Copyright (c) 2011 - 2014, Intel Corporation. All rights reserved.<BR>\r
+# Copyright (c) 2011 - 2018, Intel Corporation. All rights reserved.<BR>\r

 #\r
 #  This program and the accompanying materials\r
 #  are licensed and made available under the terms and conditions of the BSD License\r
 #\r
 #  This program and the accompanying materials\r
 #  are licensed and made available under the terms and conditions of the BSD License\r


@@ -36,13 +36,13 @@
   FaultTolerantWriteSmmDxe.c\r
   FaultTolerantWriteSmmDxe.h\r
   FaultTolerantWriteSmmCommon.h\r
   FaultTolerantWriteSmmDxe.c\r
   FaultTolerantWriteSmmDxe.h\r
   FaultTolerantWriteSmmCommon.h\r

-  \r
+\r

 [Packages]\r
   MdePkg/MdePkg.dec\r
   MdeModulePkg/MdeModulePkg.dec\r
 \r
 [LibraryClasses]\r
 [Packages]\r
   MdePkg/MdePkg.dec\r
   MdeModulePkg/MdeModulePkg.dec\r
 \r
 [LibraryClasses]\r

-  BaseLib  \r
+  BaseLib\r

   UefiBootServicesTableLib\r
   DebugLib\r
   DxeServicesTableLib\r
   UefiBootServicesTableLib\r
   DebugLib\r
   DxeServicesTableLib\r


@@ -56,7 +56,7 @@
   ## CONSUMES\r
   gEfiSmmFaultTolerantWriteProtocolGuid\r
   gEfiFirmwareVolumeBlockProtocolGuid           ## CONSUMES\r
   ## CONSUMES\r
   gEfiSmmFaultTolerantWriteProtocolGuid\r
   gEfiFirmwareVolumeBlockProtocolGuid           ## CONSUMES\r

-   \r
+\r

 [Depex]\r
   gEfiSmmCommunicationProtocolGuid\r
 \r
 [Depex]\r
   gEfiSmmCommunicationProtocolGuid\r
 \r

diff --git a/MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteSmmDxeExtra.uni b/MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteSmmDxeExtra.uni
index 8abf87409888a78f4380447f8199d2a1657aa241..6cee145f213efc535c9094b862e42ea573da96cb 100644 (file)
--- a/MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteSmmDxeExtra.uni
+++ b/MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteSmmDxeExtra.uni
@@ -1,7 +1,7 @@
 // /** @file\r
 // FaultTolerantWriteSmmDxe Localized Strings and Content\r
 //\r
 // /** @file\r
 // FaultTolerantWriteSmmDxe Localized Strings and Content\r
 //\r

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

 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r
 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r


@@ -12,8 +12,8 @@
 //\r
 // **/\r
 \r
 //\r
 // **/\r
 \r

-#string STR_PROPERTIES_MODULE_NAME \r
-#language en-US \r
+#string STR_PROPERTIES_MODULE_NAME\r
+#language en-US\r

 "Fault Tolerant Flash Write SMM/DXE Bridge Driver"\r
 \r
 \r
 "Fault Tolerant Flash Write SMM/DXE Bridge Driver"\r
 \r
 \r

diff --git a/MdeModulePkg/Universal/FaultTolerantWriteDxe/FtwMisc.c b/MdeModulePkg/Universal/FaultTolerantWriteDxe/FtwMisc.c
index 96044693ccaea3d8cce85018a1fbff395e55ef18..27b65366ef1d5e9a63dac735977378edeeeb9fe6 100644 (file)
--- a/MdeModulePkg/Universal/FaultTolerantWriteDxe/FtwMisc.c
+++ b/MdeModulePkg/Universal/FaultTolerantWriteDxe/FtwMisc.c
@@ -2,14 +2,14 @@
 \r
   Internal generic functions to operate flash block.\r
 \r
 \r
   Internal generic functions to operate flash block.\r
 \r

-Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.<BR>\r
-This program and the accompanying materials                          \r
-are licensed and made available under the terms and conditions of the BSD License         \r
-which accompanies this distribution.  The full text of the license may be found at        \r
-http://opensource.org/licenses/bsd-license.php                                            \r
-                                                                                          \r
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     \r
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. \r
+Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r
+This program and the accompanying materials\r
+are licensed and made available under the terms and conditions of the BSD License\r
+which accompanies this distribution.  The full text of the license may be found at\r
+http://opensource.org/licenses/bsd-license.php\r
+\r
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r

 \r
 **/\r
 \r
 \r
 **/\r
 \r


@@ -89,7 +89,7 @@ FtwEraseBlock (
                                 partially erased.\r
   @retval EFI_INVALID_PARAMETER One or more of the LBAs listed\r
                                 in the variable argument list do\r
                                 partially erased.\r
   @retval EFI_INVALID_PARAMETER One or more of the LBAs listed\r
                                 in the variable argument list do\r

-                                not exist in the firmware volume.  \r
+                                not exist in the firmware volume.\r

 \r
 \r
 **/\r
 \r
 \r
 **/\r


@@ -970,11 +970,11 @@ GetPreviousRecordOfWrites (
 **/\r
 EFI_STATUS\r
 InitFtwDevice (\r
 **/\r
 EFI_STATUS\r
 InitFtwDevice (\r

-  OUT EFI_FTW_DEVICE               **FtwData \r
+  OUT EFI_FTW_DEVICE               **FtwData\r

   )\r
 {\r
   EFI_FTW_DEVICE                   *FtwDevice;\r
   )\r
 {\r
   EFI_FTW_DEVICE                   *FtwDevice;\r

-  \r
+\r

   //\r
   // Allocate private data of this driver,\r
   // Including the FtwWorkSpace[FTW_WORK_SPACE_SIZE].\r
   //\r
   // Allocate private data of this driver,\r
   // Including the FtwWorkSpace[FTW_WORK_SPACE_SIZE].\r


@@ -1005,11 +1005,11 @@ InitFtwDevice (
   if (FtwDevice->WorkSpaceAddress == 0) {\r
     FtwDevice->WorkSpaceAddress = (EFI_PHYSICAL_ADDRESS) PcdGet32 (PcdFlashNvStorageFtwWorkingBase);\r
   }\r
   if (FtwDevice->WorkSpaceAddress == 0) {\r
     FtwDevice->WorkSpaceAddress = (EFI_PHYSICAL_ADDRESS) PcdGet32 (PcdFlashNvStorageFtwWorkingBase);\r
   }\r

-  \r
+\r

   FtwDevice->SpareAreaAddress = (EFI_PHYSICAL_ADDRESS) PcdGet64 (PcdFlashNvStorageFtwSpareBase64);\r
   if (FtwDevice->SpareAreaAddress == 0) {\r
     FtwDevice->SpareAreaAddress = (EFI_PHYSICAL_ADDRESS) PcdGet32 (PcdFlashNvStorageFtwSpareBase);\r
   FtwDevice->SpareAreaAddress = (EFI_PHYSICAL_ADDRESS) PcdGet64 (PcdFlashNvStorageFtwSpareBase64);\r
   if (FtwDevice->SpareAreaAddress == 0) {\r
     FtwDevice->SpareAreaAddress = (EFI_PHYSICAL_ADDRESS) PcdGet32 (PcdFlashNvStorageFtwSpareBase);\r

-  }  \r
+  }\r

 \r
   *FtwData = FtwDevice;\r
   return EFI_SUCCESS;\r
 \r
   *FtwData = FtwDevice;\r
   return EFI_SUCCESS;\r


@@ -1024,7 +1024,7 @@ InitFtwDevice (
   @retval EFI_SUCCESS           Find the FVB protocol successfully.\r
   @retval EFI_NOT_FOUND         No proper FVB protocol was found.\r
   @retval EFI_ABORTED           Some data can not be got or be invalid.\r
   @retval EFI_SUCCESS           Find the FVB protocol successfully.\r
   @retval EFI_NOT_FOUND         No proper FVB protocol was found.\r
   @retval EFI_ABORTED           Some data can not be got or be invalid.\r

-  \r
+\r

 **/\r
 EFI_STATUS\r
 FindFvbForFtw (\r
 **/\r
 EFI_STATUS\r
 FindFvbForFtw (\r


@@ -1068,7 +1068,7 @@ FindFvbForFtw (
     //\r
     Status = Fvb->GetAttributes (Fvb, &Attributes);\r
     if (EFI_ERROR (Status) || ((Attributes & EFI_FVB2_WRITE_STATUS) == 0)) {\r
     //\r
     Status = Fvb->GetAttributes (Fvb, &Attributes);\r
     if (EFI_ERROR (Status) || ((Attributes & EFI_FVB2_WRITE_STATUS) == 0)) {\r

-      continue;     \r
+      continue;\r

     }\r
     //\r
     // Compare the address and select the right one\r
     }\r
     //\r
     // Compare the address and select the right one\r


@@ -1188,7 +1188,7 @@ FindFvbForFtw (
 \r
   @retval EFI_SUCCESS           Initialize the FTW protocol successfully.\r
   @retval EFI_NOT_FOUND         No proper FVB protocol was found.\r
 \r
   @retval EFI_SUCCESS           Initialize the FTW protocol successfully.\r
   @retval EFI_NOT_FOUND         No proper FVB protocol was found.\r

-  \r
+\r

 **/\r
 EFI_STATUS\r
 InitFtwProtocol (\r
 **/\r
 EFI_STATUS\r
 InitFtwProtocol (\r


@@ -1208,7 +1208,7 @@ InitFtwProtocol (
   Status = FindFvbForFtw (FtwDevice);\r
   if (EFI_ERROR (Status)) {\r
     return EFI_NOT_FOUND;\r
   Status = FindFvbForFtw (FtwDevice);\r
   if (EFI_ERROR (Status)) {\r
     return EFI_NOT_FOUND;\r

-  }  \r
+  }\r

 \r
   //\r
   // Calculate the start LBA of working block.\r
 \r
   //\r
   // Calculate the start LBA of working block.\r


@@ -1338,7 +1338,7 @@ InitFtwProtocol (
   if (FtwDevice->FtwWorkSpace[Offset] != FTW_ERASED_BYTE) {\r
     Offset += FTW_WRITE_TOTAL_SIZE (FtwHeader->NumberOfWrites, FtwHeader->PrivateDataSize);\r
   }\r
   if (FtwDevice->FtwWorkSpace[Offset] != FTW_ERASED_BYTE) {\r
     Offset += FTW_WRITE_TOTAL_SIZE (FtwHeader->NumberOfWrites, FtwHeader->PrivateDataSize);\r
   }\r

-  \r
+\r

   if (!IsErasedFlashBuffer (FtwDevice->FtwWorkSpace + Offset, FtwDevice->FtwWorkSpaceSize - Offset)) {\r
     Status = FtwReclaimWorkSpace (FtwDevice, TRUE);\r
     ASSERT_EFI_ERROR (Status);\r
   if (!IsErasedFlashBuffer (FtwDevice->FtwWorkSpace + Offset, FtwDevice->FtwWorkSpaceSize - Offset)) {\r
     Status = FtwReclaimWorkSpace (FtwDevice, TRUE);\r
     ASSERT_EFI_ERROR (Status);\r


@@ -1378,7 +1378,7 @@ InitFtwProtocol (
   FtwDevice->FtwInstance.Restart         = FtwRestart;\r
   FtwDevice->FtwInstance.Abort           = FtwAbort;\r
   FtwDevice->FtwInstance.GetLastWrite    = FtwGetLastWrite;\r
   FtwDevice->FtwInstance.Restart         = FtwRestart;\r
   FtwDevice->FtwInstance.Abort           = FtwAbort;\r
   FtwDevice->FtwInstance.GetLastWrite    = FtwGetLastWrite;\r

-    \r
+\r

   return EFI_SUCCESS;\r
 }\r
 \r
   return EFI_SUCCESS;\r
 }\r
 \r

diff --git a/MdeModulePkg/Universal/FaultTolerantWriteDxe/SmmFaultTolerantWriteDxeExtra.uni b/MdeModulePkg/Universal/FaultTolerantWriteDxe/SmmFaultTolerantWriteDxeExtra.uni
index ad1fcc0e70a7eed88d7854e73da7d56a305a3b20..15a3c08bb5233a8168f76c223cf575e7c46a69f2 100644 (file)
--- a/MdeModulePkg/Universal/FaultTolerantWriteDxe/SmmFaultTolerantWriteDxeExtra.uni
+++ b/MdeModulePkg/Universal/FaultTolerantWriteDxe/SmmFaultTolerantWriteDxeExtra.uni
@@ -1,7 +1,7 @@
 // /** @file\r
 // SmmFaultTolerantWriteDxe Localized Strings and Content\r
 //\r
 // /** @file\r
 // SmmFaultTolerantWriteDxe Localized Strings and Content\r
 //\r

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

 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r
 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r


@@ -12,8 +12,8 @@
 //\r
 // **/\r
 \r
 //\r
 // **/\r
 \r

-#string STR_PROPERTIES_MODULE_NAME \r
-#language en-US \r
+#string STR_PROPERTIES_MODULE_NAME\r
+#language en-US\r

 "SMM Fault Tolerant Flash Write Driver"\r
 \r
 \r
 "SMM Fault Tolerant Flash Write Driver"\r
 \r
 \r

diff --git a/MdeModulePkg/Universal/FaultTolerantWriteDxe/UpdateWorkingBlock.c b/MdeModulePkg/Universal/FaultTolerantWriteDxe/UpdateWorkingBlock.c
index b4327b56192124252096cd2397c653db70742df2..50d3421b88bbdb18afefaaa394ba9c8a1f4cb5b9 100644 (file)
--- a/MdeModulePkg/Universal/FaultTolerantWriteDxe/UpdateWorkingBlock.c
+++ b/MdeModulePkg/Universal/FaultTolerantWriteDxe/UpdateWorkingBlock.c
@@ -2,14 +2,14 @@
 \r
    Internal functions to operate Working Block Space.\r
 \r
 \r
    Internal functions to operate Working Block Space.\r
 \r

-Copyright (c) 2006 - 2017, Intel Corporation. All rights reserved.<BR>\r
-This program and the accompanying materials                          \r
-are licensed and made available under the terms and conditions of the BSD License         \r
-which accompanies this distribution.  The full text of the license may be found at        \r
-http://opensource.org/licenses/bsd-license.php                                            \r
-                                                                                          \r
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     \r
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. \r
+Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r
+This program and the accompanying materials\r
+are licensed and made available under the terms and conditions of the BSD License\r
+which accompanies this distribution.  The full text of the license may be found at\r
+http://opensource.org/licenses/bsd-license.php\r
+\r
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r

 \r
 **/\r
 \r
 \r
 **/\r
 \r

diff --git a/MdeModulePkg/Universal/FaultTolerantWritePei/FaultTolerantWritePei.c b/MdeModulePkg/Universal/FaultTolerantWritePei/FaultTolerantWritePei.c
index 14e18e5ae265b1b61e460708cc25d67a519de1a5..b22b12487bcc4f365d3b42c6504f87af4d66838f 100644 (file)
--- a/MdeModulePkg/Universal/FaultTolerantWritePei/FaultTolerantWritePei.c
+++ b/MdeModulePkg/Universal/FaultTolerantWritePei/FaultTolerantWritePei.c
@@ -2,14 +2,14 @@
   This driver installs gEdkiiFaultTolerantWriteGuid PPI to inform\r
   the check for FTW last write data has been done.\r
 \r
   This driver installs gEdkiiFaultTolerantWriteGuid PPI to inform\r
   the check for FTW last write data has been done.\r
 \r

-Copyright (c) 2013, Intel Corporation. All rights reserved.<BR>\r
-This program and the accompanying materials                          \r
-are licensed and made available under the terms and conditions of the BSD License         \r
-which accompanies this distribution.  The full text of the license may be found at        \r
-http://opensource.org/licenses/bsd-license.php                                            \r
-                                                                                          \r
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     \r
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.  \r
+Copyright (c) 2013 - 2018, Intel Corporation. All rights reserved.<BR>\r
+This program and the accompanying materials\r
+are licensed and made available under the terms and conditions of the BSD License\r
+which accompanies this distribution.  The full text of the license may be found at\r
+http://opensource.org/licenses/bsd-license.php\r
+\r
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r

 \r
 **/\r
 \r
 \r
 **/\r
 \r

diff --git a/MdeModulePkg/Universal/FaultTolerantWritePei/FaultTolerantWritePeiExtra.uni b/MdeModulePkg/Universal/FaultTolerantWritePei/FaultTolerantWritePeiExtra.uni
index b9fd9425a926036d1fd3fe8869ed0ededf7a3585..fb36196216a5361ea1b1c634014cc8eda687a97a 100644 (file)
--- a/MdeModulePkg/Universal/FaultTolerantWritePei/FaultTolerantWritePeiExtra.uni
+++ b/MdeModulePkg/Universal/FaultTolerantWritePei/FaultTolerantWritePeiExtra.uni
@@ -1,7 +1,7 @@
 // /** @file\r
 // FaultTolerantWritePei Localized Strings and Content\r
 //\r
 // /** @file\r
 // FaultTolerantWritePei Localized Strings and Content\r
 //\r

-// Copyright (c) 2014, Intel Corporation. All rights reserved.<BR>\r
+// Copyright (c) 2014 - 2018, Intel Corporation. All rights reserved.<BR>\r

 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r
 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r


@@ -12,8 +12,8 @@
 //\r
 // **/\r
 \r
 //\r
 // **/\r
 \r

-#string STR_PROPERTIES_MODULE_NAME \r
-#language en-US \r
+#string STR_PROPERTIES_MODULE_NAME\r
+#language en-US\r

 "FaultTolerantWrite PEI Module"\r
 \r
 \r
 "FaultTolerantWrite PEI Module"\r
 \r
 \r

diff --git a/MdeModulePkg/Universal/FileExplorerDxe/FileExplorerDxe.inf b/MdeModulePkg/Universal/FileExplorerDxe/FileExplorerDxe.inf
index 86d753326126396f188a1a242d743ecf2facb828..8f8b8b42945fa8466737818dbee29b817fd63fcd 100644 (file)
--- a/MdeModulePkg/Universal/FileExplorerDxe/FileExplorerDxe.inf
+++ b/MdeModulePkg/Universal/FileExplorerDxe/FileExplorerDxe.inf
@@ -1,10 +1,10 @@
 ## @file\r
 #  File explorer DXE driver that produces File explorer Protocol.\r
 #\r
 ## @file\r
 #  File explorer DXE driver that produces File explorer Protocol.\r
 #\r

-#  This driver produces File explorerprotocol layered on top of the FileExplorerLib \r
+#  This driver produces File explorerprotocol layered on top of the FileExplorerLib\r

 #  from the MdeModulePkg.\r
 #\r
 #  from the MdeModulePkg.\r
 #\r

-#  Copyright (c) 2009 - 2015, Intel Corporation. All rights reserved.<BR>\r
+#  Copyright (c) 2009 - 2018, Intel Corporation. All rights reserved.<BR>\r

 #  This program and the accompanying materials\r
 #  are licensed and made available under the terms and conditions of the BSD License\r
 #  which accompanies this distribution.  The full text of the license may be found at\r
 #  This program and the accompanying materials\r
 #  are licensed and made available under the terms and conditions of the BSD License\r
 #  which accompanies this distribution.  The full text of the license may be found at\r

diff --git a/MdeModulePkg/Universal/FileExplorerDxe/FileExplorerDxe.uni b/MdeModulePkg/Universal/FileExplorerDxe/FileExplorerDxe.uni
index 583bdfed9d137c6d2aabdedf83bb01bb881d3806..a504264aa6fe5f089267e243a1a23ad78c013669 100644 (file)
--- a/MdeModulePkg/Universal/FileExplorerDxe/FileExplorerDxe.uni
+++ b/MdeModulePkg/Universal/FileExplorerDxe/FileExplorerDxe.uni
@@ -4,13 +4,13 @@
 // This driver produces File Explorer protocol layered on top of the File Explorer library\r
 // from the MdeModulePkg.\r
 //\r
 // This driver produces File Explorer protocol layered on top of the File Explorer library\r
 // from the MdeModulePkg.\r
 //\r

-// Copyright (c) 2009 - 2015, Intel Corporation. All rights reserved.<BR>\r
+// Copyright (c) 2009 - 2018, Intel Corporation. All rights reserved.<BR>\r

 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r
 // which accompanies this distribution.  The full text of the license may be found at\r
 // http://opensource.org/licenses/bsd-license.php\r
 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r
 // which accompanies this distribution.  The full text of the license may be found at\r
 // http://opensource.org/licenses/bsd-license.php\r

-// \r
+//\r

 // THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 // WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 //\r
 // THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 // WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 //\r

diff --git a/MdeModulePkg/Universal/FileExplorerDxe/FileExplorerDxeExtra.uni b/MdeModulePkg/Universal/FileExplorerDxe/FileExplorerDxeExtra.uni
index 467dfb85b79dd3bdc3fba9906bd94a3e72032eab..43a565730301dc1e7ecd496985580cf999b0580b 100644 (file)
--- a/MdeModulePkg/Universal/FileExplorerDxe/FileExplorerDxeExtra.uni
+++ b/MdeModulePkg/Universal/FileExplorerDxe/FileExplorerDxeExtra.uni
@@ -1,7 +1,7 @@
 // /** @file\r
 // FileExplorerDxe Localized Strings and Content\r
 //\r
 // /** @file\r
 // FileExplorerDxe Localized Strings and Content\r
 //\r

-// Copyright (c) 2013 - 2015, Intel Corporation. All rights reserved.<BR>\r
+// Copyright (c) 2013 - 2018, Intel Corporation. All rights reserved.<BR>\r

 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r
 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r


@@ -13,8 +13,8 @@
 //\r
 // **/\r
 \r
 //\r
 // **/\r
 \r

-#string STR_PROPERTIES_MODULE_NAME \r
-#language en-US \r
+#string STR_PROPERTIES_MODULE_NAME\r
+#language en-US\r

 "File Explorer DXE Driver"\r
 \r
 \r
 "File Explorer DXE Driver"\r
 \r
 \r

diff --git a/MdeModulePkg/Universal/FvSimpleFileSystemDxe/FvSimpleFileSystem.c b/MdeModulePkg/Universal/FvSimpleFileSystemDxe/FvSimpleFileSystem.c
index e39036aed960f701fd0e970dff650abb3a451683..746f2ced708a8e01a75eb0fdadfdfb79e3143126 100644 (file)
--- a/MdeModulePkg/Universal/FvSimpleFileSystemDxe/FvSimpleFileSystem.c
+++ b/MdeModulePkg/Universal/FvSimpleFileSystemDxe/FvSimpleFileSystem.c
@@ -12,7 +12,7 @@
   from the UEFI shell. It is entirely read-only.\r
 \r
 Copyright (c) 2014, ARM Limited. All rights reserved.\r
   from the UEFI shell. It is entirely read-only.\r
 \r
 Copyright (c) 2014, ARM Limited. All rights reserved.\r

-Copyright (c) 2014 - 2015, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2014 - 2018, Intel Corporation. All rights reserved.<BR>\r

 \r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 \r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r


@@ -826,7 +826,7 @@ FvSimpleFileSystemSetPosition (
     // Reset directory position to first entry\r
     //\r
     if (File->DirReadNext) {\r
     // Reset directory position to first entry\r
     //\r
     if (File->DirReadNext) {\r

-      File->DirReadNext = FVFS_GET_FIRST_FILE_INFO (Instance); \r
+      File->DirReadNext = FVFS_GET_FIRST_FILE_INFO (Instance);\r

     }\r
   } else if (Position == 0xFFFFFFFFFFFFFFFFull) {\r
     File->Position = File->FvFileInfo->FileInfo.FileSize;\r
     }\r
   } else if (Position == 0xFFFFFFFFFFFFFFFFull) {\r
     File->Position = File->FvFileInfo->FileInfo.FileSize;\r


@@ -942,9 +942,9 @@ FvSimpleFileSystemGetInfo (
     FsInfoOut = (EFI_FILE_SYSTEM_INFO *) Buffer;\r
 \r
     CopyMem (FsInfoOut, &mFsInfoTemplate, sizeof (EFI_FILE_SYSTEM_INFO));\r
     FsInfoOut = (EFI_FILE_SYSTEM_INFO *) Buffer;\r
 \r
     CopyMem (FsInfoOut, &mFsInfoTemplate, sizeof (EFI_FILE_SYSTEM_INFO));\r

-    Status = StrnCpyS ( FsInfoOut->VolumeLabel, \r
-                        (*BufferSize - OFFSET_OF (EFI_FILE_SYSTEM_INFO, VolumeLabel)) / sizeof (CHAR16), \r
-                        Instance->VolumeLabel, \r
+    Status = StrnCpyS ( FsInfoOut->VolumeLabel,\r
+                        (*BufferSize - OFFSET_OF (EFI_FILE_SYSTEM_INFO, VolumeLabel)) / sizeof (CHAR16),\r
+                        Instance->VolumeLabel,\r

                         StrLen (Instance->VolumeLabel)\r
                         );\r
     ASSERT_EFI_ERROR (Status);\r
                         StrLen (Instance->VolumeLabel)\r
                         );\r
     ASSERT_EFI_ERROR (Status);\r


@@ -967,9 +967,9 @@ FvSimpleFileSystemGetInfo (
     }\r
 \r
     FsVolumeLabel = (EFI_FILE_SYSTEM_VOLUME_LABEL*) Buffer;\r
     }\r
 \r
     FsVolumeLabel = (EFI_FILE_SYSTEM_VOLUME_LABEL*) Buffer;\r

-    Status        = StrnCpyS (FsVolumeLabel->VolumeLabel, \r
+    Status        = StrnCpyS (FsVolumeLabel->VolumeLabel,\r

                               (*BufferSize - OFFSET_OF (EFI_FILE_SYSTEM_VOLUME_LABEL, VolumeLabel)) / sizeof (CHAR16),\r
                               (*BufferSize - OFFSET_OF (EFI_FILE_SYSTEM_VOLUME_LABEL, VolumeLabel)) / sizeof (CHAR16),\r

-                              Instance->VolumeLabel, \r
+                              Instance->VolumeLabel,\r

                               StrLen (Instance->VolumeLabel)\r
                               );\r
     ASSERT_EFI_ERROR (Status);\r
                               StrLen (Instance->VolumeLabel)\r
                               );\r
     ASSERT_EFI_ERROR (Status);\r


@@ -1022,7 +1022,7 @@ FvSimpleFileSystemSetInfo (
   IN VOID                     *Buffer\r
   )\r
 {\r
   IN VOID                     *Buffer\r
   )\r
 {\r

-  if (CompareGuid (InformationType, &gEfiFileSystemInfoGuid) || \r
+  if (CompareGuid (InformationType, &gEfiFileSystemInfoGuid) ||\r

       CompareGuid (InformationType, &gEfiFileInfoGuid) ||\r
       CompareGuid (InformationType, &gEfiFileSystemVolumeLabelInfoIdGuid)) {\r
     return EFI_WRITE_PROTECTED;\r
       CompareGuid (InformationType, &gEfiFileInfoGuid) ||\r
       CompareGuid (InformationType, &gEfiFileSystemVolumeLabelInfoIdGuid)) {\r
     return EFI_WRITE_PROTECTED;\r

diff --git a/MdeModulePkg/Universal/FvSimpleFileSystemDxe/FvSimpleFileSystem.uni b/MdeModulePkg/Universal/FvSimpleFileSystemDxe/FvSimpleFileSystem.uni
index 75491148e31315726d9cfeec5a8168bbbc2d9faa..0e3067d129416a48ea95d090c4d6074b27c4549b 100644 (file)
--- a/MdeModulePkg/Universal/FvSimpleFileSystemDxe/FvSimpleFileSystem.uni
+++ b/MdeModulePkg/Universal/FvSimpleFileSystemDxe/FvSimpleFileSystem.uni
@@ -3,13 +3,13 @@
 //\r
 // This module produces Simple File System protocol to provide the accesses to the files in FVs.\r
 //\r
 //\r
 // This module produces Simple File System protocol to provide the accesses to the files in FVs.\r
 //\r

-// Copyright (c) 2014, Intel Corporation. All rights reserved.<BR>\r
+// Copyright (c) 2014 - 2018, Intel Corporation. All rights reserved.<BR>\r

 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r
 // which accompanies this distribution.  The full text of the license may be found at\r
 // http://opensource.org/licenses/bsd-license.php\r
 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r
 // which accompanies this distribution.  The full text of the license may be found at\r
 // http://opensource.org/licenses/bsd-license.php\r

-// \r
+//\r

 // THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 // WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 //\r
 // THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 // WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 //\r

diff --git a/MdeModulePkg/Universal/FvSimpleFileSystemDxe/FvSimpleFileSystemDxe.inf b/MdeModulePkg/Universal/FvSimpleFileSystemDxe/FvSimpleFileSystemDxe.inf
index a648c2efc8bdf840b7d95c93eb0687161449d14b..84d6184c425e6423508c3846d3c4f1d4b8cbad81 100644 (file)
--- a/MdeModulePkg/Universal/FvSimpleFileSystemDxe/FvSimpleFileSystemDxe.inf
+++ b/MdeModulePkg/Universal/FvSimpleFileSystemDxe/FvSimpleFileSystemDxe.inf
@@ -14,7 +14,7 @@
 #  from the UEFI shell. It is entirely read-only.\r
 #\r
 #  Copyright (c) 2014, ARM Ltd. All rights reserved.<BR>\r
 #  from the UEFI shell. It is entirely read-only.\r
 #\r
 #  Copyright (c) 2014, ARM Ltd. All rights reserved.<BR>\r

-#  Copyright (c) 2014, Intel Corporation. All rights reserved.<BR>\r
+#  Copyright (c) 2014 - 2018, Intel Corporation. All rights reserved.<BR>\r

 #\r
 #  This program and the accompanying materials\r
 #  are licensed and made available under the terms and conditions of the BSD License\r
 #\r
 #  This program and the accompanying materials\r
 #  are licensed and made available under the terms and conditions of the BSD License\r


@@ -71,4 +71,4 @@
   gEfiSimpleFileSystemProtocolGuid                                         ## BY_START\r
 \r
 [UserExtensions.TianoCore."ExtraFiles"]\r
   gEfiSimpleFileSystemProtocolGuid                                         ## BY_START\r
 \r
 [UserExtensions.TianoCore."ExtraFiles"]\r

-  FvSimpleFileSystemExtra.uni
\ No newline at end of file
+  FvSimpleFileSystemExtra.uni\r

diff --git a/MdeModulePkg/Universal/FvSimpleFileSystemDxe/FvSimpleFileSystemExtra.uni b/MdeModulePkg/Universal/FvSimpleFileSystemDxe/FvSimpleFileSystemExtra.uni
index eca54c42d89e3c1814fc7698b2dda96c122f5166..f3d43083657d0c61bbd263f1852e4086a7f4a50a 100644 (file)
--- a/MdeModulePkg/Universal/FvSimpleFileSystemDxe/FvSimpleFileSystemExtra.uni
+++ b/MdeModulePkg/Universal/FvSimpleFileSystemDxe/FvSimpleFileSystemExtra.uni
@@ -1,7 +1,7 @@
 // /** @file\r
 // FvSimpleFileSystem Driver's Localized Strings and Content\r
 //\r
 // /** @file\r
 // FvSimpleFileSystem Driver's Localized Strings and Content\r
 //\r

-// Copyright (c) 2014, Intel Corporation. All rights reserved.<BR>\r
+// Copyright (c) 2014 - 2018, Intel Corporation. All rights reserved.<BR>\r

 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r
 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r


@@ -13,8 +13,8 @@
 //\r
 // **/\r
 \r
 //\r
 // **/\r
 \r

-#string STR_PROPERTIES_MODULE_NAME \r
-#language en-US \r
+#string STR_PROPERTIES_MODULE_NAME\r
+#language en-US\r

 "FvSimpleFileSystem UEFI Driver"\r
 \r
 \r
 "FvSimpleFileSystem UEFI Driver"\r
 \r
 \r

diff --git a/MdeModulePkg/Universal/FvSimpleFileSystemDxe/FvSimpleFileSystemInternal.h b/MdeModulePkg/Universal/FvSimpleFileSystemDxe/FvSimpleFileSystemInternal.h
index 495ba97a59dae8466c2bb8f30f1ab1dd6eeb8cad..0dbd7b62cc9d434f7e48ad252d44ede002cdbb14 100644 (file)
--- a/MdeModulePkg/Universal/FvSimpleFileSystemDxe/FvSimpleFileSystemInternal.h
+++ b/MdeModulePkg/Universal/FvSimpleFileSystemDxe/FvSimpleFileSystemInternal.h
@@ -2,7 +2,7 @@
   The internal header file of FvSimpleFileSystem driver.\r
 \r
 Copyright (c) 2014, ARM Limited. All rights reserved.\r
   The internal header file of FvSimpleFileSystem driver.\r
 \r
 Copyright (c) 2014, ARM Limited. All rights reserved.\r

-Copyright (c) 2014, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2014 - 2018, Intel Corporation. All rights reserved.<BR>\r

 \r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 \r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r


@@ -58,7 +58,7 @@ struct _FV_FILESYSTEM_INSTANCE {
 };\r
 \r
 //\r
 };\r
 \r
 //\r

-// Struct representing a opening file. Each opening operation on file will \r
+// Struct representing a opening file. Each opening operation on file will\r

 // create such an instance except for the "root directory", which will only\r
 // be created once for each FV.\r
 //\r
 // create such an instance except for the "root directory", which will only\r
 // be created once for each FV.\r
 //\r

diff --git a/MdeModulePkg/Universal/HiiDatabaseDxe/ConfigKeywordHandler.c b/MdeModulePkg/Universal/HiiDatabaseDxe/ConfigKeywordHandler.c
index 5d5f17fb1779f09fb77a7771b47e2f53786180e5..2504597d7025f19ce1ba047b9c78b4e9120a995c 100644 (file)
--- a/MdeModulePkg/Universal/HiiDatabaseDxe/ConfigKeywordHandler.c
+++ b/MdeModulePkg/Universal/HiiDatabaseDxe/ConfigKeywordHandler.c
@@ -1,7 +1,7 @@
 /** @file\r
 Implementation of interfaces function for EFI_CONFIG_KEYWORD_HANDLER_PROTOCOL.\r
 \r
 /** @file\r
 Implementation of interfaces function for EFI_CONFIG_KEYWORD_HANDLER_PROTOCOL.\r
 \r

-Copyright (c) 2015 - 2017, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2015 - 2018, Intel Corporation. All rights reserved.<BR>\r

 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r


@@ -109,7 +109,7 @@ ExtractDevicePath (
   if (((Length + 1) / 2) < sizeof (EFI_DEVICE_PATH_PROTOCOL)) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
   if (((Length + 1) / 2) < sizeof (EFI_DEVICE_PATH_PROTOCOL)) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r

-  \r
+\r

   //\r
   // The data in <PathHdr> is encoded as hex UNICODE %02x bytes in the same order\r
   // as the device path resides in RAM memory.\r
   //\r
   // The data in <PathHdr> is encoded as hex UNICODE %02x bytes in the same order\r
   // as the device path resides in RAM memory.\r


@@ -119,7 +119,7 @@ ExtractDevicePath (
   if (DevicePathBuffer == NULL) {\r
     return EFI_OUT_OF_RESOURCES;\r
   }\r
   if (DevicePathBuffer == NULL) {\r
     return EFI_OUT_OF_RESOURCES;\r
   }\r

-  \r
+\r

   //\r
   // Convert DevicePath\r
   //\r
   //\r
   // Convert DevicePath\r
   //\r


@@ -133,7 +133,7 @@ ExtractDevicePath (
       DevicePathBuffer [Index/2] = (UINT8) ((DevicePathBuffer [Index/2] << 4) + DigitUint8);\r
     }\r
   }\r
       DevicePathBuffer [Index/2] = (UINT8) ((DevicePathBuffer [Index/2] << 4) + DigitUint8);\r
     }\r
   }\r

-  \r
+\r

   //\r
   // Validate DevicePath\r
   //\r
   //\r
   // Validate DevicePath\r
   //\r


@@ -209,7 +209,7 @@ ExtractNameSpace (
 \r
   TmpPtr = StrStr (String, L"&");\r
   if (TmpPtr != NULL) {\r
 \r
   TmpPtr = StrStr (String, L"&");\r
   if (TmpPtr != NULL) {\r

-    *TmpPtr = 0; \r
+    *TmpPtr = 0;\r

   }\r
   if (NextString != NULL) {\r
     *NextString = String + StrLen (String);\r
   }\r
   if (NextString != NULL) {\r
     *NextString = String + StrLen (String);\r


@@ -227,7 +227,7 @@ ExtractNameSpace (
   UnicodeStrToAsciiStrS (String, *NameSpace, NameSpaceSize);\r
 \r
   if (TmpPtr != NULL) {\r
   UnicodeStrToAsciiStrS (String, *NameSpace, NameSpaceSize);\r
 \r
   if (TmpPtr != NULL) {\r

-    *TmpPtr = L'&'; \r
+    *TmpPtr = L'&';\r

   }\r
 \r
   return EFI_SUCCESS;\r
   }\r
 \r
   return EFI_SUCCESS;\r


@@ -256,7 +256,7 @@ ExtractKeyword (
   EFI_STRING  TmpPtr;\r
 \r
   ASSERT ((Keyword != NULL) && (NextString != NULL));\r
   EFI_STRING  TmpPtr;\r
 \r
   ASSERT ((Keyword != NULL) && (NextString != NULL));\r

-  \r
+\r

   TmpPtr = NULL;\r
 \r
   //\r
   TmpPtr = NULL;\r
 \r
   //\r


@@ -280,10 +280,10 @@ ExtractKeyword (
   }\r
 \r
   String += StrLen (L"KEYWORD=");\r
   }\r
 \r
   String += StrLen (L"KEYWORD=");\r

-  \r
+\r

   TmpPtr = StrStr (String, L"&");\r
   if (TmpPtr != NULL) {\r
   TmpPtr = StrStr (String, L"&");\r
   if (TmpPtr != NULL) {\r

-    *TmpPtr = 0; \r
+    *TmpPtr = 0;\r

   }\r
   *NextString = String + StrLen (String);\r
 \r
   }\r
   *NextString = String + StrLen (String);\r
 \r


@@ -295,7 +295,7 @@ ExtractKeyword (
   if (TmpPtr != NULL) {\r
     *TmpPtr = L'&';\r
   }\r
   if (TmpPtr != NULL) {\r
     *TmpPtr = L'&';\r
   }\r

-  \r
+\r

   return EFI_SUCCESS;\r
 }\r
 \r
   return EFI_SUCCESS;\r
 }\r
 \r


@@ -335,10 +335,10 @@ ExtractValue (
   }\r
 \r
   String += StrLen (L"VALUE=");\r
   }\r
 \r
   String += StrLen (L"VALUE=");\r

-  \r
+\r

   TmpPtr = StrStr (String, L"&");\r
   if (TmpPtr != NULL) {\r
   TmpPtr = StrStr (String, L"&");\r
   if (TmpPtr != NULL) {\r

-    *TmpPtr = 0; \r
+    *TmpPtr = 0;\r

   }\r
   *NextString = String + StrLen (String);\r
 \r
   }\r
   *NextString = String + StrLen (String);\r
 \r


@@ -350,7 +350,7 @@ ExtractValue (
   if (TmpPtr != NULL) {\r
     *TmpPtr = L'&';\r
   }\r
   if (TmpPtr != NULL) {\r
     *TmpPtr = L'&';\r
   }\r

-  \r
+\r

   return EFI_SUCCESS;\r
 }\r
 \r
   return EFI_SUCCESS;\r
 }\r
 \r


@@ -376,7 +376,7 @@ ExtractFilter (
 {\r
   CHAR16      *PathPtr;\r
   CHAR16      *KeywordPtr;\r
 {\r
   CHAR16      *PathPtr;\r
   CHAR16      *KeywordPtr;\r

-  BOOLEAN     RetVal; \r
+  BOOLEAN     RetVal;\r

 \r
   ASSERT ((FilterFlags != NULL) && (NextString != NULL));\r
 \r
 \r
   ASSERT ((FilterFlags != NULL) && (NextString != NULL));\r
 \r


@@ -387,7 +387,7 @@ ExtractFilter (
     *NextString = NULL;\r
     return FALSE;\r
   }\r
     *NextString = NULL;\r
     return FALSE;\r
   }\r

-  \r
+\r

   *FilterFlags = 0;\r
   RetVal = TRUE;\r
 \r
   *FilterFlags = 0;\r
   RetVal = TRUE;\r
 \r


@@ -558,7 +558,7 @@ ValidateFilter (
 \r
   //\r
   // Get ReadOnly flag from Question.\r
 \r
   //\r
   // Get ReadOnly flag from Question.\r

-  // \r
+  //\r

   *ReadOnly = ExtractReadOnlyFromOpCode(OpCodeData);\r
 \r
   while (ExtractFilter (StringPtr, &FilterFlags, &NextFilter)) {\r
   *ReadOnly = ExtractReadOnlyFromOpCode(OpCodeData);\r
 \r
   while (ExtractFilter (StringPtr, &FilterFlags, &NextFilter)) {\r


@@ -653,7 +653,7 @@ ValidateFilter (
     //\r
     StringPtr = NextFilter;\r
   }\r
     //\r
     StringPtr = NextFilter;\r
   }\r

-  \r
+\r

 Done:\r
   //\r
   // The current filter which is processing.\r
 Done:\r
   //\r
   // The current filter which is processing.\r


@@ -702,14 +702,14 @@ GetRecordFromDevicePath (
 }\r
 \r
 /**\r
 }\r
 \r
 /**\r

-  Calculate the size of StringSrc and output it. Also copy string text from src \r
+  Calculate the size of StringSrc and output it. Also copy string text from src\r

   to dest.\r
 \r
   This is a internal function.\r
 \r
   @param  StringSrc              Points to current null-terminated string.\r
   @param  BufferSize             Length of the buffer.\r
   to dest.\r
 \r
   This is a internal function.\r
 \r
   @param  StringSrc              Points to current null-terminated string.\r
   @param  BufferSize             Length of the buffer.\r

-  @param  StringDest             Buffer to store the string text. \r
+  @param  StringDest             Buffer to store the string text.\r

 \r
   @retval EFI_SUCCESS            The string text was outputted successfully.\r
   @retval EFI_OUT_OF_RESOURCES   Out of resource.\r
 \r
   @retval EFI_SUCCESS            The string text was outputted successfully.\r
   @retval EFI_OUT_OF_RESOURCES   Out of resource.\r


@@ -738,7 +738,7 @@ GetUnicodeStringTextAndSize (
   if (*StringDest == NULL) {\r
     return EFI_OUT_OF_RESOURCES;\r
   }\r
   if (*StringDest == NULL) {\r
     return EFI_OUT_OF_RESOURCES;\r
   }\r

-  \r
+\r

   CopyMem (*StringDest, StringSrc, StringSize);\r
 \r
   *BufferSize = StringSize;\r
   CopyMem (*StringDest, StringSrc, StringSize);\r
 \r
   *BufferSize = StringSize;\r


@@ -1067,7 +1067,7 @@ GetNextStringId (
     case EFI_HII_SIBT_STRING_SCSU:\r
       Offset = sizeof (EFI_HII_STRING_BLOCK);\r
       StringTextPtr = BlockHdr + Offset;\r
     case EFI_HII_SIBT_STRING_SCSU:\r
       Offset = sizeof (EFI_HII_STRING_BLOCK);\r
       StringTextPtr = BlockHdr + Offset;\r

-      \r
+\r

       if (FindString) {\r
         StringSize = AsciiStrSize ((CHAR8 *) StringTextPtr);\r
         *KeywordValue = AllocatePool (StringSize * sizeof (CHAR16));\r
       if (FindString) {\r
         StringSize = AsciiStrSize ((CHAR8 *) StringTextPtr);\r
         *KeywordValue = AllocatePool (StringSize * sizeof (CHAR16));\r


@@ -1087,7 +1087,7 @@ GetNextStringId (
     case EFI_HII_SIBT_STRING_SCSU_FONT:\r
       Offset = sizeof (EFI_HII_SIBT_STRING_SCSU_FONT_BLOCK) - sizeof (UINT8);\r
       StringTextPtr = BlockHdr + Offset;\r
     case EFI_HII_SIBT_STRING_SCSU_FONT:\r
       Offset = sizeof (EFI_HII_SIBT_STRING_SCSU_FONT_BLOCK) - sizeof (UINT8);\r
       StringTextPtr = BlockHdr + Offset;\r

-      \r
+\r

       if (FindString) {\r
         StringSize = AsciiStrSize ((CHAR8 *) StringTextPtr);\r
         *KeywordValue = AllocatePool (StringSize * sizeof (CHAR16));\r
       if (FindString) {\r
         StringSize = AsciiStrSize ((CHAR8 *) StringTextPtr);\r
         *KeywordValue = AllocatePool (StringSize * sizeof (CHAR16));\r


@@ -1205,7 +1205,7 @@ GetNextStringId (
       BlockSize += Offset;\r
       CopyMem (&StringCount, BlockHdr + sizeof (EFI_HII_STRING_BLOCK), sizeof (UINT16));\r
       for (Index = 0; Index < StringCount; Index++) {\r
       BlockSize += Offset;\r
       CopyMem (&StringCount, BlockHdr + sizeof (EFI_HII_STRING_BLOCK), sizeof (UINT16));\r
       for (Index = 0; Index < StringCount; Index++) {\r

-        GetUnicodeStringTextAndSize (StringTextPtr, &StringSize, &String);        \r
+        GetUnicodeStringTextAndSize (StringTextPtr, &StringSize, &String);\r

 \r
         if (FindString) {\r
           *KeywordValue = String;\r
 \r
         if (FindString) {\r
           *KeywordValue = String;\r


@@ -1346,7 +1346,7 @@ GetStringIdFromRecord (
     StringPackage = CR (Link, HII_STRING_PACKAGE_INSTANCE, StringEntry, HII_STRING_PACKAGE_SIGNATURE);\r
 \r
     if (AsciiStrnCmp(Name, StringPackage->StringPkgHdr->Language, AsciiStrLen (Name)) == 0) {\r
     StringPackage = CR (Link, HII_STRING_PACKAGE_INSTANCE, StringEntry, HII_STRING_PACKAGE_SIGNATURE);\r
 \r
     if (AsciiStrnCmp(Name, StringPackage->StringPkgHdr->Language, AsciiStrLen (Name)) == 0) {\r

-      Status = GetStringIdFromString (StringPackage, KeywordValue, StringId); \r
+      Status = GetStringIdFromString (StringPackage, KeywordValue, StringId);\r

       if (EFI_ERROR (Status)) {\r
         return KEYWORD_HANDLER_KEYWORD_NOT_FOUND;\r
       } else {\r
       if (EFI_ERROR (Status)) {\r
         return KEYWORD_HANDLER_KEYWORD_NOT_FOUND;\r
       } else {\r


@@ -1430,10 +1430,10 @@ IsStorageOpCode (
   @retval  the opcode for the question.\r
 \r
 **/\r
   @retval  the opcode for the question.\r
 \r
 **/\r

-UINT8 * \r
+UINT8 *\r

 FindQuestionFromStringId (\r
   IN HII_IFR_PACKAGE_INSTANCE      *FormPackage,\r
 FindQuestionFromStringId (\r
   IN HII_IFR_PACKAGE_INSTANCE      *FormPackage,\r

-  IN EFI_STRING_ID                 KeywordStrId \r
+  IN EFI_STRING_ID                 KeywordStrId\r

   )\r
 {\r
   UINT8                        *OpCodeData;\r
   )\r
 {\r
   UINT8                        *OpCodeData;\r


@@ -1530,7 +1530,7 @@ FindStorageFromVarId (
   @retval  the width info for one question.\r
 \r
 **/\r
   @retval  the width info for one question.\r
 \r
 **/\r

-UINT16 \r
+UINT16\r

 GetWidth (\r
   IN UINT8        *OpCodeData\r
   )\r
 GetWidth (\r
   IN UINT8        *OpCodeData\r
   )\r


@@ -1548,16 +1548,16 @@ GetWidth (
     switch (((EFI_IFR_ONE_OF *) OpCodeData)->Flags & EFI_IFR_NUMERIC_SIZE) {\r
     case EFI_IFR_NUMERIC_SIZE_1:\r
       return (UINT16) sizeof (UINT8);\r
     switch (((EFI_IFR_ONE_OF *) OpCodeData)->Flags & EFI_IFR_NUMERIC_SIZE) {\r
     case EFI_IFR_NUMERIC_SIZE_1:\r
       return (UINT16) sizeof (UINT8);\r

-    \r
+\r

     case EFI_IFR_NUMERIC_SIZE_2:\r
       return  (UINT16) sizeof (UINT16);\r
     case EFI_IFR_NUMERIC_SIZE_2:\r
       return  (UINT16) sizeof (UINT16);\r

-    \r
+\r

     case EFI_IFR_NUMERIC_SIZE_4:\r
       return (UINT16) sizeof (UINT32);\r
     case EFI_IFR_NUMERIC_SIZE_4:\r
       return (UINT16) sizeof (UINT32);\r

-    \r
+\r

     case EFI_IFR_NUMERIC_SIZE_8:\r
       return (UINT16) sizeof (UINT64);\r
     case EFI_IFR_NUMERIC_SIZE_8:\r
       return (UINT16) sizeof (UINT64);\r

-    \r
+\r

     default:\r
       ASSERT (FALSE);\r
       return 0;\r
     default:\r
       ASSERT (FALSE);\r
       return 0;\r


@@ -1572,16 +1572,16 @@ GetWidth (
     switch (((EFI_IFR_ONE_OF_OPTION *) NextOpCodeData)->Type) {\r
     case EFI_IFR_TYPE_NUM_SIZE_8:\r
       return (UINT16) sizeof (UINT8) * ((EFI_IFR_ORDERED_LIST *) OpCodeData)->MaxContainers;\r
     switch (((EFI_IFR_ONE_OF_OPTION *) NextOpCodeData)->Type) {\r
     case EFI_IFR_TYPE_NUM_SIZE_8:\r
       return (UINT16) sizeof (UINT8) * ((EFI_IFR_ORDERED_LIST *) OpCodeData)->MaxContainers;\r

-    \r
+\r

     case EFI_IFR_TYPE_NUM_SIZE_16:\r
       return (UINT16) sizeof (UINT16) * ((EFI_IFR_ORDERED_LIST *) OpCodeData)->MaxContainers ;\r
     case EFI_IFR_TYPE_NUM_SIZE_16:\r
       return (UINT16) sizeof (UINT16) * ((EFI_IFR_ORDERED_LIST *) OpCodeData)->MaxContainers ;\r

-    \r
+\r

     case EFI_IFR_TYPE_NUM_SIZE_32:\r
       return (UINT16) sizeof (UINT32) * ((EFI_IFR_ORDERED_LIST *) OpCodeData)->MaxContainers;\r
     case EFI_IFR_TYPE_NUM_SIZE_32:\r
       return (UINT16) sizeof (UINT32) * ((EFI_IFR_ORDERED_LIST *) OpCodeData)->MaxContainers;\r

-    \r
+\r

     case EFI_IFR_TYPE_NUM_SIZE_64:\r
       return (UINT16) sizeof (UINT64) * ((EFI_IFR_ORDERED_LIST *) OpCodeData)->MaxContainers;\r
     case EFI_IFR_TYPE_NUM_SIZE_64:\r
       return (UINT16) sizeof (UINT64) * ((EFI_IFR_ORDERED_LIST *) OpCodeData)->MaxContainers;\r

-    \r
+\r

     default:\r
       ASSERT (FALSE);\r
       return 0;\r
     default:\r
       ASSERT (FALSE);\r
       return 0;\r


@@ -1589,7 +1589,7 @@ GetWidth (
 \r
   case EFI_IFR_CHECKBOX_OP:\r
     return (UINT16) sizeof (BOOLEAN);\r
 \r
   case EFI_IFR_CHECKBOX_OP:\r
     return (UINT16) sizeof (BOOLEAN);\r

-    \r
+\r

   case EFI_IFR_PASSWORD_OP:\r
     return (UINT16)((UINTN) ((EFI_IFR_PASSWORD *) OpCodeData)->MaxSize * sizeof (CHAR16));\r
 \r
   case EFI_IFR_PASSWORD_OP:\r
     return (UINT16)((UINTN) ((EFI_IFR_PASSWORD *) OpCodeData)->MaxSize * sizeof (CHAR16));\r
 \r


@@ -1648,12 +1648,12 @@ InternalLowerConfigString (
 \r
 /**\r
   Allocates and returns a Null-terminated Unicode <ConfigHdr> string.\r
 \r
 /**\r
   Allocates and returns a Null-terminated Unicode <ConfigHdr> string.\r

-  \r
+\r

   The format of a <ConfigHdr> is as follows:\r
 \r
     GUID=<HexCh>32&NAME=<Char>NameLength&PATH=<HexChar>DevicePathSize<Null>\r
 \r
   The format of a <ConfigHdr> is as follows:\r
 \r
     GUID=<HexCh>32&NAME=<Char>NameLength&PATH=<HexChar>DevicePathSize<Null>\r
 \r

-  @param[in]  OpCodeData    The opcode for the storage.                  \r
+  @param[in]  OpCodeData    The opcode for the storage.\r

   @param[in]  DriverHandle  The driver handle which supports a Device Path Protocol\r
                             that is the routing information PATH.  Each byte of\r
                             the Device Path associated with DriverHandle is converted\r
   @param[in]  DriverHandle  The driver handle which supports a Device Path Protocol\r
                             that is the routing information PATH.  Each byte of\r
                             the Device Path associated with DriverHandle is converted\r


@@ -1689,17 +1689,17 @@ ConstructConfigHdr (
     Guid      = (EFI_GUID *)(UINTN *)&((EFI_IFR_VARSTORE *) OpCodeData)->Guid;\r
     AsciiName = (CHAR8 *) ((EFI_IFR_VARSTORE *) OpCodeData)->Name;\r
     break;\r
     Guid      = (EFI_GUID *)(UINTN *)&((EFI_IFR_VARSTORE *) OpCodeData)->Guid;\r
     AsciiName = (CHAR8 *) ((EFI_IFR_VARSTORE *) OpCodeData)->Name;\r
     break;\r

-  \r
+\r

   case EFI_IFR_VARSTORE_NAME_VALUE_OP:\r
     Guid      = (EFI_GUID *)(UINTN *)&((EFI_IFR_VARSTORE_NAME_VALUE *) OpCodeData)->Guid;\r
     AsciiName = NULL;\r
     break;\r
   case EFI_IFR_VARSTORE_NAME_VALUE_OP:\r
     Guid      = (EFI_GUID *)(UINTN *)&((EFI_IFR_VARSTORE_NAME_VALUE *) OpCodeData)->Guid;\r
     AsciiName = NULL;\r
     break;\r

-  \r
+\r

   case EFI_IFR_VARSTORE_EFI_OP:\r
     Guid      = (EFI_GUID *)(UINTN *)&((EFI_IFR_VARSTORE_EFI *) OpCodeData)->Guid;\r
     AsciiName = (CHAR8 *) ((EFI_IFR_VARSTORE_EFI *) OpCodeData)->Name;\r
     break;\r
   case EFI_IFR_VARSTORE_EFI_OP:\r
     Guid      = (EFI_GUID *)(UINTN *)&((EFI_IFR_VARSTORE_EFI *) OpCodeData)->Guid;\r
     AsciiName = (CHAR8 *) ((EFI_IFR_VARSTORE_EFI *) OpCodeData)->Name;\r
     break;\r

-  \r
+\r

   default:\r
     ASSERT (FALSE);\r
     Guid      = NULL;\r
   default:\r
     ASSERT (FALSE);\r
     Guid      = NULL;\r


@@ -1717,7 +1717,7 @@ ConstructConfigHdr (
   }\r
 \r
   //\r
   }\r
 \r
   //\r

-  // Compute the length of Name in Unicode characters.  \r
+  // Compute the length of Name in Unicode characters.\r

   // If Name is NULL, then the length is 0.\r
   //\r
   NameLength = 0;\r
   // If Name is NULL, then the length is 0.\r
   //\r
   NameLength = 0;\r


@@ -1773,7 +1773,7 @@ ConstructConfigHdr (
       String += StrnLenS (String, MaxLen - ((UINTN)String - (UINTN)ReturnString) / sizeof (CHAR16));\r
     }\r
   }\r
       String += StrnLenS (String, MaxLen - ((UINTN)String - (UINTN)ReturnString) / sizeof (CHAR16));\r
     }\r
   }\r

-  \r
+\r

   //\r
   // Append L"&NAME="\r
   //\r
   //\r
   // Append L"&NAME="\r
   //\r


@@ -1841,12 +1841,12 @@ EFI_STRING
 ConstructRequestElement (\r
   IN CHAR16      *Name,\r
   IN UINT16      Offset,\r
 ConstructRequestElement (\r
   IN CHAR16      *Name,\r
   IN UINT16      Offset,\r

-  IN UINT16      Width  \r
+  IN UINT16      Width\r

   )\r
 {\r
   CHAR16    *StringPtr;\r
   UINTN     Length;\r
   )\r
 {\r
   CHAR16    *StringPtr;\r
   UINTN     Length;\r

-  \r
+\r

   if (Name != NULL) {\r
     //\r
     // Add <BlockName> length for each Name\r
   if (Name != NULL) {\r
     //\r
     // Add <BlockName> length for each Name\r


@@ -1886,10 +1886,10 @@ ConstructRequestElement (
     // Append OFFSET=XXXX&WIDTH=YYYY\0\r
     //\r
     UnicodeSPrint (\r
     // Append OFFSET=XXXX&WIDTH=YYYY\0\r
     //\r
     UnicodeSPrint (\r

-      StringPtr, \r
-      (7 + 4 + 7 + 4 + 1) * sizeof (CHAR16), \r
-      L"OFFSET=%04X&WIDTH=%04X", \r
-      Offset, \r
+      StringPtr,\r
+      (7 + 4 + 7 + 4 + 1) * sizeof (CHAR16),\r
+      L"OFFSET=%04X&WIDTH=%04X",\r
+      Offset,\r

       Width\r
     );\r
   }\r
       Width\r
     );\r
   }\r


@@ -1922,7 +1922,7 @@ GetNameFromId (
 \r
   Name = NULL;\r
   BestLanguage = NULL;\r
 \r
   Name = NULL;\r
   BestLanguage = NULL;\r

-  PlatformLanguage = NULL; \r
+  PlatformLanguage = NULL;\r

   SupportedLanguages = NULL;\r
 \r
   GetEfiGlobalVariable2 (L"PlatformLang", (VOID**)&PlatformLanguage, NULL);\r
   SupportedLanguages = NULL;\r
 \r
   GetEfiGlobalVariable2 (L"PlatformLang", (VOID**)&PlatformLanguage, NULL);\r


@@ -1932,10 +1932,10 @@ GetNameFromId (
   // Get the best matching language from SupportedLanguages\r
   //\r
   BestLanguage = GetBestLanguage (\r
   // Get the best matching language from SupportedLanguages\r
   //\r
   BestLanguage = GetBestLanguage (\r

-                   SupportedLanguages, \r
+                   SupportedLanguages,\r

                    FALSE,                                             // RFC 4646 mode\r
                    PlatformLanguage != NULL ? PlatformLanguage : "",  // Highest priority\r
                    FALSE,                                             // RFC 4646 mode\r
                    PlatformLanguage != NULL ? PlatformLanguage : "",  // Highest priority\r

-                   SupportedLanguages,                                // Lowest priority \r
+                   SupportedLanguages,                                // Lowest priority\r

                    NULL\r
                    );\r
   if (BestLanguage == NULL) {\r
                    NULL\r
                    );\r
   if (BestLanguage == NULL) {\r


@@ -2013,7 +2013,7 @@ ExtractConfigRequest (
   IN  EFI_STRING_ID         KeywordStrId,\r
   OUT UINT8                 **OpCodeData,\r
   OUT EFI_STRING            *ConfigRequest\r
   IN  EFI_STRING_ID         KeywordStrId,\r
   OUT UINT8                 **OpCodeData,\r
   OUT EFI_STRING            *ConfigRequest\r

-  ) \r
+  )\r

 {\r
   LIST_ENTRY                          *Link;\r
   HII_DATABASE_PACKAGE_LIST_INSTANCE  *PackageListNode;\r
 {\r
   LIST_ENTRY                          *Link;\r
   HII_DATABASE_PACKAGE_LIST_INSTANCE  *PackageListNode;\r


@@ -2053,7 +2053,7 @@ ExtractConfigRequest (
       //\r
       ASSERT (Header->VarStoreId != 0);\r
       DEBUG ((EFI_D_INFO, "Varstore Id: 0x%x\n", Header->VarStoreId));\r
       //\r
       ASSERT (Header->VarStoreId != 0);\r
       DEBUG ((EFI_D_INFO, "Varstore Id: 0x%x\n", Header->VarStoreId));\r

-      \r
+\r

       Storage = FindStorageFromVarId (FormPackage, Header->VarStoreId);\r
       ASSERT (Storage != NULL);\r
 \r
       Storage = FindStorageFromVarId (FormPackage, Header->VarStoreId);\r
       ASSERT (Storage != NULL);\r
 \r


@@ -2116,7 +2116,7 @@ ExtractConfigResp (
   IN  EFI_STRING            ValueElement,\r
   OUT UINT8                 **OpCodeData,\r
   OUT EFI_STRING            *ConfigResp\r
   IN  EFI_STRING            ValueElement,\r
   OUT UINT8                 **OpCodeData,\r
   OUT EFI_STRING            *ConfigResp\r

-  ) \r
+  )\r

 {\r
   LIST_ENTRY                          *Link;\r
   HII_DATABASE_PACKAGE_LIST_INSTANCE  *PackageListNode;\r
 {\r
   LIST_ENTRY                          *Link;\r
   HII_DATABASE_PACKAGE_LIST_INSTANCE  *PackageListNode;\r


@@ -2156,7 +2156,7 @@ ExtractConfigResp (
       //\r
       ASSERT (Header->VarStoreId != 0);\r
       DEBUG ((EFI_D_INFO, "Varstore Id: 0x%x\n", Header->VarStoreId));\r
       //\r
       ASSERT (Header->VarStoreId != 0);\r
       DEBUG ((EFI_D_INFO, "Varstore Id: 0x%x\n", Header->VarStoreId));\r

-      \r
+\r

       Storage = FindStorageFromVarId (FormPackage, Header->VarStoreId);\r
       ASSERT (Storage != NULL);\r
 \r
       Storage = FindStorageFromVarId (FormPackage, Header->VarStoreId);\r
       ASSERT (Storage != NULL);\r
 \r


@@ -2341,7 +2341,7 @@ GetStringIdFromDatabase (
       *ProgressErr = GetStringIdFromRecord (Record, NameSpace, KeywordData, KeywordStringId);\r
       if (*ProgressErr == KEYWORD_HANDLER_NO_ERROR) {\r
         *DataBaseRecord = Record;\r
       *ProgressErr = GetStringIdFromRecord (Record, NameSpace, KeywordData, KeywordStringId);\r
       if (*ProgressErr == KEYWORD_HANDLER_NO_ERROR) {\r
         *DataBaseRecord = Record;\r

-        \r
+\r

         if ((DevicePathPkg = Record->PackageList->DevicePathPkg) != NULL) {\r
           DestDevicePath = (EFI_DEVICE_PATH_PROTOCOL *) (DevicePathPkg + sizeof (EFI_HII_PACKAGE_HEADER));\r
           DevicePathSize = GetDevicePathSize ((EFI_DEVICE_PATH_PROTOCOL *) DestDevicePath);\r
         if ((DevicePathPkg = Record->PackageList->DevicePathPkg) != NULL) {\r
           DestDevicePath = (EFI_DEVICE_PATH_PROTOCOL *) (DevicePathPkg + sizeof (EFI_HII_PACKAGE_HEADER));\r
           DevicePathSize = GetDevicePathSize ((EFI_DEVICE_PATH_PROTOCOL *) DestDevicePath);\r


@@ -2361,7 +2361,7 @@ GetStringIdFromDatabase (
         return EFI_OUT_OF_RESOURCES;\r
       } else if (*ProgressErr == KEYWORD_HANDLER_KEYWORD_NOT_FOUND) {\r
         FindNameSpace = TRUE;\r
         return EFI_OUT_OF_RESOURCES;\r
       } else if (*ProgressErr == KEYWORD_HANDLER_KEYWORD_NOT_FOUND) {\r
         FindNameSpace = TRUE;\r

-      }  \r
+      }\r

     }\r
 \r
     //\r
     }\r
 \r
     //\r


@@ -2394,7 +2394,7 @@ GetStringIdFromDatabase (
 **/\r
 EFI_STATUS\r
 GenerateKeywordResp (\r
 **/\r
 EFI_STATUS\r
 GenerateKeywordResp (\r

-  IN  CHAR8                          *NameSpace, \r
+  IN  CHAR8                          *NameSpace,\r

   IN  EFI_DEVICE_PATH_PROTOCOL       *DevicePath,\r
   IN  EFI_STRING                     KeywordData,\r
   IN  EFI_STRING                     ValueStr,\r
   IN  EFI_DEVICE_PATH_PROTOCOL       *DevicePath,\r
   IN  EFI_STRING                     KeywordData,\r
   IN  EFI_STRING                     ValueStr,\r


@@ -2510,7 +2510,7 @@ GenerateKeywordResp (
   if (PathHdr != NULL) {\r
     FreePool (PathHdr);\r
   }\r
   if (PathHdr != NULL) {\r
     FreePool (PathHdr);\r
   }\r

-  \r
+\r

   return EFI_SUCCESS;\r
 }\r
 \r
   return EFI_SUCCESS;\r
 }\r
 \r


@@ -2562,9 +2562,9 @@ MergeToMultiKeywordResp (
 }\r
 \r
 /**\r
 }\r
 \r
 /**\r

-  Enumerate all keyword in the system. \r
-  \r
-  If error occur when parse one keyword, just skip it and parse the next one. \r
+  Enumerate all keyword in the system.\r
+\r
+  If error occur when parse one keyword, just skip it and parse the next one.\r

 \r
   This is a internal function.\r
 \r
 \r
   This is a internal function.\r
 \r


@@ -2649,7 +2649,7 @@ EnumerateAllKeywords (
         // Any valid string start from 2. so here initial it to 1.\r
         //\r
         NextStringId = 1;\r
         // Any valid string start from 2. so here initial it to 1.\r
         //\r
         NextStringId = 1;\r

-        \r
+\r

         //\r
         // Enumerate all valid stringid in the package.\r
         //\r
         //\r
         // Enumerate all valid stringid in the package.\r
         //\r


@@ -2664,7 +2664,7 @@ EnumerateAllKeywords (
             //\r
             goto Error;\r
           }\r
             //\r
             goto Error;\r
           }\r

-          \r
+\r

           //\r
           // 3.4 Extract Value for the input keyword.\r
           //\r
           //\r
           // 3.4 Extract Value for the input keyword.\r
           //\r


@@ -2698,7 +2698,7 @@ EnumerateAllKeywords (
             //\r
             goto Done;\r
           }\r
             //\r
             goto Done;\r
           }\r

-          \r
+\r

           //\r
           // 6. Merge to the MultiKeywordResp string.\r
           //\r
           //\r
           // 6. Merge to the MultiKeywordResp string.\r
           //\r


@@ -2721,7 +2721,7 @@ Error:
           if (KeywordResp != NULL) {\r
             FreePool (KeywordResp);\r
             KeywordResp = NULL;\r
           if (KeywordResp != NULL) {\r
             FreePool (KeywordResp);\r
             KeywordResp = NULL;\r

-          } \r
+          }\r

         }\r
 \r
         if (LocalNameSpace != NULL) {\r
         }\r
 \r
         if (LocalNameSpace != NULL) {\r


@@ -2729,7 +2729,7 @@ Error:
           LocalNameSpace = NULL;\r
         }\r
       }\r
           LocalNameSpace = NULL;\r
         }\r
       }\r

-    } \r
+    }\r

   }\r
 \r
   //\r
   }\r
 \r
   //\r


@@ -2746,7 +2746,7 @@ Error:
     Status = EFI_SUCCESS;\r
   }\r
   *MultiResp = MultiKeywordResp;\r
     Status = EFI_SUCCESS;\r
   }\r
   *MultiResp = MultiKeywordResp;\r

-  \r
+\r

 Done:\r
   if (LocalNameSpace != NULL) {\r
     FreePool (LocalNameSpace);\r
 Done:\r
   if (LocalNameSpace != NULL) {\r
     FreePool (LocalNameSpace);\r


@@ -2766,18 +2766,18 @@ Done:
   This function accepts a <MultiKeywordResp> formatted string, finds the associated\r
   keyword owners, creates a <MultiConfigResp> string from it and forwards it to the\r
   EFI_HII_ROUTING_PROTOCOL.RouteConfig function.\r
   This function accepts a <MultiKeywordResp> formatted string, finds the associated\r
   keyword owners, creates a <MultiConfigResp> string from it and forwards it to the\r
   EFI_HII_ROUTING_PROTOCOL.RouteConfig function.\r

-  \r
-  If there is an issue in resolving the contents of the KeywordString, then the \r
-  function returns an error and also sets the Progress and ProgressErr with the \r
+\r
+  If there is an issue in resolving the contents of the KeywordString, then the\r
+  function returns an error and also sets the Progress and ProgressErr with the\r

   appropriate information about where the issue occurred and additional data about\r
   appropriate information about where the issue occurred and additional data about\r

-  the nature of the issue. \r
-  \r
+  the nature of the issue.\r
+\r

   In the case when KeywordString containing multiple keywords, when an EFI_NOT_FOUND\r
   error is generated during processing the second or later keyword element, the system\r
   In the case when KeywordString containing multiple keywords, when an EFI_NOT_FOUND\r
   error is generated during processing the second or later keyword element, the system\r

-  storage associated with earlier keywords is not modified. All elements of the \r
+  storage associated with earlier keywords is not modified. All elements of the\r

   KeywordString must successfully pass all tests for format and access prior to making\r
   any modifications to storage.\r
   KeywordString must successfully pass all tests for format and access prior to making\r
   any modifications to storage.\r

-  \r
+\r

   In the case when EFI_DEVICE_ERROR is returned from the processing of a KeywordString\r
   containing multiple keywords, the state of storage associated with earlier keywords\r
   is undefined.\r
   In the case when EFI_DEVICE_ERROR is returned from the processing of a KeywordString\r
   containing multiple keywords, the state of storage associated with earlier keywords\r
   is undefined.\r


@@ -2785,18 +2785,18 @@ Done:
 \r
   @param This             Pointer to the EFI_KEYWORD_HANDLER _PROTOCOL instance.\r
 \r
 \r
   @param This             Pointer to the EFI_KEYWORD_HANDLER _PROTOCOL instance.\r
 \r

-  @param KeywordString    A null-terminated string in <MultiKeywordResp> format. \r
+  @param KeywordString    A null-terminated string in <MultiKeywordResp> format.\r

 \r
 \r

-  @param Progress         On return, points to a character in the KeywordString. \r
-                          Points to the string's NULL terminator if the request \r
-                          was successful. Points to the most recent '&' before \r
+  @param Progress         On return, points to a character in the KeywordString.\r
+                          Points to the string's NULL terminator if the request\r
+                          was successful. Points to the most recent '&' before\r

                           the first failing name / value pair (or the beginning\r
                           of the string if the failure is in the first name / value\r
                           pair) if the request was not successful.\r
 \r
   @param ProgressErr      If during the processing of the KeywordString there was\r
                           the first failing name / value pair (or the beginning\r
                           of the string if the failure is in the first name / value\r
                           pair) if the request was not successful.\r
 \r
   @param ProgressErr      If during the processing of the KeywordString there was\r

-                          a failure, this parameter gives additional information \r
-                          about the possible source of the problem. The various \r
+                          a failure, this parameter gives additional information\r
+                          about the possible source of the problem. The various\r

                           errors are defined in "Related Definitions" below.\r
 \r
 \r
                           errors are defined in "Related Definitions" below.\r
 \r
 \r


@@ -2804,16 +2804,16 @@ Done:
 \r
   @retval EFI_INVALID_PARAMETER   One or more of the following are TRUE:\r
                                   1. KeywordString is NULL.\r
 \r
   @retval EFI_INVALID_PARAMETER   One or more of the following are TRUE:\r
                                   1. KeywordString is NULL.\r

-                                  2. Parsing of the KeywordString resulted in an \r
+                                  2. Parsing of the KeywordString resulted in an\r

                                      error. See Progress and ProgressErr for more data.\r
 \r
                                      error. See Progress and ProgressErr for more data.\r
 \r

-  @retval EFI_NOT_FOUND           An element of the KeywordString was not found. \r
+  @retval EFI_NOT_FOUND           An element of the KeywordString was not found.\r

                                   See ProgressErr for more data.\r
 \r
                                   See ProgressErr for more data.\r
 \r

-  @retval EFI_OUT_OF_RESOURCES    Required system resources could not be allocated.  \r
+  @retval EFI_OUT_OF_RESOURCES    Required system resources could not be allocated.\r

                                   See ProgressErr for more data.\r
                                   See ProgressErr for more data.\r

-                                  \r
-  @retval EFI_ACCESS_DENIED       The action violated system policy. See ProgressErr \r
+\r
+  @retval EFI_ACCESS_DENIED       The action violated system policy. See ProgressErr\r

                                   for more data.\r
 \r
   @retval EFI_DEVICE_ERROR        An unexpected system error occurred. See ProgressErr\r
                                   for more data.\r
 \r
   @retval EFI_DEVICE_ERROR        An unexpected system error occurred. See ProgressErr\r


@@ -2821,7 +2821,7 @@ Done:
 \r
 **/\r
 EFI_STATUS\r
 \r
 **/\r
 EFI_STATUS\r

-EFIAPI \r
+EFIAPI\r

 EfiConfigKeywordHandlerSetData (\r
   IN EFI_CONFIG_KEYWORD_HANDLER_PROTOCOL *This,\r
   IN CONST EFI_STRING                    KeywordString,\r
 EfiConfigKeywordHandlerSetData (\r
   IN EFI_CONFIG_KEYWORD_HANDLER_PROTOCOL *This,\r
   IN CONST EFI_STRING                    KeywordString,\r


@@ -2974,7 +2974,7 @@ EfiConfigKeywordHandlerSetData (
       Status = EFI_ACCESS_DENIED;\r
       goto Done;\r
     }\r
       Status = EFI_ACCESS_DENIED;\r
       goto Done;\r
     }\r

-    \r
+\r

     //\r
     // 9. Merge to the MultiKeywordResp string.\r
     //\r
     //\r
     // 9. Merge to the MultiKeywordResp string.\r
     //\r


@@ -2991,7 +2991,7 @@ EfiConfigKeywordHandlerSetData (
     FreePool (KeywordData);\r
     FreePool (ValueElement);\r
     NameSpace = NULL;\r
     FreePool (KeywordData);\r
     FreePool (ValueElement);\r
     NameSpace = NULL;\r

-    DevicePath = NULL; \r
+    DevicePath = NULL;\r

     KeywordData = NULL;\r
     ValueElement = NULL;\r
     if (ConfigResp != NULL) {\r
     KeywordData = NULL;\r
     ValueElement = NULL;\r
     if (ConfigResp != NULL) {\r


@@ -3013,7 +3013,7 @@ EfiConfigKeywordHandlerSetData (
     Status = EFI_DEVICE_ERROR;\r
     goto Done;\r
   }\r
     Status = EFI_DEVICE_ERROR;\r
     goto Done;\r
   }\r

-  \r
+\r

   *ProgressErr = KEYWORD_HANDLER_NO_ERROR;\r
 \r
 Done:\r
   *ProgressErr = KEYWORD_HANDLER_NO_ERROR;\r
 \r
 Done:\r


@@ -3049,56 +3049,56 @@ Done:
 \r
 /**\r
 \r
 \r
 /**\r
 \r

-  This function accepts a <MultiKeywordRequest> formatted string, finds the underlying \r
+  This function accepts a <MultiKeywordRequest> formatted string, finds the underlying\r

   keyword owners, creates a <MultiConfigRequest> string from it and forwards it to the\r
   EFI_HII_ROUTING_PROTOCOL.ExtractConfig function.\r
   keyword owners, creates a <MultiConfigRequest> string from it and forwards it to the\r
   EFI_HII_ROUTING_PROTOCOL.ExtractConfig function.\r

-  \r
+\r

   If there is an issue in resolving the contents of the KeywordString, then the function\r
   returns an EFI_INVALID_PARAMETER and also set the Progress and ProgressErr with the\r
   appropriate information about where the issue occurred and additional data about the\r
   nature of the issue.\r
   If there is an issue in resolving the contents of the KeywordString, then the function\r
   returns an EFI_INVALID_PARAMETER and also set the Progress and ProgressErr with the\r
   appropriate information about where the issue occurred and additional data about the\r
   nature of the issue.\r

-  \r
+\r

   In the case when KeywordString is NULL, or contains multiple keywords, or when\r
   EFI_NOT_FOUND is generated while processing the keyword elements, the Results string\r
   In the case when KeywordString is NULL, or contains multiple keywords, or when\r
   EFI_NOT_FOUND is generated while processing the keyword elements, the Results string\r

-  contains values returned for all keywords processed prior to the keyword generating the \r
+  contains values returned for all keywords processed prior to the keyword generating the\r

   error but no values for the keyword with error or any following keywords.\r
 \r
   error but no values for the keyword with error or any following keywords.\r
 \r

-  \r
+\r

   @param This           Pointer to the EFI_KEYWORD_HANDLER _PROTOCOL instance.\r
   @param This           Pointer to the EFI_KEYWORD_HANDLER _PROTOCOL instance.\r

-  \r
+\r

   @param NameSpaceId    A null-terminated string containing the platform configuration\r
                         language to search through in the system. If a NULL is passed\r
                         in, then it is assumed that any platform configuration language\r
                         with the prefix of "x-UEFI-" are searched.\r
   @param NameSpaceId    A null-terminated string containing the platform configuration\r
                         language to search through in the system. If a NULL is passed\r
                         in, then it is assumed that any platform configuration language\r
                         with the prefix of "x-UEFI-" are searched.\r

-                        \r
+\r

   @param KeywordString  A null-terminated string in <MultiKeywordRequest> format. If a\r
   @param KeywordString  A null-terminated string in <MultiKeywordRequest> format. If a\r

-                        NULL is passed in the KeywordString field, all of the known \r
-                        keywords in the system for the NameSpaceId specified are \r
+                        NULL is passed in the KeywordString field, all of the known\r
+                        keywords in the system for the NameSpaceId specified are\r

                         returned in the Results field.\r
                         returned in the Results field.\r

-  \r
+\r

   @param Progress       On return, points to a character in the KeywordString. Points\r
   @param Progress       On return, points to a character in the KeywordString. Points\r

-                        to the string's NULL terminator if the request was successful. \r
+                        to the string's NULL terminator if the request was successful.\r

                         Points to the most recent '&' before the first failing name / value\r
                         pair (or the beginning of the string if the failure is in the first\r
                         name / value pair) if the request was not successful.\r
                         Points to the most recent '&' before the first failing name / value\r
                         pair (or the beginning of the string if the failure is in the first\r
                         name / value pair) if the request was not successful.\r

-                        \r
+\r

   @param ProgressErr    If during the processing of the KeywordString there was a\r
   @param ProgressErr    If during the processing of the KeywordString there was a\r

-                        failure, this parameter gives additional information about the \r
+                        failure, this parameter gives additional information about the\r

                         possible source of the problem. See the definitions in SetData()\r
                         for valid value definitions.\r
                         possible source of the problem. See the definitions in SetData()\r
                         for valid value definitions.\r

-  \r
+\r

   @param Results        A null-terminated string in <MultiKeywordResp> format is returned\r
   @param Results        A null-terminated string in <MultiKeywordResp> format is returned\r

-                        which has all the values filled in for the keywords in the \r
+                        which has all the values filled in for the keywords in the\r

                         KeywordString. This is a callee-allocated field, and must be freed\r
                         KeywordString. This is a callee-allocated field, and must be freed\r

-                        by the caller after being used. \r
+                        by the caller after being used.\r

 \r
   @retval EFI_SUCCESS             The specified action was completed successfully.\r
 \r
   @retval EFI_SUCCESS             The specified action was completed successfully.\r

-  \r
+\r

   @retval EFI_INVALID_PARAMETER   One or more of the following are TRUE:\r
                                   1.Progress, ProgressErr, or Results is NULL.\r
                                   2.Parsing of the KeywordString resulted in an error. See\r
                                     Progress and ProgressErr for more data.\r
   @retval EFI_INVALID_PARAMETER   One or more of the following are TRUE:\r
                                   1.Progress, ProgressErr, or Results is NULL.\r
                                   2.Parsing of the KeywordString resulted in an error. See\r
                                     Progress and ProgressErr for more data.\r

-  \r
+\r

 \r
   @retval EFI_NOT_FOUND           An element of the KeywordString was not found. See\r
                                   ProgressErr for more data.\r
 \r
   @retval EFI_NOT_FOUND           An element of the KeywordString was not found. See\r
                                   ProgressErr for more data.\r


@@ -3108,7 +3108,7 @@ Done:
 \r
   @retval EFI_OUT_OF_RESOURCES    Required system resources could not be allocated.  See\r
                                   ProgressErr for more data.\r
 \r
   @retval EFI_OUT_OF_RESOURCES    Required system resources could not be allocated.  See\r
                                   ProgressErr for more data.\r

-                                  \r
+\r

   @retval EFI_ACCESS_DENIED       The action violated system policy.  See ProgressErr for\r
                                   more data.\r
 \r
   @retval EFI_ACCESS_DENIED       The action violated system policy.  See ProgressErr for\r
                                   more data.\r
 \r


@@ -3117,12 +3117,12 @@ Done:
 \r
 **/\r
 EFI_STATUS\r
 \r
 **/\r
 EFI_STATUS\r

-EFIAPI \r
+EFIAPI\r

 EfiConfigKeywordHandlerGetData (\r
   IN EFI_CONFIG_KEYWORD_HANDLER_PROTOCOL  *This,\r
   IN CONST EFI_STRING                     NameSpaceId, OPTIONAL\r
   IN CONST EFI_STRING                     KeywordString, OPTIONAL\r
 EfiConfigKeywordHandlerGetData (\r
   IN EFI_CONFIG_KEYWORD_HANDLER_PROTOCOL  *This,\r
   IN CONST EFI_STRING                     NameSpaceId, OPTIONAL\r
   IN CONST EFI_STRING                     KeywordString, OPTIONAL\r

-  OUT EFI_STRING                          *Progress, \r
+  OUT EFI_STRING                          *Progress,\r

   OUT UINT32                              *ProgressErr,\r
   OUT EFI_STRING                          *Results\r
   )\r
   OUT UINT32                              *ProgressErr,\r
   OUT EFI_STRING                          *Results\r
   )\r


@@ -3132,7 +3132,7 @@ EfiConfigKeywordHandlerGetData (
   EFI_DEVICE_PATH_PROTOCOL            *DevicePath;\r
   HII_DATABASE_RECORD                 *DataBaseRecord;\r
   CHAR16                              *StringPtr;\r
   EFI_DEVICE_PATH_PROTOCOL            *DevicePath;\r
   HII_DATABASE_RECORD                 *DataBaseRecord;\r
   CHAR16                              *StringPtr;\r

-  CHAR16                              *NextStringPtr;  \r
+  CHAR16                              *NextStringPtr;\r

   CHAR16                              *KeywordData;\r
   EFI_STRING_ID                       KeywordStringId;\r
   UINT8                               *OpCode;\r
   CHAR16                              *KeywordData;\r
   EFI_STRING_ID                       KeywordStringId;\r
   UINT8                               *OpCode;\r


@@ -3188,7 +3188,7 @@ EfiConfigKeywordHandlerGetData (
       return EFI_INVALID_PARAMETER;\r
     }\r
   }\r
       return EFI_INVALID_PARAMETER;\r
     }\r
   }\r

-  \r
+\r

   if (KeywordString != NULL) {\r
     //\r
     // Use temp string to avoid changing input string buffer.\r
   if (KeywordString != NULL) {\r
     //\r
     // Use temp string to avoid changing input string buffer.\r


@@ -3208,7 +3208,7 @@ EfiConfigKeywordHandlerGetData (
       }\r
       StringPtr = NextStringPtr;\r
 \r
       }\r
       StringPtr = NextStringPtr;\r
 \r

-     \r
+\r

       //\r
       // 3. Process Keyword section from the input keywordRequest string.\r
       //\r
       //\r
       // 3. Process Keyword section from the input keywordRequest string.\r
       //\r


@@ -3240,7 +3240,7 @@ EfiConfigKeywordHandlerGetData (
       if (EFI_ERROR (Status)) {\r
         goto Done;\r
       }\r
       if (EFI_ERROR (Status)) {\r
         goto Done;\r
       }\r

-      \r
+\r

       //\r
       // 3.4 Extract Value for the input keyword.\r
       //\r
       //\r
       // 3.4 Extract Value for the input keyword.\r
       //\r


@@ -3293,7 +3293,7 @@ EfiConfigKeywordHandlerGetData (
       FreePool (KeywordData);\r
       FreePool (ValueElement);\r
       FreePool (ConfigRequest);\r
       FreePool (KeywordData);\r
       FreePool (ValueElement);\r
       FreePool (ConfigRequest);\r

-      DevicePath = NULL; \r
+      DevicePath = NULL;\r

       KeywordData = NULL;\r
       ValueElement = NULL;\r
       ConfigRequest = NULL;\r
       KeywordData = NULL;\r
       ValueElement = NULL;\r
       ConfigRequest = NULL;\r

diff --git a/MdeModulePkg/Universal/HiiDatabaseDxe/ConfigRouting.c b/MdeModulePkg/Universal/HiiDatabaseDxe/ConfigRouting.c
index 646864f4dfc1bc7a88019562408d011f5f9e2893..c778cd92f89b6da47597ec4de15b9b6ccb3c5289 100644 (file)
--- a/MdeModulePkg/Universal/HiiDatabaseDxe/ConfigRouting.c
+++ b/MdeModulePkg/Universal/HiiDatabaseDxe/ConfigRouting.c
@@ -1,7 +1,7 @@
 /** @file\r
 Implementation of interfaces function for EFI_HII_CONFIG_ROUTING_PROTOCOL.\r
 \r
 /** @file\r
 Implementation of interfaces function for EFI_HII_CONFIG_ROUTING_PROTOCOL.\r
 \r

-Copyright (c) 2007 - 2017, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2007 - 2018, Intel Corporation. All rights reserved.<BR>\r

 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r


@@ -44,7 +44,7 @@ CalculateConfigStringLen (
   //\r
   // The beginning of next <ConfigRequest>/<ConfigResp> should be "&GUID=".\r
   // Will meet '\0' if there is only one <ConfigRequest>/<ConfigResp>.\r
   //\r
   // The beginning of next <ConfigRequest>/<ConfigResp> should be "&GUID=".\r
   // Will meet '\0' if there is only one <ConfigRequest>/<ConfigResp>.\r

-  // \r
+  //\r

   TmpPtr = StrStr (String, L"&GUID=");\r
   if (TmpPtr == NULL) {\r
     return StrLen (String);\r
   TmpPtr = StrStr (String, L"&GUID=");\r
   if (TmpPtr == NULL) {\r
     return StrLen (String);\r


@@ -117,7 +117,7 @@ GetDevicePath (
   if (((Length + 1) / 2) < sizeof (EFI_DEVICE_PATH_PROTOCOL)) {\r
     return EFI_NOT_FOUND;\r
   }\r
   if (((Length + 1) / 2) < sizeof (EFI_DEVICE_PATH_PROTOCOL)) {\r
     return EFI_NOT_FOUND;\r
   }\r

-  \r
+\r

   //\r
   // The data in <PathHdr> is encoded as hex UNICODE %02x bytes in the same order\r
   // as the device path resides in RAM memory.\r
   //\r
   // The data in <PathHdr> is encoded as hex UNICODE %02x bytes in the same order\r
   // as the device path resides in RAM memory.\r


@@ -127,7 +127,7 @@ GetDevicePath (
   if (DevicePathBuffer == NULL) {\r
     return EFI_OUT_OF_RESOURCES;\r
   }\r
   if (DevicePathBuffer == NULL) {\r
     return EFI_OUT_OF_RESOURCES;\r
   }\r

-  \r
+\r

   //\r
   // Convert DevicePath\r
   //\r
   //\r
   // Convert DevicePath\r
   //\r


@@ -141,7 +141,7 @@ GetDevicePath (
       DevicePathBuffer [Index/2] = (UINT8) ((DevicePathBuffer [Index/2] << 4) + DigitUint8);\r
     }\r
   }\r
       DevicePathBuffer [Index/2] = (UINT8) ((DevicePathBuffer [Index/2] << 4) + DigitUint8);\r
     }\r
   }\r

-  \r
+\r

   //\r
   // Validate DevicePath\r
   //\r
   //\r
   // Validate DevicePath\r
   //\r


@@ -208,10 +208,10 @@ HiiToLower (
 \r
   @param  BufferLen              The length of the Buffer in bytes.\r
 \r
 \r
   @param  BufferLen              The length of the Buffer in bytes.\r
 \r

-  @param  Buffer                 Points to a buffer which will be converted to be the \r
+  @param  Buffer                 Points to a buffer which will be converted to be the\r

                                  content of the generated string.\r
 \r
                                  content of the generated string.\r
 \r

-  @param  Flag                   If 1, the buffer contains data for the value of GUID or PATH stored in \r
+  @param  Flag                   If 1, the buffer contains data for the value of GUID or PATH stored in\r

                                  UINT8 *; if 2, the buffer contains unicode string for the value of NAME;\r
                                  if 3, the buffer contains other data.\r
 \r
                                  UINT8 *; if 2, the buffer contains unicode string for the value of NAME;\r
                                  if 3, the buffer contains other data.\r
 \r


@@ -244,7 +244,7 @@ GenerateSubStr (
     ASSERT (*SubStr != NULL);\r
     return;\r
   }\r
     ASSERT (*SubStr != NULL);\r
     return;\r
   }\r

-  \r
+\r

   //\r
   // Header + Data + '&' + '\0'\r
   //\r
   //\r
   // Header + Data + '&' + '\0'\r
   //\r


@@ -317,7 +317,7 @@ GenerateSubStr (
   //\r
   // Convert the uppercase to lowercase since <HexAf> is defined in lowercase format.\r
   //\r
   //\r
   // Convert the uppercase to lowercase since <HexAf> is defined in lowercase format.\r
   //\r

-  StrCatS (Str, Length, L"&");  \r
+  StrCatS (Str, Length, L"&");\r

   HiiToLower (Str);\r
 \r
   *SubStr = Str;\r
   HiiToLower (Str);\r
 \r
   *SubStr = Str;\r


@@ -352,7 +352,7 @@ OutputConfigBody (
   if (String == NULL || ConfigBody == NULL) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
   if (String == NULL || ConfigBody == NULL) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r

-  \r
+\r

   //\r
   // The setting information should start OFFSET, not ALTCFG.\r
   //\r
   //\r
   // The setting information should start OFFSET, not ALTCFG.\r
   //\r


@@ -506,7 +506,7 @@ GetValueOfNumber (
     Status = EFI_OUT_OF_RESOURCES;\r
     goto Exit;\r
   }\r
     Status = EFI_OUT_OF_RESOURCES;\r
     goto Exit;\r
   }\r

-  \r
+\r

   Length = *Len;\r
   ZeroMem (TemStr, sizeof (TemStr));\r
   for (Index = 0; Index < Length; Index ++) {\r
   Length = *Len;\r
   ZeroMem (TemStr, sizeof (TemStr));\r
   for (Index = 0; Index < Length; Index ++) {\r


@@ -1010,10 +1010,10 @@ Exit:
   the missing AltCfgId in AltCfgResq.\r
 \r
   @param  AltCfgResp             Pointer to a null-terminated Unicode string in\r
   the missing AltCfgId in AltCfgResq.\r
 \r
   @param  AltCfgResp             Pointer to a null-terminated Unicode string in\r

-                                 <ConfigAltResp> format. The default value string \r
-                                 will be merged into it. \r
+                                 <ConfigAltResp> format. The default value string\r
+                                 will be merged into it.\r

   @param  DefaultAltCfgResp      Pointer to a null-terminated Unicode string in\r
   @param  DefaultAltCfgResp      Pointer to a null-terminated Unicode string in\r

-                                 <MultiConfigAltResp> format. The default value \r
+                                 <MultiConfigAltResp> format. The default value\r

                                  string may contain more than one ConfigAltResp\r
                                  string for the different varstore buffer.\r
 \r
                                  string may contain more than one ConfigAltResp\r
                                  string for the different varstore buffer.\r
 \r


@@ -1036,17 +1036,17 @@ MergeDefaultString (
   UINTN        SizeAltCfgResp;\r
   UINTN        MaxLen;\r
   UINTN        TotalSize;\r
   UINTN        SizeAltCfgResp;\r
   UINTN        MaxLen;\r
   UINTN        TotalSize;\r

-  \r
+\r

   if (*AltCfgResp == NULL) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
   if (*AltCfgResp == NULL) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r

-  \r
+\r

   //\r
   // Get the request ConfigHdr\r
   //\r
   SizeAltCfgResp  = 0;\r
   StringPtr       = *AltCfgResp;\r
   //\r
   // Get the request ConfigHdr\r
   //\r
   SizeAltCfgResp  = 0;\r
   StringPtr       = *AltCfgResp;\r

-  \r
+\r

   //\r
   // Find <ConfigHdr> GUID=...&NAME=...&PATH=...\r
   //\r
   //\r
   // Find <ConfigHdr> GUID=...&NAME=...&PATH=...\r
   //\r


@@ -1081,18 +1081,18 @@ MergeDefaultString (
   StrnCatS (AltConfigHdr, MaxLen, *AltCfgResp, HeaderLength);\r
   StrCatS (AltConfigHdr, MaxLen, L"&ALTCFG=");\r
   HeaderLength = StrLen (AltConfigHdr);\r
   StrnCatS (AltConfigHdr, MaxLen, *AltCfgResp, HeaderLength);\r
   StrCatS (AltConfigHdr, MaxLen, L"&ALTCFG=");\r
   HeaderLength = StrLen (AltConfigHdr);\r

-  \r
+\r

   StringPtrDefault = StrStr (DefaultAltCfgResp, AltConfigHdr);\r
   while (StringPtrDefault != NULL) {\r
     //\r
     // Get AltCfg Name\r
     //\r
     StrnCatS (AltConfigHdr, MaxLen, StringPtrDefault + HeaderLength, 4);\r
   StringPtrDefault = StrStr (DefaultAltCfgResp, AltConfigHdr);\r
   while (StringPtrDefault != NULL) {\r
     //\r
     // Get AltCfg Name\r
     //\r
     StrnCatS (AltConfigHdr, MaxLen, StringPtrDefault + HeaderLength, 4);\r

-    StringPtr = StrStr (*AltCfgResp, AltConfigHdr); \r
-    \r
+    StringPtr = StrStr (*AltCfgResp, AltConfigHdr);\r
+\r

     //\r
     // Append the found default value string to the input AltCfgResp\r
     //\r
     // Append the found default value string to the input AltCfgResp\r

-    // \r
+    //\r

     if (StringPtr == NULL) {\r
       StringPtrEnd   = StrStr (StringPtrDefault + 1, L"&GUID");\r
       SizeAltCfgResp = StrSize (*AltCfgResp);\r
     if (StringPtr == NULL) {\r
       StringPtrEnd   = StrStr (StringPtrDefault + 1, L"&GUID");\r
       SizeAltCfgResp = StrSize (*AltCfgResp);\r


@@ -1136,16 +1136,16 @@ MergeDefaultString (
       //\r
       CompareAndMergeDefaultString (AltCfgResp, DefaultAltCfgResp, AltConfigHdr);\r
     }\r
       //\r
       CompareAndMergeDefaultString (AltCfgResp, DefaultAltCfgResp, AltConfigHdr);\r
     }\r

-    \r
+\r

     //\r
     // Find next AltCfg String\r
     //\r
     *(AltConfigHdr + HeaderLength) = L'\0';\r
     StringPtrDefault = StrStr (StringPtrDefault + 1, AltConfigHdr);\r
   }\r
     //\r
     // Find next AltCfg String\r
     //\r
     *(AltConfigHdr + HeaderLength) = L'\0';\r
     StringPtrDefault = StrStr (StringPtrDefault + 1, AltConfigHdr);\r
   }\r

-  \r
+\r

   FreePool (AltConfigHdr);\r
   FreePool (AltConfigHdr);\r

-  return EFI_SUCCESS;  \r
+  return EFI_SUCCESS;\r

 }\r
 \r
 /**\r
 }\r
 \r
 /**\r


@@ -1162,9 +1162,9 @@ InsertDefaultValue (
   )\r
 {\r
   LIST_ENTRY             *Link;\r
   )\r
 {\r
   LIST_ENTRY             *Link;\r

-  IFR_DEFAULT_DATA       *DefaultValueArray; \r
+  IFR_DEFAULT_DATA       *DefaultValueArray;\r

   LIST_ENTRY             *DefaultLink;\r
   LIST_ENTRY             *DefaultLink;\r

- \r
+\r

   DefaultLink   = &BlockData->DefaultValueEntry;\r
 \r
   for (Link = DefaultLink->ForwardLink; Link != DefaultLink; Link = Link->ForwardLink) {\r
   DefaultLink   = &BlockData->DefaultValueEntry;\r
 \r
   for (Link = DefaultLink->ForwardLink; Link != DefaultLink; Link = Link->ForwardLink) {\r


@@ -1183,7 +1183,7 @@ InsertDefaultValue (
         DefaultValueArray->Cleaned = DefaultValueData->Cleaned;\r
       }\r
       return;\r
         DefaultValueArray->Cleaned = DefaultValueData->Cleaned;\r
       }\r
       return;\r

-    } \r
+    }\r

   }\r
 \r
   //\r
   }\r
 \r
   //\r


@@ -1200,7 +1200,7 @@ InsertDefaultValue (
 \r
   @param  BlockLink      The list entry points to block array.\r
   @param  BlockData      The point to BlockData is added.\r
 \r
   @param  BlockLink      The list entry points to block array.\r
   @param  BlockData      The point to BlockData is added.\r

-  \r
+\r

 **/\r
 VOID\r
 InsertBlockData (\r
 **/\r
 VOID\r
 InsertBlockData (\r


@@ -1245,26 +1245,26 @@ InsertBlockData (
       }\r
     } else if (BlockArray->Offset > BlockSingleData->Offset) {\r
       //\r
       }\r
     } else if (BlockArray->Offset > BlockSingleData->Offset) {\r
       //\r

-      // Insert new block data in the front of block array \r
+      // Insert new block data in the front of block array\r

       //\r
       InsertTailList (Link, &BlockSingleData->Entry);\r
       return;\r
     }\r
   }\r
       //\r
       InsertTailList (Link, &BlockSingleData->Entry);\r
       return;\r
     }\r
   }\r

-  \r
+\r

   //\r
   // Add new block data into the tail.\r
   //\r
   //\r
   // Add new block data into the tail.\r
   //\r

-  InsertTailList (Link, &BlockSingleData->Entry); \r
+  InsertTailList (Link, &BlockSingleData->Entry);\r

 }\r
 \r
 /**\r
 }\r
 \r
 /**\r

-  Retrieves a pointer to the a Null-terminated ASCII string containing the list \r
-  of languages that an HII handle in the HII Database supports.  The returned \r
+  Retrieves a pointer to the a Null-terminated ASCII string containing the list\r
+  of languages that an HII handle in the HII Database supports.  The returned\r

   string is allocated using AllocatePool().  The caller is responsible for freeing\r
   the returned string using FreePool().  The format of the returned string follows\r
   the language format assumed the HII Database.\r
   string is allocated using AllocatePool().  The caller is responsible for freeing\r
   the returned string using FreePool().  The format of the returned string follows\r
   the language format assumed the HII Database.\r

-  \r
+\r

   If HiiHandle is NULL, then ASSERT().\r
 \r
   @param[in]  HiiHandle  A handle that was previously registered in the HII Database.\r
   If HiiHandle is NULL, then ASSERT().\r
 \r
   @param[in]  HiiHandle  A handle that was previously registered in the HII Database.\r


@@ -1295,8 +1295,8 @@ GetSupportedLanguages (
   Status = mPrivate.HiiString.GetLanguages (&mPrivate.HiiString, HiiHandle, &TempSupportedLanguages, &LanguageSize);\r
 \r
   //\r
   Status = mPrivate.HiiString.GetLanguages (&mPrivate.HiiString, HiiHandle, &TempSupportedLanguages, &LanguageSize);\r
 \r
   //\r

-  // If GetLanguages() returns EFI_SUCCESS for a zero size, \r
-  // then there are no supported languages registered for HiiHandle.  If GetLanguages() \r
+  // If GetLanguages() returns EFI_SUCCESS for a zero size,\r
+  // then there are no supported languages registered for HiiHandle.  If GetLanguages()\r

   // returns an error other than EFI_BUFFER_TOO_SMALL, then HiiHandle is not present\r
   // in the HII Database\r
   //\r
   // returns an error other than EFI_BUFFER_TOO_SMALL, then HiiHandle is not present\r
   // in the HII Database\r
   //\r


@@ -1338,12 +1338,12 @@ GetSupportedLanguages (
 \r
 /**\r
   Retrieves a string from a string package.\r
 \r
 /**\r
   Retrieves a string from a string package.\r

-  \r
+\r

   If HiiHandle is NULL, then ASSERT().\r
   If StringId is 0, then ASSET.\r
 \r
   @param[in]  HiiHandle  A handle that was previously registered in the HII Database.\r
   If HiiHandle is NULL, then ASSERT().\r
   If StringId is 0, then ASSET.\r
 \r
   @param[in]  HiiHandle  A handle that was previously registered in the HII Database.\r

-  @param[in]  StringId   The identifier of the string to retrieved from the string \r
+  @param[in]  StringId   The identifier of the string to retrieved from the string\r

                          package associated with HiiHandle.\r
 \r
   @retval NULL   The string specified by StringId is not present in the string package.\r
                          package associated with HiiHandle.\r
 \r
   @retval NULL   The string specified by StringId is not present in the string package.\r


@@ -1370,7 +1370,7 @@ InternalGetString (
 \r
   //\r
   // Initialize all allocated buffers to NULL\r
 \r
   //\r
   // Initialize all allocated buffers to NULL\r

-  // \r
+  //\r

   SupportedLanguages = NULL;\r
   PlatformLanguage   = NULL;\r
   BestLanguage       = NULL;\r
   SupportedLanguages = NULL;\r
   PlatformLanguage   = NULL;\r
   BestLanguage       = NULL;\r


@@ -1394,11 +1394,11 @@ InternalGetString (
   // Get the best matching language from SupportedLanguages\r
   //\r
   BestLanguage = GetBestLanguage (\r
   // Get the best matching language from SupportedLanguages\r
   //\r
   BestLanguage = GetBestLanguage (\r

-                   SupportedLanguages, \r
+                   SupportedLanguages,\r

                    FALSE,                                             // RFC 4646 mode\r
                    FALSE,                                             // RFC 4646 mode\r

-                   Language,                                          // Highest priority \r
+                   Language,                                          // Highest priority\r

                    PlatformLanguage != NULL ? PlatformLanguage : "",  // Next highest priority\r
                    PlatformLanguage != NULL ? PlatformLanguage : "",  // Next highest priority\r

-                   SupportedLanguages,                                // Lowest priority \r
+                   SupportedLanguages,                                // Lowest priority\r

                    NULL\r
                    );\r
   if (BestLanguage == NULL) {\r
                    NULL\r
                    );\r
   if (BestLanguage == NULL) {\r


@@ -1419,8 +1419,8 @@ InternalGetString (
                          NULL\r
                          );\r
   //\r
                          NULL\r
                          );\r
   //\r

-  // If GetString() returns EFI_SUCCESS for a zero size, \r
-  // then there are no supported languages registered for HiiHandle.  If GetString() \r
+  // If GetString() returns EFI_SUCCESS for a zero size,\r
+  // then there are no supported languages registered for HiiHandle.  If GetString()\r

   // returns an error other than EFI_BUFFER_TOO_SMALL, then HiiHandle is not present\r
   // in the HII Database\r
   //\r
   // returns an error other than EFI_BUFFER_TOO_SMALL, then HiiHandle is not present\r
   // in the HII Database\r
   //\r


@@ -1479,12 +1479,12 @@ Error:
 /**\r
   This function checks VarOffset and VarWidth is in the block range.\r
 \r
 /**\r
   This function checks VarOffset and VarWidth is in the block range.\r
 \r

-  @param  RequestBlockArray  The block array is to be checked. \r
+  @param  RequestBlockArray  The block array is to be checked.\r

   @param  VarOffset          Offset of var to the structure\r
   @param  VarWidth           Width of var.\r
   @param  IsNameValueType    Whether this varstore is name/value varstore or not.\r
   @param  HiiHandle          Hii handle for this hii package.\r
   @param  VarOffset          Offset of var to the structure\r
   @param  VarWidth           Width of var.\r
   @param  IsNameValueType    Whether this varstore is name/value varstore or not.\r
   @param  HiiHandle          Hii handle for this hii package.\r

-  \r
+\r

   @retval TRUE   This Var is in the block range.\r
   @retval FALSE  This Var is not in the block range.\r
 **/\r
   @retval TRUE   This Var is in the block range.\r
   @retval FALSE  This Var is not in the block range.\r
 **/\r


@@ -1562,18 +1562,18 @@ GetFormPackageData (
   // 0. Get Hii Form Package by HiiHandle\r
   //\r
   Status = ExportFormPackages (\r
   // 0. Get Hii Form Package by HiiHandle\r
   //\r
   Status = ExportFormPackages (\r

-             &mPrivate, \r
-             DataBaseRecord->Handle, \r
-             DataBaseRecord->PackageList, \r
-             0, \r
-             Size, \r
+             &mPrivate,\r
+             DataBaseRecord->Handle,\r
+             DataBaseRecord->PackageList,\r
+             0,\r
+             Size,\r

              HiiFormPackage,\r
              &ResultSize\r
            );\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
              HiiFormPackage,\r
              &ResultSize\r
            );\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r

- \r
+\r

   (*HiiFormPackage) = AllocatePool (ResultSize);\r
   if (*HiiFormPackage == NULL) {\r
     Status = EFI_OUT_OF_RESOURCES;\r
   (*HiiFormPackage) = AllocatePool (ResultSize);\r
   if (*HiiFormPackage == NULL) {\r
     Status = EFI_OUT_OF_RESOURCES;\r


@@ -1586,18 +1586,18 @@ GetFormPackageData (
   Size   = ResultSize;\r
   ResultSize    = 0;\r
   Status = ExportFormPackages (\r
   Size   = ResultSize;\r
   ResultSize    = 0;\r
   Status = ExportFormPackages (\r

-             &mPrivate, \r
-             DataBaseRecord->Handle, \r
-             DataBaseRecord->PackageList, \r
+             &mPrivate,\r
+             DataBaseRecord->Handle,\r
+             DataBaseRecord->PackageList,\r

              0,\r
              0,\r

-             Size, \r
+             Size,\r

              *HiiFormPackage,\r
              &ResultSize\r
            );\r
   if (EFI_ERROR (Status)) {\r
     FreePool (*HiiFormPackage);\r
   }\r
              *HiiFormPackage,\r
              &ResultSize\r
            );\r
   if (EFI_ERROR (Status)) {\r
     FreePool (*HiiFormPackage);\r
   }\r

-  \r
+\r

   *PackageSize = Size;\r
 \r
   return Status;\r
   *PackageSize = Size;\r
 \r
   return Status;\r


@@ -1612,7 +1612,7 @@ GetFormPackageData (
                                 the first found varstore will be as ConfigHdr.\r
   @param  IsEfiVarstore         Whether the request storage type is efi varstore type.\r
   @param  EfiVarStore           The efi varstore info which will return.\r
                                 the first found varstore will be as ConfigHdr.\r
   @param  IsEfiVarstore         Whether the request storage type is efi varstore type.\r
   @param  EfiVarStore           The efi varstore info which will return.\r

-**/                                \r
+**/\r

 EFI_STATUS\r
 GetVarStoreType (\r
   IN     HII_DATABASE_RECORD        *DataBaseRecord,\r
 EFI_STATUS\r
 GetVarStoreType (\r
   IN     HII_DATABASE_RECORD        *DataBaseRecord,\r


@@ -1630,12 +1630,12 @@ GetVarStoreType (
   EFI_STRING               GuidStr;\r
   EFI_STRING               NameStr;\r
   EFI_STRING               TempStr;\r
   EFI_STRING               GuidStr;\r
   EFI_STRING               NameStr;\r
   EFI_STRING               TempStr;\r

-  UINTN                    LengthString;  \r
+  UINTN                    LengthString;\r

   UINT8                    *HiiFormPackage;\r
   UINTN                    PackageSize;\r
   EFI_IFR_VARSTORE_EFI     *IfrEfiVarStore;\r
   EFI_HII_PACKAGE_HEADER   *PackageHeader;\r
   UINT8                    *HiiFormPackage;\r
   UINTN                    PackageSize;\r
   EFI_IFR_VARSTORE_EFI     *IfrEfiVarStore;\r
   EFI_HII_PACKAGE_HEADER   *PackageHeader;\r

-  \r
+\r

   HiiFormPackage = NULL;\r
   LengthString     = 0;\r
   Status           = EFI_SUCCESS;\r
   HiiFormPackage = NULL;\r
   LengthString     = 0;\r
   Status           = EFI_SUCCESS;\r


@@ -1673,8 +1673,8 @@ GetVarStoreType (
     if (IfrOpHdr->OpCode == EFI_IFR_VARSTORE_EFI_OP ) {\r
       IfrEfiVarStore = (EFI_IFR_VARSTORE_EFI *) IfrOpHdr;\r
       //\r
     if (IfrOpHdr->OpCode == EFI_IFR_VARSTORE_EFI_OP ) {\r
       IfrEfiVarStore = (EFI_IFR_VARSTORE_EFI *) IfrOpHdr;\r
       //\r

-      // If the length is small than the structure, this is from old efi \r
-      // varstore definition. Old efi varstore get config directly from \r
+      // If the length is small than the structure, this is from old efi\r
+      // varstore definition. Old efi varstore get config directly from\r

       // GetVariable function.\r
       //\r
       if (IfrOpHdr->Length < sizeof (EFI_IFR_VARSTORE_EFI)) {\r
       // GetVariable function.\r
       //\r
       if (IfrOpHdr->Length < sizeof (EFI_IFR_VARSTORE_EFI)) {\r


@@ -1715,8 +1715,8 @@ GetVarStoreType (
         }\r
         *IsEfiVarstore = TRUE;\r
         CopyMem (*EfiVarStore, IfrEfiVarStore, IfrOpHdr->Length);\r
         }\r
         *IsEfiVarstore = TRUE;\r
         CopyMem (*EfiVarStore, IfrEfiVarStore, IfrOpHdr->Length);\r

-      } \r
-        \r
+      }\r
+\r

       //\r
       // Free allocated temp string.\r
       //\r
       //\r
       // Free allocated temp string.\r
       //\r


@@ -1778,7 +1778,7 @@ GetElementsFromRequest (
 \r
   @retval  TRUE              This varstore is the request one.\r
   @retval  FALSE             This varstore is not the request one.\r
 \r
   @retval  TRUE              This varstore is the request one.\r
   @retval  FALSE             This varstore is not the request one.\r

-                                 \r
+\r

 **/\r
 BOOLEAN\r
 IsThisVarstore (\r
 **/\r
 BOOLEAN\r
 IsThisVarstore (\r


@@ -1826,7 +1826,7 @@ IsThisVarstore (
 \r
 Done:\r
   if (GuidStr != NULL) {\r
 \r
 Done:\r
   if (GuidStr != NULL) {\r

-    FreePool (GuidStr); \r
+    FreePool (GuidStr);\r

   }\r
 \r
   if (NameStr != NULL) {\r
   }\r
 \r
   if (NameStr != NULL) {\r


@@ -1848,7 +1848,7 @@ Done:
                                 the first found varstore will be as ConfigHdr.\r
   @retval  TRUE                 This hii package is the request one.\r
   @retval  FALSE                This hii package is not the request one.\r
                                 the first found varstore will be as ConfigHdr.\r
   @retval  TRUE                 This hii package is the request one.\r
   @retval  FALSE                This hii package is not the request one.\r

-**/                                \r
+**/\r

 BOOLEAN\r
 IsThisPackageList (\r
   IN     HII_DATABASE_RECORD        *DataBaseRecord,\r
 BOOLEAN\r
 IsThisPackageList (\r
   IN     HII_DATABASE_RECORD        *DataBaseRecord,\r


@@ -1901,7 +1901,7 @@ IsThisPackageList (
     PackageOffset += IfrOpHdr->Length;\r
 \r
     switch (IfrOpHdr->OpCode) {\r
     PackageOffset += IfrOpHdr->Length;\r
 \r
     switch (IfrOpHdr->OpCode) {\r

-    \r
+\r

     case EFI_IFR_VARSTORE_OP:\r
       IfrVarStore = (EFI_IFR_VARSTORE *) IfrOpHdr;\r
 \r
     case EFI_IFR_VARSTORE_OP:\r
       IfrVarStore = (EFI_IFR_VARSTORE *) IfrOpHdr;\r
 \r


@@ -1947,7 +1947,7 @@ IsThisPackageList (
         goto Done;\r
       }\r
       break;\r
         goto Done;\r
       }\r
       break;\r

-      \r
+\r

     case EFI_IFR_FORM_OP:\r
     case EFI_IFR_FORM_MAP_OP:\r
       //\r
     case EFI_IFR_FORM_OP:\r
     case EFI_IFR_FORM_MAP_OP:\r
       //\r


@@ -1985,7 +1985,7 @@ Done:
   @retval  EFI_SUCCESS           This opcode is required.\r
   @retval  EFI_NOT_FOUND         This opcode is not required.\r
   @retval  Others                Contain some error.\r
   @retval  EFI_SUCCESS           This opcode is required.\r
   @retval  EFI_NOT_FOUND         This opcode is not required.\r
   @retval  Others                Contain some error.\r

-                                 \r
+\r

 **/\r
 EFI_STATUS\r
 IsThisOpcodeRequired (\r
 **/\r
 EFI_STATUS\r
 IsThisOpcodeRequired (\r


@@ -2042,7 +2042,7 @@ IsThisOpcodeRequired (
       BitWidth = VarWidth;\r
       BitOffset = VarOffset * 8;\r
     }\r
       BitWidth = VarWidth;\r
       BitOffset = VarOffset * 8;\r
     }\r

-    \r
+\r

     //\r
     // Check whether this question is in requested block array.\r
     //\r
     //\r
     // Check whether this question is in requested block array.\r
     //\r


@@ -2054,7 +2054,7 @@ IsThisOpcodeRequired (
     }\r
 \r
     //\r
     }\r
 \r
     //\r

-    // Check this var question is in the var storage \r
+    // Check this var question is in the var storage\r

     //\r
     if (((VarOffset + VarWidth) > VarStorageData->Size)) {\r
       return EFI_INVALID_PARAMETER;\r
     //\r
     if (((VarOffset + VarWidth) > VarStorageData->Size)) {\r
       return EFI_INVALID_PARAMETER;\r


@@ -2104,7 +2104,7 @@ IsThisOpcodeRequired (
 \r
   @retval EFI_SUCCESS           The block array and the default value array are got.\r
   @retval EFI_INVALID_PARAMETER The varstore definition in the different form packages\r
 \r
   @retval EFI_SUCCESS           The block array and the default value array are got.\r
   @retval EFI_INVALID_PARAMETER The varstore definition in the different form packages\r

-                                are conflicted. \r
+                                are conflicted.\r

   @retval EFI_OUT_OF_RESOURCES  No enough memory.\r
 **/\r
 EFI_STATUS\r
   @retval EFI_OUT_OF_RESOURCES  No enough memory.\r
 **/\r
 EFI_STATUS\r


@@ -2239,10 +2239,10 @@ ParseIfrData (
       IfrEfiVarStore = (EFI_IFR_VARSTORE_EFI *) IfrOpHdr;\r
 \r
       //\r
       IfrEfiVarStore = (EFI_IFR_VARSTORE_EFI *) IfrOpHdr;\r
 \r
       //\r

-      // If the length is small than the structure, this is from old efi \r
-      // varstore definition. Old efi varstore get config directly from \r
+      // If the length is small than the structure, this is from old efi\r
+      // varstore definition. Old efi varstore get config directly from\r

       // GetVariable function.\r
       // GetVariable function.\r

-      //      \r
+      //\r

       if (IfrOpHdr->Length < sizeof (EFI_IFR_VARSTORE_EFI)) {\r
         break;\r
       }\r
       if (IfrOpHdr->Length < sizeof (EFI_IFR_VARSTORE_EFI)) {\r
         break;\r
       }\r


@@ -2317,7 +2317,7 @@ ParseIfrData (
 \r
     case EFI_IFR_REF_OP:\r
       //\r
 \r
     case EFI_IFR_REF_OP:\r
       //\r

-      // Ref question is not in IFR Form. This IFR form is not valid. \r
+      // Ref question is not in IFR Form. This IFR form is not valid.\r

       //\r
       if ( VarStoreId == 0) {\r
         Status = EFI_INVALID_PARAMETER;\r
       //\r
       if ( VarStoreId == 0) {\r
         Status = EFI_INVALID_PARAMETER;\r


@@ -2358,7 +2358,7 @@ ParseIfrData (
       //\r
 \r
       //\r
       //\r
 \r
       //\r

-      // Numeric and OneOf question is not in IFR Form. This IFR form is not valid. \r
+      // Numeric and OneOf question is not in IFR Form. This IFR form is not valid.\r

       //\r
       if (VarStoreId == 0) {\r
         Status = EFI_INVALID_PARAMETER;\r
       //\r
       if (VarStoreId == 0) {\r
         Status = EFI_INVALID_PARAMETER;\r


@@ -2408,7 +2408,7 @@ ParseIfrData (
         FirstOneOfOption = TRUE;\r
       } else if (IfrOpHdr->OpCode == EFI_IFR_NUMERIC_OP) {\r
         //\r
         FirstOneOfOption = TRUE;\r
       } else if (IfrOpHdr->OpCode == EFI_IFR_NUMERIC_OP) {\r
         //\r

-        // Numeric minimum value will be used as default value when no default is specified. \r
+        // Numeric minimum value will be used as default value when no default is specified.\r

         //\r
         DefaultData.Type        = DefaultValueFromDefault;\r
         if (QuestionReferBitField) {\r
         //\r
         DefaultData.Type        = DefaultValueFromDefault;\r
         if (QuestionReferBitField) {\r


@@ -2441,7 +2441,7 @@ ParseIfrData (
         }\r
         //\r
         // Set default value base on the DefaultId list get from IFR data.\r
         }\r
         //\r
         // Set default value base on the DefaultId list get from IFR data.\r

-        //        \r
+        //\r

         for (LinkData = DefaultIdArray->Entry.ForwardLink; LinkData != &DefaultIdArray->Entry; LinkData = LinkData->ForwardLink) {\r
           DefaultDataPtr = BASE_CR (LinkData, IFR_DEFAULT_DATA, Entry);\r
           DefaultData.DefaultId   = DefaultDataPtr->DefaultId;\r
         for (LinkData = DefaultIdArray->Entry.ForwardLink; LinkData != &DefaultIdArray->Entry; LinkData = LinkData->ForwardLink) {\r
           DefaultDataPtr = BASE_CR (LinkData, IFR_DEFAULT_DATA, Entry);\r
           DefaultData.DefaultId   = DefaultDataPtr->DefaultId;\r


@@ -2458,7 +2458,7 @@ ParseIfrData (
 \r
       FirstOrderedList = TRUE;\r
       //\r
 \r
       FirstOrderedList = TRUE;\r
       //\r

-      // OrderedList question is not in IFR Form. This IFR form is not valid. \r
+      // OrderedList question is not in IFR Form. This IFR form is not valid.\r

       //\r
       if (VarStoreId == 0) {\r
         Status = EFI_INVALID_PARAMETER;\r
       //\r
       if (VarStoreId == 0) {\r
         Status = EFI_INVALID_PARAMETER;\r


@@ -2501,10 +2501,10 @@ ParseIfrData (
       // default id by CheckBox Flags if CheckBox flags (Default or Mau) is set, the default value is 1 to be set.\r
       // value by DefaultOption\r
       // default id by DeaultOption DefaultId can override CheckBox Flags and Default value.\r
       // default id by CheckBox Flags if CheckBox flags (Default or Mau) is set, the default value is 1 to be set.\r
       // value by DefaultOption\r
       // default id by DeaultOption DefaultId can override CheckBox Flags and Default value.\r

-      // \r
+      //\r

 \r
       //\r
 \r
       //\r

-      // CheckBox question is not in IFR Form. This IFR form is not valid. \r
+      // CheckBox question is not in IFR Form. This IFR form is not valid.\r

       //\r
       if (VarStoreId == 0) {\r
         Status = EFI_INVALID_PARAMETER;\r
       //\r
       if (VarStoreId == 0) {\r
         Status = EFI_INVALID_PARAMETER;\r


@@ -2651,7 +2651,7 @@ ParseIfrData (
       //\r
 \r
       //\r
       //\r
 \r
       //\r

-      // Date question is not in IFR Form. This IFR form is not valid. \r
+      // Date question is not in IFR Form. This IFR form is not valid.\r

       //\r
       if (VarStoreId == 0) {\r
         Status = EFI_INVALID_PARAMETER;\r
       //\r
       if (VarStoreId == 0) {\r
         Status = EFI_INVALID_PARAMETER;\r


@@ -2693,7 +2693,7 @@ ParseIfrData (
       //\r
 \r
       //\r
       //\r
 \r
       //\r

-      // Time question is not in IFR Form. This IFR form is not valid. \r
+      // Time question is not in IFR Form. This IFR form is not valid.\r

       //\r
       if (VarStoreId == 0) {\r
         Status = EFI_INVALID_PARAMETER;\r
       //\r
       if (VarStoreId == 0) {\r
         Status = EFI_INVALID_PARAMETER;\r


@@ -2735,7 +2735,7 @@ ParseIfrData (
       //\r
 \r
       //\r
       //\r
 \r
       //\r

-      // String question is not in IFR Form. This IFR form is not valid. \r
+      // String question is not in IFR Form. This IFR form is not valid.\r

       //\r
       if (VarStoreId == 0) {\r
         Status = EFI_INVALID_PARAMETER;\r
       //\r
       if (VarStoreId == 0) {\r
         Status = EFI_INVALID_PARAMETER;\r


@@ -2777,7 +2777,7 @@ ParseIfrData (
       //\r
 \r
       //\r
       //\r
 \r
       //\r

-      // Password question is not in IFR Form. This IFR form is not valid. \r
+      // Password question is not in IFR Form. This IFR form is not valid.\r

       //\r
       if (VarStoreId == 0) {\r
         Status = EFI_INVALID_PARAMETER;\r
       //\r
       if (VarStoreId == 0) {\r
         Status = EFI_INVALID_PARAMETER;\r


@@ -2872,7 +2872,7 @@ ParseIfrData (
           break;\r
         }\r
         //\r
           break;\r
         }\r
         //\r

-        // Check this var question is in the var storage \r
+        // Check this var question is in the var storage\r

         //\r
         if ((BlockData->Name == NULL) && ((BlockData->Offset + BlockData->Width) > VarStorageData->Size)) {\r
           Status = EFI_INVALID_PARAMETER;\r
         //\r
         if ((BlockData->Name == NULL) && ((BlockData->Offset + BlockData->Width) > VarStorageData->Size)) {\r
           Status = EFI_INVALID_PARAMETER;\r


@@ -2899,13 +2899,13 @@ ParseIfrData (
       if (((IfrOneOfOption->Flags & EFI_IFR_OPTION_DEFAULT) == EFI_IFR_OPTION_DEFAULT) ||\r
           ((IfrOneOfOption->Flags & EFI_IFR_OPTION_DEFAULT_MFG) == EFI_IFR_OPTION_DEFAULT_MFG)) {\r
         //\r
       if (((IfrOneOfOption->Flags & EFI_IFR_OPTION_DEFAULT) == EFI_IFR_OPTION_DEFAULT) ||\r
           ((IfrOneOfOption->Flags & EFI_IFR_OPTION_DEFAULT_MFG) == EFI_IFR_OPTION_DEFAULT_MFG)) {\r
         //\r

-        // This flag is used to specify whether this option is the first. Set it to FALSE for the following options. \r
-        // The first oneof option value will be used as default value when no default value is specified. \r
+        // This flag is used to specify whether this option is the first. Set it to FALSE for the following options.\r
+        // The first oneof option value will be used as default value when no default value is specified.\r

         //\r
         FirstOneOfOption = FALSE;\r
 \r
         SmallestIdFromFlag = FALSE;\r
         //\r
         FirstOneOfOption = FALSE;\r
 \r
         SmallestIdFromFlag = FALSE;\r

-        \r
+\r

         // Prepare new DefaultValue\r
         //\r
         DefaultData.Type     = DefaultValueFromFlag;\r
         // Prepare new DefaultValue\r
         //\r
         DefaultData.Type     = DefaultValueFromFlag;\r


@@ -2951,19 +2951,19 @@ ParseIfrData (
 \r
       //\r
       // 2. Set as the default value when this is the first option.\r
 \r
       //\r
       // 2. Set as the default value when this is the first option.\r

-      // The first oneof option value will be used as default value when no default value is specified. \r
+      // The first oneof option value will be used as default value when no default value is specified.\r

       //\r
       if (FirstOneOfOption) {\r
       //\r
       if (FirstOneOfOption) {\r

-        // This flag is used to specify whether this option is the first. Set it to FALSE for the following options. \r
+        // This flag is used to specify whether this option is the first. Set it to FALSE for the following options.\r

         FirstOneOfOption = FALSE;\r
         FirstOneOfOption = FALSE;\r

-        \r
+\r

         //\r
         // Prepare new DefaultValue\r
         //\r
         // Prepare new DefaultValue\r

-        //        \r
+        //\r

         DefaultData.Type     = DefaultValueFromDefault;\r
         CopyMem (&DefaultData.Value, &IfrOneOfOption->Value, IfrOneOfOption->Header.Length - OFFSET_OF (EFI_IFR_ONE_OF_OPTION, Value));\r
         for (LinkData = DefaultIdArray->Entry.ForwardLink; LinkData != &DefaultIdArray->Entry; LinkData = LinkData->ForwardLink) {\r
         DefaultData.Type     = DefaultValueFromDefault;\r
         CopyMem (&DefaultData.Value, &IfrOneOfOption->Value, IfrOneOfOption->Header.Length - OFFSET_OF (EFI_IFR_ONE_OF_OPTION, Value));\r
         for (LinkData = DefaultIdArray->Entry.ForwardLink; LinkData != &DefaultIdArray->Entry; LinkData = LinkData->ForwardLink) {\r

-          DefaultDataPtr = BASE_CR (LinkData, IFR_DEFAULT_DATA, Entry); \r
+          DefaultDataPtr = BASE_CR (LinkData, IFR_DEFAULT_DATA, Entry);\r

           DefaultData.DefaultId   = DefaultDataPtr->DefaultId;\r
           InsertDefaultValue (BlockData, &DefaultData);\r
         }\r
           DefaultData.DefaultId   = DefaultDataPtr->DefaultId;\r
           InsertDefaultValue (BlockData, &DefaultData);\r
         }\r


@@ -3194,7 +3194,7 @@ GetBlockElement (
     if (*StringPtr != 0 && *StringPtr != L'&') {\r
       goto Done;\r
     }\r
     if (*StringPtr != 0 && *StringPtr != L'&') {\r
       goto Done;\r
     }\r

-    \r
+\r

     //\r
     // Set Block Data\r
     //\r
     //\r
     // Set Block Data\r
     //\r


@@ -3226,7 +3226,7 @@ GetBlockElement (
       }\r
     }\r
     //\r
       }\r
     }\r
     //\r

-    // If '\0', parsing is finished. \r
+    // If '\0', parsing is finished.\r

     //\r
     if (*StringPtr == 0) {\r
       break;\r
     //\r
     if (*StringPtr == 0) {\r
       break;\r


@@ -3343,7 +3343,7 @@ GetNameElement (
     if (HasValue) {\r
       //\r
       // If has value, skip the value.\r
     if (HasValue) {\r
       //\r
       // If has value, skip the value.\r

-      //    \r
+      //\r

       StringPtr = NextTag + 1;\r
       *NextTag  = L'=';\r
       StringPtr = StrStr (StringPtr, L"&");\r
       StringPtr = NextTag + 1;\r
       *NextTag  = L'=';\r
       StringPtr = StrStr (StringPtr, L"&");\r


@@ -3408,14 +3408,14 @@ GenerateConfigRequest (
   // Append VarStorageData BlockEntry into *Request string\r
   // Now support only one varstore in a form package.\r
   //\r
   // Append VarStorageData BlockEntry into *Request string\r
   // Now support only one varstore in a form package.\r
   //\r

-  \r
+\r

   //\r
   // Go through all VarStorageData Entry and get BlockEntry for each one for the multiple varstore in a single form package\r
   // Then construct them all to return MultiRequest string : ConfigHdr BlockConfig\r
   //\r
   //\r
   // Go through all VarStorageData Entry and get BlockEntry for each one for the multiple varstore in a single form package\r
   // Then construct them all to return MultiRequest string : ConfigHdr BlockConfig\r
   //\r

-  \r
+\r

   //\r
   //\r

-  // Compute the length of the entire request starting with <ConfigHdr> and a \r
+  // Compute the length of the entire request starting with <ConfigHdr> and a\r

   // Null-terminator\r
   //\r
   DataExist = FALSE;\r
   // Null-terminator\r
   //\r
   DataExist = FALSE;\r


@@ -3428,7 +3428,7 @@ GenerateConfigRequest (
       //\r
       // Add <BlockName> length for each Name\r
       //\r
       //\r
       // Add <BlockName> length for each Name\r
       //\r

-      // <BlockName> ::= &Name1&Name2&... \r
+      // <BlockName> ::= &Name1&Name2&...\r

       //                 |1| StrLen(Name1)\r
       //\r
       Length = Length + (1 + StrLen (BlockData->Name));\r
       //                 |1| StrLen(Name1)\r
       //\r
       Length = Length + (1 + StrLen (BlockData->Name));\r


@@ -3486,10 +3486,10 @@ GenerateConfigRequest (
       // Append &OFFSET=XXXX&WIDTH=YYYY\0\r
       //\r
       UnicodeSPrint (\r
       // Append &OFFSET=XXXX&WIDTH=YYYY\0\r
       //\r
       UnicodeSPrint (\r

-        StringPtr, \r
-        (8 + 4 + 7 + 4 + 1) * sizeof (CHAR16), \r
-        L"&OFFSET=%04X&WIDTH=%04X", \r
-        BlockData->Offset, \r
+        StringPtr,\r
+        (8 + 4 + 7 + 4 + 1) * sizeof (CHAR16),\r
+        L"&OFFSET=%04X&WIDTH=%04X",\r
+        BlockData->Offset,\r

         BlockData->Width\r
       );\r
     }\r
         BlockData->Width\r
       );\r
     }\r


@@ -3897,7 +3897,7 @@ GenerateAltConfigResp (
     //                |1| StrLen (ConfigHdr) | 8 | 4 |\r
     //\r
     Length += (1 + StrLen (ConfigHdr) + 8 + 4);\r
     //                |1| StrLen (ConfigHdr) | 8 | 4 |\r
     //\r
     Length += (1 + StrLen (ConfigHdr) + 8 + 4);\r

-    \r
+\r

     for (LinkData = VarStorageData->BlockEntry.ForwardLink; LinkData != &VarStorageData->BlockEntry; LinkData = LinkData->ForwardLink) {\r
       BlockData = BASE_CR (LinkData, IFR_BLOCK_DATA, Entry);\r
       ListEntry     = &BlockData->DefaultValueEntry;\r
     for (LinkData = VarStorageData->BlockEntry.ForwardLink; LinkData != &VarStorageData->BlockEntry; LinkData = LinkData->ForwardLink) {\r
       BlockData = BASE_CR (LinkData, IFR_BLOCK_DATA, Entry);\r
       ListEntry     = &BlockData->DefaultValueEntry;\r


@@ -3923,7 +3923,7 @@ GenerateAltConfigResp (
       }\r
     }\r
   }\r
       }\r
     }\r
   }\r

-  \r
+\r

   //\r
   // No default value is found. The default string doesn't exist.\r
   //\r
   //\r
   // No default value is found. The default string doesn't exist.\r
   //\r


@@ -3953,10 +3953,10 @@ GenerateAltConfigResp (
     //                                |1| StrLen (ConfigHdr) | 8 | 4 |\r
     //\r
     UnicodeSPrint (\r
     //                                |1| StrLen (ConfigHdr) | 8 | 4 |\r
     //\r
     UnicodeSPrint (\r

-      StringPtr, \r
-      (1 + StrLen (ConfigHdr) + 8 + 4 + 1) * sizeof (CHAR16), \r
-      L"&%s&ALTCFG=%04X", \r
-      ConfigHdr, \r
+      StringPtr,\r
+      (1 + StrLen (ConfigHdr) + 8 + 4 + 1) * sizeof (CHAR16),\r
+      L"&%s&ALTCFG=%04X",\r
+      ConfigHdr,\r

       DefaultId->DefaultId\r
       );\r
     StringPtr += StrLen (StringPtr);\r
       DefaultId->DefaultId\r
       );\r
     StringPtr += StrLen (StringPtr);\r


@@ -3971,9 +3971,9 @@ GenerateAltConfigResp (
         }\r
         if (VarStorageData->Type == EFI_HII_VARSTORE_NAME_VALUE) {\r
           UnicodeSPrint (\r
         }\r
         if (VarStorageData->Type == EFI_HII_VARSTORE_NAME_VALUE) {\r
           UnicodeSPrint (\r

-            StringPtr, \r
-            (1 + StrLen (ConfigHdr) + 1) * sizeof (CHAR16), \r
-            L"&%s=", \r
+            StringPtr,\r
+            (1 + StrLen (ConfigHdr) + 1) * sizeof (CHAR16),\r
+            L"&%s=",\r

             BlockData->Name\r
             );\r
           StringPtr += StrLen (StringPtr);\r
             BlockData->Name\r
             );\r
           StringPtr += StrLen (StringPtr);\r


@@ -3983,10 +3983,10 @@ GenerateAltConfigResp (
           // <BlockConfig> ::= 'OFFSET='<Number>&'WIDTH='<Number>&'VALUE'=<Number>\r
           //\r
           UnicodeSPrint (\r
           // <BlockConfig> ::= 'OFFSET='<Number>&'WIDTH='<Number>&'VALUE'=<Number>\r
           //\r
           UnicodeSPrint (\r

-            StringPtr, \r
+            StringPtr,\r

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

-            L"&OFFSET=%04X&WIDTH=%04X&VALUE=", \r
-            BlockData->Offset, \r
+            L"&OFFSET=%04X&WIDTH=%04X&VALUE=",\r
+            BlockData->Offset,\r

             BlockData->Width\r
             );\r
           StringPtr += StrLen (StringPtr);\r
             BlockData->Width\r
             );\r
           StringPtr += StrLen (StringPtr);\r


@@ -4038,32 +4038,32 @@ GenerateAltConfigResp (
 }\r
 \r
 /**\r
 }\r
 \r
 /**\r

-  This function gets the full request string and full default value string by \r
-  parsing IFR data in HII form packages. \r
-  \r
-  When Request points to NULL string, the request string and default value string \r
-  for each varstore in form package will return. \r
+  This function gets the full request string and full default value string by\r
+  parsing IFR data in HII form packages.\r
+\r
+  When Request points to NULL string, the request string and default value string\r
+  for each varstore in form package will return.\r

 \r
   @param  DataBaseRecord         The DataBaseRecord instance contains the found Hii handle and package.\r
   @param  DevicePath             Device Path which Hii Config Access Protocol is registered.\r
   @param  Request                Pointer to a null-terminated Unicode string in\r
                                  <ConfigRequest> format. When it doesn't contain\r
 \r
   @param  DataBaseRecord         The DataBaseRecord instance contains the found Hii handle and package.\r
   @param  DevicePath             Device Path which Hii Config Access Protocol is registered.\r
   @param  Request                Pointer to a null-terminated Unicode string in\r
                                  <ConfigRequest> format. When it doesn't contain\r

-                                 any RequestElement, it will be updated to return \r
+                                 any RequestElement, it will be updated to return\r

                                  the full RequestElement retrieved from IFR data.\r
                                  If it points to NULL, the request string for the first\r
                                  varstore in form package will be merged into a\r
                                  the full RequestElement retrieved from IFR data.\r
                                  If it points to NULL, the request string for the first\r
                                  varstore in form package will be merged into a\r

-                                 <MultiConfigRequest> format string and return. \r
+                                 <MultiConfigRequest> format string and return.\r

   @param  AltCfgResp             Pointer to a null-terminated Unicode string in\r
                                  <ConfigAltResp> format. When the pointer is to NULL,\r
                                  the full default value string retrieved from IFR data\r
                                  will return. When the pinter is to a string, the\r
                                  full default value string retrieved from IFR data\r
                                  will be merged into the input string and return.\r
   @param  AltCfgResp             Pointer to a null-terminated Unicode string in\r
                                  <ConfigAltResp> format. When the pointer is to NULL,\r
                                  the full default value string retrieved from IFR data\r
                                  will return. When the pinter is to a string, the\r
                                  full default value string retrieved from IFR data\r
                                  will be merged into the input string and return.\r

-                                 When Request points to NULL, the default value string \r
-                                 for each varstore in form package will be merged into \r
+                                 When Request points to NULL, the default value string\r
+                                 for each varstore in form package will be merged into\r

                                  a <MultiConfigAltResp> format string and return.\r
   @param  PointerProgress        Optional parameter, it can be NULL.\r
                                  a <MultiConfigAltResp> format string and return.\r
   @param  PointerProgress        Optional parameter, it can be NULL.\r

-                                 When it is not NULL, if Request is NULL, it returns NULL. \r
+                                 When it is not NULL, if Request is NULL, it returns NULL.\r

                                  On return, points to a character in the Request\r
                                  string. Points to the string's null terminator if\r
                                  request was successful. Points to the most recent\r
                                  On return, points to a character in the Request\r
                                  string. Points to the string's null terminator if\r
                                  request was successful. Points to the most recent\r


@@ -4074,7 +4074,7 @@ GenerateAltConfigResp (
   @retval EFI_SUCCESS            The Results string is set to the full request string.\r
                                  And AltCfgResp contains all default value string.\r
   @retval EFI_OUT_OF_RESOURCES   Not enough memory for the return string.\r
   @retval EFI_SUCCESS            The Results string is set to the full request string.\r
                                  And AltCfgResp contains all default value string.\r
   @retval EFI_OUT_OF_RESOURCES   Not enough memory for the return string.\r

-  @retval EFI_NOT_FOUND          The varstore (Guid and Name) in Request string \r
+  @retval EFI_NOT_FOUND          The varstore (Guid and Name) in Request string\r

                                  can't be found in Form package.\r
   @retval EFI_NOT_FOUND          HiiPackage can't be got on the input HiiHandle.\r
   @retval EFI_INVALID_PARAMETER  Request points to NULL.\r
                                  can't be found in Form package.\r
   @retval EFI_NOT_FOUND          HiiPackage can't be got on the input HiiHandle.\r
   @retval EFI_INVALID_PARAMETER  Request points to NULL.\r


@@ -4321,7 +4321,7 @@ Done:
   }\r
 \r
   //\r
   }\r
 \r
   //\r

-  // Free the allocated string \r
+  // Free the allocated string\r

   //\r
   if (ConfigHdr != NULL) {\r
     FreePool (ConfigHdr);\r
   //\r
   if (ConfigHdr != NULL) {\r
     FreePool (ConfigHdr);\r


@@ -4348,13 +4348,13 @@ Done:
 }\r
 \r
 /**\r
 }\r
 \r
 /**\r

-  This function gets the full request resp string by \r
+  This function gets the full request resp string by\r

   parsing IFR data in HII form packages.\r
 \r
   @param  This                   A pointer to the EFI_HII_CONFIG_ROUTING_PROTOCOL\r
                                  instance.\r
   parsing IFR data in HII form packages.\r
 \r
   @param  This                   A pointer to the EFI_HII_CONFIG_ROUTING_PROTOCOL\r
                                  instance.\r

-  @param  EfiVarStoreInfo        The efi varstore info which is save in the EFI \r
-                                 varstore data structure.                       \r
+  @param  EfiVarStoreInfo        The efi varstore info which is save in the EFI\r
+                                 varstore data structure.\r

   @param  Request                Pointer to a null-terminated Unicode string in\r
                                  <ConfigRequest> format.\r
   @param  RequestResp            Pointer to a null-terminated Unicode string in\r
   @param  Request                Pointer to a null-terminated Unicode string in\r
                                  <ConfigRequest> format.\r
   @param  RequestResp            Pointer to a null-terminated Unicode string in\r


@@ -4376,7 +4376,7 @@ Done:
 EFI_STATUS\r
 GetConfigRespFromEfiVarStore (\r
   IN  CONST EFI_HII_CONFIG_ROUTING_PROTOCOL  *This,\r
 EFI_STATUS\r
 GetConfigRespFromEfiVarStore (\r
   IN  CONST EFI_HII_CONFIG_ROUTING_PROTOCOL  *This,\r

-  IN  EFI_IFR_VARSTORE_EFI                   *EfiVarStoreInfo,    \r
+  IN  EFI_IFR_VARSTORE_EFI                   *EfiVarStoreInfo,\r

   IN  EFI_STRING                             Request,\r
   OUT EFI_STRING                             *RequestResp,\r
   OUT EFI_STRING                             *AccessProgress\r
   IN  EFI_STRING                             Request,\r
   OUT EFI_STRING                             *RequestResp,\r
   OUT EFI_STRING                             *AccessProgress\r


@@ -4401,8 +4401,8 @@ GetConfigRespFromEfiVarStore (
     goto Done;\r
   }\r
   AsciiStrToUnicodeStrS ((CHAR8 *) EfiVarStoreInfo->Name, VarStoreName, NameSize);\r
     goto Done;\r
   }\r
   AsciiStrToUnicodeStrS ((CHAR8 *) EfiVarStoreInfo->Name, VarStoreName, NameSize);\r

-   \r
-  \r
+\r
+\r

   Status = gRT->GetVariable (VarStoreName, &EfiVarStoreInfo->Guid, NULL, &BufferSize, NULL);\r
   if (Status != EFI_BUFFER_TOO_SMALL) {\r
     goto Done;\r
   Status = gRT->GetVariable (VarStoreName, &EfiVarStoreInfo->Guid, NULL, &BufferSize, NULL);\r
   if (Status != EFI_BUFFER_TOO_SMALL) {\r
     goto Done;\r


@@ -4434,17 +4434,17 @@ Done:
 \r
 \r
 /**\r
 \r
 \r
 /**\r

-  This function route the full request resp string for efi varstore. \r
+  This function route the full request resp string for efi varstore.\r

 \r
   @param  This                   A pointer to the EFI_HII_CONFIG_ROUTING_PROTOCOL\r
                                  instance.\r
 \r
   @param  This                   A pointer to the EFI_HII_CONFIG_ROUTING_PROTOCOL\r
                                  instance.\r

-  @param  EfiVarStoreInfo        The efi varstore info which is save in the EFI \r
-                                 varstore data structure.      \r
+  @param  EfiVarStoreInfo        The efi varstore info which is save in the EFI\r
+                                 varstore data structure.\r

   @param  RequestResp            Pointer to a null-terminated Unicode string in\r
                                  <ConfigResp> format.\r
   @param  Result                 Pointer to a null-terminated Unicode string in\r
                                  <ConfigResp> format.\r
   @param  RequestResp            Pointer to a null-terminated Unicode string in\r
                                  <ConfigResp> format.\r
   @param  Result                 Pointer to a null-terminated Unicode string in\r
                                  <ConfigResp> format.\r

-                                 \r
+\r

   @retval EFI_SUCCESS            The Results string is set to the full request string.\r
                                  And AltCfgResp contains all default value string.\r
   @retval EFI_OUT_OF_RESOURCES   Not enough memory for the return string.\r
   @retval EFI_SUCCESS            The Results string is set to the full request string.\r
                                  And AltCfgResp contains all default value string.\r
   @retval EFI_OUT_OF_RESOURCES   Not enough memory for the return string.\r


@@ -4454,7 +4454,7 @@ Done:
 EFI_STATUS\r
 RouteConfigRespForEfiVarStore (\r
   IN  CONST EFI_HII_CONFIG_ROUTING_PROTOCOL  *This,\r
 EFI_STATUS\r
 RouteConfigRespForEfiVarStore (\r
   IN  CONST EFI_HII_CONFIG_ROUTING_PROTOCOL  *This,\r

-  IN  EFI_IFR_VARSTORE_EFI                   *EfiVarStoreInfo,  \r
+  IN  EFI_IFR_VARSTORE_EFI                   *EfiVarStoreInfo,\r

   IN  EFI_STRING                             RequestResp,\r
   OUT EFI_STRING                             *Result\r
   )\r
   IN  EFI_STRING                             RequestResp,\r
   OUT EFI_STRING                             *Result\r
   )\r


@@ -4479,7 +4479,7 @@ RouteConfigRespForEfiVarStore (
     goto Done;\r
   }\r
   AsciiStrToUnicodeStrS ((CHAR8 *) EfiVarStoreInfo->Name, VarStoreName, NameSize);\r
     goto Done;\r
   }\r
   AsciiStrToUnicodeStrS ((CHAR8 *) EfiVarStoreInfo->Name, VarStoreName, NameSize);\r

-      \r
+\r

   Status = gRT->GetVariable (VarStoreName, &EfiVarStoreInfo->Guid, NULL, &BufferSize, NULL);\r
   if (Status != EFI_BUFFER_TOO_SMALL) {\r
     DEBUG ((DEBUG_ERROR, "The variable does not exist!"));\r
   Status = gRT->GetVariable (VarStoreName, &EfiVarStoreInfo->Guid, NULL, &BufferSize, NULL);\r
   if (Status != EFI_BUFFER_TOO_SMALL) {\r
     DEBUG ((DEBUG_ERROR, "The variable does not exist!"));\r


@@ -4520,7 +4520,7 @@ Done:
 /**\r
   Validate the config request elements.\r
 \r
 /**\r
   Validate the config request elements.\r
 \r

-  @param  ConfigElements                A null-terminated Unicode string in <ConfigRequest> format, \r
+  @param  ConfigElements                A null-terminated Unicode string in <ConfigRequest> format,\r

                                         without configHdr field.\r
 \r
   @retval     CHAR16 *    THE first Name/value pair not correct.\r
                                         without configHdr field.\r
 \r
   @retval     CHAR16 *    THE first Name/value pair not correct.\r


@@ -4563,7 +4563,7 @@ OffsetWidthValidate (
 /**\r
   Validate the config request elements.\r
 \r
 /**\r
   Validate the config request elements.\r
 \r

-  @param  ConfigElements                A null-terminated Unicode string in <ConfigRequest> format, \r
+  @param  ConfigElements                A null-terminated Unicode string in <ConfigRequest> format,\r

                                         without configHdr field.\r
 \r
   @retval     CHAR16 *    THE first Name/value pair not correct.\r
                                         without configHdr field.\r
 \r
   @retval     CHAR16 *    THE first Name/value pair not correct.\r


@@ -4588,7 +4588,7 @@ NameValueValidate (
     StringPtr += 1;\r
 \r
     StringPtr = StrStr (StringPtr, L"&");\r
     StringPtr += 1;\r
 \r
     StringPtr = StrStr (StringPtr, L"&");\r

-    \r
+\r

     if (StringPtr == NULL) {\r
       return NULL;\r
     }\r
     if (StringPtr == NULL) {\r
       return NULL;\r
     }\r


@@ -4696,7 +4696,7 @@ ConfigRequestValidate (
   @retval EFI_INVALID_PARAMETER  Illegal syntax. Progress set to most recent &\r
                                  before the error or the beginning of the string.\r
   @retval EFI_INVALID_PARAMETER  The ExtractConfig function of the underlying HII\r
   @retval EFI_INVALID_PARAMETER  Illegal syntax. Progress set to most recent &\r
                                  before the error or the beginning of the string.\r
   @retval EFI_INVALID_PARAMETER  The ExtractConfig function of the underlying HII\r

-                                 Configuration Access Protocol returned \r
+                                 Configuration Access Protocol returned\r

                                  EFI_INVALID_PARAMETER. Progress set to most recent\r
                                  & before the error or the beginning of the string.\r
 \r
                                  EFI_INVALID_PARAMETER. Progress set to most recent\r
                                  & before the error or the beginning of the string.\r
 \r


@@ -4833,7 +4833,7 @@ HiiConfigRoutingExtractConfig (
         }\r
       }\r
     }\r
         }\r
       }\r
     }\r

-    \r
+\r

     //\r
     // Try to find driver handle by device path.\r
     //\r
     //\r
     // Try to find driver handle by device path.\r
     //\r


@@ -4871,7 +4871,7 @@ HiiConfigRoutingExtractConfig (
     IfrDataParsedFlag = FALSE;\r
     if ((HiiHandle != NULL) && !GetElementsFromRequest(ConfigRequest)) {\r
       //\r
     IfrDataParsedFlag = FALSE;\r
     if ((HiiHandle != NULL) && !GetElementsFromRequest(ConfigRequest)) {\r
       //\r

-      // Get the full request string from IFR when HiiPackage is registered to HiiHandle \r
+      // Get the full request string from IFR when HiiPackage is registered to HiiHandle\r

       //\r
       IfrDataParsedFlag = TRUE;\r
       Status = GetFullStringFromHiiFormPackages (Database, DevicePath, &ConfigRequest, &DefaultResults, &AccessProgress);\r
       //\r
       IfrDataParsedFlag = TRUE;\r
       Status = GetFullStringFromHiiFormPackages (Database, DevicePath, &ConfigRequest, &DefaultResults, &AccessProgress);\r


@@ -4900,7 +4900,7 @@ HiiConfigRoutingExtractConfig (
     if (EFI_ERROR (Status)) {\r
       goto Done;\r
     }\r
     if (EFI_ERROR (Status)) {\r
       goto Done;\r
     }\r

-    \r
+\r

     if (IsEfiVarStore) {\r
       //\r
       // Call the GetVariable function to extract settings.\r
     if (IsEfiVarStore) {\r
       //\r
       // Call the GetVariable function to extract settings.\r


@@ -4999,7 +4999,7 @@ HiiConfigRoutingExtractConfig (
     ASSERT (*AccessProgress == 0);\r
 \r
     //\r
     ASSERT (*AccessProgress == 0);\r
 \r
     //\r

-    // Update AccessResults by getting default setting from IFR when HiiPackage is registered to HiiHandle \r
+    // Update AccessResults by getting default setting from IFR when HiiPackage is registered to HiiHandle\r

     //\r
     if (!IfrDataParsedFlag && HiiHandle != NULL) {\r
       Status = GetFullStringFromHiiFormPackages (Database, DevicePath, &ConfigRequest, &DefaultResults, NULL);\r
     //\r
     if (!IfrDataParsedFlag && HiiHandle != NULL) {\r
       Status = GetFullStringFromHiiFormPackages (Database, DevicePath, &ConfigRequest, &DefaultResults, NULL);\r


@@ -5015,13 +5015,13 @@ HiiConfigRoutingExtractConfig (
       FreePool (DefaultResults);\r
       DefaultResults = NULL;\r
     }\r
       FreePool (DefaultResults);\r
       DefaultResults = NULL;\r
     }\r

-    \r
+\r

 NextConfigString:\r
     if (!FirstElement) {\r
       Status = AppendToMultiString (Results, L"&");\r
       ASSERT_EFI_ERROR (Status);\r
     }\r
 NextConfigString:\r
     if (!FirstElement) {\r
       Status = AppendToMultiString (Results, L"&");\r
       ASSERT_EFI_ERROR (Status);\r
     }\r

-    \r
+\r

     Status = AppendToMultiString (Results, AccessResults);\r
     ASSERT_EFI_ERROR (Status);\r
 \r
     Status = AppendToMultiString (Results, AccessResults);\r
     ASSERT_EFI_ERROR (Status);\r
 \r


@@ -5049,22 +5049,22 @@ Done:
     FreePool (*Results);\r
     *Results = NULL;\r
   }\r
     FreePool (*Results);\r
     *Results = NULL;\r
   }\r

-  \r
+\r

   if (ConfigRequest != NULL) {\r
     FreePool (ConfigRequest);\r
   }\r
   if (ConfigRequest != NULL) {\r
     FreePool (ConfigRequest);\r
   }\r

-  \r
+\r

   if (AccessResults != NULL) {\r
     FreePool (AccessResults);\r
   }\r
   if (AccessResults != NULL) {\r
     FreePool (AccessResults);\r
   }\r

-  \r
+\r

   if (DefaultResults != NULL) {\r
     FreePool (DefaultResults);\r
   }\r
   if (DefaultResults != NULL) {\r
     FreePool (DefaultResults);\r
   }\r

-  \r
+\r

   if (DevicePath != NULL) {\r
     FreePool (DevicePath);\r
   if (DevicePath != NULL) {\r
     FreePool (DevicePath);\r

-  }  \r
+  }\r

 \r
   return Status;\r
 }\r
 \r
   return Status;\r
 }\r


@@ -5079,8 +5079,8 @@ Done:
                                  instance.\r
   @param  Results                Null-terminated Unicode string in\r
                                  <MultiConfigAltResp> format which has all values\r
                                  instance.\r
   @param  Results                Null-terminated Unicode string in\r
                                  <MultiConfigAltResp> format which has all values\r

-                                 filled in for the entirety of the current HII \r
-                                 database. String to be allocated by the  called \r
+                                 filled in for the entirety of the current HII\r
+                                 database. String to be allocated by the  called\r

                                  function. De-allocation is up to the caller.\r
 \r
   @retval EFI_SUCCESS            The Results string is filled with the values\r
                                  function. De-allocation is up to the caller.\r
 \r
   @retval EFI_SUCCESS            The Results string is filled with the values\r


@@ -5196,7 +5196,7 @@ HiiConfigRoutingExportConfig (
                              );\r
     if (EFI_ERROR (Status)) {\r
       //\r
                              );\r
     if (EFI_ERROR (Status)) {\r
       //\r

-      // Update AccessResults by getting default setting from IFR when HiiPackage is registered to HiiHandle \r
+      // Update AccessResults by getting default setting from IFR when HiiPackage is registered to HiiHandle\r

       //\r
       if (HiiHandle != NULL && DevicePath != NULL) {\r
         IfrDataParsedFlag = TRUE;\r
       //\r
       if (HiiHandle != NULL && DevicePath != NULL) {\r
         IfrDataParsedFlag = TRUE;\r


@@ -5220,7 +5220,7 @@ HiiConfigRoutingExportConfig (
 \r
     if (!EFI_ERROR (Status)) {\r
       //\r
 \r
     if (!EFI_ERROR (Status)) {\r
       //\r

-      // Update AccessResults by getting default setting from IFR when HiiPackage is registered to HiiHandle \r
+      // Update AccessResults by getting default setting from IFR when HiiPackage is registered to HiiHandle\r

       //\r
       if (!IfrDataParsedFlag && HiiHandle != NULL && DevicePath != NULL) {\r
         StringPtr = StrStr (AccessResults, L"&GUID=");\r
       //\r
       if (!IfrDataParsedFlag && HiiHandle != NULL && DevicePath != NULL) {\r
         StringPtr = StrStr (AccessResults, L"&GUID=");\r


@@ -5244,7 +5244,7 @@ HiiConfigRoutingExportConfig (
         FreePool (DefaultResults);\r
         DefaultResults = NULL;\r
       }\r
         FreePool (DefaultResults);\r
         DefaultResults = NULL;\r
       }\r

-      \r
+\r

       //\r
       // Attach this <ConfigAltResp> to a <MultiConfigAltResp>. There is a '&'\r
       // which separates the first <ConfigAltResp> and the following ones.\r
       //\r
       // Attach this <ConfigAltResp> to a <MultiConfigAltResp>. There is a '&'\r
       // which separates the first <ConfigAltResp> and the following ones.\r


@@ -5253,19 +5253,19 @@ HiiConfigRoutingExportConfig (
         Status = AppendToMultiString (Results, L"&");\r
         ASSERT_EFI_ERROR (Status);\r
       }\r
         Status = AppendToMultiString (Results, L"&");\r
         ASSERT_EFI_ERROR (Status);\r
       }\r

-      \r
+\r

       Status = AppendToMultiString (Results, AccessResults);\r
       ASSERT_EFI_ERROR (Status);\r
 \r
       FirstElement = FALSE;\r
       Status = AppendToMultiString (Results, AccessResults);\r
       ASSERT_EFI_ERROR (Status);\r
 \r
       FirstElement = FALSE;\r

-      \r
+\r

       FreePool (AccessResults);\r
       AccessResults = NULL;\r
     }\r
   }\r
   FreePool (ConfigAccessHandles);\r
 \r
       FreePool (AccessResults);\r
       AccessResults = NULL;\r
     }\r
   }\r
   FreePool (ConfigAccessHandles);\r
 \r

-  return EFI_SUCCESS;  \r
+  return EFI_SUCCESS;\r

 }\r
 \r
 \r
 }\r
 \r
 \r


@@ -5433,7 +5433,7 @@ HiiConfigRoutingRouteConfig (
     if (IsEfiVarstore) {\r
       //\r
       // Call the SetVariable function to route settings.\r
     if (IsEfiVarstore) {\r
       //\r
       // Call the SetVariable function to route settings.\r

-      //    \r
+      //\r

       Status = RouteConfigRespForEfiVarStore(This, EfiVarStoreInfo, ConfigResp, &AccessProgress);\r
       FreePool (EfiVarStoreInfo);\r
     } else {\r
       Status = RouteConfigRespForEfiVarStore(This, EfiVarStoreInfo, ConfigResp, &AccessProgress);\r
       FreePool (EfiVarStoreInfo);\r
     } else {\r


@@ -5705,7 +5705,7 @@ HiiBlockToConfig (
       Status = EFI_OUT_OF_RESOURCES;\r
       goto Exit;\r
     }\r
       Status = EFI_OUT_OF_RESOURCES;\r
       goto Exit;\r
     }\r

-    \r
+\r

     TemString = ValueStr;\r
     TemBuffer = Value + Width - 1;\r
     for (Index = 0; Index < Width; Index ++, TemBuffer --) {\r
     TemString = ValueStr;\r
     TemBuffer = Value + Width - 1;\r
     for (Index = 0; Index < Width; Index ++, TemBuffer --) {\r


@@ -5762,7 +5762,7 @@ HiiBlockToConfig (
     Status = EFI_INVALID_PARAMETER;\r
     goto Exit;\r
   }\r
     Status = EFI_INVALID_PARAMETER;\r
     goto Exit;\r
   }\r

-  \r
+\r

   HiiToLower (*Config);\r
   *Progress = StringPtr;\r
   return EFI_SUCCESS;\r
   HiiToLower (*Config);\r
   *Progress = StringPtr;\r
   return EFI_SUCCESS;\r


@@ -5827,7 +5827,7 @@ Exit:
                                  value pair. Block is left updated and\r
                                  Progress points at the '&' preceding the first\r
                                  non-<BlockName>.\r
                                  value pair. Block is left updated and\r
                                  Progress points at the '&' preceding the first\r
                                  non-<BlockName>.\r

-  @retval EFI_BUFFER_TOO_SMALL   Block not large enough. Progress undefined. \r
+  @retval EFI_BUFFER_TOO_SMALL   Block not large enough. Progress undefined.\r

                                  BlockSize is updated with the required buffer size.\r
   @retval EFI_NOT_FOUND          Target for the specified routing data was not found.\r
                                  Progress points to the "G" in "GUID" of the errant\r
                                  BlockSize is updated with the required buffer size.\r
   @retval EFI_NOT_FOUND          Target for the specified routing data was not found.\r
                                  Progress points to the "G" in "GUID" of the errant\r


@@ -5993,7 +5993,7 @@ HiiConfigToBlock (
       break;\r
     }\r
   }\r
       break;\r
     }\r
   }\r

-  \r
+\r

   //\r
   // The input string is not ConfigResp format, return error.\r
   //\r
   //\r
   // The input string is not ConfigResp format, return error.\r
   //\r


@@ -6128,10 +6128,10 @@ HiiGetAltCfg (
     &PathStr\r
     );\r
   if (AltCfgId != NULL) {\r
     &PathStr\r
     );\r
   if (AltCfgId != NULL) {\r

-    GenerateSubStr (L"ALTCFG=", sizeof (UINT16), (VOID *) AltCfgId, 3, &AltIdStr);  \r
+    GenerateSubStr (L"ALTCFG=", sizeof (UINT16), (VOID *) AltCfgId, 3, &AltIdStr);\r

   }\r
   if (Name != NULL) {\r
   }\r
   if (Name != NULL) {\r

-    GenerateSubStr (L"NAME=", StrLen (Name) * sizeof (CHAR16), (VOID *) Name, 2, &NameStr);    \r
+    GenerateSubStr (L"NAME=", StrLen (Name) * sizeof (CHAR16), (VOID *) Name, 2, &NameStr);\r

   } else {\r
     GenerateSubStr (L"NAME=", 0, NULL, 2, &NameStr);\r
   }\r
   } else {\r
     GenerateSubStr (L"NAME=", 0, NULL, 2, &NameStr);\r
   }\r

diff --git a/MdeModulePkg/Universal/HiiDatabaseDxe/Database.c b/MdeModulePkg/Universal/HiiDatabaseDxe/Database.c
index e8f4564e6478e3b2f10fc18bb249f438c6b3b662..45448c5198ac804ddc0d15762b5b3adffeb312d3 100644 (file)
--- a/MdeModulePkg/Universal/HiiDatabaseDxe/Database.c
+++ b/MdeModulePkg/Universal/HiiDatabaseDxe/Database.c
@@ -1,7 +1,7 @@
 /** @file\r
 Implementation for EFI_HII_DATABASE_PROTOCOL.\r
 \r
 /** @file\r
 Implementation for EFI_HII_DATABASE_PROTOCOL.\r
 \r

-Copyright (c) 2007 - 2017, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2007 - 2018, Intel Corporation. All rights reserved.<BR>\r

 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r


@@ -1431,7 +1431,7 @@ Error:
 \r
 /**\r
  Adjust all string packages in a single package list to have the same max string ID.\r
 \r
 /**\r
  Adjust all string packages in a single package list to have the same max string ID.\r

- \r
+\r

  @param  PackageList        Pointer to a package list which will be adjusted.\r
 \r
  @retval EFI_SUCCESS  Adjust all string packages successfully.\r
  @param  PackageList        Pointer to a package list which will be adjusted.\r
 \r
  @retval EFI_SUCCESS  Adjust all string packages successfully.\r


@@ -3154,7 +3154,7 @@ AddPackages (
     PackageHdrPtr = (EFI_HII_PACKAGE_HEADER *) ((UINT8 *) PackageHdrPtr + PackageHeader.Length);\r
     CopyMem (&PackageHeader, PackageHdrPtr, sizeof (EFI_HII_PACKAGE_HEADER));\r
   }\r
     PackageHdrPtr = (EFI_HII_PACKAGE_HEADER *) ((UINT8 *) PackageHdrPtr + PackageHeader.Length);\r
     CopyMem (&PackageHeader, PackageHdrPtr, sizeof (EFI_HII_PACKAGE_HEADER));\r
   }\r

-  \r
+\r

   //\r
   // Adjust String Package to make sure all string packages have the same max string ID.\r
   //\r
   //\r
   // Adjust String Package to make sure all string packages have the same max string ID.\r
   //\r


@@ -3520,7 +3520,7 @@ HiiNewPackageList (
     DatabaseRecord = CR (Link, HII_DATABASE_RECORD, DatabaseEntry, HII_DATABASE_RECORD_SIGNATURE);\r
     if (CompareGuid (\r
           &(DatabaseRecord->PackageList->PackageListHdr.PackageListGuid),\r
     DatabaseRecord = CR (Link, HII_DATABASE_RECORD, DatabaseEntry, HII_DATABASE_RECORD_SIGNATURE);\r
     if (CompareGuid (\r
           &(DatabaseRecord->PackageList->PackageListHdr.PackageListGuid),\r

-          &PackageListGuid) && \r
+          &PackageListGuid) &&\r

         DatabaseRecord->DriverHandle == DriverHandle) {\r
       return EFI_INVALID_PARAMETER;\r
     }\r
         DatabaseRecord->DriverHandle == DriverHandle) {\r
       return EFI_INVALID_PARAMETER;\r
     }\r


@@ -3992,7 +3992,7 @@ HiiListPackageLists (
   @retval EFI_NOT_FOUND          The specified Handle could not be found in the\r
                                  current database.\r
   @retval EFI_INVALID_PARAMETER  BufferSize was NULL.\r
   @retval EFI_NOT_FOUND          The specified Handle could not be found in the\r
                                  current database.\r
   @retval EFI_INVALID_PARAMETER  BufferSize was NULL.\r

-  @retval EFI_INVALID_PARAMETER  The value referenced by BufferSize was not zero \r
+  @retval EFI_INVALID_PARAMETER  The value referenced by BufferSize was not zero\r

                                  and Buffer was NULL.\r
 \r
 **/\r
                                  and Buffer was NULL.\r
 \r
 **/\r

diff --git a/MdeModulePkg/Universal/HiiDatabaseDxe/Font.c b/MdeModulePkg/Universal/HiiDatabaseDxe/Font.c
index b85cf88f54e53a8386ad1ed7005f8c09f52df9cb..4840933f291894ec3ba0d5e24ecb7b0249a63b10 100644 (file)
--- a/MdeModulePkg/Universal/HiiDatabaseDxe/Font.c
+++ b/MdeModulePkg/Universal/HiiDatabaseDxe/Font.c
@@ -2,7 +2,7 @@
 Implementation for EFI_HII_FONT_PROTOCOL.\r
 \r
 \r
 Implementation for EFI_HII_FONT_PROTOCOL.\r
 \r
 \r

-Copyright (c) 2007 - 2017, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2007 - 2018, Intel Corporation. All rights reserved.<BR>\r

 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r


@@ -304,14 +304,14 @@ NarrowGlyphToBlt (
 \r
   Height = EFI_GLYPH_HEIGHT;\r
   Width  = EFI_GLYPH_WIDTH;\r
 \r
   Height = EFI_GLYPH_HEIGHT;\r
   Width  = EFI_GLYPH_WIDTH;\r

-  \r
+\r

   //\r
   // Move position to the left-top corner of char.\r
   //\r
   Buffer = *Origin - EFI_GLYPH_HEIGHT * ImageWidth;\r
 \r
   //\r
   //\r
   // Move position to the left-top corner of char.\r
   //\r
   Buffer = *Origin - EFI_GLYPH_HEIGHT * ImageWidth;\r
 \r
   //\r

-  // Char may be partially displayed when CLIP_X or CLIP_Y is not set. \r
+  // Char may be partially displayed when CLIP_X or CLIP_Y is not set.\r

   //\r
   if (RowHeight < Height) {\r
     Height = (UINT8) RowHeight;\r
   //\r
   if (RowHeight < Height) {\r
     Height = (UINT8) RowHeight;\r


@@ -685,7 +685,7 @@ FindGlyphBlock (
   ASSERT (FontPackage->Signature == HII_FONT_PACKAGE_SIGNATURE);\r
   BaseLine  = 0;\r
   MinOffsetY = 0;\r
   ASSERT (FontPackage->Signature == HII_FONT_PACKAGE_SIGNATURE);\r
   BaseLine  = 0;\r
   MinOffsetY = 0;\r

-  \r
+\r

   if (CharValue == (CHAR16) (-1)) {\r
     //\r
     // Collect the cell information specified in font package fixed header.\r
   if (CharValue == (CHAR16) (-1)) {\r
     //\r
     // Collect the cell information specified in font package fixed header.\r


@@ -1099,8 +1099,8 @@ IsSystemFontInfo (
   }\r
   if ((StringInfo->FontInfoMask & EFI_FONT_INFO_SYS_FORE_COLOR) == 0) {\r
     if (CompareMem (\r
   }\r
   if ((StringInfo->FontInfoMask & EFI_FONT_INFO_SYS_FORE_COLOR) == 0) {\r
     if (CompareMem (\r

-          &StringInfo->ForegroundColor, \r
-          &SystemDefault->ForegroundColor, \r
+          &StringInfo->ForegroundColor,\r
+          &SystemDefault->ForegroundColor,\r

           sizeof (EFI_GRAPHICS_OUTPUT_BLT_PIXEL)\r
           ) != 0) {\r
       goto Exit;\r
           sizeof (EFI_GRAPHICS_OUTPUT_BLT_PIXEL)\r
           ) != 0) {\r
       goto Exit;\r


@@ -1108,8 +1108,8 @@ IsSystemFontInfo (
   }\r
   if ((StringInfo->FontInfoMask & EFI_FONT_INFO_SYS_BACK_COLOR) == 0) {\r
     if (CompareMem (\r
   }\r
   if ((StringInfo->FontInfoMask & EFI_FONT_INFO_SYS_BACK_COLOR) == 0) {\r
     if (CompareMem (\r

-          &StringInfo->BackgroundColor, \r
-          &SystemDefault->BackgroundColor, \r
+          &StringInfo->BackgroundColor,\r
+          &SystemDefault->BackgroundColor,\r

           sizeof (EFI_GRAPHICS_OUTPUT_BLT_PIXEL)\r
           ) != 0) {\r
       goto Exit;\r
           sizeof (EFI_GRAPHICS_OUTPUT_BLT_PIXEL)\r
           ) != 0) {\r
       goto Exit;\r


@@ -1745,7 +1745,7 @@ HiiStringToImage (
       goto Exit;\r
     }\r
   }\r
       goto Exit;\r
     }\r
   }\r

-  \r
+\r

   //\r
   // Use the maximum height of font as the base line.\r
   // And, use the maximum height as line height.\r
   //\r
   // Use the maximum height of font as the base line.\r
   // And, use the maximum height as line height.\r


@@ -1753,7 +1753,7 @@ HiiStringToImage (
   LineHeight     = Height;\r
   LastLineHeight = Height;\r
   BaseLineOffset = Height - BaseLine;\r
   LineHeight     = Height;\r
   LastLineHeight = Height;\r
   BaseLineOffset = Height - BaseLine;\r

-  \r
+\r

   //\r
   // Parse the string to be displayed to drop some ignored characters.\r
   //\r
   //\r
   // Parse the string to be displayed to drop some ignored characters.\r
   //\r


@@ -1799,7 +1799,7 @@ HiiStringToImage (
       Index++;\r
       continue;\r
     }\r
       Index++;\r
       continue;\r
     }\r

-    \r
+\r

     Status = GetGlyphBuffer (Private, *StringPtr, FontInfo, &GlyphBuf[Index], &Cell[Index], &Attributes[Index]);\r
     if (Status == EFI_NOT_FOUND) {\r
       if ((Flags & EFI_HII_IGNORE_IF_NO_GLYPH) == EFI_HII_IGNORE_IF_NO_GLYPH) {\r
     Status = GetGlyphBuffer (Private, *StringPtr, FontInfo, &GlyphBuf[Index], &Cell[Index], &Attributes[Index]);\r
     if (Status == EFI_NOT_FOUND) {\r
       if ((Flags & EFI_HII_IGNORE_IF_NO_GLYPH) == EFI_HII_IGNORE_IF_NO_GLYPH) {\r


@@ -1971,8 +1971,8 @@ HiiStringToImage (
     // opportunity prior to a character whose right-most extent would exceed Width.\r
     // Search the right-most line-break opportunity here.\r
     //\r
     // opportunity prior to a character whose right-most extent would exceed Width.\r
     // Search the right-most line-break opportunity here.\r
     //\r

-    if ((Flags & EFI_HII_OUT_FLAG_WRAP) == EFI_HII_OUT_FLAG_WRAP && \r
-        (RowInfo[RowIndex].LineWidth + BltX > Image->Width || StringPtr[NextIndex] != 0) && \r
+    if ((Flags & EFI_HII_OUT_FLAG_WRAP) == EFI_HII_OUT_FLAG_WRAP &&\r
+        (RowInfo[RowIndex].LineWidth + BltX > Image->Width || StringPtr[NextIndex] != 0) &&\r

         !LineBreak) {\r
       if ((Flags & EFI_HII_IGNORE_LINE_BREAK) == 0) {\r
         LineWidth = RowInfo[RowIndex].LineWidth;\r
         !LineBreak) {\r
       if ((Flags & EFI_HII_IGNORE_LINE_BREAK) == 0) {\r
         LineWidth = RowInfo[RowIndex].LineWidth;\r


@@ -2040,7 +2040,7 @@ HiiStringToImage (
         }\r
       }\r
     }\r
         }\r
       }\r
     }\r

-    \r
+\r

     //\r
     // LineWidth can't exceed Image width.\r
     //\r
     //\r
     // LineWidth can't exceed Image width.\r
     //\r


@@ -2091,7 +2091,7 @@ HiiStringToImage (
           );\r
         }\r
         if (ColumnInfoArray != NULL) {\r
           );\r
         }\r
         if (ColumnInfoArray != NULL) {\r

-          if ((GlyphBuf[Index1] == NULL && Cell[Index1].AdvanceX == 0) \r
+          if ((GlyphBuf[Index1] == NULL && Cell[Index1].AdvanceX == 0)\r

               || RowInfo[RowIndex].LineWidth == 0) {\r
             *ColumnInfoArray = (UINTN) ~0;\r
           } else {\r
               || RowInfo[RowIndex].LineWidth == 0) {\r
             *ColumnInfoArray = (UINTN) ~0;\r
           } else {\r


@@ -2119,7 +2119,7 @@ HiiStringToImage (
           FreePool (BltBuffer);\r
           goto Exit;\r
         }\r
           FreePool (BltBuffer);\r
           goto Exit;\r
         }\r

-  \r
+\r

         FreePool (BltBuffer);\r
       }\r
     } else {\r
         FreePool (BltBuffer);\r
       }\r
     } else {\r


@@ -2151,7 +2151,7 @@ HiiStringToImage (
           );\r
         }\r
         if (ColumnInfoArray != NULL) {\r
           );\r
         }\r
         if (ColumnInfoArray != NULL) {\r

-          if ((GlyphBuf[Index1] == NULL && Cell[Index1].AdvanceX == 0) \r
+          if ((GlyphBuf[Index1] == NULL && Cell[Index1].AdvanceX == 0)\r

               || RowInfo[RowIndex].LineWidth == 0) {\r
             *ColumnInfoArray = (UINTN) ~0;\r
           } else {\r
               || RowInfo[RowIndex].LineWidth == 0) {\r
             *ColumnInfoArray = (UINTN) ~0;\r
           } else {\r


@@ -2392,7 +2392,7 @@ HiiStringIdToImage (
   if (EFI_ERROR (Status)) {\r
     goto Exit;\r
   }\r
   if (EFI_ERROR (Status)) {\r
     goto Exit;\r
   }\r

- \r
+\r

   if (Language == NULL) {\r
     Language = "";\r
   }\r
   if (Language == NULL) {\r
     Language = "";\r
   }\r


@@ -2409,7 +2409,7 @@ HiiStringIdToImage (
     Status = EFI_NOT_FOUND;\r
     goto Exit;\r
   }\r
     Status = EFI_NOT_FOUND;\r
     goto Exit;\r
   }\r

-    \r
+\r

   StringSize = MAX_STRING_LENGTH;\r
   String = (EFI_STRING) AllocateZeroPool (StringSize);\r
   if (String == NULL) {\r
   StringSize = MAX_STRING_LENGTH;\r
   String = (EFI_STRING) AllocateZeroPool (StringSize);\r
   if (String == NULL) {\r


@@ -2447,33 +2447,33 @@ HiiStringIdToImage (
   if (EFI_ERROR (Status)) {\r
     goto Exit;\r
   }\r
   if (EFI_ERROR (Status)) {\r
     goto Exit;\r
   }\r

-    \r
+\r

   //\r
   // When StringInfo specifies that string will be output in the system default font and color,\r
   //\r
   // When StringInfo specifies that string will be output in the system default font and color,\r

-  // use particular stringfontinfo described in string package instead if exists. \r
+  // use particular stringfontinfo described in string package instead if exists.\r

   // StringFontInfo equals NULL means system default font attaches with the string block.\r
   //\r
   if (StringFontInfo != NULL && IsSystemFontInfo (Private, (EFI_FONT_DISPLAY_INFO *) StringInfo, NULL, NULL)) {\r
     NameSize = StrSize (StringFontInfo->FontName);\r
     FontLen = sizeof (EFI_FONT_DISPLAY_INFO) - sizeof (CHAR16) + NameSize;\r
     NewStringInfo = AllocateZeroPool (FontLen);\r
   // StringFontInfo equals NULL means system default font attaches with the string block.\r
   //\r
   if (StringFontInfo != NULL && IsSystemFontInfo (Private, (EFI_FONT_DISPLAY_INFO *) StringInfo, NULL, NULL)) {\r
     NameSize = StrSize (StringFontInfo->FontName);\r
     FontLen = sizeof (EFI_FONT_DISPLAY_INFO) - sizeof (CHAR16) + NameSize;\r
     NewStringInfo = AllocateZeroPool (FontLen);\r

-    if (NewStringInfo == NULL) {      \r
+    if (NewStringInfo == NULL) {\r

       Status = EFI_OUT_OF_RESOURCES;\r
       goto Exit;\r
     }\r
     NewStringInfo->FontInfoMask       = EFI_FONT_INFO_SYS_FORE_COLOR | EFI_FONT_INFO_SYS_BACK_COLOR;\r
     NewStringInfo->FontInfo.FontStyle = StringFontInfo->FontStyle;\r
       Status = EFI_OUT_OF_RESOURCES;\r
       goto Exit;\r
     }\r
     NewStringInfo->FontInfoMask       = EFI_FONT_INFO_SYS_FORE_COLOR | EFI_FONT_INFO_SYS_BACK_COLOR;\r
     NewStringInfo->FontInfo.FontStyle = StringFontInfo->FontStyle;\r

-    NewStringInfo->FontInfo.FontSize  = StringFontInfo->FontSize;    \r
+    NewStringInfo->FontInfo.FontSize  = StringFontInfo->FontSize;\r

     StrCpyS (NewStringInfo->FontInfo.FontName, NameSize / sizeof (CHAR16), StringFontInfo->FontName);\r
     StrCpyS (NewStringInfo->FontInfo.FontName, NameSize / sizeof (CHAR16), StringFontInfo->FontName);\r

-  \r
+\r

     Status = HiiStringToImage (\r
     Status = HiiStringToImage (\r

-               This, \r
-               Flags, \r
-               String, \r
-               NewStringInfo, \r
-               Blt, \r
-               BltX, \r
-               BltY, \r
+               This,\r
+               Flags,\r
+               String,\r
+               NewStringInfo,\r
+               Blt,\r
+               BltX,\r
+               BltY,\r

                RowInfoArray,\r
                RowInfoArraySize,\r
                ColumnInfoArray\r
                RowInfoArray,\r
                RowInfoArraySize,\r
                ColumnInfoArray\r


@@ -2640,7 +2640,7 @@ HiiGetGlyph (
     //\r
     BaseLine  = (UINT16) (Cell.Height + Cell.OffsetY);\r
     //\r
     //\r
     BaseLine  = (UINT16) (Cell.Height + Cell.OffsetY);\r
     //\r

-    // Set BltBuffer to the position of Origin. \r
+    // Set BltBuffer to the position of Origin.\r

     //\r
     BltBuffer = Image->Image.Bitmap + (Cell.Height + Cell.OffsetY) * Image->Width - Cell.OffsetX;\r
     GlyphToImage (\r
     //\r
     BltBuffer = Image->Image.Bitmap + (Cell.Height + Cell.OffsetY) * Image->Width - Cell.OffsetX;\r
     GlyphToImage (\r


@@ -2715,7 +2715,7 @@ Exit:
   @param  StringInfoOut           Upon return, contains the matching font's information.\r
                                   If NULL, then no information is returned. This buffer\r
                                   is allocated with a call to the Boot Service AllocatePool().\r
   @param  StringInfoOut           Upon return, contains the matching font's information.\r
                                   If NULL, then no information is returned. This buffer\r
                                   is allocated with a call to the Boot Service AllocatePool().\r

-                                  It is the caller's responsibility to call the Boot \r
+                                  It is the caller's responsibility to call the Boot\r

                                   Service FreePool() when the caller no longer requires\r
                                   the contents of StringInfoOut.\r
   @param  String                  Points to the string which will be tested to\r
                                   Service FreePool() when the caller no longer requires\r
                                   the contents of StringInfoOut.\r
   @param  String                  Points to the string which will be tested to\r


@@ -2800,7 +2800,7 @@ HiiGetFontInfo (
       goto Exit;\r
     }\r
   }\r
       goto Exit;\r
     }\r
   }\r

-  \r
+\r

   //\r
   // StringInfoIn must not be NULL if it is not system default font info.\r
   //\r
   //\r
   // StringInfoIn must not be NULL if it is not system default font info.\r
   //\r


@@ -2808,15 +2808,15 @@ HiiGetFontInfo (
   //\r
   // Check the font information mask to make sure it is valid.\r
   //\r
   //\r
   // Check the font information mask to make sure it is valid.\r
   //\r

-  if (((StringInfoIn->FontInfoMask & (EFI_FONT_INFO_SYS_FONT  | EFI_FONT_INFO_ANY_FONT))  == \r
+  if (((StringInfoIn->FontInfoMask & (EFI_FONT_INFO_SYS_FONT  | EFI_FONT_INFO_ANY_FONT))  ==\r

        (EFI_FONT_INFO_SYS_FONT | EFI_FONT_INFO_ANY_FONT))   ||\r
        (EFI_FONT_INFO_SYS_FONT | EFI_FONT_INFO_ANY_FONT))   ||\r

-      ((StringInfoIn->FontInfoMask & (EFI_FONT_INFO_SYS_SIZE  | EFI_FONT_INFO_ANY_SIZE))  == \r
+      ((StringInfoIn->FontInfoMask & (EFI_FONT_INFO_SYS_SIZE  | EFI_FONT_INFO_ANY_SIZE))  ==\r

        (EFI_FONT_INFO_SYS_SIZE | EFI_FONT_INFO_ANY_SIZE))   ||\r
        (EFI_FONT_INFO_SYS_SIZE | EFI_FONT_INFO_ANY_SIZE))   ||\r

-      ((StringInfoIn->FontInfoMask & (EFI_FONT_INFO_SYS_STYLE | EFI_FONT_INFO_ANY_STYLE)) == \r
+      ((StringInfoIn->FontInfoMask & (EFI_FONT_INFO_SYS_STYLE | EFI_FONT_INFO_ANY_STYLE)) ==\r

        (EFI_FONT_INFO_SYS_STYLE | EFI_FONT_INFO_ANY_STYLE)) ||\r
        (EFI_FONT_INFO_SYS_STYLE | EFI_FONT_INFO_ANY_STYLE)) ||\r

-      ((StringInfoIn->FontInfoMask & (EFI_FONT_INFO_RESIZE    | EFI_FONT_INFO_ANY_SIZE))  == \r
-       (EFI_FONT_INFO_RESIZE | EFI_FONT_INFO_ANY_SIZE))     ||           \r
-      ((StringInfoIn->FontInfoMask & (EFI_FONT_INFO_RESTYLE   | EFI_FONT_INFO_ANY_STYLE)) == \r
+      ((StringInfoIn->FontInfoMask & (EFI_FONT_INFO_RESIZE    | EFI_FONT_INFO_ANY_SIZE))  ==\r
+       (EFI_FONT_INFO_RESIZE | EFI_FONT_INFO_ANY_SIZE))     ||\r
+      ((StringInfoIn->FontInfoMask & (EFI_FONT_INFO_RESTYLE   | EFI_FONT_INFO_ANY_STYLE)) ==\r

        (EFI_FONT_INFO_RESTYLE | EFI_FONT_INFO_ANY_STYLE))) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
        (EFI_FONT_INFO_RESTYLE | EFI_FONT_INFO_ANY_STYLE))) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r


@@ -2838,7 +2838,7 @@ HiiGetFontInfo (
 \r
   if ((StringInfoIn->FontInfoMask & EFI_FONT_INFO_SYS_SIZE) == EFI_FONT_INFO_SYS_SIZE) {\r
     InfoOut.FontInfo.FontSize = SystemDefault->FontInfo.FontSize;\r
 \r
   if ((StringInfoIn->FontInfoMask & EFI_FONT_INFO_SYS_SIZE) == EFI_FONT_INFO_SYS_SIZE) {\r
     InfoOut.FontInfo.FontSize = SystemDefault->FontInfo.FontSize;\r

-  } \r
+  }\r

   if ((StringInfoIn->FontInfoMask & EFI_FONT_INFO_SYS_STYLE) == EFI_FONT_INFO_SYS_STYLE) {\r
     InfoOut.FontInfo.FontStyle = SystemDefault->FontInfo.FontStyle;\r
   }\r
   if ((StringInfoIn->FontInfoMask & EFI_FONT_INFO_SYS_STYLE) == EFI_FONT_INFO_SYS_STYLE) {\r
     InfoOut.FontInfo.FontStyle = SystemDefault->FontInfo.FontStyle;\r
   }\r


@@ -2848,7 +2848,7 @@ HiiGetFontInfo (
   if ((StringInfoIn->FontInfoMask & EFI_FONT_INFO_SYS_BACK_COLOR) == EFI_FONT_INFO_SYS_BACK_COLOR) {\r
     InfoOut.BackgroundColor = SystemDefault->BackgroundColor;\r
   }\r
   if ((StringInfoIn->FontInfoMask & EFI_FONT_INFO_SYS_BACK_COLOR) == EFI_FONT_INFO_SYS_BACK_COLOR) {\r
     InfoOut.BackgroundColor = SystemDefault->BackgroundColor;\r
   }\r

-  \r
+\r

   ASSERT (FontInfo != NULL);\r
   FontInfo->FontSize  = InfoOut.FontInfo.FontSize;\r
   FontInfo->FontStyle = InfoOut.FontInfo.FontStyle;\r
   ASSERT (FontInfo != NULL);\r
   FontInfo->FontSize  = InfoOut.FontInfo.FontSize;\r
   FontInfo->FontStyle = InfoOut.FontInfo.FontStyle;\r


@@ -2856,7 +2856,7 @@ HiiGetFontInfo (
   if (IsFontInfoExisted (Private, FontInfo, &InfoOut.FontInfoMask, LocalFontHandle, &GlobalFont)) {\r
     //\r
     // Test to guarantee all characters are available in the found font.\r
   if (IsFontInfoExisted (Private, FontInfo, &InfoOut.FontInfoMask, LocalFontHandle, &GlobalFont)) {\r
     //\r
     // Test to guarantee all characters are available in the found font.\r

-    //    \r
+    //\r

     if (String != NULL) {\r
       StringIn = String;\r
       while (*StringIn != 0) {\r
     if (String != NULL) {\r
       StringIn = String;\r
       while (*StringIn != 0) {\r


@@ -2873,21 +2873,21 @@ HiiGetFontInfo (
     //\r
     if (StringInfoOut != NULL) {\r
       StringInfoOutLen = sizeof (EFI_FONT_DISPLAY_INFO) - sizeof (EFI_FONT_INFO) + GlobalFont->FontInfoSize;\r
     //\r
     if (StringInfoOut != NULL) {\r
       StringInfoOutLen = sizeof (EFI_FONT_DISPLAY_INFO) - sizeof (EFI_FONT_INFO) + GlobalFont->FontInfoSize;\r

-      *StringInfoOut   = (EFI_FONT_DISPLAY_INFO *) AllocateZeroPool (StringInfoOutLen);      \r
+      *StringInfoOut   = (EFI_FONT_DISPLAY_INFO *) AllocateZeroPool (StringInfoOutLen);\r

       if (*StringInfoOut == NULL) {\r
         Status = EFI_OUT_OF_RESOURCES;\r
         LocalFontHandle = NULL;\r
         goto Exit;\r
       }\r
       if (*StringInfoOut == NULL) {\r
         Status = EFI_OUT_OF_RESOURCES;\r
         LocalFontHandle = NULL;\r
         goto Exit;\r
       }\r

-      \r
+\r

       CopyMem (*StringInfoOut, &InfoOut, sizeof (EFI_FONT_DISPLAY_INFO));\r
       CopyMem (&(*StringInfoOut)->FontInfo, GlobalFont->FontInfo, GlobalFont->FontInfoSize);\r
     }\r
       CopyMem (*StringInfoOut, &InfoOut, sizeof (EFI_FONT_DISPLAY_INFO));\r
       CopyMem (&(*StringInfoOut)->FontInfo, GlobalFont->FontInfo, GlobalFont->FontInfoSize);\r
     }\r

-    \r
-    LocalFontHandle = GlobalFont->Entry.ForwardLink;    \r
+\r
+    LocalFontHandle = GlobalFont->Entry.ForwardLink;\r

     Status = EFI_SUCCESS;\r
     goto Exit;\r
     Status = EFI_SUCCESS;\r
     goto Exit;\r

-  }  \r
+  }\r

 \r
   Status = EFI_NOT_FOUND;\r
 \r
 \r
   Status = EFI_NOT_FOUND;\r
 \r

diff --git a/MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabase.h b/MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabase.h
index 8336dd0f4fed7c9eece1908829adb98202cafb6a..4391625a9fa071baef9358457f670cd815f7e078 100644 (file)
--- a/MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabase.h
+++ b/MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabase.h
@@ -1,7 +1,7 @@
 /** @file\r
 Private structures definitions in HiiDatabase.\r
 \r
 /** @file\r
 Private structures definitions in HiiDatabase.\r
 \r

-Copyright (c) 2007 - 2017, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2007 - 2018, Intel Corporation. All rights reserved.<BR>\r

 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r


@@ -390,10 +390,10 @@ typedef struct _HII_DATABASE_PRIVATE_DATA {
 \r
   @param  BufferLen              The length of the Buffer in bytes.\r
 \r
 \r
   @param  BufferLen              The length of the Buffer in bytes.\r
 \r

-  @param  Buffer                 Points to a buffer which will be converted to be the \r
+  @param  Buffer                 Points to a buffer which will be converted to be the\r

                                  content of the generated string.\r
 \r
                                  content of the generated string.\r
 \r

-  @param  Flag                   If 1, the buffer contains data for the value of GUID or PATH stored in \r
+  @param  Flag                   If 1, the buffer contains data for the value of GUID or PATH stored in\r

                                  UINT8 *; if 2, the buffer contains unicode string for the value of NAME;\r
                                  if 3, the buffer contains other data.\r
 \r
                                  UINT8 *; if 2, the buffer contains unicode string for the value of NAME;\r
                                  if 3, the buffer contains other data.\r
 \r


@@ -460,21 +460,21 @@ IsFontInfoExisted (
 /**\r
 \r
    This function invokes the matching registered function.\r
 /**\r
 \r
    This function invokes the matching registered function.\r

-    \r
+\r

    @param  Private           HII Database driver private structure.\r
    @param  NotifyType        The type of change concerning the database.\r
    @param  PackageInstance   Points to the package referred to by the notification.\r
    @param  PackageType       Package type\r
    @param  Handle            The handle of the package list which contains the specified package.\r
    @param  Private           HII Database driver private structure.\r
    @param  NotifyType        The type of change concerning the database.\r
    @param  PackageInstance   Points to the package referred to by the notification.\r
    @param  PackageType       Package type\r
    @param  Handle            The handle of the package list which contains the specified package.\r

-    \r
-   @retval EFI_SUCCESS            Already checked all registered function and invoked \r
+\r
+   @retval EFI_SUCCESS            Already checked all registered function and invoked\r

                                   if matched.\r
    @retval EFI_INVALID_PARAMETER  Any input parameter is not valid.\r
                                   if matched.\r
    @retval EFI_INVALID_PARAMETER  Any input parameter is not valid.\r

-     \r
+\r

 **/\r
 EFI_STATUS\r
 InvokeRegisteredFunction (\r
 **/\r
 EFI_STATUS\r
 InvokeRegisteredFunction (\r

-  IN HII_DATABASE_PRIVATE_DATA    *Private, \r
+  IN HII_DATABASE_PRIVATE_DATA    *Private,\r

   IN EFI_HII_DATABASE_NOTIFY_TYPE NotifyType,\r
   IN VOID                         *PackageInstance,\r
   IN UINT8                        PackageType,\r
   IN EFI_HII_DATABASE_NOTIFY_TYPE NotifyType,\r
   IN VOID                         *PackageInstance,\r
   IN UINT8                        PackageType,\r


@@ -508,7 +508,7 @@ GetSystemFont (
 /**\r
   Parse all string blocks to find a String block specified by StringId.\r
   If StringId = (EFI_STRING_ID) (-1), find out all EFI_HII_SIBT_FONT blocks\r
 /**\r
   Parse all string blocks to find a String block specified by StringId.\r
   If StringId = (EFI_STRING_ID) (-1), find out all EFI_HII_SIBT_FONT blocks\r

-  within this string package and backup its information. If LastStringId is \r
+  within this string package and backup its information. If LastStringId is\r

   specified, the string id of last string block will also be output.\r
   If StringId = 0, output the string id of last string block (EFI_HII_SIBT_STRING).\r
 \r
   specified, the string id of last string block will also be output.\r
   If StringId = 0, output the string id of last string block (EFI_HII_SIBT_STRING).\r
 \r


@@ -734,8 +734,8 @@ HiiStringToImage (
                                   RowInfoArray or Blt.\r
   @retval EFI_INVALID_PARAMETER The Blt or PackageList was NULL.\r
   @retval EFI_INVALID_PARAMETER Flags were invalid combination.\r
                                   RowInfoArray or Blt.\r
   @retval EFI_INVALID_PARAMETER The Blt or PackageList was NULL.\r
   @retval EFI_INVALID_PARAMETER Flags were invalid combination.\r

-  @retval EFI_NOT_FOUND         The specified PackageList is not in the Database or the stringid is not \r
-                          in the specified PackageList. \r
+  @retval EFI_NOT_FOUND         The specified PackageList is not in the Database or the stringid is not\r
+                          in the specified PackageList.\r

 \r
 **/\r
 EFI_STATUS\r
 \r
 **/\r
 EFI_STATUS\r


@@ -806,7 +806,7 @@ HiiGetGlyph (
   @param  StringInfoOut           Upon return, contains the matching font's information.\r
                                   If NULL, then no information is returned. This buffer\r
                                   is allocated with a call to the Boot Service AllocatePool().\r
   @param  StringInfoOut           Upon return, contains the matching font's information.\r
                                   If NULL, then no information is returned. This buffer\r
                                   is allocated with a call to the Boot Service AllocatePool().\r

-                                  It is the caller's responsibility to call the Boot \r
+                                  It is the caller's responsibility to call the Boot\r

                                   Service FreePool() when the caller no longer requires\r
                                   the contents of StringInfoOut.\r
   @param  String                  Points to the string which will be tested to\r
                                   Service FreePool() when the caller no longer requires\r
                                   the contents of StringInfoOut.\r
   @param  String                  Points to the string which will be tested to\r


@@ -1067,7 +1067,7 @@ HiiDrawImage (
   @retval EFI_SUCCESS             The image was successfully drawn.\r
   @retval EFI_OUT_OF_RESOURCES    Unable to allocate an output buffer for Blt.\r
   @retval EFI_INVALID_PARAMETER  The Blt was NULL.\r
   @retval EFI_SUCCESS             The image was successfully drawn.\r
   @retval EFI_OUT_OF_RESOURCES    Unable to allocate an output buffer for Blt.\r
   @retval EFI_INVALID_PARAMETER  The Blt was NULL.\r

-  @retval EFI_NOT_FOUND          The image specified by ImageId is not in the database. \r
+  @retval EFI_NOT_FOUND          The image specified by ImageId is not in the database.\r

                            The specified PackageList is not in the database.\r
 \r
 **/\r
                            The specified PackageList is not in the database.\r
 \r
 **/\r


@@ -1654,7 +1654,7 @@ HiiListPackageLists (
   @retval EFI_NOT_FOUND           The specified Handle could not be found in the\r
                                   current database.\r
   @retval EFI_INVALID_PARAMETER   BufferSize was NULL.\r
   @retval EFI_NOT_FOUND           The specified Handle could not be found in the\r
                                   current database.\r
   @retval EFI_INVALID_PARAMETER   BufferSize was NULL.\r

-  @retval EFI_INVALID_PARAMETER   The value referenced by BufferSize was not zero \r
+  @retval EFI_INVALID_PARAMETER   The value referenced by BufferSize was not zero\r

                                   and Buffer was NULL.\r
 \r
 **/\r
                                   and Buffer was NULL.\r
 \r
 **/\r


@@ -1725,7 +1725,7 @@ HiiRegisterPackageNotify (
                                   unregistered.\r
 \r
   @retval EFI_SUCCESS             Notification is unregistered successfully.\r
                                   unregistered.\r
 \r
   @retval EFI_SUCCESS             Notification is unregistered successfully.\r

-  @retval EFI_NOT_FOUND          The incoming notification handle does not exist \r
+  @retval EFI_NOT_FOUND          The incoming notification handle does not exist\r

                            in current hii database.\r
 \r
 **/\r
                            in current hii database.\r
 \r
 **/\r


@@ -1912,8 +1912,8 @@ HiiConfigRoutingExtractConfig (
                                   instance.\r
   @param  Results                 Null-terminated Unicode string in\r
                                   <MultiConfigAltResp> format which has all values\r
                                   instance.\r
   @param  Results                 Null-terminated Unicode string in\r
                                   <MultiConfigAltResp> format which has all values\r

-                                  filled in for the entirety of the current HII \r
-                                  database. String to be allocated by the  called \r
+                                  filled in for the entirety of the current HII\r
+                                  database. String to be allocated by the  called\r

                                   function. De-allocation is up to the caller.\r
 \r
   @retval EFI_SUCCESS             The Results string is filled with the values\r
                                   function. De-allocation is up to the caller.\r
 \r
   @retval EFI_SUCCESS             The Results string is filled with the values\r


@@ -2064,7 +2064,7 @@ HiiBlockToConfig (
                                   value pair. Block is left updated and\r
                                   Progress points at the '&' preceding the first\r
                                   non-<BlockName>.\r
                                   value pair. Block is left updated and\r
                                   Progress points at the '&' preceding the first\r
                                   non-<BlockName>.\r

-  @retval EFI_BUFFER_TOO_SMALL    Block not large enough. Progress undefined. \r
+  @retval EFI_BUFFER_TOO_SMALL    Block not large enough. Progress undefined.\r

                                   BlockSize is updated with the required buffer size.\r
 \r
 **/\r
                                   BlockSize is updated with the required buffer size.\r
 \r
 **/\r


@@ -2136,18 +2136,18 @@ HiiGetAltCfg (
   This function accepts a <MultiKeywordResp> formatted string, finds the associated\r
   keyword owners, creates a <MultiConfigResp> string from it and forwards it to the\r
   EFI_HII_ROUTING_PROTOCOL.RouteConfig function.\r
   This function accepts a <MultiKeywordResp> formatted string, finds the associated\r
   keyword owners, creates a <MultiConfigResp> string from it and forwards it to the\r
   EFI_HII_ROUTING_PROTOCOL.RouteConfig function.\r

-  \r
-  If there is an issue in resolving the contents of the KeywordString, then the \r
-  function returns an error and also sets the Progress and ProgressErr with the \r
+\r
+  If there is an issue in resolving the contents of the KeywordString, then the\r
+  function returns an error and also sets the Progress and ProgressErr with the\r

   appropriate information about where the issue occurred and additional data about\r
   appropriate information about where the issue occurred and additional data about\r

-  the nature of the issue. \r
-  \r
+  the nature of the issue.\r
+\r

   In the case when KeywordString containing multiple keywords, when an EFI_NOT_FOUND\r
   error is generated during processing the second or later keyword element, the system\r
   In the case when KeywordString containing multiple keywords, when an EFI_NOT_FOUND\r
   error is generated during processing the second or later keyword element, the system\r

-  storage associated with earlier keywords is not modified. All elements of the \r
+  storage associated with earlier keywords is not modified. All elements of the\r

   KeywordString must successfully pass all tests for format and access prior to making\r
   any modifications to storage.\r
   KeywordString must successfully pass all tests for format and access prior to making\r
   any modifications to storage.\r

-  \r
+\r

   In the case when EFI_DEVICE_ERROR is returned from the processing of a KeywordString\r
   containing multiple keywords, the state of storage associated with earlier keywords\r
   is undefined.\r
   In the case when EFI_DEVICE_ERROR is returned from the processing of a KeywordString\r
   containing multiple keywords, the state of storage associated with earlier keywords\r
   is undefined.\r


@@ -2155,18 +2155,18 @@ HiiGetAltCfg (
 \r
   @param This             Pointer to the EFI_KEYWORD_HANDLER _PROTOCOL instance.\r
 \r
 \r
   @param This             Pointer to the EFI_KEYWORD_HANDLER _PROTOCOL instance.\r
 \r

-  @param KeywordString    A null-terminated string in <MultiKeywordResp> format. \r
+  @param KeywordString    A null-terminated string in <MultiKeywordResp> format.\r

 \r
 \r

-  @param Progress         On return, points to a character in the KeywordString. \r
-                          Points to the string's NULL terminator if the request \r
-                          was successful. Points to the most recent '&' before \r
+  @param Progress         On return, points to a character in the KeywordString.\r
+                          Points to the string's NULL terminator if the request\r
+                          was successful. Points to the most recent '&' before\r

                           the first failing name / value pair (or the beginning\r
                           of the string if the failure is in the first name / value\r
                           pair) if the request was not successful.\r
 \r
   @param ProgressErr      If during the processing of the KeywordString there was\r
                           the first failing name / value pair (or the beginning\r
                           of the string if the failure is in the first name / value\r
                           pair) if the request was not successful.\r
 \r
   @param ProgressErr      If during the processing of the KeywordString there was\r

-                          a failure, this parameter gives additional information \r
-                          about the possible source of the problem. The various \r
+                          a failure, this parameter gives additional information\r
+                          about the possible source of the problem. The various\r

                           errors are defined in "Related Definitions" below.\r
 \r
 \r
                           errors are defined in "Related Definitions" below.\r
 \r
 \r


@@ -2174,16 +2174,16 @@ HiiGetAltCfg (
 \r
   @retval EFI_INVALID_PARAMETER   One or more of the following are TRUE:\r
                                   1. KeywordString is NULL.\r
 \r
   @retval EFI_INVALID_PARAMETER   One or more of the following are TRUE:\r
                                   1. KeywordString is NULL.\r

-                                  2. Parsing of the KeywordString resulted in an \r
+                                  2. Parsing of the KeywordString resulted in an\r

                                      error. See Progress and ProgressErr for more data.\r
 \r
                                      error. See Progress and ProgressErr for more data.\r
 \r

-  @retval EFI_NOT_FOUND           An element of the KeywordString was not found. \r
+  @retval EFI_NOT_FOUND           An element of the KeywordString was not found.\r

                                   See ProgressErr for more data.\r
 \r
                                   See ProgressErr for more data.\r
 \r

-  @retval EFI_OUT_OF_RESOURCES    Required system resources could not be allocated.  \r
+  @retval EFI_OUT_OF_RESOURCES    Required system resources could not be allocated.\r

                                   See ProgressErr for more data.\r
                                   See ProgressErr for more data.\r

-                                  \r
-  @retval EFI_ACCESS_DENIED       The action violated system policy. See ProgressErr \r
+\r
+  @retval EFI_ACCESS_DENIED       The action violated system policy. See ProgressErr\r

                                   for more data.\r
 \r
   @retval EFI_DEVICE_ERROR        An unexpected system error occurred. See ProgressErr\r
                                   for more data.\r
 \r
   @retval EFI_DEVICE_ERROR        An unexpected system error occurred. See ProgressErr\r


@@ -2191,7 +2191,7 @@ HiiGetAltCfg (
 \r
 **/\r
 EFI_STATUS\r
 \r
 **/\r
 EFI_STATUS\r

-EFIAPI \r
+EFIAPI\r

 EfiConfigKeywordHandlerSetData (\r
   IN EFI_CONFIG_KEYWORD_HANDLER_PROTOCOL *This,\r
   IN CONST EFI_STRING                    KeywordString,\r
 EfiConfigKeywordHandlerSetData (\r
   IN EFI_CONFIG_KEYWORD_HANDLER_PROTOCOL *This,\r
   IN CONST EFI_STRING                    KeywordString,\r


@@ -2201,56 +2201,56 @@ EfiConfigKeywordHandlerSetData (
 \r
 /**\r
 \r
 \r
 /**\r
 \r

-  This function accepts a <MultiKeywordRequest> formatted string, finds the underlying \r
+  This function accepts a <MultiKeywordRequest> formatted string, finds the underlying\r

   keyword owners, creates a <MultiConfigRequest> string from it and forwards it to the\r
   EFI_HII_ROUTING_PROTOCOL.ExtractConfig function.\r
   keyword owners, creates a <MultiConfigRequest> string from it and forwards it to the\r
   EFI_HII_ROUTING_PROTOCOL.ExtractConfig function.\r

-  \r
+\r

   If there is an issue in resolving the contents of the KeywordString, then the function\r
   returns an EFI_INVALID_PARAMETER and also set the Progress and ProgressErr with the\r
   appropriate information about where the issue occurred and additional data about the\r
   nature of the issue.\r
   If there is an issue in resolving the contents of the KeywordString, then the function\r
   returns an EFI_INVALID_PARAMETER and also set the Progress and ProgressErr with the\r
   appropriate information about where the issue occurred and additional data about the\r
   nature of the issue.\r

-  \r
+\r

   In the case when KeywordString is NULL, or contains multiple keywords, or when\r
   EFI_NOT_FOUND is generated while processing the keyword elements, the Results string\r
   In the case when KeywordString is NULL, or contains multiple keywords, or when\r
   EFI_NOT_FOUND is generated while processing the keyword elements, the Results string\r

-  contains values returned for all keywords processed prior to the keyword generating the \r
+  contains values returned for all keywords processed prior to the keyword generating the\r

   error but no values for the keyword with error or any following keywords.\r
 \r
   error but no values for the keyword with error or any following keywords.\r
 \r

-  \r
+\r

   @param This           Pointer to the EFI_KEYWORD_HANDLER _PROTOCOL instance.\r
   @param This           Pointer to the EFI_KEYWORD_HANDLER _PROTOCOL instance.\r

-  \r
+\r

   @param NameSpaceId    A null-terminated string containing the platform configuration\r
                         language to search through in the system. If a NULL is passed\r
                         in, then it is assumed that any platform configuration language\r
                         with the prefix of "x-UEFI-" are searched.\r
   @param NameSpaceId    A null-terminated string containing the platform configuration\r
                         language to search through in the system. If a NULL is passed\r
                         in, then it is assumed that any platform configuration language\r
                         with the prefix of "x-UEFI-" are searched.\r

-                        \r
+\r

   @param KeywordString  A null-terminated string in <MultiKeywordRequest> format. If a\r
   @param KeywordString  A null-terminated string in <MultiKeywordRequest> format. If a\r

-                        NULL is passed in the KeywordString field, all of the known \r
-                        keywords in the system for the NameSpaceId specified are \r
+                        NULL is passed in the KeywordString field, all of the known\r
+                        keywords in the system for the NameSpaceId specified are\r

                         returned in the Results field.\r
                         returned in the Results field.\r

-  \r
+\r

   @param Progress       On return, points to a character in the KeywordString. Points\r
   @param Progress       On return, points to a character in the KeywordString. Points\r

-                        to the string's NULL terminator if the request was successful. \r
+                        to the string's NULL terminator if the request was successful.\r

                         Points to the most recent '&' before the first failing name / value\r
                         pair (or the beginning of the string if the failure is in the first\r
                         name / value pair) if the request was not successful.\r
                         Points to the most recent '&' before the first failing name / value\r
                         pair (or the beginning of the string if the failure is in the first\r
                         name / value pair) if the request was not successful.\r

-                        \r
+\r

   @param ProgressErr    If during the processing of the KeywordString there was a\r
   @param ProgressErr    If during the processing of the KeywordString there was a\r

-                        failure, this parameter gives additional information about the \r
+                        failure, this parameter gives additional information about the\r

                         possible source of the problem. See the definitions in SetData()\r
                         for valid value definitions.\r
                         possible source of the problem. See the definitions in SetData()\r
                         for valid value definitions.\r

-  \r
+\r

   @param Results        A null-terminated string in <MultiKeywordResp> format is returned\r
   @param Results        A null-terminated string in <MultiKeywordResp> format is returned\r

-                        which has all the values filled in for the keywords in the \r
+                        which has all the values filled in for the keywords in the\r

                         KeywordString. This is a callee-allocated field, and must be freed\r
                         KeywordString. This is a callee-allocated field, and must be freed\r

-                        by the caller after being used. \r
+                        by the caller after being used.\r

 \r
   @retval EFI_SUCCESS             The specified action was completed successfully.\r
 \r
   @retval EFI_SUCCESS             The specified action was completed successfully.\r

-  \r
+\r

   @retval EFI_INVALID_PARAMETER   One or more of the following are TRUE:\r
                                   1.Progress, ProgressErr, or Results is NULL.\r
                                   2.Parsing of the KeywordString resulted in an error. See\r
                                     Progress and ProgressErr for more data.\r
   @retval EFI_INVALID_PARAMETER   One or more of the following are TRUE:\r
                                   1.Progress, ProgressErr, or Results is NULL.\r
                                   2.Parsing of the KeywordString resulted in an error. See\r
                                     Progress and ProgressErr for more data.\r

-  \r
+\r

 \r
   @retval EFI_NOT_FOUND           An element of the KeywordString was not found. See\r
                                   ProgressErr for more data.\r
 \r
   @retval EFI_NOT_FOUND           An element of the KeywordString was not found. See\r
                                   ProgressErr for more data.\r


@@ -2260,7 +2260,7 @@ EfiConfigKeywordHandlerSetData (
 \r
   @retval EFI_OUT_OF_RESOURCES    Required system resources could not be allocated.  See\r
                                   ProgressErr for more data.\r
 \r
   @retval EFI_OUT_OF_RESOURCES    Required system resources could not be allocated.  See\r
                                   ProgressErr for more data.\r

-                                  \r
+\r

   @retval EFI_ACCESS_DENIED       The action violated system policy.  See ProgressErr for\r
                                   more data.\r
 \r
   @retval EFI_ACCESS_DENIED       The action violated system policy.  See ProgressErr for\r
                                   more data.\r
 \r


@@ -2269,12 +2269,12 @@ EfiConfigKeywordHandlerSetData (
 \r
 **/\r
 EFI_STATUS\r
 \r
 **/\r
 EFI_STATUS\r

-EFIAPI \r
+EFIAPI\r

 EfiConfigKeywordHandlerGetData (\r
   IN EFI_CONFIG_KEYWORD_HANDLER_PROTOCOL  *This,\r
   IN CONST EFI_STRING                     NameSpaceId, OPTIONAL\r
   IN CONST EFI_STRING                     KeywordString, OPTIONAL\r
 EfiConfigKeywordHandlerGetData (\r
   IN EFI_CONFIG_KEYWORD_HANDLER_PROTOCOL  *This,\r
   IN CONST EFI_STRING                     NameSpaceId, OPTIONAL\r
   IN CONST EFI_STRING                     KeywordString, OPTIONAL\r

-  OUT EFI_STRING                          *Progress, \r
+  OUT EFI_STRING                          *Progress,\r

   OUT UINT32                              *ProgressErr,\r
   OUT EFI_STRING                          *Results\r
   );\r
   OUT UINT32                              *ProgressErr,\r
   OUT EFI_STRING                          *Results\r
   );\r


@@ -2298,11 +2298,11 @@ HiiCompareLanguage (
 \r
 /**\r
   Retrieves a pointer to a Null-terminated ASCII string containing the list\r
 \r
 /**\r
   Retrieves a pointer to a Null-terminated ASCII string containing the list\r

-  of languages that an HII handle in the HII Database supports.  The returned \r
+  of languages that an HII handle in the HII Database supports.  The returned\r

   string is allocated using AllocatePool().  The caller is responsible for freeing\r
   the returned string using FreePool().  The format of the returned string follows\r
   the language format assumed the HII Database.\r
   string is allocated using AllocatePool().  The caller is responsible for freeing\r
   the returned string using FreePool().  The format of the returned string follows\r
   the language format assumed the HII Database.\r

-  \r
+\r

   If HiiHandle is NULL, then ASSERT().\r
 \r
   @param[in]  HiiHandle  A handle that was previously registered in the HII Database.\r
   If HiiHandle is NULL, then ASSERT().\r
 \r
   @param[in]  HiiHandle  A handle that was previously registered in the HII Database.\r

diff --git a/MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabase.uni b/MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabase.uni
index 58f220879b46e7dd52586d18a4941e2849c8e494..43c68057752ad8e70312ce234f0c7173d8734e52 100644 (file)
--- a/MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabase.uni
+++ b/MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabase.uni
@@ -4,13 +4,13 @@
 // This driver produces all required HII serivces that includes HiiDataBase, HiiString,\r
 // HiiFont, HiiConfigRouting. To support UEFI HII, this driver is required.\r
 //\r
 // This driver produces all required HII serivces that includes HiiDataBase, HiiString,\r
 // HiiFont, HiiConfigRouting. To support UEFI HII, this driver is required.\r
 //\r

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

 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r
 // which accompanies this distribution. The full text of the license may be found at\r
 // http://opensource.org/licenses/bsd-license.php\r
 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r
 // which accompanies this distribution. The full text of the license may be found at\r
 // http://opensource.org/licenses/bsd-license.php\r

-// \r
+//\r

 // THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 // WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 //\r
 // THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 // WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 //\r

diff --git a/MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe.inf b/MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe.inf
index adb3603e84c44853e66355089639edcf203b07b2..0593ff85bb6ca5fc597b09b77b7fd0bb4450c72b 100644 (file)
--- a/MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe.inf
+++ b/MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe.inf
@@ -4,14 +4,14 @@
 # This driver produces all required HII serivces that includes HiiDataBase, HiiString,\r
 # HiiFont, HiiConfigRouting. To support UEFI HII, this driver is required.\r
 #\r
 # This driver produces all required HII serivces that includes HiiDataBase, HiiString,\r
 # HiiFont, HiiConfigRouting. To support UEFI HII, this driver is required.\r
 #\r

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

 #\r
 #\r

-#  This program and the accompanying materials       \r
-#  are licensed and made available under the terms and conditions of the BSD License   \r
-#  which accompanies this distribution. The full text of the license may be found at  \r
-#  http://opensource.org/licenses/bsd-license.php           \r
-#  \r
-#  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,      \r
+#  This program and the accompanying materials\r
+#  are licensed and made available under the terms and conditions of the BSD License\r
+#  which accompanies this distribution. The full text of the license may be found at\r
+#  http://opensource.org/licenses/bsd-license.php\r
+#\r
+#  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r

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


@@ -81,7 +81,7 @@
   gEfiMdePkgTokenSpaceGuid.PcdUefiVariableDefaultPlatformLang ## CONSUMES\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdNvStoreDefaultValueBuffer ## CONSUMES\r
 \r
   gEfiMdePkgTokenSpaceGuid.PcdUefiVariableDefaultPlatformLang ## CONSUMES\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdNvStoreDefaultValueBuffer ## CONSUMES\r
 \r

-[Guids]  \r
+[Guids]\r

   #\r
   # Event registered to EFI_HII_SET_KEYBOARD_LAYOUT_EVENT_GUID group,\r
   # which will be triggered by EFI_HII_DATABASE_PROTOCOL.SetKeyboardLayout().\r
   #\r
   # Event registered to EFI_HII_SET_KEYBOARD_LAYOUT_EVENT_GUID group,\r
   # which will be triggered by EFI_HII_DATABASE_PROTOCOL.SetKeyboardLayout().\r

diff --git a/MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseEntry.c b/MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseEntry.c
index 9d09c60b23512cd4d567f55c8656603a35f0f071..5951b5e304047efa432b994f8642bb179b085d76 100644 (file)
--- a/MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseEntry.c
+++ b/MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseEntry.c
@@ -2,7 +2,7 @@
 This file contains the entry code to the HII database, which is defined by\r
 UEFI 2.1 specification.\r
 \r
 This file contains the entry code to the HII database, which is defined by\r
 UEFI 2.1 specification.\r
 \r

-Copyright (c) 2007 - 2016, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2007 - 2018, Intel Corporation. All rights reserved.<BR>\r

 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r


@@ -188,7 +188,7 @@ InitializeHiiDatabase (
   ASSERT_PROTOCOL_ALREADY_INSTALLED (NULL, &gEfiHiiStringProtocolGuid);\r
   ASSERT_PROTOCOL_ALREADY_INSTALLED (NULL, &gEfiHiiConfigRoutingProtocolGuid);\r
   ASSERT_PROTOCOL_ALREADY_INSTALLED (NULL, &gEfiConfigKeywordHandlerProtocolGuid);\r
   ASSERT_PROTOCOL_ALREADY_INSTALLED (NULL, &gEfiHiiStringProtocolGuid);\r
   ASSERT_PROTOCOL_ALREADY_INSTALLED (NULL, &gEfiHiiConfigRoutingProtocolGuid);\r
   ASSERT_PROTOCOL_ALREADY_INSTALLED (NULL, &gEfiConfigKeywordHandlerProtocolGuid);\r

-  \r
+\r

   InitializeListHead (&mPrivate.DatabaseList);\r
   InitializeListHead (&mPrivate.DatabaseNotifyList);\r
   InitializeListHead (&mPrivate.HiiHandleList);\r
   InitializeListHead (&mPrivate.DatabaseList);\r
   InitializeListHead (&mPrivate.DatabaseNotifyList);\r
   InitializeListHead (&mPrivate.HiiHandleList);\r

diff --git a/MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseExtra.uni b/MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseExtra.uni
index d85eef1ee9bdcf011aaac5f960a3e81c5d960d02..6fbd75a161004e13ec30f143e59c25f27d6abaf2 100644 (file)
--- a/MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseExtra.uni
+++ b/MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseExtra.uni
@@ -1,7 +1,7 @@
 // /** @file\r
 // HiiDatabase Localized Strings and Content\r
 //\r
 // /** @file\r
 // HiiDatabase Localized Strings and Content\r
 //\r

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

 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r
 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r


@@ -13,8 +13,8 @@
 //\r
 // **/\r
 \r
 //\r
 // **/\r
 \r

-#string STR_PROPERTIES_MODULE_NAME \r
-#language en-US \r
+#string STR_PROPERTIES_MODULE_NAME\r
+#language en-US\r

 "HII Database DXE Driver"\r
 \r
 \r
 "HII Database DXE Driver"\r
 \r
 \r

diff --git a/MdeModulePkg/Universal/HiiDatabaseDxe/Image.c b/MdeModulePkg/Universal/HiiDatabaseDxe/Image.c
index 431a5b84543b876522d0d9208ef568fed7642678..d1010820e05e67d352257a30f1dccc8b48954bfd 100644 (file)
--- a/MdeModulePkg/Universal/HiiDatabaseDxe/Image.c
+++ b/MdeModulePkg/Universal/HiiDatabaseDxe/Image.c
@@ -2,7 +2,7 @@
 Implementation for EFI_HII_IMAGE_PROTOCOL.\r
 \r
 \r
 Implementation for EFI_HII_IMAGE_PROTOCOL.\r
 \r
 \r

-Copyright (c) 2007 - 2017, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2007 - 2018, Intel Corporation. All rights reserved.<BR>\r

 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r


@@ -1018,7 +1018,7 @@ HiiGetImage (
 \r
   @retval EFI_SUCCESS            The new image was updated successfully.\r
   @retval EFI_NOT_FOUND          The image specified by ImageId is not in the\r
 \r
   @retval EFI_SUCCESS            The new image was updated successfully.\r
   @retval EFI_NOT_FOUND          The image specified by ImageId is not in the\r

-                                                database. The specified PackageList is not in the database.    \r
+                                                database. The specified PackageList is not in the database.\r

   @retval EFI_INVALID_PARAMETER  The Image was NULL.\r
 \r
 **/\r
   @retval EFI_INVALID_PARAMETER  The Image was NULL.\r
 \r
 **/\r


@@ -1426,8 +1426,8 @@ HiiDrawImage (
   @retval EFI_SUCCESS            The image was successfully drawn.\r
   @retval EFI_OUT_OF_RESOURCES   Unable to allocate an output buffer for Blt.\r
   @retval EFI_INVALID_PARAMETER  The Blt was NULL.\r
   @retval EFI_SUCCESS            The image was successfully drawn.\r
   @retval EFI_OUT_OF_RESOURCES   Unable to allocate an output buffer for Blt.\r
   @retval EFI_INVALID_PARAMETER  The Blt was NULL.\r

-  @retval EFI_NOT_FOUND          The image specified by ImageId is not in the database. \r
-                           The specified PackageList is not in the database.                             \r
+  @retval EFI_NOT_FOUND          The image specified by ImageId is not in the database.\r
+                           The specified PackageList is not in the database.\r

 \r
 **/\r
 EFI_STATUS\r
 \r
 **/\r
 EFI_STATUS\r

diff --git a/MdeModulePkg/Universal/HiiDatabaseDxe/String.c b/MdeModulePkg/Universal/HiiDatabaseDxe/String.c
index d5a7488a79d39ee2201560dc8146881e805451e0..aeda47430f7203c5c2f82756ad125a3a59655955 100644 (file)
--- a/MdeModulePkg/Universal/HiiDatabaseDxe/String.c
+++ b/MdeModulePkg/Universal/HiiDatabaseDxe/String.c
@@ -2,7 +2,7 @@
 Implementation for EFI_HII_STRING_PROTOCOL.\r
 \r
 \r
 Implementation for EFI_HII_STRING_PROTOCOL.\r
 \r
 \r

-Copyright (c) 2007 - 2016, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2007 - 2018, Intel Corporation. All rights reserved.<BR>\r

 (C) Copyright 2016 Hewlett Packard Enterprise Development LP<BR>\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 (C) Copyright 2016 Hewlett Packard Enterprise Development LP<BR>\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r


@@ -236,7 +236,7 @@ GetStringFontInfo (
 /**\r
   Parse all string blocks to find a String block specified by StringId.\r
   If StringId = (EFI_STRING_ID) (-1), find out all EFI_HII_SIBT_FONT blocks\r
 /**\r
   Parse all string blocks to find a String block specified by StringId.\r
   If StringId = (EFI_STRING_ID) (-1), find out all EFI_HII_SIBT_FONT blocks\r

-  within this string package and backup its information. If LastStringId is \r
+  within this string package and backup its information. If LastStringId is\r

   specified, the string id of last string block will also be output.\r
   If StringId = 0, output the string id of last string block (EFI_HII_SIBT_STRING).\r
 \r
   specified, the string id of last string block will also be output.\r
   If StringId = 0, output the string id of last string block (EFI_HII_SIBT_STRING).\r
 \r


@@ -524,7 +524,7 @@ FindStringBlock (
         // Since string package tool set FontId initially to 0 and increases it\r
         // progressively by one, StringPackage->FondId always represents an unique\r
         // and available FontId.\r
         // Since string package tool set FontId initially to 0 and increases it\r
         // progressively by one, StringPackage->FondId always represents an unique\r
         // and available FontId.\r

-        //        \r
+        //\r

         StringPackage->FontId++;\r
 \r
         FreePool (FontInfo);\r
         StringPackage->FontId++;\r
 \r
         FreePool (FontInfo);\r


@@ -574,7 +574,7 @@ FindStringBlock (
         *StartStringId  = CurrentStringId;\r
     }\r
   }\r
         *StartStringId  = CurrentStringId;\r
     }\r
   }\r

-  \r
+\r

   //\r
   // Get last string ID\r
   //\r
   //\r
   // Get last string ID\r
   //\r


@@ -681,7 +681,7 @@ GetStringWorker (
   }\r
 \r
   //\r
   }\r
 \r
   //\r

-  // Get the string font. The FontId 0 is the default font for those string blocks which \r
+  // Get the string font. The FontId 0 is the default font for those string blocks which\r

   // do not specify a font identifier. If default font is not specified, return NULL.\r
   //\r
   if (StringFontInfo != NULL) {\r
   // do not specify a font identifier. If default font is not specified, return NULL.\r
   //\r
   if (StringFontInfo != NULL) {\r


@@ -706,17 +706,17 @@ GetStringWorker (
 \r
 /**\r
   If GetStringBlock find the StringId's string is not saved in the exist string block,\r
 \r
 /**\r
   If GetStringBlock find the StringId's string is not saved in the exist string block,\r

-  this function will create the UCS2 string block to save the string; also split the \r
+  this function will create the UCS2 string block to save the string; also split the\r

   skip block into two or one skip block.\r
 \r
   This is a internal function.\r
   skip block into two or one skip block.\r
 \r
   This is a internal function.\r

-  \r
+\r

   @param  StringPackage           Hii string package instance.\r
   @param  StartStringId           The first id in the skip block which StringId in the block.\r
   @param  StringId                The string's id, which is unique within\r
   @param  StringPackage           Hii string package instance.\r
   @param  StartStringId           The first id in the skip block which StringId in the block.\r
   @param  StringId                The string's id, which is unique within\r

-                                  PackageList.  \r
-  @param  BlockType               Output the block type of found string block.  \r
-  @param  StringBlockAddr         Output the block address of found string block.  \r
+                                  PackageList.\r
+  @param  BlockType               Output the block type of found string block.\r
+  @param  StringBlockAddr         Output the block address of found string block.\r

   @param  FontBlock               whether this string block has font info.\r
 \r
   @retval EFI_SUCCESS            The string font is outputted successfully.\r
   @param  FontBlock               whether this string block has font info.\r
 \r
   @retval EFI_SUCCESS            The string font is outputted successfully.\r


@@ -735,7 +735,7 @@ InsertLackStringBlock (
 {\r
   UINT8                                *BlockPtr;\r
   UINT8                                *StringBlock;\r
 {\r
   UINT8                                *BlockPtr;\r
   UINT8                                *StringBlock;\r

-  UINT32                               SkipLen;    \r
+  UINT32                               SkipLen;\r

   UINT32                               OldBlockSize;\r
   UINT32                               NewBlockSize;\r
   UINT32                               FrontSkipNum;\r
   UINT32                               OldBlockSize;\r
   UINT32                               NewBlockSize;\r
   UINT32                               FrontSkipNum;\r


@@ -746,7 +746,7 @@ InsertLackStringBlock (
   FrontSkipNum  = 0;\r
   SkipLen       = 0;\r
   OldStringAddr = *StringBlockAddr;\r
   FrontSkipNum  = 0;\r
   SkipLen       = 0;\r
   OldStringAddr = *StringBlockAddr;\r

-  \r
+\r

   ASSERT (*BlockType == EFI_HII_SIBT_SKIP1 || *BlockType == EFI_HII_SIBT_SKIP2);\r
   //\r
   // Old skip block size.\r
   ASSERT (*BlockType == EFI_HII_SIBT_SKIP1 || *BlockType == EFI_HII_SIBT_SKIP2);\r
   //\r
   // Old skip block size.\r


@@ -757,7 +757,7 @@ InsertLackStringBlock (
   } else {\r
     SkipLen = sizeof (EFI_HII_SIBT_SKIP2_BLOCK);\r
     IdCount = *(UINT16*)(OldStringAddr + sizeof (EFI_HII_STRING_BLOCK));\r
   } else {\r
     SkipLen = sizeof (EFI_HII_SIBT_SKIP2_BLOCK);\r
     IdCount = *(UINT16*)(OldStringAddr + sizeof (EFI_HII_STRING_BLOCK));\r

-  } \r
+  }\r

 \r
   //\r
   // New create UCS or UCS2 block size.\r
 \r
   //\r
   // New create UCS or UCS2 block size.\r


@@ -801,7 +801,7 @@ InsertLackStringBlock (
   //\r
   // Copy old block in front of skip block.\r
   //\r
   //\r
   // Copy old block in front of skip block.\r
   //\r

-  CopyMem (StringBlock, StringPackage->StringBlock, OldStringAddr - StringPackage->StringBlock);  \r
+  CopyMem (StringBlock, StringPackage->StringBlock, OldStringAddr - StringPackage->StringBlock);\r

   BlockPtr = StringBlock + (OldStringAddr - StringPackage->StringBlock);\r
 \r
   if (FrontSkipNum > 0) {\r
   BlockPtr = StringBlock + (OldStringAddr - StringPackage->StringBlock);\r
 \r
   if (FrontSkipNum > 0) {\r


@@ -838,7 +838,7 @@ InsertLackStringBlock (
   //\r
   // Append a EFI_HII_SIBT_END block to the end.\r
   //\r
   //\r
   // Append a EFI_HII_SIBT_END block to the end.\r
   //\r

-  CopyMem (BlockPtr, OldStringAddr + SkipLen, OldBlockSize - (OldStringAddr - StringPackage->StringBlock) - SkipLen);  \r
+  CopyMem (BlockPtr, OldStringAddr + SkipLen, OldBlockSize - (OldStringAddr - StringPackage->StringBlock) - SkipLen);\r

 \r
   if (FontBlock) {\r
     *BlockType = EFI_HII_SIBT_STRING_UCS2_FONT;\r
 \r
   if (FontBlock) {\r
     *BlockType = EFI_HII_SIBT_STRING_UCS2_FONT;\r


@@ -918,9 +918,9 @@ SetStringWorker (
              &StartStringId\r
              );\r
   if (EFI_ERROR (Status) && (BlockType == EFI_HII_SIBT_SKIP1 || BlockType == EFI_HII_SIBT_SKIP2)) {\r
              &StartStringId\r
              );\r
   if (EFI_ERROR (Status) && (BlockType == EFI_HII_SIBT_SKIP1 || BlockType == EFI_HII_SIBT_SKIP2)) {\r

-    Status = InsertLackStringBlock(StringPackage, \r
-                          StartStringId, \r
-                          StringId, \r
+    Status = InsertLackStringBlock(StringPackage,\r
+                          StartStringId,\r
+                          StringId,\r

                           &BlockType,\r
                           &StringBlockAddr,\r
                           (BOOLEAN)(StringFontInfo != NULL)\r
                           &BlockType,\r
                           &StringBlockAddr,\r
                           (BOOLEAN)(StringFontInfo != NULL)\r


@@ -947,11 +947,11 @@ SetStringWorker (
       return EFI_INVALID_PARAMETER;\r
     } else {\r
       Referred = ReferFontInfoLocally (\r
       return EFI_INVALID_PARAMETER;\r
     } else {\r
       Referred = ReferFontInfoLocally (\r

-                   Private, \r
-                   StringPackage, \r
-                   StringPackage->FontId, \r
-                   FALSE, \r
-                   GlobalFont, \r
+                   Private,\r
+                   StringPackage,\r
+                   StringPackage->FontId,\r
+                   FALSE,\r
+                   GlobalFont,\r

                    &LocalFont\r
                    );\r
       if (!Referred) {\r
                    &LocalFont\r
                    );\r
       if (!Referred) {\r


@@ -962,7 +962,7 @@ SetStringWorker (
     // Update the FontId of the specified string block to input font info.\r
     //\r
     switch (BlockType) {\r
     // Update the FontId of the specified string block to input font info.\r
     //\r
     switch (BlockType) {\r

-    case EFI_HII_SIBT_STRING_SCSU_FONT:  \r
+    case EFI_HII_SIBT_STRING_SCSU_FONT:\r

     case EFI_HII_SIBT_STRINGS_SCSU_FONT:\r
     case EFI_HII_SIBT_STRING_UCS2_FONT:\r
     case EFI_HII_SIBT_STRINGS_UCS2_FONT:\r
     case EFI_HII_SIBT_STRINGS_SCSU_FONT:\r
     case EFI_HII_SIBT_STRING_UCS2_FONT:\r
     case EFI_HII_SIBT_STRINGS_UCS2_FONT:\r


@@ -973,7 +973,7 @@ SetStringWorker (
       // When modify the font info of these blocks, the block type should be updated\r
       // to contain font info thus the whole structure should be revised.\r
       // It is recommended to use tool to modify the block type not in the code.\r
       // When modify the font info of these blocks, the block type should be updated\r
       // to contain font info thus the whole structure should be revised.\r
       // It is recommended to use tool to modify the block type not in the code.\r

-      //      \r
+      //\r

       return EFI_UNSUPPORTED;\r
     }\r
   }\r
       return EFI_UNSUPPORTED;\r
     }\r
   }\r


@@ -1004,7 +1004,7 @@ SetStringWorker (
     }\r
     *BlockPtr++ = 0;\r
 \r
     }\r
     *BlockPtr++ = 0;\r
 \r

-    \r
+\r

     TmpSize = OldBlockSize - (StringTextPtr - StringPackage->StringBlock) - AsciiStrSize ((CHAR8 *) StringTextPtr);\r
     CopyMem (\r
       BlockPtr,\r
     TmpSize = OldBlockSize - (StringTextPtr - StringPackage->StringBlock) - AsciiStrSize ((CHAR8 *) StringTextPtr);\r
     CopyMem (\r
       BlockPtr,\r


@@ -1107,9 +1107,9 @@ SetStringWorker (
 \r
 /**\r
   This function adds the string String to the group of strings owned by PackageList, with the\r
 \r
 /**\r
   This function adds the string String to the group of strings owned by PackageList, with the\r

-  specified font information StringFontInfo and returns a new string id. \r
-  The new string identifier is guaranteed to be unique within the package list. \r
-  That new string identifier is reserved for all languages in the package list. \r
+  specified font information StringFontInfo and returns a new string id.\r
+  The new string identifier is guaranteed to be unique within the package list.\r
+  That new string identifier is reserved for all languages in the package list.\r

 \r
 \r
   @param  This                   A pointer to the EFI_HII_STRING_PROTOCOL instance.\r
 \r
 \r
   @param  This                   A pointer to the EFI_HII_STRING_PROTOCOL instance.\r


@@ -1341,7 +1341,7 @@ HiiNewString (
     // Calculate the length of the string blocks, including string block to record\r
     // printable language full name and EFI_HII_SIBT_END_BLOCK.\r
     //\r
     // Calculate the length of the string blocks, including string block to record\r
     // printable language full name and EFI_HII_SIBT_END_BLOCK.\r
     //\r

-    Ucs2BlockSize = (UINT32) (StrSize ((CHAR16 *) LanguageName) + \r
+    Ucs2BlockSize = (UINT32) (StrSize ((CHAR16 *) LanguageName) +\r

                               (*StringId - 1) * sizeof (EFI_HII_SIBT_STRING_UCS2_BLOCK) - sizeof (CHAR16));\r
 \r
     BlockSize     = Ucs2BlockSize + sizeof (EFI_HII_SIBT_END_BLOCK);\r
                               (*StringId - 1) * sizeof (EFI_HII_SIBT_STRING_UCS2_BLOCK) - sizeof (CHAR16));\r
 \r
     BlockSize     = Ucs2BlockSize + sizeof (EFI_HII_SIBT_END_BLOCK);\r


@@ -1519,7 +1519,7 @@ HiiNewString (
       PackageListNode->PackageListHdr.PackageLength += FontBlockSize + Ucs2FontBlockSize;\r
 \r
       //\r
       PackageListNode->PackageListHdr.PackageLength += FontBlockSize + Ucs2FontBlockSize;\r
 \r
       //\r

-      // Increase the FontId to make it unique since we already add \r
+      // Increase the FontId to make it unique since we already add\r

       // a EFI_HII_SIBT_FONT block to this string package.\r
       //\r
       StringPackage->FontId++;\r
       // a EFI_HII_SIBT_FONT block to this string package.\r
       //\r
       StringPackage->FontId++;\r


@@ -1671,16 +1671,16 @@ HiiGetString (
       //\r
       // Second search: to match the StringId in other available languages if exist.\r
       //\r
       //\r
       // Second search: to match the StringId in other available languages if exist.\r
       //\r

-      for (Link =  PackageListNode->StringPkgHdr.ForwardLink; \r
+      for (Link =  PackageListNode->StringPkgHdr.ForwardLink;\r

            Link != &PackageListNode->StringPkgHdr;\r
            Link =  Link->ForwardLink\r
           ) {\r
            Link != &PackageListNode->StringPkgHdr;\r
            Link =  Link->ForwardLink\r
           ) {\r

-      StringPackage = CR (Link, HII_STRING_PACKAGE_INSTANCE, StringEntry, HII_STRING_PACKAGE_SIGNATURE);      \r
+      StringPackage = CR (Link, HII_STRING_PACKAGE_INSTANCE, StringEntry, HII_STRING_PACKAGE_SIGNATURE);\r

       Status = GetStringWorker (Private, StringPackage, StringId, NULL, NULL, NULL);\r
       if (!EFI_ERROR (Status)) {\r
         return EFI_INVALID_LANGUAGE;\r
       }\r
       Status = GetStringWorker (Private, StringPackage, StringId, NULL, NULL, NULL);\r
       if (!EFI_ERROR (Status)) {\r
         return EFI_INVALID_LANGUAGE;\r
       }\r

-    }    \r
+    }\r

   }\r
 \r
   return EFI_NOT_FOUND;\r
   }\r
 \r
   return EFI_NOT_FOUND;\r


@@ -1940,7 +1940,7 @@ HiiGetSecondaryLanguages (
 \r
   Private    = HII_STRING_DATABASE_PRIVATE_DATA_FROM_THIS (This);\r
 \r
 \r
   Private    = HII_STRING_DATABASE_PRIVATE_DATA_FROM_THIS (This);\r
 \r

-  PackageListNode = NULL;     \r
+  PackageListNode = NULL;\r

   for (Link = Private->DatabaseList.ForwardLink; Link != &Private->DatabaseList; Link = Link->ForwardLink) {\r
     DatabaseRecord  = CR (Link, HII_DATABASE_RECORD, DatabaseEntry, HII_DATABASE_RECORD_SIGNATURE);\r
     if (DatabaseRecord->Handle == PackageList) {\r
   for (Link = Private->DatabaseList.ForwardLink; Link != &Private->DatabaseList; Link = Link->ForwardLink) {\r
     DatabaseRecord  = CR (Link, HII_DATABASE_RECORD, DatabaseEntry, HII_DATABASE_RECORD_SIGNATURE);\r
     if (DatabaseRecord->Handle == PackageList) {\r


@@ -1951,7 +1951,7 @@ HiiGetSecondaryLanguages (
     if (PackageListNode == NULL) {\r
       return EFI_NOT_FOUND;\r
     }\r
     if (PackageListNode == NULL) {\r
       return EFI_NOT_FOUND;\r
     }\r

-      \r
+\r

     Languages  = NULL;\r
     ResultSize = 0;\r
     for (Link1 = PackageListNode->StringPkgHdr.ForwardLink;\r
     Languages  = NULL;\r
     ResultSize = 0;\r
     for (Link1 = PackageListNode->StringPkgHdr.ForwardLink;\r

diff --git a/MdeModulePkg/Universal/HiiResourcesSampleDxe/HiiResourcesSample.c b/MdeModulePkg/Universal/HiiResourcesSampleDxe/HiiResourcesSample.c
index adce780e09e443a5b62d9bdddf61f0fce0c6b2ce..6f87716408829080f21653b9ff5890593efac0d8 100644 (file)
--- a/MdeModulePkg/Universal/HiiResourcesSampleDxe/HiiResourcesSample.c
+++ b/MdeModulePkg/Universal/HiiResourcesSampleDxe/HiiResourcesSample.c
@@ -2,7 +2,7 @@
 This is an example of how a driver retrieve HII data using HII Package List\r
 Protocol, and how to publish the HII data.\r
 \r
 This is an example of how a driver retrieve HII data using HII Package List\r
 Protocol, and how to publish the HII data.\r
 \r

-Copyright (c) 2009 - 2011, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2009 - 2018, Intel Corporation. All rights reserved.<BR>\r

 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r


@@ -51,7 +51,7 @@ HII_VENDOR_DEVICE_PATH  mHiiVendorDevicePath = {
   {\r
     END_DEVICE_PATH_TYPE,\r
     END_ENTIRE_DEVICE_PATH_SUBTYPE,\r
   {\r
     END_DEVICE_PATH_TYPE,\r
     END_ENTIRE_DEVICE_PATH_SUBTYPE,\r

-    { \r
+    {\r

       (UINT8) (END_DEVICE_PATH_LENGTH),\r
       (UINT8) ((END_DEVICE_PATH_LENGTH) >> 8)\r
     }\r
       (UINT8) (END_DEVICE_PATH_LENGTH),\r
       (UINT8) ((END_DEVICE_PATH_LENGTH) >> 8)\r
     }\r


@@ -60,7 +60,7 @@ HII_VENDOR_DEVICE_PATH  mHiiVendorDevicePath = {
 \r
 /**\r
   Main entry for this driver.\r
 \r
 /**\r
   Main entry for this driver.\r

-  \r
+\r

   @param[in] ImageHandle     Image handle this driver.\r
   @param[in] SystemTable     Pointer to SystemTable.\r
 \r
   @param[in] ImageHandle     Image handle this driver.\r
   @param[in] SystemTable     Pointer to SystemTable.\r
 \r

diff --git a/MdeModulePkg/Universal/HiiResourcesSampleDxe/HiiResourcesSample.uni b/MdeModulePkg/Universal/HiiResourcesSampleDxe/HiiResourcesSample.uni
index acef41e2820bcddae416fe546e24c2fc680f28da..0de7ad76fbe84d4c803b4998476d1e37fcf27203 100644 (file)
--- a/MdeModulePkg/Universal/HiiResourcesSampleDxe/HiiResourcesSample.uni
+++ b/MdeModulePkg/Universal/HiiResourcesSampleDxe/HiiResourcesSample.uni
@@ -4,13 +4,13 @@
 // This driver show how a HII driver retrieve HII data using HII Package List protocol\r
 // and publish the HII data.\r
 //\r
 // This driver show how a HII driver retrieve HII data using HII Package List protocol\r
 // and publish the HII data.\r
 //\r

-// Copyright (c) 2009 - 2014, Intel Corporation. All rights reserved.<BR>\r
+// Copyright (c) 2009 - 2018, Intel Corporation. All rights reserved.<BR>\r

 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r
 // which accompanies this distribution. The full text of the license may be found at\r
 // http://opensource.org/licenses/bsd-license.php\r
 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r
 // which accompanies this distribution. The full text of the license may be found at\r
 // http://opensource.org/licenses/bsd-license.php\r

-// \r
+//\r

 // THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 // WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 //\r
 // THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 // WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 //\r

diff --git a/MdeModulePkg/Universal/HiiResourcesSampleDxe/HiiResourcesSampleDxe.inf b/MdeModulePkg/Universal/HiiResourcesSampleDxe/HiiResourcesSampleDxe.inf
index 51a598cb05e587a22ed41139faef3e9cac5896a5..7287ba5050212a9f6bb4df26e35dc0a60ae67ea7 100644 (file)
--- a/MdeModulePkg/Universal/HiiResourcesSampleDxe/HiiResourcesSampleDxe.inf
+++ b/MdeModulePkg/Universal/HiiResourcesSampleDxe/HiiResourcesSampleDxe.inf
@@ -4,13 +4,13 @@
 #  This driver show how a HII driver retrieve HII data using HII Package List protocol\r
 #  and publish the HII data.\r
 #\r
 #  This driver show how a HII driver retrieve HII data using HII Package List protocol\r
 #  and publish the HII data.\r
 #\r

-#  Copyright (c) 2009 - 2014, Intel Corporation. All rights reserved.<BR>\r
+#  Copyright (c) 2009 - 2018, Intel Corporation. All rights reserved.<BR>\r

 #\r
 #  This program and the accompanying materials\r
 #  are licensed and made available under the terms and conditions of the BSD License\r
 #  which accompanies this distribution. The full text of the license may be found at\r
 #  http://opensource.org/licenses/bsd-license.php\r
 #\r
 #  This program and the accompanying materials\r
 #  are licensed and made available under the terms and conditions of the BSD License\r
 #  which accompanies this distribution. The full text of the license may be found at\r
 #  http://opensource.org/licenses/bsd-license.php\r

-#  \r
+#\r

 #  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 #  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 #\r
 #  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 #  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 #\r

diff --git a/MdeModulePkg/Universal/HiiResourcesSampleDxe/HiiResourcesSampleExtra.uni b/MdeModulePkg/Universal/HiiResourcesSampleDxe/HiiResourcesSampleExtra.uni
index b7c85c1cc560feacc2cf779f0dd70ddb6c8e5d26..2705e702e6fa6a2b5bdb547550f15531794d2ca0 100644 (file)
--- a/MdeModulePkg/Universal/HiiResourcesSampleDxe/HiiResourcesSampleExtra.uni
+++ b/MdeModulePkg/Universal/HiiResourcesSampleDxe/HiiResourcesSampleExtra.uni
@@ -1,7 +1,7 @@
 // /** @file\r
 // HiiResourcesSample Localized Strings and Content\r
 //\r
 // /** @file\r
 // HiiResourcesSample Localized Strings and Content\r
 //\r

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

 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r
 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r


@@ -13,8 +13,8 @@
 //\r
 // **/\r
 \r
 //\r
 // **/\r
 \r

-#string STR_PROPERTIES_MODULE_NAME \r
-#language en-US \r
+#string STR_PROPERTIES_MODULE_NAME\r
+#language en-US\r

 "HII Resources Sample DXE Driver"\r
 \r
 \r
 "HII Resources Sample DXE Driver"\r
 \r
 \r

diff --git a/MdeModulePkg/Universal/HiiResourcesSampleDxe/Sample.vfr b/MdeModulePkg/Universal/HiiResourcesSampleDxe/Sample.vfr
index 3ca20988e85670a43d442696547ac432ddf51898..e53c1f2ad920b3f3ec7c47291eba8dac9167de49 100644 (file)
--- a/MdeModulePkg/Universal/HiiResourcesSampleDxe/Sample.vfr
+++ b/MdeModulePkg/Universal/HiiResourcesSampleDxe/Sample.vfr
@@ -1,6 +1,6 @@
 // *++\r
 //\r
 // *++\r
 //\r

-// Copyright (c) 2009 - 2011, Intel Corporation. All rights reserved.<BR>\r
+// Copyright (c) 2009 - 2018, Intel Corporation. All rights reserved.<BR>\r

 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r
 // which accompanies this distribution.  The full text of the license may be found at\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r
 // which accompanies this distribution.  The full text of the license may be found at\r


@@ -31,10 +31,10 @@ formset
   form formid = 1,\r
        title  = STRING_TOKEN(STR_SAMPLE_FORM1_TITLE);\r
 \r
   form formid = 1,\r
        title  = STRING_TOKEN(STR_SAMPLE_FORM1_TITLE);\r
 \r

-       text\r
+    text\r

       help   = STRING_TOKEN(STR_SAMPLE_VERSION_HELP),\r
       text   = STRING_TOKEN(STR_SAMPLE_VERSION_TEXT),\r
       help   = STRING_TOKEN(STR_SAMPLE_VERSION_HELP),\r
       text   = STRING_TOKEN(STR_SAMPLE_VERSION_TEXT),\r

-           text   = STRING_TOKEN(STR_SAMPLE_EMPTY);\r
+      text   = STRING_TOKEN(STR_SAMPLE_EMPTY);\r

 \r
     subtitle text = STRING_TOKEN(STR_SAMPLE_EMPTY);\r
 \r
 \r
     subtitle text = STRING_TOKEN(STR_SAMPLE_EMPTY);\r
 \r

diff --git a/MdeModulePkg/Universal/HiiResourcesSampleDxe/SampleStrings.uni b/MdeModulePkg/Universal/HiiResourcesSampleDxe/SampleStrings.uni
index f3464b38fe57961a976d1fa79504c2af462a9d42..85948e271821126c8d1335464c009640487570d1 100644 (file)
--- a/MdeModulePkg/Universal/HiiResourcesSampleDxe/SampleStrings.uni
+++ b/MdeModulePkg/Universal/HiiResourcesSampleDxe/SampleStrings.uni
@@ -1,24 +1,24 @@
 // *++\r
 //\r
 // *++\r
 //\r

-// Copyright (c) 2009, Intel Corporation. All rights reserved.<BR>\r
-// This program and the accompanying materials                          \r
-// are licensed and made available under the terms and conditions of the BSD License         \r
-// which accompanies this distribution.  The full text of the license may be found at        \r
-// http://opensource.org/licenses/bsd-license.php                                            \r
-//                                                                                           \r
-// THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     \r
-// WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             \r
-// \r
+// Copyright (c) 2009 - 2018, Intel Corporation. All rights reserved.<BR>\r
+// This program and the accompanying materials\r
+// are licensed and made available under the terms and conditions of the BSD License\r
+// which accompanies this distribution.  The full text of the license may be found at\r
+// http://opensource.org/licenses/bsd-license.php\r
+//\r
+// THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
+// WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
+//\r

 // Module Name:\r
 //\r
 //   SampleStrings.uni\r
 // Module Name:\r
 //\r
 //   SampleStrings.uni\r

-// \r
+//\r

 // Abstract:\r
 // Abstract:\r

-// \r
+//\r

 //   String definitions for Sample.vfr\r
 //   String definitions for Sample.vfr\r

-// \r
+//\r

 // Revision History:\r
 // Revision History:\r

-// \r
+//\r

 // --*/\r
 \r
 \r
 // --*/\r
 \r
 \r

diff --git a/MdeModulePkg/Universal/LegacyRegion2Dxe/LegacyRegion2.c b/MdeModulePkg/Universal/LegacyRegion2Dxe/LegacyRegion2.c
index a956ea975a56cae8670817278cc2b68de9b40af9..db4a2e8ba9212c26e8e9819015d178fcaa7f9b53 100644 (file)
--- a/MdeModulePkg/Universal/LegacyRegion2Dxe/LegacyRegion2.c
+++ b/MdeModulePkg/Universal/LegacyRegion2Dxe/LegacyRegion2.c
@@ -1,13 +1,13 @@
 /** @file\r
   Dummy implementation of Legacy Region 2 Protocol.\r
 \r
 /** @file\r
   Dummy implementation of Legacy Region 2 Protocol.\r
 \r

-  This generic implementation of the Legacy Region 2 Protocol does not actually \r
-  perform any lock/unlock operations.  This module may be used on platforms \r
-  that do not provide HW locking of the legacy memory regions.  It can also \r
+  This generic implementation of the Legacy Region 2 Protocol does not actually\r
+  perform any lock/unlock operations.  This module may be used on platforms\r
+  that do not provide HW locking of the legacy memory regions.  It can also\r

   be used as a template driver for implementing the Legacy Region 2 Protocol on\r
   a platform that does support HW locking of the legacy memory regions.\r
 \r
   be used as a template driver for implementing the Legacy Region 2 Protocol on\r
   a platform that does support HW locking of the legacy memory regions.\r
 \r

-Copyright (c) 2009 - 2010, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2009 - 2018, Intel Corporation. All rights reserved.<BR>\r

 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r


@@ -33,9 +33,9 @@ EFI_LEGACY_REGION2_PROTOCOL  mLegacyRegion2 = {
 /**\r
   Modify the hardware to allow (decode) or disallow (not decode) memory reads in a region.\r
 \r
 /**\r
   Modify the hardware to allow (decode) or disallow (not decode) memory reads in a region.\r
 \r

-  If the On parameter evaluates to TRUE, this function enables memory reads in the address range \r
+  If the On parameter evaluates to TRUE, this function enables memory reads in the address range\r

   Start to (Start + Length - 1).\r
   Start to (Start + Length - 1).\r

-  If the On parameter evaluates to FALSE, this function disables memory reads in the address range \r
+  If the On parameter evaluates to FALSE, this function disables memory reads in the address range\r

   Start to (Start + Length - 1).\r
 \r
   @param  This[in]              Indicates the EFI_LEGACY_REGION_PROTOCOL instance.\r
   Start to (Start + Length - 1).\r
 \r
   @param  This[in]              Indicates the EFI_LEGACY_REGION_PROTOCOL instance.\r


@@ -114,7 +114,7 @@ LegacyRegion2Lock (
 /**\r
   Modify the hardware to disallow memory attribute changes in a region.\r
 \r
 /**\r
   Modify the hardware to disallow memory attribute changes in a region.\r
 \r

-  This function makes the attributes of a region read only. Once a region is boot-locked with this \r
+  This function makes the attributes of a region read only. Once a region is boot-locked with this\r

   function, the read and write attributes of that region cannot be changed until a power cycle has\r
   reset the boot-lock attribute. Calls to Decode(), Lock() and Unlock() will have no effect.\r
 \r
   function, the read and write attributes of that region cannot be changed until a power cycle has\r
   reset the boot-lock attribute. Calls to Decode(), Lock() and Unlock() will have no effect.\r
 \r


@@ -155,7 +155,7 @@ LegacyRegion2BootLock (
 /**\r
   Modify the hardware to allow memory writes in a region.\r
 \r
 /**\r
   Modify the hardware to allow memory writes in a region.\r
 \r

-  This function changes the attributes of a memory range to allow writes.  \r
+  This function changes the attributes of a memory range to allow writes.\r

 \r
   @param  This[in]              Indicates the EFI_LEGACY_REGION_PROTOCOL instance.\r
   @param  Start[in]             The beginning of the physical address of the region whose\r
 \r
   @param  This[in]              Indicates the EFI_LEGACY_REGION_PROTOCOL instance.\r
   @param  Start[in]             The beginning of the physical address of the region whose\r


@@ -193,9 +193,9 @@ LegacyRegion2Unlock (
 /**\r
   Get region information for the attributes of the Legacy Region.\r
 \r
 /**\r
   Get region information for the attributes of the Legacy Region.\r
 \r

-  This function is used to discover the granularity of the attributes for the memory in the legacy \r
+  This function is used to discover the granularity of the attributes for the memory in the legacy\r

   region. Each attribute may have a different granularity and the granularity may not be the same\r
   region. Each attribute may have a different granularity and the granularity may not be the same\r

-  for all memory ranges in the legacy region.  \r
+  for all memory ranges in the legacy region.\r

 \r
   @param  This[in]              Indicates the EFI_LEGACY_REGION2_PROTOCOL instance.\r
   @param  DescriptorCount[out]  The number of region descriptor entries returned in the Descriptor\r
 \r
   @param  This[in]              Indicates the EFI_LEGACY_REGION2_PROTOCOL instance.\r
   @param  DescriptorCount[out]  The number of region descriptor entries returned in the Descriptor\r


@@ -223,9 +223,9 @@ LegacyRegionGetInfo (
 /**\r
   The user Entry Point for module LegacyRegionDxe.  The user code starts with this function.\r
 \r
 /**\r
   The user Entry Point for module LegacyRegionDxe.  The user code starts with this function.\r
 \r

-  @param[in] ImageHandle    The firmware allocated handle for the EFI image.  \r
+  @param[in] ImageHandle    The firmware allocated handle for the EFI image.\r

   @param[in] SystemTable    A pointer to the EFI System Table.\r
   @param[in] SystemTable    A pointer to the EFI System Table.\r

-  \r
+\r

   @retval EFI_SUCCESS       The entry point is executed successfully.\r
 \r
 **/\r
   @retval EFI_SUCCESS       The entry point is executed successfully.\r
 \r
 **/\r


@@ -237,12 +237,12 @@ LegacyRegion2Install (
   )\r
 {\r
   EFI_STATUS  Status;\r
   )\r
 {\r
   EFI_STATUS  Status;\r

-  \r
+\r

   //\r
   // Make sure the Legacy Region 2 Protocol is not already installed in the system\r
   //\r
   ASSERT_PROTOCOL_ALREADY_INSTALLED (NULL, &gEfiLegacyRegion2ProtocolGuid);\r
   //\r
   // Make sure the Legacy Region 2 Protocol is not already installed in the system\r
   //\r
   ASSERT_PROTOCOL_ALREADY_INSTALLED (NULL, &gEfiLegacyRegion2ProtocolGuid);\r

-  \r
+\r

   //\r
   // Install the protocol on a new handle.\r
   //\r
   //\r
   // Install the protocol on a new handle.\r
   //\r

diff --git a/MdeModulePkg/Universal/LegacyRegion2Dxe/LegacyRegion2.h b/MdeModulePkg/Universal/LegacyRegion2Dxe/LegacyRegion2.h
index be4f85481f0af6c19b832661f0064d1509d1c84c..0329dc5cc5903ee13fa1f35028ddc2b39061081c 100644 (file)
--- a/MdeModulePkg/Universal/LegacyRegion2Dxe/LegacyRegion2.h
+++ b/MdeModulePkg/Universal/LegacyRegion2Dxe/LegacyRegion2.h
@@ -1,7 +1,7 @@
 /** @file\r
   Internal include file for the dummy Legacy Region 2 Protocol implementation.\r
 \r
 /** @file\r
   Internal include file for the dummy Legacy Region 2 Protocol implementation.\r
 \r

-Copyright (c) 2009, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2009 - 2018, Intel Corporation. All rights reserved.<BR>\r

 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r


@@ -22,9 +22,9 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 /**\r
   Modify the hardware to allow (decode) or disallow (not decode) memory reads in a region.\r
 \r
 /**\r
   Modify the hardware to allow (decode) or disallow (not decode) memory reads in a region.\r
 \r

-  If the On parameter evaluates to TRUE, this function enables memory reads in the address range \r
+  If the On parameter evaluates to TRUE, this function enables memory reads in the address range\r

   Start to (Start + Length - 1).\r
   Start to (Start + Length - 1).\r

-  If the On parameter evaluates to FALSE, this function disables memory reads in the address range \r
+  If the On parameter evaluates to FALSE, this function disables memory reads in the address range\r

   Start to (Start + Length - 1).\r
 \r
   @param  This[in]              Indicates the EFI_LEGACY_REGION_PROTOCOL instance.\r
   Start to (Start + Length - 1).\r
 \r
   @param  This[in]              Indicates the EFI_LEGACY_REGION_PROTOCOL instance.\r


@@ -85,7 +85,7 @@ LegacyRegion2Lock (
 /**\r
   Modify the hardware to disallow memory attribute changes in a region.\r
 \r
 /**\r
   Modify the hardware to disallow memory attribute changes in a region.\r
 \r

-  This function makes the attributes of a region read only. Once a region is boot-locked with this \r
+  This function makes the attributes of a region read only. Once a region is boot-locked with this\r

   function, the read and write attributes of that region cannot be changed until a power cycle has\r
   reset the boot-lock attribute. Calls to Decode(), Lock() and Unlock() will have no effect.\r
 \r
   function, the read and write attributes of that region cannot be changed until a power cycle has\r
   reset the boot-lock attribute. Calls to Decode(), Lock() and Unlock() will have no effect.\r
 \r


@@ -119,7 +119,7 @@ LegacyRegion2BootLock (
 /**\r
   Modify the hardware to allow memory writes in a region.\r
 \r
 /**\r
   Modify the hardware to allow memory writes in a region.\r
 \r

-  This function changes the attributes of a memory range to allow writes.  \r
+  This function changes the attributes of a memory range to allow writes.\r

 \r
   @param  This[in]              Indicates the EFI_LEGACY_REGION_PROTOCOL instance.\r
   @param  Start[in]             The beginning of the physical address of the region whose\r
 \r
   @param  This[in]              Indicates the EFI_LEGACY_REGION_PROTOCOL instance.\r
   @param  Start[in]             The beginning of the physical address of the region whose\r


@@ -148,9 +148,9 @@ LegacyRegion2Unlock (
 /**\r
   Get region information for the attributes of the Legacy Region.\r
 \r
 /**\r
   Get region information for the attributes of the Legacy Region.\r
 \r

-  This function is used to discover the granularity of the attributes for the memory in the legacy \r
+  This function is used to discover the granularity of the attributes for the memory in the legacy\r

   region. Each attribute may have a different granularity and the granularity may not be the same\r
   region. Each attribute may have a different granularity and the granularity may not be the same\r

-  for all memory ranges in the legacy region.  \r
+  for all memory ranges in the legacy region.\r

 \r
   @param  This[in]              Indicates the EFI_LEGACY_REGION_PROTOCOL instance.\r
   @param  DescriptorCount[out]  The number of region descriptor entries returned in the Descriptor\r
 \r
   @param  This[in]              Indicates the EFI_LEGACY_REGION_PROTOCOL instance.\r
   @param  DescriptorCount[out]  The number of region descriptor entries returned in the Descriptor\r

diff --git a/MdeModulePkg/Universal/LegacyRegion2Dxe/LegacyRegion2Dxe.inf b/MdeModulePkg/Universal/LegacyRegion2Dxe/LegacyRegion2Dxe.inf
index 46cd490d8fe3ef4580fed22e4c9d982561804aa4..3a34cf210fb6e93e7e6a22ae4fe32adbc11a3143 100644 (file)
--- a/MdeModulePkg/Universal/LegacyRegion2Dxe/LegacyRegion2Dxe.inf
+++ b/MdeModulePkg/Universal/LegacyRegion2Dxe/LegacyRegion2Dxe.inf
@@ -1,9 +1,9 @@
 ## @file\r
 #  Produces the Legacy Region 2 Protocol.\r
 #\r
 ## @file\r
 #  Produces the Legacy Region 2 Protocol.\r
 #\r

-#  This generic implementation of the Legacy Region 2 Protocol does not actually \r
-#  perform any lock/unlock operations.  This module may be used on platforms \r
-#  that do not provide HW locking of the legacy memory regions.  It can also \r
+#  This generic implementation of the Legacy Region 2 Protocol does not actually\r
+#  perform any lock/unlock operations.  This module may be used on platforms\r
+#  that do not provide HW locking of the legacy memory regions.  It can also\r

 #  be used as a template driver for implementing the Legacy Region 2 Protocol on\r
 #  a platform that does support HW locking of the legacy memory regions.\r
 #\r
 #  be used as a template driver for implementing the Legacy Region 2 Protocol on\r
 #  a platform that does support HW locking of the legacy memory regions.\r
 #\r


@@ -11,12 +11,12 @@
 #  Protocol. For Lock/UnLock/Decode, EFI_SUCCESS is returned although the region's\r
 #  attributes were not actually modified.\r
 #\r
 #  Protocol. For Lock/UnLock/Decode, EFI_SUCCESS is returned although the region's\r
 #  attributes were not actually modified.\r
 #\r

-# Copyright (c) 2009 - 2014, Intel Corporation. All rights reserved.<BR>\r
+# Copyright (c) 2009 - 2018, Intel Corporation. All rights reserved.<BR>\r

 # This program and the accompanying materials\r
 # are licensed and made available under the terms and conditions of the BSD License\r
 # which accompanies this distribution.  The full text of the license may be found at\r
 # http://opensource.org/licenses/bsd-license.php\r
 # This program and the accompanying materials\r
 # are licensed and made available under the terms and conditions of the BSD License\r
 # which accompanies this distribution.  The full text of the license may be found at\r
 # http://opensource.org/licenses/bsd-license.php\r

-#                                                                                           \r
+#\r

 # THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 # WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 #\r
 # THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 # WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 #\r


@@ -28,7 +28,7 @@
   MODULE_UNI_FILE                = LegacyRegion2Dxe.uni\r
   FILE_GUID                      = EC2BEECA-E84A-445B-869B-F7A73C96F58A\r
   MODULE_TYPE                    = DXE_DRIVER\r
   MODULE_UNI_FILE                = LegacyRegion2Dxe.uni\r
   FILE_GUID                      = EC2BEECA-E84A-445B-869B-F7A73C96F58A\r
   MODULE_TYPE                    = DXE_DRIVER\r

-  VERSION_STRING                 = 1.0  \r
+  VERSION_STRING                 = 1.0\r

   ENTRY_POINT                    = LegacyRegion2Install\r
 \r
 #\r
   ENTRY_POINT                    = LegacyRegion2Install\r
 \r
 #\r

diff --git a/MdeModulePkg/Universal/LegacyRegion2Dxe/LegacyRegion2Dxe.uni b/MdeModulePkg/Universal/LegacyRegion2Dxe/LegacyRegion2Dxe.uni
index b665bbfc4e01f65750c390f1c6513306a06c5b74..bfe8862b4527e9bb0f5fad8ccd42babdc23f78e0 100644 (file)
--- a/MdeModulePkg/Universal/LegacyRegion2Dxe/LegacyRegion2Dxe.uni
+++ b/MdeModulePkg/Universal/LegacyRegion2Dxe/LegacyRegion2Dxe.uni
@@ -6,18 +6,18 @@
 // that do not provide HW locking of the legacy memory regions.  It can also\r
 // be used as a template driver for implementing the Legacy Region 2 Protocol on\r
 // a platform that does support HW locking of the legacy memory regions.\r
 // that do not provide HW locking of the legacy memory regions.  It can also\r
 // be used as a template driver for implementing the Legacy Region 2 Protocol on\r
 // a platform that does support HW locking of the legacy memory regions.\r

-// \r
+//\r

 // Note: This module does not fully comply with PI Specification of Legacy Region 2\r
 // Protocol. For Lock/UnLock/Decode, EFI_SUCCESS is returned although the region's\r
 // attributes were not actually modified.\r
 //\r
 // Note: This module does not fully comply with PI Specification of Legacy Region 2\r
 // Protocol. For Lock/UnLock/Decode, EFI_SUCCESS is returned although the region's\r
 // attributes were not actually modified.\r
 //\r

-// Copyright (c) 2009 - 2014, Intel Corporation. All rights reserved.<BR>\r
+// Copyright (c) 2009 - 2018, Intel Corporation. All rights reserved.<BR>\r

 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r
 // which accompanies this distribution.  The full text of the license may be found at\r
 // http://opensource.org/licenses/bsd-license.php\r
 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r
 // which accompanies this distribution.  The full text of the license may be found at\r
 // http://opensource.org/licenses/bsd-license.php\r

-// \r
+//\r

 // THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 // WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 //\r
 // THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 // WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 //\r

diff --git a/MdeModulePkg/Universal/LegacyRegion2Dxe/LegacyRegion2DxeExtra.uni b/MdeModulePkg/Universal/LegacyRegion2Dxe/LegacyRegion2DxeExtra.uni
index 22335058d22a047a6dcd43089fe3c9ed056b2b59..5c4336b6f2b850fd1df042f7c62f9dd4fe3739b8 100644 (file)
--- a/MdeModulePkg/Universal/LegacyRegion2Dxe/LegacyRegion2DxeExtra.uni
+++ b/MdeModulePkg/Universal/LegacyRegion2Dxe/LegacyRegion2DxeExtra.uni
@@ -1,7 +1,7 @@
 // /** @file\r
 // LegacyRegion2Dxe Localized Strings and Content\r
 //\r
 // /** @file\r
 // LegacyRegion2Dxe Localized Strings and Content\r
 //\r

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

 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r
 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r


@@ -13,8 +13,8 @@
 //\r
 // **/\r
 \r
 //\r
 // **/\r
 \r

-#string STR_PROPERTIES_MODULE_NAME \r
-#language en-US \r
+#string STR_PROPERTIES_MODULE_NAME\r
+#language en-US\r

 "Legacy Region DXE Driver v2"\r
 \r
 \r
 "Legacy Region DXE Driver v2"\r
 \r
 \r

diff --git a/MdeModulePkg/Universal/LockBox/SmmLockBox/SmmLockBox.c b/MdeModulePkg/Universal/LockBox/SmmLockBox/SmmLockBox.c
index d4183ca4b05796b48cc18e3e7d9b33835d3bc91f..28d5180e011e51dca7614ec0174e3adcb6998bec 100644 (file)
--- a/MdeModulePkg/Universal/LockBox/SmmLockBox/SmmLockBox.c
+++ b/MdeModulePkg/Universal/LockBox/SmmLockBox/SmmLockBox.c
@@ -1,11 +1,11 @@
 /** @file\r
   LockBox SMM driver.\r
 /** @file\r
   LockBox SMM driver.\r

-  \r
+\r

   Caution: This module requires additional review when modified.\r
   This driver will have external input - communicate buffer in SMM mode.\r
   This external input must be validated carefully to avoid security issue like\r
   buffer overflow, integer overflow.\r
   Caution: This module requires additional review when modified.\r
   This driver will have external input - communicate buffer in SMM mode.\r
   This external input must be validated carefully to avoid security issue like\r
   buffer overflow, integer overflow.\r

-  \r
+\r

   SmmLockBoxHandler(), SmmLockBoxRestore(), SmmLockBoxUpdate(), SmmLockBoxSave()\r
   will receive untrusted input and do basic validation.\r
 \r
   SmmLockBoxHandler(), SmmLockBoxRestore(), SmmLockBoxUpdate(), SmmLockBoxSave()\r
   will receive untrusted input and do basic validation.\r
 \r


@@ -47,7 +47,7 @@ BOOLEAN              mLocked = FALSE;
   Restore buffer and length are external input, so this function will validate\r
   it is in SMRAM.\r
 \r
   Restore buffer and length are external input, so this function will validate\r
   it is in SMRAM.\r
 \r

-  @param LockBoxParameterSave  parameter of lock box save \r
+  @param LockBoxParameterSave  parameter of lock box save\r

 **/\r
 VOID\r
 SmmLockBoxSave (\r
 **/\r
 VOID\r
 SmmLockBoxSave (\r


@@ -131,7 +131,7 @@ SmmLockBoxSetAttributes (
   Restore buffer and length are external input, so this function will validate\r
   it is in SMRAM.\r
 \r
   Restore buffer and length are external input, so this function will validate\r
   it is in SMRAM.\r
 \r

-  @param LockBoxParameterUpdate  parameter of lock box update \r
+  @param LockBoxParameterUpdate  parameter of lock box update\r

 **/\r
 VOID\r
 SmmLockBoxUpdate (\r
 **/\r
 VOID\r
 SmmLockBoxUpdate (\r


@@ -181,7 +181,7 @@ SmmLockBoxUpdate (
   Restore buffer and length are external input, so this function will validate\r
   it is in SMRAM.\r
 \r
   Restore buffer and length are external input, so this function will validate\r
   it is in SMRAM.\r
 \r

-  @param LockBoxParameterRestore  parameter of lock box restore \r
+  @param LockBoxParameterRestore  parameter of lock box restore\r

 **/\r
 VOID\r
 SmmLockBoxRestore (\r
 **/\r
 VOID\r
 SmmLockBoxRestore (\r


@@ -353,7 +353,7 @@ SmmLockBoxHandler (
   Smm Ready To Lock event notification handler.\r
 \r
   It sets a flag indicating that SMRAM has been locked.\r
   Smm Ready To Lock event notification handler.\r
 \r
   It sets a flag indicating that SMRAM has been locked.\r

-  \r
+\r

   @param[in] Protocol   Points to the protocol's unique identifier.\r
   @param[in] Interface  Points to the interface instance.\r
   @param[in] Handle     The handle on which the interface was installed.\r
   @param[in] Protocol   Points to the protocol's unique identifier.\r
   @param[in] Interface  Points to the interface instance.\r
   @param[in] Handle     The handle on which the interface was installed.\r


@@ -378,7 +378,7 @@ SmmReadyToLockEventNotify (
   @param[in] ImageHandle  Image handle of this driver.\r
   @param[in] SystemTable  A Pointer to the EFI System Table.\r
 \r
   @param[in] ImageHandle  Image handle of this driver.\r
   @param[in] SystemTable  A Pointer to the EFI System Table.\r
 \r

-  @retval EFI_SUCEESS     \r
+  @retval EFI_SUCEESS\r

   @return Others          Some error occurs.\r
 **/\r
 EFI_STATUS\r
   @return Others          Some error occurs.\r
 **/\r
 EFI_STATUS\r

diff --git a/MdeModulePkg/Universal/LockBox/SmmLockBox/SmmLockBox.inf b/MdeModulePkg/Universal/LockBox/SmmLockBox/SmmLockBox.inf
index 772cad9890be5999daf5b66cd5056ff8c4a92150..f07ab20e1a55e58dc51bf27453e25867a39b1288 100644 (file)
--- a/MdeModulePkg/Universal/LockBox/SmmLockBox/SmmLockBox.inf
+++ b/MdeModulePkg/Universal/LockBox/SmmLockBox/SmmLockBox.inf
@@ -6,7 +6,7 @@
 #  This external input must be validated carefully to avoid security issue like\r
 #  buffer overflow, integer overflow.\r
 #\r
 #  This external input must be validated carefully to avoid security issue like\r
 #  buffer overflow, integer overflow.\r
 #\r

-#  Copyright (c) 2010 - 2015, Intel Corporation. All rights reserved.<BR>\r
+#  Copyright (c) 2010 - 2018, Intel Corporation. All rights reserved.<BR>\r

 #\r
 #  This program and the accompanying materials\r
 #  are licensed and made available under the terms and conditions\r
 #\r
 #  This program and the accompanying materials\r
 #  are licensed and made available under the terms and conditions\r


@@ -32,7 +32,7 @@
 #\r
 # The following information is for reference only and not required by the build tools.\r
 #\r
 #\r
 # The following information is for reference only and not required by the build tools.\r
 #\r

-#  VALID_ARCHITECTURES           = IA32 X64 \r
+#  VALID_ARCHITECTURES           = IA32 X64\r

 #\r
 \r
 [Sources]\r
 #\r
 \r
 [Sources]\r

diff --git a/MdeModulePkg/Universal/LockBox/SmmLockBox/SmmLockBox.uni b/MdeModulePkg/Universal/LockBox/SmmLockBox/SmmLockBox.uni
index 4e5cce8a42b46839493c537603dba7a615e089c9..ead8588b798a323ec1234023b50c783bea832f5f 100644 (file)
--- a/MdeModulePkg/Universal/LockBox/SmmLockBox/SmmLockBox.uni
+++ b/MdeModulePkg/Universal/LockBox/SmmLockBox/SmmLockBox.uni
@@ -6,14 +6,14 @@
 // This external input must be validated carefully to avoid security issue like\r
 // buffer overflow, integer overflow.\r
 //\r
 // This external input must be validated carefully to avoid security issue like\r
 // buffer overflow, integer overflow.\r
 //\r

-// Copyright (c) 2010 - 2014, Intel Corporation. All rights reserved.<BR>\r
+// Copyright (c) 2010 - 2018, Intel Corporation. All rights reserved.<BR>\r

 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions\r
 // of the BSD License which accompanies this distribution.  The\r
 // full text of the license may be found at\r
 // http://opensource.org/licenses/bsd-license.php\r
 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions\r
 // of the BSD License which accompanies this distribution.  The\r
 // full text of the license may be found at\r
 // http://opensource.org/licenses/bsd-license.php\r

-// \r
+//\r

 // THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 // WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 //\r
 // THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 // WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 //\r

diff --git a/MdeModulePkg/Universal/LockBox/SmmLockBox/SmmLockBoxExtra.uni b/MdeModulePkg/Universal/LockBox/SmmLockBox/SmmLockBoxExtra.uni
index 9c07cb509d0e67fa1a79f242d3fb665043998cec..539e1620dd4321ecd746eafe9112b9003ddd077c 100644 (file)
--- a/MdeModulePkg/Universal/LockBox/SmmLockBox/SmmLockBoxExtra.uni
+++ b/MdeModulePkg/Universal/LockBox/SmmLockBox/SmmLockBoxExtra.uni
@@ -1,7 +1,7 @@
 // /** @file\r
 // SmmLockBox Localized Strings and Content\r
 //\r
 // /** @file\r
 // SmmLockBox Localized Strings and Content\r
 //\r

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

 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions\r
 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions\r


@@ -14,8 +14,8 @@
 //\r
 // **/\r
 \r
 //\r
 // **/\r
 \r

-#string STR_PROPERTIES_MODULE_NAME \r
-#language en-US \r
+#string STR_PROPERTIES_MODULE_NAME\r
+#language en-US\r

 "SMM Lock Box Driver"\r
 \r
 \r
 "SMM Lock Box Driver"\r
 \r
 \r

diff --git a/MdeModulePkg/Universal/MemoryTest/GenericMemoryTestDxe/GenericMemoryTestDxe.uni b/MdeModulePkg/Universal/MemoryTest/GenericMemoryTestDxe/GenericMemoryTestDxe.uni
index 1e380c2889cb2ccbe8fdec0630433a127df3b404..1cd4bb0a07ff632d39ddf7159864644050d6cf3a 100644 (file)
--- a/MdeModulePkg/Universal/MemoryTest/GenericMemoryTestDxe/GenericMemoryTestDxe.uni
+++ b/MdeModulePkg/Universal/MemoryTest/GenericMemoryTestDxe/GenericMemoryTestDxe.uni
@@ -3,13 +3,13 @@
 //\r
 // This driver first constructs the non-tested memory range, then performs the R/W/V memory test.\r
 //\r
 //\r
 // This driver first constructs the non-tested memory range, then performs the R/W/V memory test.\r
 //\r

-// Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.<BR>\r
+// Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r

 //\r
 // This program and the accompanying materials are\r
 // licensed and made available under the terms and conditions of the BSD License\r
 // which accompanies this distribution.  The full text of the license may be found at\r
 // http://opensource.org/licenses/bsd-license.php\r
 //\r
 // This program and the accompanying materials are\r
 // licensed and made available under the terms and conditions of the BSD License\r
 // which accompanies this distribution.  The full text of the license may be found at\r
 // http://opensource.org/licenses/bsd-license.php\r

-// \r
+//\r

 // THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 // WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 //\r
 // THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 // WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 //\r

diff --git a/MdeModulePkg/Universal/MemoryTest/GenericMemoryTestDxe/GenericMemoryTestDxeExtra.uni b/MdeModulePkg/Universal/MemoryTest/GenericMemoryTestDxe/GenericMemoryTestDxeExtra.uni
index 2ae03289015c7b78765a846eb3b42c8679d7c9fb..f57ee9cfaf61344616c08f6591eb6cbea37c7693 100644 (file)
--- a/MdeModulePkg/Universal/MemoryTest/GenericMemoryTestDxe/GenericMemoryTestDxeExtra.uni
+++ b/MdeModulePkg/Universal/MemoryTest/GenericMemoryTestDxe/GenericMemoryTestDxeExtra.uni
@@ -1,7 +1,7 @@
 // /** @file\r
 // GenericMemoryTestDxe Localized Strings and Content\r
 //\r
 // /** @file\r
 // GenericMemoryTestDxe Localized Strings and Content\r
 //\r

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

 //\r
 // This program and the accompanying materials are\r
 // licensed and made available under the terms and conditions of the BSD License\r
 //\r
 // This program and the accompanying materials are\r
 // licensed and made available under the terms and conditions of the BSD License\r


@@ -13,8 +13,8 @@
 //\r
 // **/\r
 \r
 //\r
 // **/\r
 \r

-#string STR_PROPERTIES_MODULE_NAME \r
-#language en-US \r
+#string STR_PROPERTIES_MODULE_NAME\r
+#language en-US\r

 "Generic Memory Test DXE Driver"\r
 \r
 \r
 "Generic Memory Test DXE Driver"\r
 \r
 \r

diff --git a/MdeModulePkg/Universal/MemoryTest/GenericMemoryTestDxe/LightMemoryTest.c b/MdeModulePkg/Universal/MemoryTest/GenericMemoryTestDxe/LightMemoryTest.c
index a7ade955c34754759187675947c721208408dbca..86c2be13dcb1f17a9f13ef68f484b140bcdeb118 100644 (file)
--- a/MdeModulePkg/Universal/MemoryTest/GenericMemoryTestDxe/LightMemoryTest.c
+++ b/MdeModulePkg/Universal/MemoryTest/GenericMemoryTestDxe/LightMemoryTest.c
@@ -52,7 +52,7 @@ UINT32                  GenericMemoryTestMonoPattern[GENERIC_CACHELINE_SIZE / 4]
   If all Length bytes of the two buffers are identical, then 0 is returned.  Otherwise, the\r
   value returned is the first mismatched byte in SourceBuffer subtracted from the first\r
   mismatched byte in DestinationBuffer.\r
   If all Length bytes of the two buffers are identical, then 0 is returned.  Otherwise, the\r
   value returned is the first mismatched byte in SourceBuffer subtracted from the first\r
   mismatched byte in DestinationBuffer.\r

-  \r
+\r

   If Length = 0, then ASSERT().\r
 \r
   @param[in] DestinationBuffer The pointer to the destination buffer to compare.\r
   If Length = 0, then ASSERT().\r
 \r
   @param[in] DestinationBuffer The pointer to the destination buffer to compare.\r


@@ -62,7 +62,7 @@ UINT32                  GenericMemoryTestMonoPattern[GENERIC_CACHELINE_SIZE / 4]
   @return 0                 All Length bytes of the two buffers are identical.\r
   @retval Non-zero          The first mismatched byte in SourceBuffer subtracted from the first\r
                             mismatched byte in DestinationBuffer.\r
   @return 0                 All Length bytes of the two buffers are identical.\r
   @retval Non-zero          The first mismatched byte in SourceBuffer subtracted from the first\r
                             mismatched byte in DestinationBuffer.\r

-                            \r
+\r

 **/\r
 INTN\r
 EFIAPI\r
 **/\r
 INTN\r
 EFIAPI\r


@@ -89,7 +89,7 @@ CompareMemWithoutCheckArgument (
   @retval EFI_SUCCESS          Successful construct the base memory range through GCD service.\r
   @retval EFI_OUT_OF_RESOURCE  Could not allocate needed resource from base memory.\r
   @retval Others               Failed to construct base memory range through GCD service.\r
   @retval EFI_SUCCESS          Successful construct the base memory range through GCD service.\r
   @retval EFI_OUT_OF_RESOURCE  Could not allocate needed resource from base memory.\r
   @retval Others               Failed to construct base memory range through GCD service.\r

-                            \r
+\r

 **/\r
 EFI_STATUS\r
 ConstructBaseMemoryRange (\r
 **/\r
 EFI_STATUS\r
 ConstructBaseMemoryRange (\r


@@ -119,7 +119,7 @@ ConstructBaseMemoryRange (
   Destroy the link list base on the correspond link list type.\r
 \r
   @param[in] Private  Point to generic memory test driver's private data.\r
   Destroy the link list base on the correspond link list type.\r
 \r
   @param[in] Private  Point to generic memory test driver's private data.\r

-                            \r
+\r

 **/\r
 VOID\r
 DestroyLinkList (\r
 **/\r
 VOID\r
 DestroyLinkList (\r


@@ -181,7 +181,7 @@ ConvertToTestedMemory (
 \r
   @retval EFI_SUCCESS Successful add all the extended memory to system memory map.\r
   @retval Others      Failed to add the tested extended memory.\r
 \r
   @retval EFI_SUCCESS Successful add all the extended memory to system memory map.\r
   @retval Others      Failed to add the tested extended memory.\r

-                            \r
+\r

 **/\r
 EFI_STATUS\r
 UpdateMemoryMap (\r
 **/\r
 EFI_STATUS\r
 UpdateMemoryMap (\r


@@ -218,7 +218,7 @@ UpdateMemoryMap (
 \r
   @retval EFI_SUCCESS      Successful test the range of memory.\r
   @retval Others           Failed to test the range of memory.\r
 \r
   @retval EFI_SUCCESS      Successful test the range of memory.\r
   @retval Others           Failed to test the range of memory.\r

-                            \r
+\r

 **/\r
 EFI_STATUS\r
 DirectRangeTest (\r
 **/\r
 EFI_STATUS\r
 DirectRangeTest (\r


@@ -263,7 +263,7 @@ DirectRangeTest (
   @retval EFI_SUCCESS          Successful construct the non-tested memory range through GCD service.\r
   @retval EFI_OUT_OF_RESOURCE  Could not allocate needed resource from base memory.\r
   @retval Others               Failed to construct non-tested memory range through GCD service.\r
   @retval EFI_SUCCESS          Successful construct the non-tested memory range through GCD service.\r
   @retval EFI_OUT_OF_RESOURCE  Could not allocate needed resource from base memory.\r
   @retval Others               Failed to construct non-tested memory range through GCD service.\r

-                            \r
+\r

 **/\r
 EFI_STATUS\r
 ConstructNonTestedMemoryRange (\r
 **/\r
 EFI_STATUS\r
 ConstructNonTestedMemoryRange (\r


@@ -324,7 +324,7 @@ ConstructNonTestedMemoryRange (
 \r
   @retval EFI_SUCCESS Successful write the test pattern into the non-tested memory.\r
   @retval Others      The test pattern may not really write into the physical memory.\r
 \r
   @retval EFI_SUCCESS Successful write the test pattern into the non-tested memory.\r
   @retval Others      The test pattern may not really write into the physical memory.\r

-                            \r
+\r

 **/\r
 EFI_STATUS\r
 WriteMemory (\r
 **/\r
 EFI_STATUS\r
 WriteMemory (\r


@@ -372,7 +372,7 @@ WriteMemory (
 \r
   @retval EFI_SUCCESS Successful verify the range of memory, no errors' location found.\r
   @retval Others      The range of memory have errors contained.\r
 \r
   @retval EFI_SUCCESS Successful verify the range of memory, no errors' location found.\r
   @retval Others      The range of memory have errors contained.\r

-                            \r
+\r

 **/\r
 EFI_STATUS\r
 VerifyMemory (\r
 **/\r
 EFI_STATUS\r
 VerifyMemory (\r


@@ -432,7 +432,7 @@ VerifyMemory (
           NULL,\r
           (UINT8 *) ExtendedErrorData + sizeof (EFI_STATUS_CODE_DATA),\r
           ExtendedErrorData->DataHeader.Size\r
           NULL,\r
           (UINT8 *) ExtendedErrorData + sizeof (EFI_STATUS_CODE_DATA),\r
           ExtendedErrorData->DataHeader.Size\r

-          ); \r
+          );\r

 \r
       return EFI_DEVICE_ERROR;\r
     }\r
 \r
       return EFI_DEVICE_ERROR;\r
     }\r


@@ -446,12 +446,12 @@ VerifyMemory (
 /**\r
   Initialize the generic memory test.\r
 \r
 /**\r
   Initialize the generic memory test.\r
 \r

-  @param[in]  This                The protocol instance pointer. \r
-  @param[in]  Level               The coverage level of the memory test. \r
-  @param[out] RequireSoftECCInit  Indicate if the memory need software ECC init. \r
+  @param[in]  This                The protocol instance pointer.\r
+  @param[in]  Level               The coverage level of the memory test.\r
+  @param[out] RequireSoftECCInit  Indicate if the memory need software ECC init.\r

 \r
 \r

-  @retval EFI_SUCCESS         The generic memory test is initialized correctly. \r
-  @retval EFI_NO_MEDIA        The system had no memory to be tested. \r
+  @retval EFI_SUCCESS         The generic memory test is initialized correctly.\r
+  @retval EFI_NO_MEDIA        The system had no memory to be tested.\r

 \r
 **/\r
 EFI_STATUS\r
 \r
 **/\r
 EFI_STATUS\r


@@ -542,12 +542,12 @@ InitializeMemoryTest (
 /**\r
   Perform the memory test.\r
 \r
 /**\r
   Perform the memory test.\r
 \r

-  @param[in]  This              The protocol instance pointer. \r
-  @param[out] TestedMemorySize  Return the tested extended memory size. \r
-  @param[out] TotalMemorySize   Return the whole system physical memory size. \r
-                                The total memory size does not include memory in a slot with a disabled DIMM.  \r
+  @param[in]  This              The protocol instance pointer.\r
+  @param[out] TestedMemorySize  Return the tested extended memory size.\r
+  @param[out] TotalMemorySize   Return the whole system physical memory size.\r
+                                The total memory size does not include memory in a slot with a disabled DIMM.\r

   @param[out] ErrorOut          TRUE if the memory error occured.\r
   @param[out] ErrorOut          TRUE if the memory error occured.\r

-  @param[in]  IfTestAbort       Indicates that the user pressed "ESC" to skip the memory test. \r
+  @param[in]  IfTestAbort       Indicates that the user pressed "ESC" to skip the memory test.\r

 \r
   @retval EFI_SUCCESS         One block of memory passed the test.\r
   @retval EFI_NOT_FOUND       All memory blocks have already been tested.\r
 \r
   @retval EFI_SUCCESS         One block of memory passed the test.\r
   @retval EFI_NOT_FOUND       All memory blocks have already been tested.\r


@@ -667,7 +667,7 @@ GenPerformMemoryTest (
 /**\r
   Finish the memory test.\r
 \r
 /**\r
   Finish the memory test.\r
 \r

-  @param[in] This             The protocol instance pointer. \r
+  @param[in] This             The protocol instance pointer.\r

 \r
   @retval EFI_SUCCESS         Success. All resources used in the memory test are freed.\r
 \r
 \r
   @retval EFI_SUCCESS         Success. All resources used in the memory test are freed.\r
 \r


@@ -705,12 +705,12 @@ GenMemoryTestFinished (
 /**\r
   Provides the capability to test the compatible range used by some special drivers.\r
 \r
 /**\r
   Provides the capability to test the compatible range used by some special drivers.\r
 \r

-  @param[in]  This              The protocol instance pointer. \r
+  @param[in]  This              The protocol instance pointer.\r

   @param[in]  StartAddress      The start address of the compatible memory range that\r
                                 must be below 16M.\r
   @param[in]  StartAddress      The start address of the compatible memory range that\r
                                 must be below 16M.\r

-  @param[in]  Length            The compatible memory range's length. \r
-  \r
-  @retval EFI_SUCCESS           The compatible memory range pass the memory test. \r
+  @param[in]  Length            The compatible memory range's length.\r
+\r
+  @retval EFI_SUCCESS           The compatible memory range pass the memory test.\r

   @retval EFI_INVALID_PARAMETER The compatible memory range are not below Low 16M.\r
 \r
 **/\r
   @retval EFI_INVALID_PARAMETER The compatible memory range are not below Low 16M.\r
 \r
 **/\r


@@ -780,9 +780,9 @@ GenCompatibleRangeTest (
   Perform the address line walking ones test.\r
 \r
   @param[in] Private  Point to generic memory test driver's private data.\r
   Perform the address line walking ones test.\r
 \r
   @param[in] Private  Point to generic memory test driver's private data.\r

-  \r
-  @retval EFI_SUCCESS          Successful finished walking ones test. \r
-  @retval EFI_OUT_OF_RESOURCE  Could not get resource in base memory. \r
+\r
+  @retval EFI_SUCCESS          Successful finished walking ones test.\r
+  @retval EFI_OUT_OF_RESOURCE  Could not get resource in base memory.\r

   @retval EFI_ACCESS_DENIED    Code may can not run here because if walking one test\r
                                failed, system may be already halt.\r
 \r
   @retval EFI_ACCESS_DENIED    Code may can not run here because if walking one test\r
                                failed, system may be already halt.\r
 \r


@@ -861,9 +861,9 @@ GENERIC_MEMORY_TEST_PRIVATE mGenericMemoryTestPrivate = {
 \r
   It initializes private data to default value.\r
 \r
 \r
   It initializes private data to default value.\r
 \r

-  @param[in] ImageHandle  The firmware allocated handle for the EFI image.  \r
+  @param[in] ImageHandle  The firmware allocated handle for the EFI image.\r

   @param[in] SystemTable  A pointer to the EFI System Table.\r
   @param[in] SystemTable  A pointer to the EFI System Table.\r

-  \r
+\r

   @retval EFI_SUCCESS     The entry point is executed successfully.\r
   @retval EFI_NOT_FOUND   Can't find HandOff Hob in HobList.\r
   @retval other           Some error occurs when executing this entry point.\r
   @retval EFI_SUCCESS     The entry point is executed successfully.\r
   @retval EFI_NOT_FOUND   Can't find HandOff Hob in HobList.\r
   @retval other           Some error occurs when executing this entry point.\r

diff --git a/MdeModulePkg/Universal/MemoryTest/GenericMemoryTestDxe/LightMemoryTest.h b/MdeModulePkg/Universal/MemoryTest/GenericMemoryTestDxe/LightMemoryTest.h
index 391c8a4c81eb9c05c101bec97441cc7abd81a38a..defe9f28ead553ad430d6cd067c7e2c3280cf09a 100644 (file)
--- a/MdeModulePkg/Universal/MemoryTest/GenericMemoryTestDxe/LightMemoryTest.h
+++ b/MdeModulePkg/Universal/MemoryTest/GenericMemoryTestDxe/LightMemoryTest.h
@@ -1,7 +1,7 @@
 /** @file\r
   The generic memory test driver definition\r
 \r
 /** @file\r
   The generic memory test driver definition\r
 \r

-  Copyright (c) 2006 - 2010, Intel Corporation. All rights reserved.<BR>\r
+  Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r

 \r
   This program and the accompanying materials\r
   are licensed and made available under the terms and conditions\r
 \r
   This program and the accompanying materials\r
   are licensed and made available under the terms and conditions\r


@@ -139,7 +139,7 @@ typedef struct {
   @retval EFI_SUCCESS          Successful construct the base memory range through GCD service.\r
   @retval EFI_OUT_OF_RESOURCE  Could not allocate needed resource from base memory.\r
   @retval Others               Failed to construct base memory range through GCD service.\r
   @retval EFI_SUCCESS          Successful construct the base memory range through GCD service.\r
   @retval EFI_OUT_OF_RESOURCE  Could not allocate needed resource from base memory.\r
   @retval Others               Failed to construct base memory range through GCD service.\r

-                            \r
+\r

 **/\r
 EFI_STATUS\r
 ConstructBaseMemoryRange (\r
 **/\r
 EFI_STATUS\r
 ConstructBaseMemoryRange (\r


@@ -154,7 +154,7 @@ ConstructBaseMemoryRange (
   @retval EFI_SUCCESS          Successful construct the non-tested memory range through GCD service.\r
   @retval EFI_OUT_OF_RESOURCE  Could not allocate needed resource from base memory.\r
   @retval Others               Failed to construct non-tested memory range through GCD service.\r
   @retval EFI_SUCCESS          Successful construct the non-tested memory range through GCD service.\r
   @retval EFI_OUT_OF_RESOURCE  Could not allocate needed resource from base memory.\r
   @retval Others               Failed to construct non-tested memory range through GCD service.\r

-                            \r
+\r

 **/\r
 EFI_STATUS\r
 ConstructNonTestedMemoryRange (\r
 **/\r
 EFI_STATUS\r
 ConstructNonTestedMemoryRange (\r


@@ -165,9 +165,9 @@ ConstructNonTestedMemoryRange (
   Perform the address line walking ones test.\r
 \r
   @param[in] Private  Point to generic memory test driver's private data.\r
   Perform the address line walking ones test.\r
 \r
   @param[in] Private  Point to generic memory test driver's private data.\r

-  \r
-  @retval EFI_SUCCESS          Successful finished walking ones test. \r
-  @retval EFI_OUT_OF_RESOURCE  Could not get resource in base memory. \r
+\r
+  @retval EFI_SUCCESS          Successful finished walking ones test.\r
+  @retval EFI_OUT_OF_RESOURCE  Could not get resource in base memory.\r

   @retval EFI_ACCESS_DENIED    Code may can not run here because if walking one test\r
                                failed, system may be already halt.\r
 \r
   @retval EFI_ACCESS_DENIED    Code may can not run here because if walking one test\r
                                failed, system may be already halt.\r
 \r


@@ -181,7 +181,7 @@ PerformAddressDataLineTest (
   Destroy the link list base on the correspond link list type.\r
 \r
   @param[in] Private  Point to generic memory test driver's private data.\r
   Destroy the link list base on the correspond link list type.\r
 \r
   @param[in] Private  Point to generic memory test driver's private data.\r

-                            \r
+\r

 **/\r
 VOID\r
 DestroyLinkList (\r
 **/\r
 VOID\r
 DestroyLinkList (\r


@@ -195,7 +195,7 @@ DestroyLinkList (
 \r
   @retval EFI_SUCCESS Successful add all the extended memory to system memory map.\r
   @retval Others      Failed to add the tested extended memory.\r
 \r
   @retval EFI_SUCCESS Successful add all the extended memory to system memory map.\r
   @retval Others      Failed to add the tested extended memory.\r

-                            \r
+\r

 **/\r
 EFI_STATUS\r
 UpdateMemoryMap (\r
 **/\r
 EFI_STATUS\r
 UpdateMemoryMap (\r


@@ -211,7 +211,7 @@ UpdateMemoryMap (
 \r
   @retval EFI_SUCCESS Successful write the test pattern into the non-tested memory.\r
   @retval Others      The test pattern may not really write into the physical memory.\r
 \r
   @retval EFI_SUCCESS Successful write the test pattern into the non-tested memory.\r
   @retval Others      The test pattern may not really write into the physical memory.\r

-                            \r
+\r

 **/\r
 EFI_STATUS\r
 WriteMemory (\r
 **/\r
 EFI_STATUS\r
 WriteMemory (\r


@@ -232,7 +232,7 @@ WriteMemory (
 \r
   @retval EFI_SUCCESS Successful verify the range of memory, no errors' location found.\r
   @retval Others      The range of memory have errors contained.\r
 \r
   @retval EFI_SUCCESS Successful verify the range of memory, no errors' location found.\r
   @retval Others      The range of memory have errors contained.\r

-                            \r
+\r

 **/\r
 EFI_STATUS\r
 VerifyMemory (\r
 **/\r
 EFI_STATUS\r
 VerifyMemory (\r


@@ -251,7 +251,7 @@ VerifyMemory (
 \r
   @retval EFI_SUCCESS      Successful test the range of memory.\r
   @retval Others           Failed to test the range of memory.\r
 \r
   @retval EFI_SUCCESS      Successful test the range of memory.\r
   @retval Others           Failed to test the range of memory.\r

-                            \r
+\r

 **/\r
 EFI_STATUS\r
 DirectRangeTest (\r
 **/\r
 EFI_STATUS\r
 DirectRangeTest (\r


@@ -264,12 +264,12 @@ DirectRangeTest (
 /**\r
   Initialize the generic memory test.\r
 \r
 /**\r
   Initialize the generic memory test.\r
 \r

-  @param[in]  This                The protocol instance pointer. \r
-  @param[in]  Level               The coverage level of the memory test. \r
-  @param[out] RequireSoftECCInit  Indicate if the memory need software ECC init. \r
+  @param[in]  This                The protocol instance pointer.\r
+  @param[in]  Level               The coverage level of the memory test.\r
+  @param[out] RequireSoftECCInit  Indicate if the memory need software ECC init.\r

 \r
 \r

-  @retval EFI_SUCCESS         The generic memory test is initialized correctly. \r
-  @retval EFI_NO_MEDIA        The system had no memory to be tested. \r
+  @retval EFI_SUCCESS         The generic memory test is initialized correctly.\r
+  @retval EFI_NO_MEDIA        The system had no memory to be tested.\r

 \r
 **/\r
 EFI_STATUS\r
 \r
 **/\r
 EFI_STATUS\r


@@ -283,12 +283,12 @@ InitializeMemoryTest (
 /**\r
   Perform the memory test.\r
 \r
 /**\r
   Perform the memory test.\r
 \r

-  @param[in]  This              The protocol instance pointer. \r
-  @param[out] TestedMemorySize  Return the tested extended memory size. \r
-  @param[out] TotalMemorySize   Return the whole system physical memory size. \r
-                                The total memory size does not include memory in a slot with a disabled DIMM.  \r
+  @param[in]  This              The protocol instance pointer.\r
+  @param[out] TestedMemorySize  Return the tested extended memory size.\r
+  @param[out] TotalMemorySize   Return the whole system physical memory size.\r
+                                The total memory size does not include memory in a slot with a disabled DIMM.\r

   @param[out] ErrorOut          TRUE if the memory error occured.\r
   @param[out] ErrorOut          TRUE if the memory error occured.\r

-  @param[in]  IfTestAbort       Indicates that the user pressed "ESC" to skip the memory test. \r
+  @param[in]  IfTestAbort       Indicates that the user pressed "ESC" to skip the memory test.\r

 \r
   @retval EFI_SUCCESS         One block of memory passed the test.\r
   @retval EFI_NOT_FOUND       All memory blocks have already been tested.\r
 \r
   @retval EFI_SUCCESS         One block of memory passed the test.\r
   @retval EFI_NOT_FOUND       All memory blocks have already been tested.\r


@@ -308,7 +308,7 @@ GenPerformMemoryTest (
 /**\r
   Finish the memory test.\r
 \r
 /**\r
   Finish the memory test.\r
 \r

-  @param[in] This             The protocol instance pointer. \r
+  @param[in] This             The protocol instance pointer.\r

 \r
   @retval EFI_SUCCESS         Success. All resources used in the memory test are freed.\r
 \r
 \r
   @retval EFI_SUCCESS         Success. All resources used in the memory test are freed.\r
 \r


@@ -322,12 +322,12 @@ GenMemoryTestFinished (
 /**\r
   Provides the capability to test the compatible range used by some special drivers.\r
 \r
 /**\r
   Provides the capability to test the compatible range used by some special drivers.\r
 \r

-  @param[in]  This              The protocol instance pointer. \r
+  @param[in]  This              The protocol instance pointer.\r

   @param[in]  StartAddress      The start address of the compatible memory range that\r
                                 must be below 16M.\r
   @param[in]  StartAddress      The start address of the compatible memory range that\r
                                 must be below 16M.\r

-  @param[in]  Length            The compatible memory range's length. \r
-  \r
-  @retval EFI_SUCCESS           The compatible memory range pass the memory test. \r
+  @param[in]  Length            The compatible memory range's length.\r
+\r
+  @retval EFI_SUCCESS           The compatible memory range pass the memory test.\r

   @retval EFI_INVALID_PARAMETER The compatible memory range are not below Low 16M.\r
 \r
 **/\r
   @retval EFI_INVALID_PARAMETER The compatible memory range are not below Low 16M.\r
 \r
 **/\r

diff --git a/MdeModulePkg/Universal/MemoryTest/NullMemoryTestDxe/NullMemoryTest.c b/MdeModulePkg/Universal/MemoryTest/NullMemoryTestDxe/NullMemoryTest.c
index a9bd1015013104d99e63d9f609452f6fe67e4bba..51111b848f60b9a75fc33acaccae1b862197672f 100644 (file)
--- a/MdeModulePkg/Universal/MemoryTest/NullMemoryTestDxe/NullMemoryTest.c
+++ b/MdeModulePkg/Universal/MemoryTest/NullMemoryTestDxe/NullMemoryTest.c
@@ -28,7 +28,7 @@ EFI_GENERIC_MEMORY_TEST_PROTOCOL  mGenericMemoryTest = {
 \r
 /**\r
   Entry point of the NULL memory test driver.\r
 \r
 /**\r
   Entry point of the NULL memory test driver.\r

-  \r
+\r

   This function is the entry point of the NULL memory test driver.\r
   It simply installs the Generic Memory Test Protocol.\r
 \r
   This function is the entry point of the NULL memory test driver.\r
   It simply installs the Generic Memory Test Protocol.\r
 \r


@@ -99,15 +99,15 @@ ConvertToTestedMemory (
   This function implements EFI_GENERIC_MEMORY_TEST_PROTOCOL.MemoryTestInit.\r
   It simply promotes untested reserved memory to system memory without real test.\r
 \r
   This function implements EFI_GENERIC_MEMORY_TEST_PROTOCOL.MemoryTestInit.\r
   It simply promotes untested reserved memory to system memory without real test.\r
 \r

-  @param  This                Protocol instance pointer. \r
-  @param  Level               The coverage level of the memory test. \r
-  @param  RequireSoftECCInit  Indicate if the memory need software ECC init. \r
+  @param  This                Protocol instance pointer.\r
+  @param  Level               The coverage level of the memory test.\r
+  @param  RequireSoftECCInit  Indicate if the memory need software ECC init.\r

 \r
 \r

-  @retval EFI_SUCCESS         The generic memory test initialized correctly. \r
-  @retval EFI_NO_MEDIA        There is not any non-tested memory found, in this \r
-                              function if not any non-tesed memory found means  \r
-                              that the memory test driver have not detect any \r
-                              non-tested extended memory of current system. \r
+  @retval EFI_SUCCESS         The generic memory test initialized correctly.\r
+  @retval EFI_NO_MEDIA        There is not any non-tested memory found, in this\r
+                              function if not any non-tesed memory found means\r
+                              that the memory test driver have not detect any\r
+                              non-tested extended memory of current system.\r

 \r
 **/\r
 EFI_STATUS\r
 \r
 **/\r
 EFI_STATUS\r


@@ -158,20 +158,20 @@ InitializeMemoryTest (
   This function implements EFI_GENERIC_MEMORY_TEST_PROTOCOL.PerformMemoryTest.\r
   It simply returns EFI_NOT_FOUND.\r
 \r
   This function implements EFI_GENERIC_MEMORY_TEST_PROTOCOL.PerformMemoryTest.\r
   It simply returns EFI_NOT_FOUND.\r
 \r

-  @param  This                Protocol instance pointer. \r
-  @param  TestedMemorySize    Return the tested extended memory size. \r
-  @param  TotalMemorySize     Return the whole system physical memory size, this  \r
-                              value may be changed if in some case some error  \r
-                              DIMMs be disabled. \r
-  @param  ErrorOut            Any time the memory error occurs, this will be \r
-                              TRUE. \r
-  @param  IfTestAbort         Indicate if the user press "ESC" to skip the memory \r
-                              test. \r
-\r
-  @retval EFI_SUCCESS         One block of memory test ok, the block size is hide \r
-                              internally. \r
-  @retval EFI_NOT_FOUND       Indicate all the non-tested memory blocks have  \r
-                              already go through. \r
+  @param  This                Protocol instance pointer.\r
+  @param  TestedMemorySize    Return the tested extended memory size.\r
+  @param  TotalMemorySize     Return the whole system physical memory size, this\r
+                              value may be changed if in some case some error\r
+                              DIMMs be disabled.\r
+  @param  ErrorOut            Any time the memory error occurs, this will be\r
+                              TRUE.\r
+  @param  IfTestAbort         Indicate if the user press "ESC" to skip the memory\r
+                              test.\r
+\r
+  @retval EFI_SUCCESS         One block of memory test ok, the block size is hide\r
+                              internally.\r
+  @retval EFI_NOT_FOUND       Indicate all the non-tested memory blocks have\r
+                              already go through.\r

   @retval EFI_DEVICE_ERROR    Mis-compare error, and no agent can handle it\r
 \r
 **/\r
   @retval EFI_DEVICE_ERROR    Mis-compare error, and no agent can handle it\r
 \r
 **/\r


@@ -199,11 +199,11 @@ GenPerformMemoryTest (
   This function implements EFI_GENERIC_MEMORY_TEST_PROTOCOL.Finished.\r
   It simply returns EFI_SUCCESS.\r
 \r
   This function implements EFI_GENERIC_MEMORY_TEST_PROTOCOL.Finished.\r
   It simply returns EFI_SUCCESS.\r
 \r

-  @param  This                Protocol instance pointer. \r
+  @param  This                Protocol instance pointer.\r

 \r
 \r

-  @retval EFI_SUCCESS         Successful free all the generic memory test driver \r
-                              allocated resource and notify to platform memory \r
-                              test driver that memory test finished. \r
+  @retval EFI_SUCCESS         Successful free all the generic memory test driver\r
+                              allocated resource and notify to platform memory\r
+                              test driver that memory test finished.\r

 \r
 **/\r
 EFI_STATUS\r
 \r
 **/\r
 EFI_STATUS\r


@@ -222,11 +222,11 @@ GenMemoryTestFinished (
   This function implements EFI_GENERIC_MEMORY_TEST_PROTOCOL.CompatibleRangeTest.\r
   It simply sets the memory range to system memory.\r
 \r
   This function implements EFI_GENERIC_MEMORY_TEST_PROTOCOL.CompatibleRangeTest.\r
   It simply sets the memory range to system memory.\r
 \r

-  @param  This                Protocol instance pointer. \r
-  @param  StartAddress        The start address of the memory range. \r
-  @param  Length              The memory range's length. \r
-  \r
-  @retval EFI_SUCCESS           The compatible memory range pass the memory test. \r
+  @param  This                Protocol instance pointer.\r
+  @param  StartAddress        The start address of the memory range.\r
+  @param  Length              The memory range's length.\r
+\r
+  @retval EFI_SUCCESS           The compatible memory range pass the memory test.\r

   @retval EFI_INVALID_PARAMETER The compatible memory range must be below 16M.\r
 \r
 **/\r
   @retval EFI_INVALID_PARAMETER The compatible memory range must be below 16M.\r
 \r
 **/\r

diff --git a/MdeModulePkg/Universal/MemoryTest/NullMemoryTestDxe/NullMemoryTest.h b/MdeModulePkg/Universal/MemoryTest/NullMemoryTestDxe/NullMemoryTest.h
index 77c18eb331a52f0e506ad687538d36ce47429bc3..d09c84354ef543b7ab22b79ae6fdbd0496565c17 100644 (file)
--- a/MdeModulePkg/Universal/MemoryTest/NullMemoryTestDxe/NullMemoryTest.h
+++ b/MdeModulePkg/Universal/MemoryTest/NullMemoryTestDxe/NullMemoryTest.h
@@ -1,7 +1,7 @@
 /** @file\r
   Include file of the NULL memory test driver.\r
 \r
 /** @file\r
   Include file of the NULL memory test driver.\r
 \r

-Copyright (c) 2006 - 2008, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r

 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r


@@ -40,15 +40,15 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   This function implements EFI_GENERIC_MEMORY_TEST_PROTOCOL.MemoryTestInit.\r
   It simply promotes untested reserved memory to system memory without real test.\r
 \r
   This function implements EFI_GENERIC_MEMORY_TEST_PROTOCOL.MemoryTestInit.\r
   It simply promotes untested reserved memory to system memory without real test.\r
 \r

-  @param  This                Protocol instance pointer. \r
-  @param  Level               The coverage level of the memory test. \r
-  @param  RequireSoftECCInit  Indicate if the memory need software ECC init. \r
+  @param  This                Protocol instance pointer.\r
+  @param  Level               The coverage level of the memory test.\r
+  @param  RequireSoftECCInit  Indicate if the memory need software ECC init.\r

 \r
 \r

-  @retval EFI_SUCCESS         The generic memory test initialized correctly. \r
-  @retval EFI_NO_MEDIA        There is not any non-tested memory found, in this \r
-                              function if not any non-tesed memory found means  \r
-                              that the memory test driver have not detect any \r
-                              non-tested extended memory of current system. \r
+  @retval EFI_SUCCESS         The generic memory test initialized correctly.\r
+  @retval EFI_NO_MEDIA        There is not any non-tested memory found, in this\r
+                              function if not any non-tesed memory found means\r
+                              that the memory test driver have not detect any\r
+                              non-tested extended memory of current system.\r

 \r
 **/\r
 EFI_STATUS\r
 \r
 **/\r
 EFI_STATUS\r


@@ -65,20 +65,20 @@ InitializeMemoryTest (
   This function implements EFI_GENERIC_MEMORY_TEST_PROTOCOL.PerformMemoryTest.\r
   It simply returns EFI_NOT_FOUND.\r
 \r
   This function implements EFI_GENERIC_MEMORY_TEST_PROTOCOL.PerformMemoryTest.\r
   It simply returns EFI_NOT_FOUND.\r
 \r

-  @param  This                Protocol instance pointer. \r
-  @param  TestedMemorySize    Return the tested extended memory size. \r
-  @param  TotalMemorySize     Return the whole system physical memory size, this  \r
-                              value may be changed if in some case some error  \r
-                              DIMMs be disabled. \r
-  @param  ErrorOut            Any time the memory error occurs, this will be \r
-                              TRUE. \r
-  @param  IfTestAbort         Indicate if the user press "ESC" to skip the memory \r
-                              test. \r
-\r
-  @retval EFI_SUCCESS         One block of memory test ok, the block size is hide \r
-                              internally. \r
-  @retval EFI_NOT_FOUND       Indicate all the non-tested memory blocks have  \r
-                              already go through. \r
+  @param  This                Protocol instance pointer.\r
+  @param  TestedMemorySize    Return the tested extended memory size.\r
+  @param  TotalMemorySize     Return the whole system physical memory size, this\r
+                              value may be changed if in some case some error\r
+                              DIMMs be disabled.\r
+  @param  ErrorOut            Any time the memory error occurs, this will be\r
+                              TRUE.\r
+  @param  IfTestAbort         Indicate if the user press "ESC" to skip the memory\r
+                              test.\r
+\r
+  @retval EFI_SUCCESS         One block of memory test ok, the block size is hide\r
+                              internally.\r
+  @retval EFI_NOT_FOUND       Indicate all the non-tested memory blocks have\r
+                              already go through.\r

   @retval EFI_DEVICE_ERROR    Mis-compare error, and no agent can handle it\r
 \r
 **/\r
   @retval EFI_DEVICE_ERROR    Mis-compare error, and no agent can handle it\r
 \r
 **/\r


@@ -98,11 +98,11 @@ GenPerformMemoryTest (
   This function implements EFI_GENERIC_MEMORY_TEST_PROTOCOL.Finished.\r
   It simply returns EFI_SUCCESS.\r
 \r
   This function implements EFI_GENERIC_MEMORY_TEST_PROTOCOL.Finished.\r
   It simply returns EFI_SUCCESS.\r
 \r

-  @param  This                Protocol instance pointer. \r
+  @param  This                Protocol instance pointer.\r

 \r
 \r

-  @retval EFI_SUCCESS         Successful free all the generic memory test driver \r
-                              allocated resource and notify to platform memory \r
-                              test driver that memory test finished. \r
+  @retval EFI_SUCCESS         Successful free all the generic memory test driver\r
+                              allocated resource and notify to platform memory\r
+                              test driver that memory test finished.\r

 \r
 **/\r
 EFI_STATUS\r
 \r
 **/\r
 EFI_STATUS\r


@@ -118,11 +118,11 @@ GenMemoryTestFinished (
   This function implements EFI_GENERIC_MEMORY_TEST_PROTOCOL.CompatibleRangeTest.\r
   It simply set the memory range to system memory.\r
 \r
   This function implements EFI_GENERIC_MEMORY_TEST_PROTOCOL.CompatibleRangeTest.\r
   It simply set the memory range to system memory.\r
 \r

-  @param  This                Protocol instance pointer. \r
-  @param  StartAddress        The start address of the memory range. \r
-  @param  Length              The memory range's length. \r
-  \r
-  @retval EFI_SUCCESS           The compatible memory range pass the memory test. \r
+  @param  This                Protocol instance pointer.\r
+  @param  StartAddress        The start address of the memory range.\r
+  @param  Length              The memory range's length.\r
+\r
+  @retval EFI_SUCCESS           The compatible memory range pass the memory test.\r

   @retval EFI_INVALID_PARAMETER The compatible memory range must be below 16M.\r
 \r
 **/\r
   @retval EFI_INVALID_PARAMETER The compatible memory range must be below 16M.\r
 \r
 **/\r

diff --git a/MdeModulePkg/Universal/MemoryTest/NullMemoryTestDxe/NullMemoryTestDxe.inf b/MdeModulePkg/Universal/MemoryTest/NullMemoryTestDxe/NullMemoryTestDxe.inf
index 96770e5b8d7e16604c967cbe6855d558cf6ad8c3..a0d2ce7a891a541b7fd1f114e1815e196b5db82a 100644 (file)
--- a/MdeModulePkg/Universal/MemoryTest/NullMemoryTestDxe/NullMemoryTestDxe.inf
+++ b/MdeModulePkg/Universal/MemoryTest/NullMemoryTestDxe/NullMemoryTestDxe.inf
@@ -1,15 +1,15 @@
 ## @file\r
 #   This driver installs Generic Memory Test Protocol which does not perform real memory test.\r
 ## @file\r
 #   This driver installs Generic Memory Test Protocol which does not perform real memory test.\r

-#  \r
-#  Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.<BR>\r
+#\r
+#  Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r

 #  This program and the accompanying materials\r
 #  are licensed and made available under the terms and conditions of the BSD License\r
 #  which accompanies this distribution.  The full text of the license may be found at\r
 #  http://opensource.org/licenses/bsd-license.php\r
 #  This program and the accompanying materials\r
 #  are licensed and made available under the terms and conditions of the BSD License\r
 #  which accompanies this distribution.  The full text of the license may be found at\r
 #  http://opensource.org/licenses/bsd-license.php\r

-#  \r
+#\r

 #  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 #  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 #  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 #  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r

-#  \r
+#\r

 ##\r
 \r
 [Defines]\r
 ##\r
 \r
 [Defines]\r

diff --git a/MdeModulePkg/Universal/MemoryTest/NullMemoryTestDxe/NullMemoryTestDxe.uni b/MdeModulePkg/Universal/MemoryTest/NullMemoryTestDxe/NullMemoryTestDxe.uni
index e8f6fa6ea980b0ebe0c23844fb7436055edb313a..b758f70ceead654f36be739e3430fa7ba9dbdafa 100644 (file)
--- a/MdeModulePkg/Universal/MemoryTest/NullMemoryTestDxe/NullMemoryTestDxe.uni
+++ b/MdeModulePkg/Universal/MemoryTest/NullMemoryTestDxe/NullMemoryTestDxe.uni
@@ -3,13 +3,13 @@
 //\r
 // This driver installs Generic Memory Test Protocol, which does not perform a real memory test.\r
 //\r
 //\r
 // This driver installs Generic Memory Test Protocol, which does not perform a real memory test.\r
 //\r

-// Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.<BR>\r
+// Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r

 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r
 // which accompanies this distribution.  The full text of the license may be found at\r
 // http://opensource.org/licenses/bsd-license.php\r
 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r
 // which accompanies this distribution.  The full text of the license may be found at\r
 // http://opensource.org/licenses/bsd-license.php\r

-// \r
+//\r

 // THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 // WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 //\r
 // THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 // WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 //\r

diff --git a/MdeModulePkg/Universal/MemoryTest/NullMemoryTestDxe/NullMemoryTestDxeExtra.uni b/MdeModulePkg/Universal/MemoryTest/NullMemoryTestDxe/NullMemoryTestDxeExtra.uni
index f0b5372ed8358d117026286596e1c6a1195b4afd..2cd88bf316e377f0d55dfd8cbbafb0985a8cb5f8 100644 (file)
--- a/MdeModulePkg/Universal/MemoryTest/NullMemoryTestDxe/NullMemoryTestDxeExtra.uni
+++ b/MdeModulePkg/Universal/MemoryTest/NullMemoryTestDxe/NullMemoryTestDxeExtra.uni
@@ -1,7 +1,7 @@
 // /** @file\r
 // NullMemoryTestDxe Localized Strings and Content\r
 //\r
 // /** @file\r
 // NullMemoryTestDxe Localized Strings and Content\r
 //\r

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

 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r
 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r


@@ -13,8 +13,8 @@
 //\r
 // **/\r
 \r
 //\r
 // **/\r
 \r

-#string STR_PROPERTIES_MODULE_NAME \r
-#language en-US \r
+#string STR_PROPERTIES_MODULE_NAME\r
+#language en-US\r

 "NULL Memory Test DXE Driver"\r
 \r
 \r
 "NULL Memory Test DXE Driver"\r
 \r
 \r

diff --git a/MdeModulePkg/Universal/Metronome/Metronome.c b/MdeModulePkg/Universal/Metronome/Metronome.c
index c3dc0b875a0224095dd6910cc3901443ad61b2a7..936beae1d57a66f850aa47a8431c03950291fd87 100644 (file)
--- a/MdeModulePkg/Universal/Metronome/Metronome.c
+++ b/MdeModulePkg/Universal/Metronome/Metronome.c
@@ -9,16 +9,16 @@
   microsecond units.  If the number of ticks is small, then nanoseconds are used.\r
   If the number of ticks is large, then microseconds are used.  This prevents\r
   overflows that could occur for long delays if only nanoseconds were used and also\r
   microsecond units.  If the number of ticks is small, then nanoseconds are used.\r
   If the number of ticks is large, then microseconds are used.  This prevents\r
   overflows that could occur for long delays if only nanoseconds were used and also\r

-  provides the greatest accuracy for small delays. \r
+  provides the greatest accuracy for small delays.\r

 \r
 \r

-Copyright (c) 2008, Intel Corporation. All rights reserved.<BR>\r
-This program and the accompanying materials                          \r
-are licensed and made available under the terms and conditions of the BSD License         \r
-which accompanies this distribution.  The full text of the license may be found at        \r
-http://opensource.org/licenses/bsd-license.php                                            \r
-                                                                                          \r
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     \r
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             \r
+Copyright (c) 2008 - 2018, Intel Corporation. All rights reserved.<BR>\r
+This program and the accompanying materials\r
+are licensed and made available under the terms and conditions of the BSD License\r
+which accompanies this distribution.  The full text of the license may be found at\r
+http://opensource.org/licenses/bsd-license.php\r
+\r
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r

 \r
 **/\r
 \r
 \r
 **/\r
 \r


@@ -39,19 +39,19 @@ EFI_METRONOME_ARCH_PROTOCOL mMetronome = {
 \r
 /**\r
   Waits for the specified number of ticks.\r
 \r
 /**\r
   Waits for the specified number of ticks.\r

-  \r
+\r

   This function implements EFI_METRONOME_ARCH_PROTOCOL.WaitForTick().\r
   This function implements EFI_METRONOME_ARCH_PROTOCOL.WaitForTick().\r

-  The WaitForTick() function waits for the number of ticks specified by \r
-  TickNumber from a known time source in the platform.  If TickNumber of \r
-  ticks are detected, then EFI_SUCCESS is returned.  The actual time passed \r
-  between entry of this function and the first tick is between 0 and \r
-  TickPeriod 100 nS units.  If you want to guarantee that at least TickPeriod \r
-  time has elapsed, wait for two ticks.  This function waits for a hardware \r
-  event to determine when a tick occurs.  It is possible for interrupt \r
-  processing, or exception processing to interrupt the execution of the \r
-  WaitForTick() function.  Depending on the hardware source for the ticks, it \r
-  is possible for a tick to be missed.  This function cannot guarantee that \r
-  ticks will not be missed.  If a timeout occurs waiting for the specified \r
+  The WaitForTick() function waits for the number of ticks specified by\r
+  TickNumber from a known time source in the platform.  If TickNumber of\r
+  ticks are detected, then EFI_SUCCESS is returned.  The actual time passed\r
+  between entry of this function and the first tick is between 0 and\r
+  TickPeriod 100 nS units.  If you want to guarantee that at least TickPeriod\r
+  time has elapsed, wait for two ticks.  This function waits for a hardware\r
+  event to determine when a tick occurs.  It is possible for interrupt\r
+  processing, or exception processing to interrupt the execution of the\r
+  WaitForTick() function.  Depending on the hardware source for the ticks, it\r
+  is possible for a tick to be missed.  This function cannot guarantee that\r
+  ticks will not be missed.  If a timeout occurs waiting for the specified\r

   number of ticks, then EFI_TIMEOUT is returned.\r
 \r
   @param  This             The EFI_METRONOME_ARCH_PROTOCOL instance.\r
   number of ticks, then EFI_TIMEOUT is returned.\r
 \r
   @param  This             The EFI_METRONOME_ARCH_PROTOCOL instance.\r


@@ -90,9 +90,9 @@ WaitForTick (
 /**\r
   The user Entry Point for module Metronome. The user code starts with this function.\r
 \r
 /**\r
   The user Entry Point for module Metronome. The user code starts with this function.\r
 \r

-  @param[in] ImageHandle    The firmware allocated handle for the EFI image.  \r
+  @param[in] ImageHandle    The firmware allocated handle for the EFI image.\r

   @param[in] SystemTable    A pointer to the EFI System Table.\r
   @param[in] SystemTable    A pointer to the EFI System Table.\r

-  \r
+\r

   @retval EFI_SUCCESS       The entry point is executed successfully.\r
   @retval other             Some error occurs when executing this entry point.\r
 \r
   @retval EFI_SUCCESS       The entry point is executed successfully.\r
   @retval other             Some error occurs when executing this entry point.\r
 \r

diff --git a/MdeModulePkg/Universal/Metronome/Metronome.h b/MdeModulePkg/Universal/Metronome/Metronome.h
index 3556e6b342e2fb4209b5f9088a662f82c22b3019..d77cb0dda3ac7a9832b0bd967937c59f2e616ad1 100644 (file)
--- a/MdeModulePkg/Universal/Metronome/Metronome.h
+++ b/MdeModulePkg/Universal/Metronome/Metronome.h
@@ -1,7 +1,7 @@
 /** @file\r
   Include file of Metronome driver.\r
 \r
 /** @file\r
   Include file of Metronome driver.\r
 \r

-Copyright (c) 2008, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2008 - 2018, Intel Corporation. All rights reserved.<BR>\r

 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r


@@ -24,19 +24,19 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 \r
 /**\r
   Waits for the specified number of ticks.\r
 \r
 /**\r
   Waits for the specified number of ticks.\r

-  \r
+\r

   This function implements EFI_METRONOME_ARCH_PROTOCOL.WaitForTick().\r
   This function implements EFI_METRONOME_ARCH_PROTOCOL.WaitForTick().\r

-  The WaitForTick() function waits for the number of ticks specified by \r
-  TickNumber from a known time source in the platform.  If TickNumber of \r
-  ticks are detected, then EFI_SUCCESS is returned.  The actual time passed \r
-  between entry of this function and the first tick is between 0 and \r
-  TickPeriod 100 nS units.  If you want to guarantee that at least TickPeriod \r
-  time has elapsed, wait for two ticks.  This function waits for a hardware \r
-  event to determine when a tick occurs.  It is possible for interrupt \r
-  processing, or exception processing to interrupt the execution of the \r
-  WaitForTick() function.  Depending on the hardware source for the ticks, it \r
-  is possible for a tick to be missed.  This function cannot guarantee that \r
-  ticks will not be missed.  If a timeout occurs waiting for the specified \r
+  The WaitForTick() function waits for the number of ticks specified by\r
+  TickNumber from a known time source in the platform.  If TickNumber of\r
+  ticks are detected, then EFI_SUCCESS is returned.  The actual time passed\r
+  between entry of this function and the first tick is between 0 and\r
+  TickPeriod 100 nS units.  If you want to guarantee that at least TickPeriod\r
+  time has elapsed, wait for two ticks.  This function waits for a hardware\r
+  event to determine when a tick occurs.  It is possible for interrupt\r
+  processing, or exception processing to interrupt the execution of the\r
+  WaitForTick() function.  Depending on the hardware source for the ticks, it\r
+  is possible for a tick to be missed.  This function cannot guarantee that\r
+  ticks will not be missed.  If a timeout occurs waiting for the specified\r

   number of ticks, then EFI_TIMEOUT is returned.\r
 \r
   @param  This             The EFI_METRONOME_ARCH_PROTOCOL instance.\r
   number of ticks, then EFI_TIMEOUT is returned.\r
 \r
   @param  This             The EFI_METRONOME_ARCH_PROTOCOL instance.\r

diff --git a/MdeModulePkg/Universal/Metronome/Metronome.inf b/MdeModulePkg/Universal/Metronome/Metronome.inf
index a688f3cc02cd5d771f4bc53084891897b6aaaa35..3a633ed753c27624762f044ac719216dae213470 100644 (file)
--- a/MdeModulePkg/Universal/Metronome/Metronome.inf
+++ b/MdeModulePkg/Universal/Metronome/Metronome.inf
@@ -9,16 +9,16 @@
 # microsecond units.  If the number of ticks is small, then nanoseconds are used.\r
 # If the number of ticks is large, then microseconds are used.  This prevents\r
 # overflows that could occur for long delays if only nanoseconds were used and also\r
 # microsecond units.  If the number of ticks is small, then nanoseconds are used.\r
 # If the number of ticks is large, then microseconds are used.  This prevents\r
 # overflows that could occur for long delays if only nanoseconds were used and also\r

-# provides the greatest accuracy for small delays. \r
+# provides the greatest accuracy for small delays.\r

 #\r
 #\r

-# Copyright (c) 2008 - 2014, Intel Corporation. All rights reserved.<BR>\r
-# This program and the accompanying materials                          \r
-# are licensed and made available under the terms and conditions of the BSD License         \r
-# which accompanies this distribution.  The full text of the license may be found at        \r
-# http://opensource.org/licenses/bsd-license.php                                            \r
-#                                                                                           \r
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     \r
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             \r
+# Copyright (c) 2008 - 2018, Intel Corporation. All rights reserved.<BR>\r
+# This program and the accompanying materials\r
+# are licensed and made available under the terms and conditions of the BSD License\r
+# which accompanies this distribution.  The full text of the license may be found at\r
+# http://opensource.org/licenses/bsd-license.php\r
+#\r
+# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
+# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r

 #\r
 ##\r
 \r
 #\r
 ##\r
 \r

diff --git a/MdeModulePkg/Universal/Metronome/Metronome.uni b/MdeModulePkg/Universal/Metronome/Metronome.uni
index 693026d41e6ace0ccfed8f2822d3b88c84a14ac1..af906ef657fab1755ec4bdefd17fa4d672b5f340 100644 (file)
--- a/MdeModulePkg/Universal/Metronome/Metronome.uni
+++ b/MdeModulePkg/Universal/Metronome/Metronome.uni
@@ -11,13 +11,13 @@
 // overflows that could occur for long delays if only nanoseconds were used and also\r
 // provides the greatest accuracy for small delays.\r
 //\r
 // overflows that could occur for long delays if only nanoseconds were used and also\r
 // provides the greatest accuracy for small delays.\r
 //\r

-// Copyright (c) 2008 - 2014, Intel Corporation. All rights reserved.<BR>\r
+// Copyright (c) 2008 - 2018, Intel Corporation. All rights reserved.<BR>\r

 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r
 // which accompanies this distribution.  The full text of the license may be found at\r
 // http://opensource.org/licenses/bsd-license.php\r
 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r
 // which accompanies this distribution.  The full text of the license may be found at\r
 // http://opensource.org/licenses/bsd-license.php\r

-// \r
+//\r

 // THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 // WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 //\r
 // THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 // WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 //\r

diff --git a/MdeModulePkg/Universal/Metronome/MetronomeExtra.uni b/MdeModulePkg/Universal/Metronome/MetronomeExtra.uni
index 51b622066d7a18e34195397f37739fe4aa7d9d67..6d24946fa75051ff49992b595500dafb9edadccf 100644 (file)
--- a/MdeModulePkg/Universal/Metronome/MetronomeExtra.uni
+++ b/MdeModulePkg/Universal/Metronome/MetronomeExtra.uni
@@ -1,7 +1,7 @@
 // /** @file\r
 // Metronome Localized Strings and Content\r
 //\r
 // /** @file\r
 // Metronome Localized Strings and Content\r
 //\r

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

 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r
 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r


@@ -13,8 +13,8 @@
 //\r
 // **/\r
 \r
 //\r
 // **/\r
 \r

-#string STR_PROPERTIES_MODULE_NAME \r
-#language en-US \r
+#string STR_PROPERTIES_MODULE_NAME\r
+#language en-US\r

 "Metronome/Timer DXE Driver"\r
 \r
 \r
 "Metronome/Timer DXE Driver"\r
 \r
 \r

diff --git a/MdeModulePkg/Universal/MonotonicCounterRuntimeDxe/MonotonicCounter.c b/MdeModulePkg/Universal/MonotonicCounterRuntimeDxe/MonotonicCounter.c
index 2bfede668106bf7bec27e0eba317108298451174..2f9d2df914c7fdd039778c2376c6db3e63a57fd1 100644 (file)
--- a/MdeModulePkg/Universal/MonotonicCounterRuntimeDxe/MonotonicCounter.c
+++ b/MdeModulePkg/Universal/MonotonicCounterRuntimeDxe/MonotonicCounter.c
@@ -2,7 +2,7 @@
   Produce the UEFI boot service GetNextMonotonicCount() and runtime service\r
   GetNextHighMonotonicCount().\r
 \r
   Produce the UEFI boot service GetNextMonotonicCount() and runtime service\r
   GetNextHighMonotonicCount().\r
 \r

-Copyright (c) 2006 - 2016, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r

 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r


@@ -51,7 +51,7 @@ EFI_EVENT   mEfiMtcEvent;
   The high 32-bit value is nonvolatile and is increased by one on whenever the\r
   system resets or the low 32-bit counter overflows.\r
 \r
   The high 32-bit value is nonvolatile and is increased by one on whenever the\r
   system resets or the low 32-bit counter overflows.\r
 \r

-  @param  Count                        Pointer to returned value.\r
+  @param  Count                  Pointer to returned value.\r

 \r
   @retval EFI_SUCCESS           The next monotonic count was returned.\r
   @retval EFI_DEVICE_ERROR      The device is not functioning properly.\r
 \r
   @retval EFI_SUCCESS           The next monotonic count was returned.\r
   @retval EFI_DEVICE_ERROR      The device is not functioning properly.\r


@@ -123,7 +123,7 @@ MonotonicCounterDriverGetNextMonotonicCount (
 \r
   This function may only be called at Runtime.\r
 \r
 \r
   This function may only be called at Runtime.\r
 \r

-  @param  HighCount                Pointer to returned value.\r
+  @param  HighCount              Pointer to returned value.\r

 \r
   @retval EFI_SUCCESS           The next high monotonic count was returned.\r
   @retval EFI_INVALID_PARAMETER HighCount is NULL.\r
 \r
   @retval EFI_SUCCESS           The next high monotonic count was returned.\r
   @retval EFI_INVALID_PARAMETER HighCount is NULL.\r

diff --git a/MdeModulePkg/Universal/MonotonicCounterRuntimeDxe/MonotonicCounterRuntimeDxeExtra.uni b/MdeModulePkg/Universal/MonotonicCounterRuntimeDxe/MonotonicCounterRuntimeDxeExtra.uni
index 4865903eb1d577d80c051ab3e291f5a490e29ab4..c219c81d257e0691c45b57a234d7a7d72f1ad283 100644 (file)
--- a/MdeModulePkg/Universal/MonotonicCounterRuntimeDxe/MonotonicCounterRuntimeDxeExtra.uni
+++ b/MdeModulePkg/Universal/MonotonicCounterRuntimeDxe/MonotonicCounterRuntimeDxeExtra.uni
@@ -1,7 +1,7 @@
 // /** @file\r
 // MonotonicCounterRuntimeDxe Localized Strings and Content\r
 //\r
 // /** @file\r
 // MonotonicCounterRuntimeDxe Localized Strings and Content\r
 //\r

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

 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r
 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r


@@ -12,8 +12,8 @@
 //\r
 // **/\r
 \r
 //\r
 // **/\r
 \r

-#string STR_PROPERTIES_MODULE_NAME \r
-#language en-US \r
+#string STR_PROPERTIES_MODULE_NAME\r
+#language en-US\r

 "Monotonic Counter DXE Driver"\r
 \r
 \r
 "Monotonic Counter DXE Driver"\r
 \r
 \r

diff --git a/MdeModulePkg/Universal/Network/ArpDxe/ArpDriver.c b/MdeModulePkg/Universal/Network/ArpDxe/ArpDriver.c
index 91edcccc0d9f42f0f55daca41126e0471267c579..cd4e259e7f8a19e0ff3c5baba8633f4b5794a2bd 100644 (file)
--- a/MdeModulePkg/Universal/Network/ArpDxe/ArpDriver.c
+++ b/MdeModulePkg/Universal/Network/ArpDxe/ArpDriver.c
@@ -1,7 +1,7 @@
 /** @file\r
   ARP driver functions.\r
 /** @file\r
   ARP driver functions.\r

-  \r
-Copyright (c) 2006 - 2016, Intel Corporation. All rights reserved.<BR>\r
+\r
+Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r

 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at<BR>\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at<BR>\r


@@ -35,7 +35,7 @@ EFI_DRIVER_BINDING_PROTOCOL gArpDriverBinding = {
                                      context data.\r
 \r
   @retval EFI_SUCCESS                The arp service context is initialized.\r
                                      context data.\r
 \r
   @retval EFI_SUCCESS                The arp service context is initialized.\r

-  \r
+\r

   @retval EFI_UNSUPPORTED            The underlayer Snp mode type is not ethernet.\r
                                      Failed to initialize the service context.\r
   @retval other                      Failed to initialize the arp service context.\r
   @retval EFI_UNSUPPORTED            The underlayer Snp mode type is not ethernet.\r
                                      Failed to initialize the service context.\r
   @retval other                      Failed to initialize the arp service context.\r


@@ -243,7 +243,7 @@ ArpCleanService (
 \r
 /**\r
   Callback function which provided by user to remove one node in NetDestroyLinkList process.\r
 \r
 /**\r
   Callback function which provided by user to remove one node in NetDestroyLinkList process.\r

-  \r
+\r

   @param[in]    Entry           The entry to be removed.\r
   @param[in]    Context         Pointer to the callback context corresponds to the Context in NetDestroyLinkList.\r
 \r
   @param[in]    Entry           The entry to be removed.\r
   @param[in]    Context         Pointer to the callback context corresponds to the Context in NetDestroyLinkList.\r
 \r


@@ -260,7 +260,7 @@ ArpDestroyChildEntryInHandleBuffer (
 {\r
   ARP_INSTANCE_DATA             *Instance;\r
   EFI_SERVICE_BINDING_PROTOCOL  *ServiceBinding;\r
 {\r
   ARP_INSTANCE_DATA             *Instance;\r
   EFI_SERVICE_BINDING_PROTOCOL  *ServiceBinding;\r

-  \r
+\r

   if (Entry == NULL || Context == NULL) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
   if (Entry == NULL || Context == NULL) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r


@@ -272,31 +272,31 @@ ArpDestroyChildEntryInHandleBuffer (
 }\r
 \r
 /**\r
 }\r
 \r
 /**\r

-  Tests to see if this driver supports a given controller. \r
-  \r
-  If a child device is provided, it further tests to see if this driver supports \r
+  Tests to see if this driver supports a given controller.\r
+\r
+  If a child device is provided, it further tests to see if this driver supports\r

   creating a handle for the specified child device.\r
 \r
   @param[in]  This                 A pointer to the EFI_DRIVER_BINDING_PROTOCOL instance.\r
   creating a handle for the specified child device.\r
 \r
   @param[in]  This                 A pointer to the EFI_DRIVER_BINDING_PROTOCOL instance.\r

-  @param[in]  ControllerHandle     The handle of the controller to test. This handle \r
-                                   must support a protocol interface that supplies \r
+  @param[in]  ControllerHandle     The handle of the controller to test. This handle\r
+                                   must support a protocol interface that supplies\r

                                    an I/O abstraction to the driver.\r
                                    an I/O abstraction to the driver.\r

-  @param[in]  RemainingDevicePath  A pointer to the remaining portion of a device path. \r
-                                   This parameter is ignored by device drivers, \r
+  @param[in]  RemainingDevicePath  A pointer to the remaining portion of a device path.\r
+                                   This parameter is ignored by device drivers,\r

                                    and is optional for bus drivers.\r
 \r
   @retval EFI_SUCCESS              The device specified by ControllerHandle and\r
                                    and is optional for bus drivers.\r
 \r
   @retval EFI_SUCCESS              The device specified by ControllerHandle and\r

-                                   RemainingDevicePath is supported by the driver \r
+                                   RemainingDevicePath is supported by the driver\r

                                    specified by This.\r
   @retval EFI_ALREADY_STARTED      The device specified by ControllerHandle and\r
                                    specified by This.\r
   @retval EFI_ALREADY_STARTED      The device specified by ControllerHandle and\r

-                                   RemainingDevicePath is already being managed \r
+                                   RemainingDevicePath is already being managed\r

                                    by the driver specified by This.\r
   @retval EFI_ACCESS_DENIED        The device specified by ControllerHandle and\r
                                    by the driver specified by This.\r
   @retval EFI_ACCESS_DENIED        The device specified by ControllerHandle and\r

-                                   RemainingDevicePath is already being managed by \r
-                                   a different driver or an application that \r
+                                   RemainingDevicePath is already being managed by\r
+                                   a different driver or an application that\r

                                    requires exclusive acces. Currently not implemented.\r
   @retval EFI_UNSUPPORTED          The device specified by ControllerHandle and\r
                                    requires exclusive acces. Currently not implemented.\r
   @retval EFI_UNSUPPORTED          The device specified by ControllerHandle and\r

-                                   RemainingDevicePath is not supported by the \r
+                                   RemainingDevicePath is not supported by the\r

                                    driver specified by This.\r
 \r
 **/\r
                                    driver specified by This.\r
 \r
 **/\r


@@ -342,32 +342,32 @@ ArpDriverBindingSupported (
 \r
 \r
 /**\r
 \r
 \r
 /**\r

-  Start this driver on ControllerHandle. \r
-  \r
-  The Start() function is designed to be invoked from the EFI boot service ConnectController(). \r
-  As a result, much of the error checking on the parameters to Start() has been \r
-  moved into this common boot service. It is legal to call Start() from other locations, \r
-  but the following calling restrictions must be followed or the system behavior \r
+  Start this driver on ControllerHandle.\r
+\r
+  The Start() function is designed to be invoked from the EFI boot service ConnectController().\r
+  As a result, much of the error checking on the parameters to Start() has been\r
+  moved into this common boot service. It is legal to call Start() from other locations,\r
+  but the following calling restrictions must be followed or the system behavior\r

   will not be deterministic.\r
   1. ControllerHandle must be a valid EFI_HANDLE.\r
   will not be deterministic.\r
   1. ControllerHandle must be a valid EFI_HANDLE.\r

-  2. If RemainingDevicePath is not NULL, then it must be a pointer to a naturally \r
+  2. If RemainingDevicePath is not NULL, then it must be a pointer to a naturally\r

      aligned EFI_DEVICE_PATH_PROTOCOL.\r
      aligned EFI_DEVICE_PATH_PROTOCOL.\r

-  3. Prior to calling Start(), the Supported() function for the driver specified \r
-     by This must have been called with the same calling parameters, and Supported() \r
-     must have returned EFI_SUCCESS.  \r
+  3. Prior to calling Start(), the Supported() function for the driver specified\r
+     by This must have been called with the same calling parameters, and Supported()\r
+     must have returned EFI_SUCCESS.\r

 \r
   @param[in]  This                 A pointer to the EFI_DRIVER_BINDING_PROTOCOL instance.\r
 \r
   @param[in]  This                 A pointer to the EFI_DRIVER_BINDING_PROTOCOL instance.\r

-  @param[in]  ControllerHandle     The handle of the controller to start. This handle \r
-                                   must support a protocol interface that supplies \r
+  @param[in]  ControllerHandle     The handle of the controller to start. This handle\r
+                                   must support a protocol interface that supplies\r

                                    an I/O abstraction to the driver.\r
                                    an I/O abstraction to the driver.\r

-  @param[in]  RemainingDevicePath  A pointer to the remaining portion of a device path. \r
-                                   This parameter is ignored by device drivers, \r
+  @param[in]  RemainingDevicePath  A pointer to the remaining portion of a device path.\r
+                                   This parameter is ignored by device drivers,\r

                                    and is optional for bus drivers.\r
 \r
   @retval EFI_SUCCESS              The device was started.\r
   @retval EFI_DEVICE_ERROR         The device could not be started due to a device error.\r
                                    Currently not implemented.\r
                                    and is optional for bus drivers.\r
 \r
   @retval EFI_SUCCESS              The device was started.\r
   @retval EFI_DEVICE_ERROR         The device could not be started due to a device error.\r
                                    Currently not implemented.\r

-  @retval EFI_OUT_OF_RESOURCES     The request could not be completed due to a lack of \r
+  @retval EFI_OUT_OF_RESOURCES     The request could not be completed due to a lack of\r

                                    resources.\r
   @retval Others                   The driver failded to start the device.\r
 \r
                                    resources.\r
   @retval Others                   The driver failded to start the device.\r
 \r


@@ -435,13 +435,13 @@ ERROR:
 \r
 \r
 /**\r
 \r
 \r
 /**\r

-  Stop this driver on ControllerHandle. \r
-  \r
+  Stop this driver on ControllerHandle.\r
+\r

   Release the control of this controller and remove the IScsi functions. The Stop()\r
   Release the control of this controller and remove the IScsi functions. The Stop()\r

-  function is designed to be invoked from the EFI boot service DisconnectController(). \r
-  As a result, much of the error checking on the parameters to Stop() has been moved \r
-  into this common boot service. It is legal to call Stop() from other locations, \r
-  but the following calling restrictions must be followed or the system behavior \r
+  function is designed to be invoked from the EFI boot service DisconnectController().\r
+  As a result, much of the error checking on the parameters to Stop() has been moved\r
+  into this common boot service. It is legal to call Stop() from other locations,\r
+  but the following calling restrictions must be followed or the system behavior\r

   will not be deterministic.\r
   1. ControllerHandle must be a valid EFI_HANDLE that was used on a previous call to this\r
      same driver's Start() function.\r
   will not be deterministic.\r
   1. ControllerHandle must be a valid EFI_HANDLE that was used on a previous call to this\r
      same driver's Start() function.\r


@@ -449,14 +449,14 @@ ERROR:
      EFI_HANDLE. In addition, all of these handles must have been created in this driver's\r
      Start() function, and the Start() function must have called OpenProtocol() on\r
      ControllerHandle with an Attribute of EFI_OPEN_PROTOCOL_BY_CHILD_CONTROLLER.\r
      EFI_HANDLE. In addition, all of these handles must have been created in this driver's\r
      Start() function, and the Start() function must have called OpenProtocol() on\r
      ControllerHandle with an Attribute of EFI_OPEN_PROTOCOL_BY_CHILD_CONTROLLER.\r

-  \r
+\r

   @param[in]  This              A pointer to the EFI_DRIVER_BINDING_PROTOCOL instance.\r
   @param[in]  This              A pointer to the EFI_DRIVER_BINDING_PROTOCOL instance.\r

-  @param[in]  ControllerHandle  A handle to the device being stopped. The handle must \r
-                                support a bus specific I/O protocol for the driver \r
+  @param[in]  ControllerHandle  A handle to the device being stopped. The handle must\r
+                                support a bus specific I/O protocol for the driver\r

                                 to use to stop the device.\r
   @param[in]  NumberOfChildren  The number of child device handles in ChildHandleBuffer.\r
                                 Not used.\r
                                 to use to stop the device.\r
   @param[in]  NumberOfChildren  The number of child device handles in ChildHandleBuffer.\r
                                 Not used.\r

-  @param[in]  ChildHandleBuffer An array of child handles to be freed. May be NULL \r
+  @param[in]  ChildHandleBuffer An array of child handles to be freed. May be NULL\r

                                 if NumberOfChildren is 0.Not used.\r
 \r
   @retval EFI_SUCCESS           The device was stopped.\r
                                 if NumberOfChildren is 0.Not used.\r
 \r
   @retval EFI_SUCCESS           The device was stopped.\r


@@ -542,15 +542,15 @@ ArpDriverBindingStop (
 \r
 /**\r
   Creates a child handle and installs a protocol.\r
 \r
 /**\r
   Creates a child handle and installs a protocol.\r

-  \r
-  The CreateChild() function installs a protocol on ChildHandle. \r
-  If ChildHandle is a pointer to NULL, then a new handle is created and returned \r
-  in ChildHandle. If ChildHandle is not a pointer to NULL, then the protocol \r
+\r
+  The CreateChild() function installs a protocol on ChildHandle.\r
+  If ChildHandle is a pointer to NULL, then a new handle is created and returned\r
+  in ChildHandle. If ChildHandle is not a pointer to NULL, then the protocol\r

   installs on the existing ChildHandle.\r
 \r
   @param  This        Pointer to the EFI_SERVICE_BINDING_PROTOCOL instance.\r
   @param  ChildHandle Pointer to the handle of the child to create. If it is NULL,\r
   installs on the existing ChildHandle.\r
 \r
   @param  This        Pointer to the EFI_SERVICE_BINDING_PROTOCOL instance.\r
   @param  ChildHandle Pointer to the handle of the child to create. If it is NULL,\r

-                      then a new handle is created. If it is a pointer to an existing \r
+                      then a new handle is created. If it is a pointer to an existing\r

                       UEFI handle, then the protocol is added to the existing UEFI handle.\r
 \r
   @retval EFI_SUCCES            The protocol was added to ChildHandle.\r
                       UEFI handle, then the protocol is added to the existing UEFI handle.\r
 \r
   @retval EFI_SUCCES            The protocol was added to ChildHandle.\r


@@ -670,16 +670,16 @@ ERROR:
 \r
 /**\r
   Destroys a child handle with a protocol installed on it.\r
 \r
 /**\r
   Destroys a child handle with a protocol installed on it.\r

-  \r
-  The DestroyChild() function does the opposite of CreateChild(). It removes a protocol \r
-  that was installed by CreateChild() from ChildHandle. If the removed protocol is the \r
+\r
+  The DestroyChild() function does the opposite of CreateChild(). It removes a protocol\r
+  that was installed by CreateChild() from ChildHandle. If the removed protocol is the\r

   last protocol on ChildHandle, then ChildHandle is destroyed.\r
 \r
   @param  This        Pointer to the EFI_SERVICE_BINDING_PROTOCOL instance.\r
   @param  ChildHandle Handle of the child to destroy\r
 \r
   @retval EFI_SUCCES            The protocol was removed from ChildHandle.\r
   last protocol on ChildHandle, then ChildHandle is destroyed.\r
 \r
   @param  This        Pointer to the EFI_SERVICE_BINDING_PROTOCOL instance.\r
   @param  ChildHandle Handle of the child to destroy\r
 \r
   @retval EFI_SUCCES            The protocol was removed from ChildHandle.\r

-  @retval EFI_UNSUPPORTED       ChildHandle does not support the protocol that is \r
+  @retval EFI_UNSUPPORTED       ChildHandle does not support the protocol that is\r

                                 being removed.\r
   @retval EFI_INVALID_PARAMETER Child handle is NULL.\r
   @retval EFI_ACCESS_DENIED     The protocol could not be removed from the ChildHandle\r
                                 being removed.\r
   @retval EFI_INVALID_PARAMETER Child handle is NULL.\r
   @retval EFI_ACCESS_DENIED     The protocol could not be removed from the ChildHandle\r


@@ -793,7 +793,7 @@ ArpServiceBindingDestroyChild (
   @param[in]  ImageHandle        The image handle of the driver.\r
   @param[in]  SystemTable        The system table.\r
 \r
   @param[in]  ImageHandle        The image handle of the driver.\r
   @param[in]  SystemTable        The system table.\r
 \r

-  @retval EFI_SUCCESS            if the driver binding and component name protocols \r
+  @retval EFI_SUCCESS            if the driver binding and component name protocols\r

                                  are successfully\r
   @retval Others                 Failed to install the protocols.\r
 \r
                                  are successfully\r
   @retval Others                 Failed to install the protocols.\r
 \r

diff --git a/MdeModulePkg/Universal/Network/ArpDxe/ArpDriver.h b/MdeModulePkg/Universal/Network/ArpDxe/ArpDriver.h
index d5fd3ea5c2a113823c7ebbcbd4232197de68ef1d..2390de65843f344fec2f85daac50f9a65e94622a 100644 (file)
--- a/MdeModulePkg/Universal/Network/ArpDxe/ArpDriver.h
+++ b/MdeModulePkg/Universal/Network/ArpDxe/ArpDriver.h
@@ -1,7 +1,7 @@
 /** @file\r
   ARP driver header file.\r
 /** @file\r
   ARP driver header file.\r

-  \r
-Copyright (c) 2006 - 2016, Intel Corporation. All rights reserved.<BR>\r
+\r
+Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r

 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at<BR>\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at<BR>\r


@@ -39,31 +39,31 @@ extern EFI_COMPONENT_NAME2_PROTOCOL   gArpComponentName2;
 // Function prototypes for the Drivr Binding Protocol\r
 //\r
 /**\r
 // Function prototypes for the Drivr Binding Protocol\r
 //\r
 /**\r

-  Tests to see if this driver supports a given controller. \r
-  \r
-  If a child device is provided, it further tests to see if this driver supports \r
+  Tests to see if this driver supports a given controller.\r
+\r
+  If a child device is provided, it further tests to see if this driver supports\r

   creating a handle for the specified child device.\r
 \r
   @param[in]  This                 A pointer to the EFI_DRIVER_BINDING_PROTOCOL instance.\r
   creating a handle for the specified child device.\r
 \r
   @param[in]  This                 A pointer to the EFI_DRIVER_BINDING_PROTOCOL instance.\r

-  @param[in]  ControllerHandle     The handle of the controller to test. This handle \r
-                                   must support a protocol interface that supplies \r
+  @param[in]  ControllerHandle     The handle of the controller to test. This handle\r
+                                   must support a protocol interface that supplies\r

                                    an I/O abstraction to the driver.\r
                                    an I/O abstraction to the driver.\r

-  @param[in]  RemainingDevicePath  A pointer to the remaining portion of a device path. \r
-                                   This parameter is ignored by device drivers, \r
+  @param[in]  RemainingDevicePath  A pointer to the remaining portion of a device path.\r
+                                   This parameter is ignored by device drivers,\r

                                    and is optional for bus drivers.\r
 \r
   @retval EFI_SUCCESS              The device specified by ControllerHandle and\r
                                    and is optional for bus drivers.\r
 \r
   @retval EFI_SUCCESS              The device specified by ControllerHandle and\r

-                                   RemainingDevicePath is supported by the driver \r
+                                   RemainingDevicePath is supported by the driver\r

                                    specified by This.\r
   @retval EFI_ALREADY_STARTED      The device specified by ControllerHandle and\r
                                    specified by This.\r
   @retval EFI_ALREADY_STARTED      The device specified by ControllerHandle and\r

-                                   RemainingDevicePath is already being managed \r
+                                   RemainingDevicePath is already being managed\r

                                    by the driver specified by This.\r
   @retval EFI_ACCESS_DENIED        The device specified by ControllerHandle and\r
                                    by the driver specified by This.\r
   @retval EFI_ACCESS_DENIED        The device specified by ControllerHandle and\r

-                                   RemainingDevicePath is already being managed by \r
-                                   a different driver or an application that \r
+                                   RemainingDevicePath is already being managed by\r
+                                   a different driver or an application that\r

                                    requires exclusive acces. Currently not implemented.\r
   @retval EFI_UNSUPPORTED          The device specified by ControllerHandle and\r
                                    requires exclusive acces. Currently not implemented.\r
   @retval EFI_UNSUPPORTED          The device specified by ControllerHandle and\r

-                                   RemainingDevicePath is not supported by the \r
+                                   RemainingDevicePath is not supported by the\r

                                    driver specified by This.\r
 \r
 **/\r
                                    driver specified by This.\r
 \r
 **/\r


@@ -76,32 +76,32 @@ ArpDriverBindingSupported (
   );\r
 \r
 /**\r
   );\r
 \r
 /**\r

-  Start this driver on ControllerHandle. \r
-  \r
-  The Start() function is designed to be invoked from the EFI boot service ConnectController(). \r
-  As a result, much of the error checking on the parameters to Start() has been \r
-  moved into this common boot service. It is legal to call Start() from other locations, \r
-  but the following calling restrictions must be followed or the system behavior \r
+  Start this driver on ControllerHandle.\r
+\r
+  The Start() function is designed to be invoked from the EFI boot service ConnectController().\r
+  As a result, much of the error checking on the parameters to Start() has been\r
+  moved into this common boot service. It is legal to call Start() from other locations,\r
+  but the following calling restrictions must be followed or the system behavior\r

   will not be deterministic.\r
   1. ControllerHandle must be a valid EFI_HANDLE.\r
   will not be deterministic.\r
   1. ControllerHandle must be a valid EFI_HANDLE.\r

-  2. If RemainingDevicePath is not NULL, then it must be a pointer to a naturally \r
+  2. If RemainingDevicePath is not NULL, then it must be a pointer to a naturally\r

      aligned EFI_DEVICE_PATH_PROTOCOL.\r
      aligned EFI_DEVICE_PATH_PROTOCOL.\r

-  3. Prior to calling Start(), the Supported() function for the driver specified \r
-     by This must have been called with the same calling parameters, and Supported() \r
-     must have returned EFI_SUCCESS.  \r
+  3. Prior to calling Start(), the Supported() function for the driver specified\r
+     by This must have been called with the same calling parameters, and Supported()\r
+     must have returned EFI_SUCCESS.\r

 \r
   @param[in]  This                 A pointer to the EFI_DRIVER_BINDING_PROTOCOL instance.\r
 \r
   @param[in]  This                 A pointer to the EFI_DRIVER_BINDING_PROTOCOL instance.\r

-  @param[in]  ControllerHandle     The handle of the controller to start. This handle \r
-                                   must support a protocol interface that supplies \r
+  @param[in]  ControllerHandle     The handle of the controller to start. This handle\r
+                                   must support a protocol interface that supplies\r

                                    an I/O abstraction to the driver.\r
                                    an I/O abstraction to the driver.\r

-  @param[in]  RemainingDevicePath  A pointer to the remaining portion of a device path. \r
-                                   This parameter is ignored by device drivers, \r
+  @param[in]  RemainingDevicePath  A pointer to the remaining portion of a device path.\r
+                                   This parameter is ignored by device drivers,\r

                                    and is optional for bus drivers.\r
 \r
   @retval EFI_SUCCESS              The device was started.\r
   @retval EFI_DEVICE_ERROR         The device could not be started due to a device error.\r
                                    Currently not implemented.\r
                                    and is optional for bus drivers.\r
 \r
   @retval EFI_SUCCESS              The device was started.\r
   @retval EFI_DEVICE_ERROR         The device could not be started due to a device error.\r
                                    Currently not implemented.\r

-  @retval EFI_OUT_OF_RESOURCES     The request could not be completed due to a lack of \r
+  @retval EFI_OUT_OF_RESOURCES     The request could not be completed due to a lack of\r

                                    resources.\r
   @retval Others                   The driver failded to start the device.\r
 \r
                                    resources.\r
   @retval Others                   The driver failded to start the device.\r
 \r


@@ -115,13 +115,13 @@ ArpDriverBindingStart (
   );\r
 \r
 /**\r
   );\r
 \r
 /**\r

-  Stop this driver on ControllerHandle. \r
-  \r
+  Stop this driver on ControllerHandle.\r
+\r

   Release the control of this controller and remove the IScsi functions. The Stop()\r
   Release the control of this controller and remove the IScsi functions. The Stop()\r

-  function is designed to be invoked from the EFI boot service DisconnectController(). \r
-  As a result, much of the error checking on the parameters to Stop() has been moved \r
-  into this common boot service. It is legal to call Stop() from other locations, \r
-  but the following calling restrictions must be followed or the system behavior \r
+  function is designed to be invoked from the EFI boot service DisconnectController().\r
+  As a result, much of the error checking on the parameters to Stop() has been moved\r
+  into this common boot service. It is legal to call Stop() from other locations,\r
+  but the following calling restrictions must be followed or the system behavior\r

   will not be deterministic.\r
   1. ControllerHandle must be a valid EFI_HANDLE that was used on a previous call to this\r
      same driver's Start() function.\r
   will not be deterministic.\r
   1. ControllerHandle must be a valid EFI_HANDLE that was used on a previous call to this\r
      same driver's Start() function.\r


@@ -129,14 +129,14 @@ ArpDriverBindingStart (
      EFI_HANDLE. In addition, all of these handles must have been created in this driver's\r
      Start() function, and the Start() function must have called OpenProtocol() on\r
      ControllerHandle with an Attribute of EFI_OPEN_PROTOCOL_BY_CHILD_CONTROLLER.\r
      EFI_HANDLE. In addition, all of these handles must have been created in this driver's\r
      Start() function, and the Start() function must have called OpenProtocol() on\r
      ControllerHandle with an Attribute of EFI_OPEN_PROTOCOL_BY_CHILD_CONTROLLER.\r

-  \r
+\r

   @param[in]  This              A pointer to the EFI_DRIVER_BINDING_PROTOCOL instance.\r
   @param[in]  This              A pointer to the EFI_DRIVER_BINDING_PROTOCOL instance.\r

-  @param[in]  ControllerHandle  A handle to the device being stopped. The handle must \r
-                                support a bus specific I/O protocol for the driver \r
+  @param[in]  ControllerHandle  A handle to the device being stopped. The handle must\r
+                                support a bus specific I/O protocol for the driver\r

                                 to use to stop the device.\r
   @param[in]  NumberOfChildren  The number of child device handles in ChildHandleBuffer.\r
                                 Not used.\r
                                 to use to stop the device.\r
   @param[in]  NumberOfChildren  The number of child device handles in ChildHandleBuffer.\r
                                 Not used.\r

-  @param[in]  ChildHandleBuffer An array of child handles to be freed. May be NULL \r
+  @param[in]  ChildHandleBuffer An array of child handles to be freed. May be NULL\r

                                 if NumberOfChildren is 0.Not used.\r
 \r
   @retval EFI_SUCCESS           The device was stopped.\r
                                 if NumberOfChildren is 0.Not used.\r
 \r
   @retval EFI_SUCCESS           The device was stopped.\r


@@ -154,15 +154,15 @@ ArpDriverBindingStop (
 \r
 /**\r
   Creates a child handle and installs a protocol.\r
 \r
 /**\r
   Creates a child handle and installs a protocol.\r

-  \r
-  The CreateChild() function installs a protocol on ChildHandle. \r
-  If ChildHandle is a pointer to NULL, then a new handle is created and returned \r
-  in ChildHandle. If ChildHandle is not a pointer to NULL, then the protocol \r
+\r
+  The CreateChild() function installs a protocol on ChildHandle.\r
+  If ChildHandle is a pointer to NULL, then a new handle is created and returned\r
+  in ChildHandle. If ChildHandle is not a pointer to NULL, then the protocol\r

   installs on the existing ChildHandle.\r
 \r
   @param  This        Pointer to the EFI_SERVICE_BINDING_PROTOCOL instance.\r
   @param  ChildHandle Pointer to the handle of the child to create. If it is NULL,\r
   installs on the existing ChildHandle.\r
 \r
   @param  This        Pointer to the EFI_SERVICE_BINDING_PROTOCOL instance.\r
   @param  ChildHandle Pointer to the handle of the child to create. If it is NULL,\r

-                      then a new handle is created. If it is a pointer to an existing \r
+                      then a new handle is created. If it is a pointer to an existing\r

                       UEFI handle, then the protocol is added to the existing UEFI handle.\r
 \r
   @retval EFI_SUCCES            The protocol was added to ChildHandle.\r
                       UEFI handle, then the protocol is added to the existing UEFI handle.\r
 \r
   @retval EFI_SUCCES            The protocol was added to ChildHandle.\r


@@ -181,16 +181,16 @@ ArpServiceBindingCreateChild (
 \r
 /**\r
   Destroys a child handle with a protocol installed on it.\r
 \r
 /**\r
   Destroys a child handle with a protocol installed on it.\r

-  \r
-  The DestroyChild() function does the opposite of CreateChild(). It removes a protocol \r
-  that was installed by CreateChild() from ChildHandle. If the removed protocol is the \r
+\r
+  The DestroyChild() function does the opposite of CreateChild(). It removes a protocol\r
+  that was installed by CreateChild() from ChildHandle. If the removed protocol is the\r

   last protocol on ChildHandle, then ChildHandle is destroyed.\r
 \r
   @param  This        Pointer to the EFI_SERVICE_BINDING_PROTOCOL instance.\r
   @param  ChildHandle Handle of the child to destroy\r
 \r
   @retval EFI_SUCCES            The protocol was removed from ChildHandle.\r
   last protocol on ChildHandle, then ChildHandle is destroyed.\r
 \r
   @param  This        Pointer to the EFI_SERVICE_BINDING_PROTOCOL instance.\r
   @param  ChildHandle Handle of the child to destroy\r
 \r
   @retval EFI_SUCCES            The protocol was removed from ChildHandle.\r

-  @retval EFI_UNSUPPORTED       ChildHandle does not support the protocol that is \r
+  @retval EFI_UNSUPPORTED       ChildHandle does not support the protocol that is\r

                                 being removed.\r
   @retval EFI_INVALID_PARAMETER Child handle is NULL.\r
   @retval EFI_ACCESS_DENIED     The protocol could not be removed from the ChildHandle\r
                                 being removed.\r
   @retval EFI_INVALID_PARAMETER Child handle is NULL.\r
   @retval EFI_ACCESS_DENIED     The protocol could not be removed from the ChildHandle\r

diff --git a/MdeModulePkg/Universal/Network/ArpDxe/ArpDxe.inf b/MdeModulePkg/Universal/Network/ArpDxe/ArpDxe.inf
index 9dff604a94bf2a592f46ab9f5c314decb44d7fe1..85f7982971d53703794d6916905635c24516c5d3 100644 (file)
--- a/MdeModulePkg/Universal/Network/ArpDxe/ArpDxe.inf
+++ b/MdeModulePkg/Universal/Network/ArpDxe/ArpDxe.inf
@@ -5,7 +5,7 @@
 #  implementation of the Address Resolution Protocol that is described in RFCs 826\r
 #  and 1122.\r
 #\r
 #  implementation of the Address Resolution Protocol that is described in RFCs 826\r
 #  and 1122.\r
 #\r

-#  Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.<BR>\r
+#  Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r

 #  This program and the accompanying materials\r
 #  are licensed and made available under the terms and conditions of the BSD License\r
 #  which accompanies this distribution. The full text of the license may be found at\r
 #  This program and the accompanying materials\r
 #  are licensed and made available under the terms and conditions of the BSD License\r
 #  which accompanies this distribution. The full text of the license may be found at\r


@@ -31,7 +31,7 @@
 #\r
 #  VALID_ARCHITECTURES           = IA32 X64 IPF EBC\r
 #\r
 #\r
 #  VALID_ARCHITECTURES           = IA32 X64 IPF EBC\r
 #\r

-#  DRIVER_BINDING                =  gArpDriverBinding                       \r
+#  DRIVER_BINDING                =  gArpDriverBinding\r

 #  COMPONENT_NAME                =  gArpComponentName\r
 #  COMPONENT_NAME2               =  gArpComponentName2\r
 #\r
 #  COMPONENT_NAME                =  gArpComponentName\r
 #  COMPONENT_NAME2               =  gArpComponentName2\r
 #\r

diff --git a/MdeModulePkg/Universal/Network/ArpDxe/ArpDxe.uni b/MdeModulePkg/Universal/Network/ArpDxe/ArpDxe.uni
index 4f02ae151d09ecf81482887483b4b3acdbae0de9..15f73b389f761de7b725ba3fd711b0e80a6c48ed 100644 (file)
--- a/MdeModulePkg/Universal/Network/ArpDxe/ArpDxe.uni
+++ b/MdeModulePkg/Universal/Network/ArpDxe/ArpDxe.uni
@@ -5,13 +5,13 @@
 // implementation of the Address Resolution Protocol that is described in RFCs 826\r
 // and 1122.\r
 //\r
 // implementation of the Address Resolution Protocol that is described in RFCs 826\r
 // and 1122.\r
 //\r

-// Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.<BR>\r
+// Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r

 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r
 // which accompanies this distribution. The full text of the license may be found at\r
 // http://opensource.org/licenses/bsd-license.php\r
 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r
 // which accompanies this distribution. The full text of the license may be found at\r
 // http://opensource.org/licenses/bsd-license.php\r

-// \r
+//\r

 // THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 // WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 //\r
 // THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 // WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 //\r

diff --git a/MdeModulePkg/Universal/Network/ArpDxe/ArpDxeExtra.uni b/MdeModulePkg/Universal/Network/ArpDxe/ArpDxeExtra.uni
index 9af9fb1ac3af1f6b2efc94ea2fd900e988119d43..6870da1833fc6b75688c7ffe3aba609c80d3fd8c 100644 (file)
--- a/MdeModulePkg/Universal/Network/ArpDxe/ArpDxeExtra.uni
+++ b/MdeModulePkg/Universal/Network/ArpDxe/ArpDxeExtra.uni
@@ -1,7 +1,7 @@
 // /** @file\r
 // ArpDxe Localized Strings and Content\r
 //\r
 // /** @file\r
 // ArpDxe Localized Strings and Content\r
 //\r

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

 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r
 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r


@@ -13,8 +13,8 @@
 //\r
 // **/\r
 \r
 //\r
 // **/\r
 \r

-#string STR_PROPERTIES_MODULE_NAME \r
-#language en-US \r
+#string STR_PROPERTIES_MODULE_NAME\r
+#language en-US\r

 "ARP DXE Driver"\r
 \r
 \r
 "ARP DXE Driver"\r
 \r
 \r

diff --git a/MdeModulePkg/Universal/Network/ArpDxe/ArpImpl.c b/MdeModulePkg/Universal/Network/ArpDxe/ArpImpl.c
index a02de203c0770ebb544f1819475246077571bb05..af23538ef235b1c8348eafdf37fb2fff0c5a1738 100644 (file)
--- a/MdeModulePkg/Universal/Network/ArpDxe/ArpImpl.c
+++ b/MdeModulePkg/Universal/Network/ArpDxe/ArpImpl.c
@@ -1,7 +1,7 @@
 /** @file\r
   The implementation of the ARP protocol.\r
 /** @file\r
   The implementation of the ARP protocol.\r

-  \r
-Copyright (c) 2006 - 2016, Intel Corporation. All rights reserved.<BR>\r
+\r
+Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r

 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at<BR>\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at<BR>\r


@@ -343,7 +343,7 @@ ArpOnFrameRcvd (
 \r
 /**\r
   Process the already sent arp packets.\r
 \r
 /**\r
   Process the already sent arp packets.\r

-  \r
+\r

   @param[in]  Context                Pointer to the context data registerd to the\r
                                      Event.\r
 \r
   @param[in]  Context                Pointer to the context data registerd to the\r
                                      Event.\r
 \r

diff --git a/MdeModulePkg/Universal/Network/ArpDxe/ArpImpl.h b/MdeModulePkg/Universal/Network/ArpDxe/ArpImpl.h
index a5dce7d9a5b54af4eeaeaae5992787e3edf44b7f..248c16652ccc53144fa8a6973e243867eefe6d7b 100644 (file)
--- a/MdeModulePkg/Universal/Network/ArpDxe/ArpImpl.h
+++ b/MdeModulePkg/Universal/Network/ArpDxe/ArpImpl.h
@@ -1,7 +1,7 @@
 /** @file\r
   EFI Address Resolution Protocol (ARP) Protocol interface header file.\r
 \r
 /** @file\r
   EFI Address Resolution Protocol (ARP) Protocol interface header file.\r
 \r

-Copyright (c) 2006 - 2012, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r

 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at<BR>\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at<BR>\r


@@ -94,13 +94,13 @@ typedef enum {
 \r
 /**\r
   Returns a pointer to the ARP_INSTANCE_DATA structure from the input a.\r
 \r
 /**\r
   Returns a pointer to the ARP_INSTANCE_DATA structure from the input a.\r

-  \r
-  If the signatures matches, then a pointer to the data structure that contains \r
+\r
+  If the signatures matches, then a pointer to the data structure that contains\r

   a specified field of that data structure is returned.\r
   a specified field of that data structure is returned.\r

-   \r
-  @param  a              Pointer to the field specified by ArpProto within a data \r
+\r
+  @param  a              Pointer to the field specified by ArpProto within a data\r

                          structure of type ARP_INSTANCE_DATA.\r
                          structure of type ARP_INSTANCE_DATA.\r

- \r
+\r

 **/\r
 #define ARP_INSTANCE_DATA_FROM_THIS(a) \\r
   CR ( \\r
 **/\r
 #define ARP_INSTANCE_DATA_FROM_THIS(a) \\r
   CR ( \\r


@@ -130,13 +130,13 @@ typedef struct {
 \r
 /**\r
   Returns a pointer to the ARP_SERVICE_DATA structure from the input a.\r
 \r
 /**\r
   Returns a pointer to the ARP_SERVICE_DATA structure from the input a.\r

-  \r
-  If the signatures matches, then a pointer to the data structure that contains \r
+\r
+  If the signatures matches, then a pointer to the data structure that contains\r

   a specified field of that data structure is returned.\r
   a specified field of that data structure is returned.\r

-   \r
-  @param  a              Pointer to the field specified by ServiceBinding within \r
+\r
+  @param  a              Pointer to the field specified by ServiceBinding within\r

                          a data structure of type ARP_SERVICE_DATA.\r
                          a data structure of type ARP_SERVICE_DATA.\r

- \r
+\r

 **/\r
 #define ARP_SERVICE_DATA_FROM_THIS(a) \\r
   CR ( \\r
 **/\r
 #define ARP_SERVICE_DATA_FROM_THIS(a) \\r
   CR ( \\r


@@ -228,13 +228,13 @@ typedef struct {
 /**\r
   This function is used to assign a station address to the ARP cache for this instance\r
   of the ARP driver.\r
 /**\r
   This function is used to assign a station address to the ARP cache for this instance\r
   of the ARP driver.\r

-  \r
-  Each ARP instance has one station address. The EFI_ARP_PROTOCOL driver will \r
-  respond to ARP requests that match this registered station address. A call to \r
+\r
+  Each ARP instance has one station address. The EFI_ARP_PROTOCOL driver will\r
+  respond to ARP requests that match this registered station address. A call to\r

   this function with the ConfigData field set to NULL will reset this ARP instance.\r
   this function with the ConfigData field set to NULL will reset this ARP instance.\r

-  \r
-  Once a protocol type and station address have been assigned to this ARP instance, \r
-  all the following ARP functions will use this information. Attempting to change \r
+\r
+  Once a protocol type and station address have been assigned to this ARP instance,\r
+  all the following ARP functions will use this information. Attempting to change\r

   the protocol type or station address to a configured ARP instance will result in errors.\r
 \r
   @param  This                   Pointer to the EFI_ARP_PROTOCOL instance.\r
   the protocol type or station address to a configured ARP instance will result in errors.\r
 \r
   @param  This                   Pointer to the EFI_ARP_PROTOCOL instance.\r


@@ -263,17 +263,17 @@ ArpConfigure (
 /**\r
   This function is used to insert entries into the ARP cache.\r
 \r
 /**\r
   This function is used to insert entries into the ARP cache.\r
 \r

-  ARP cache entries are typically inserted and updated by network protocol drivers \r
-  as network traffic is processed. Most ARP cache entries will time out and be \r
-  deleted if the network traffic stops. ARP cache entries that were inserted \r
+  ARP cache entries are typically inserted and updated by network protocol drivers\r
+  as network traffic is processed. Most ARP cache entries will time out and be\r
+  deleted if the network traffic stops. ARP cache entries that were inserted\r

   by the Add() function may be static (will not time out) or dynamic (will time out).\r
   by the Add() function may be static (will not time out) or dynamic (will time out).\r

-  Default ARP cache timeout values are not covered in most network protocol \r
-  specifications (although RFC 1122 comes pretty close) and will only be \r
-  discussed in general in this specification. The timeout values that are \r
-  used in the EFI Sample Implementation should be used only as a guideline. \r
-  Final product implementations of the EFI network stack should be tuned for \r
+  Default ARP cache timeout values are not covered in most network protocol\r
+  specifications (although RFC 1122 comes pretty close) and will only be\r
+  discussed in general in this specification. The timeout values that are\r
+  used in the EFI Sample Implementation should be used only as a guideline.\r
+  Final product implementations of the EFI network stack should be tuned for\r

   their expected network environments.\r
   their expected network environments.\r

-  \r
+\r

   @param  This                   Pointer to the EFI_ARP_PROTOCOL instance.\r
   @param  DenyFlag               Set to TRUE if this entry is a deny entry. Set to\r
                                  FALSE if this  entry is a normal entry.\r
   @param  This                   Pointer to the EFI_ARP_PROTOCOL instance.\r
   @param  DenyFlag               Set to TRUE if this entry is a deny entry. Set to\r
                                  FALSE if this  entry is a normal entry.\r


@@ -319,14 +319,14 @@ ArpAdd (
 /**\r
   This function searches the ARP cache for matching entries and allocates a buffer into\r
   which those entries are copied.\r
 /**\r
   This function searches the ARP cache for matching entries and allocates a buffer into\r
   which those entries are copied.\r

-  \r
-  The first part of the allocated buffer is EFI_ARP_FIND_DATA, following which \r
+\r
+  The first part of the allocated buffer is EFI_ARP_FIND_DATA, following which\r

   are protocol address pairs and hardware address pairs.\r
   are protocol address pairs and hardware address pairs.\r

-  When finding a specific protocol address (BySwAddress is TRUE and AddressBuffer \r
-  is not NULL), the ARP cache timeout for the found entry is reset if Refresh is \r
-  set to TRUE. If the found ARP cache entry is a permanent entry, it is not \r
+  When finding a specific protocol address (BySwAddress is TRUE and AddressBuffer\r
+  is not NULL), the ARP cache timeout for the found entry is reset if Refresh is\r
+  set to TRUE. If the found ARP cache entry is a permanent entry, it is not\r

   affected by Refresh.\r
   affected by Refresh.\r

-  \r
+\r

   @param  This                   Pointer to the EFI_ARP_PROTOCOL instance.\r
   @param  BySwAddress            Set to TRUE to look for matching software protocol\r
                                  addresses. Set to FALSE to look for matching\r
   @param  This                   Pointer to the EFI_ARP_PROTOCOL instance.\r
   @param  BySwAddress            Set to TRUE to look for matching software protocol\r
                                  addresses. Set to FALSE to look for matching\r


@@ -439,13 +439,13 @@ ArpRequest (
 /**\r
   This function aborts the previous ARP request (identified by This,  TargetSwAddress\r
   and ResolvedEvent) that is issued by EFI_ARP_PROTOCOL.Request().\r
 /**\r
   This function aborts the previous ARP request (identified by This,  TargetSwAddress\r
   and ResolvedEvent) that is issued by EFI_ARP_PROTOCOL.Request().\r

-  \r
-  If the request is in the internal ARP request queue, the request is aborted \r
-  immediately and its ResolvedEvent is signaled. Only an asynchronous address \r
-  request needs to be canceled. If TargeSwAddress and ResolveEvent are both \r
-  NULL, all the pending asynchronous requests that have been issued by This \r
+\r
+  If the request is in the internal ARP request queue, the request is aborted\r
+  immediately and its ResolvedEvent is signaled. Only an asynchronous address\r
+  request needs to be canceled. If TargeSwAddress and ResolveEvent are both\r
+  NULL, all the pending asynchronous requests that have been issued by This\r

   instance will be cancelled and their corresponding events will be signaled.\r
   instance will be cancelled and their corresponding events will be signaled.\r

-  \r
+\r

   @param  This                   Pointer to the EFI_ARP_PROTOCOL instance.\r
   @param  TargetSwAddress        Pointer to the protocol address in previous\r
                                  request session.\r
   @param  This                   Pointer to the EFI_ARP_PROTOCOL instance.\r
   @param  TargetSwAddress        Pointer to the protocol address in previous\r
                                  request session.\r


@@ -673,7 +673,7 @@ ArpOnFrameRcvd (
 \r
 /**\r
   Process the already sent arp packets.\r
 \r
 /**\r
   Process the already sent arp packets.\r

-  \r
+\r

   @param[in]  Context                Pointer to the context data registerd to the\r
                                      Event.\r
 \r
   @param[in]  Context                Pointer to the context data registerd to the\r
                                      Event.\r
 \r

diff --git a/MdeModulePkg/Universal/Network/ArpDxe/ArpMain.c b/MdeModulePkg/Universal/Network/ArpDxe/ArpMain.c
index abe02c1af41463947be8a4f611207cbd11eac69a..6922621105adeaccd545d8a8083d00be27108538 100644 (file)
--- a/MdeModulePkg/Universal/Network/ArpDxe/ArpMain.c
+++ b/MdeModulePkg/Universal/Network/ArpDxe/ArpMain.c
@@ -1,7 +1,7 @@
 /** @file\r
   Implementation of EFI Address Resolution Protocol (ARP) Protocol interface functions.\r
 /** @file\r
   Implementation of EFI Address Resolution Protocol (ARP) Protocol interface functions.\r

-  \r
-Copyright (c) 2006 - 2009, Intel Corporation. All rights reserved.<BR>\r
+\r
+Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r

 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at<BR>\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at<BR>\r


@@ -18,13 +18,13 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 /**\r
   This function is used to assign a station address to the ARP cache for this instance\r
   of the ARP driver.\r
 /**\r
   This function is used to assign a station address to the ARP cache for this instance\r
   of the ARP driver.\r

-  \r
-  Each ARP instance has one station address. The EFI_ARP_PROTOCOL driver will \r
-  respond to ARP requests that match this registered station address. A call to \r
+\r
+  Each ARP instance has one station address. The EFI_ARP_PROTOCOL driver will\r
+  respond to ARP requests that match this registered station address. A call to\r

   this function with the ConfigData field set to NULL will reset this ARP instance.\r
   this function with the ConfigData field set to NULL will reset this ARP instance.\r

-  \r
-  Once a protocol type and station address have been assigned to this ARP instance, \r
-  all the following ARP functions will use this information. Attempting to change \r
+\r
+  Once a protocol type and station address have been assigned to this ARP instance,\r
+  all the following ARP functions will use this information. Attempting to change\r

   the protocol type or station address to a configured ARP instance will result in errors.\r
 \r
   @param  This                   Pointer to the EFI_ARP_PROTOCOL instance.\r
   the protocol type or station address to a configured ARP instance will result in errors.\r
 \r
   @param  This                   Pointer to the EFI_ARP_PROTOCOL instance.\r


@@ -83,17 +83,17 @@ ArpConfigure (
 /**\r
   This function is used to insert entries into the ARP cache.\r
 \r
 /**\r
   This function is used to insert entries into the ARP cache.\r
 \r

-  ARP cache entries are typically inserted and updated by network protocol drivers \r
-  as network traffic is processed. Most ARP cache entries will time out and be \r
-  deleted if the network traffic stops. ARP cache entries that were inserted \r
+  ARP cache entries are typically inserted and updated by network protocol drivers\r
+  as network traffic is processed. Most ARP cache entries will time out and be\r
+  deleted if the network traffic stops. ARP cache entries that were inserted\r

   by the Add() function may be static (will not time out) or dynamic (will time out).\r
   by the Add() function may be static (will not time out) or dynamic (will time out).\r

-  Default ARP cache timeout values are not covered in most network protocol \r
-  specifications (although RFC 1122 comes pretty close) and will only be \r
-  discussed in general in this specification. The timeout values that are \r
-  used in the EFI Sample Implementation should be used only as a guideline. \r
-  Final product implementations of the EFI network stack should be tuned for \r
+  Default ARP cache timeout values are not covered in most network protocol\r
+  specifications (although RFC 1122 comes pretty close) and will only be\r
+  discussed in general in this specification. The timeout values that are\r
+  used in the EFI Sample Implementation should be used only as a guideline.\r
+  Final product implementations of the EFI network stack should be tuned for\r

   their expected network environments.\r
   their expected network environments.\r

-  \r
+\r

   @param  This                   Pointer to the EFI_ARP_PROTOCOL instance.\r
   @param  DenyFlag               Set to TRUE if this entry is a deny entry. Set to\r
                                  FALSE if this  entry is a normal entry.\r
   @param  This                   Pointer to the EFI_ARP_PROTOCOL instance.\r
   @param  DenyFlag               Set to TRUE if this entry is a deny entry. Set to\r
                                  FALSE if this  entry is a normal entry.\r


@@ -281,14 +281,14 @@ UNLOCK_EXIT:
 /**\r
   This function searches the ARP cache for matching entries and allocates a buffer into\r
   which those entries are copied.\r
 /**\r
   This function searches the ARP cache for matching entries and allocates a buffer into\r
   which those entries are copied.\r

-  \r
-  The first part of the allocated buffer is EFI_ARP_FIND_DATA, following which \r
+\r
+  The first part of the allocated buffer is EFI_ARP_FIND_DATA, following which\r

   are protocol address pairs and hardware address pairs.\r
   are protocol address pairs and hardware address pairs.\r

-  When finding a specific protocol address (BySwAddress is TRUE and AddressBuffer \r
-  is not NULL), the ARP cache timeout for the found entry is reset if Refresh is \r
-  set to TRUE. If the found ARP cache entry is a permanent entry, it is not \r
+  When finding a specific protocol address (BySwAddress is TRUE and AddressBuffer\r
+  is not NULL), the ARP cache timeout for the found entry is reset if Refresh is\r
+  set to TRUE. If the found ARP cache entry is a permanent entry, it is not\r

   affected by Refresh.\r
   affected by Refresh.\r

-  \r
+\r

   @param  This                   Pointer to the EFI_ARP_PROTOCOL instance.\r
   @param  BySwAddress            Set to TRUE to look for matching software protocol\r
                                  addresses. Set to FALSE to look for matching\r
   @param  This                   Pointer to the EFI_ARP_PROTOCOL instance.\r
   @param  BySwAddress            Set to TRUE to look for matching software protocol\r
                                  addresses. Set to FALSE to look for matching\r


@@ -678,13 +678,13 @@ SIGNAL_USER:
 /**\r
   This function aborts the previous ARP request (identified by This,  TargetSwAddress\r
   and ResolvedEvent) that is issued by EFI_ARP_PROTOCOL.Request().\r
 /**\r
   This function aborts the previous ARP request (identified by This,  TargetSwAddress\r
   and ResolvedEvent) that is issued by EFI_ARP_PROTOCOL.Request().\r

-  \r
-  If the request is in the internal ARP request queue, the request is aborted \r
-  immediately and its ResolvedEvent is signaled. Only an asynchronous address \r
-  request needs to be canceled. If TargeSwAddress and ResolveEvent are both \r
-  NULL, all the pending asynchronous requests that have been issued by This \r
+\r
+  If the request is in the internal ARP request queue, the request is aborted\r
+  immediately and its ResolvedEvent is signaled. Only an asynchronous address\r
+  request needs to be canceled. If TargeSwAddress and ResolveEvent are both\r
+  NULL, all the pending asynchronous requests that have been issued by This\r

   instance will be cancelled and their corresponding events will be signaled.\r
   instance will be cancelled and their corresponding events will be signaled.\r

-  \r
+\r

   @param  This                   Pointer to the EFI_ARP_PROTOCOL instance.\r
   @param  TargetSwAddress        Pointer to the protocol address in previous\r
                                  request session.\r
   @param  This                   Pointer to the EFI_ARP_PROTOCOL instance.\r
   @param  TargetSwAddress        Pointer to the protocol address in previous\r
                                  request session.\r

diff --git a/MdeModulePkg/Universal/Network/ArpDxe/ComponentName.c b/MdeModulePkg/Universal/Network/ArpDxe/ComponentName.c
index ee47fb1ef729aa1a9b3a145fadda554910f8c5d0..240c1e7c4186b69ea147474cf72eae6e3c357056 100644 (file)
--- a/MdeModulePkg/Universal/Network/ArpDxe/ComponentName.c
+++ b/MdeModulePkg/Universal/Network/ArpDxe/ComponentName.c
@@ -1,7 +1,7 @@
 /** @file\r
   UEFI Component Name(2) protocol implementation for ArpDxe driver.\r
 \r
 /** @file\r
   UEFI Component Name(2) protocol implementation for ArpDxe driver.\r
 \r

-Copyright (c) 2006 - 2012, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r

 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at<BR>\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at<BR>\r


@@ -187,10 +187,10 @@ ArpComponentNameGetControllerName (
   if (ChildHandle == NULL) {\r
     return EFI_UNSUPPORTED;\r
   }\r
   if (ChildHandle == NULL) {\r
     return EFI_UNSUPPORTED;\r
   }\r

-  \r
-  // \r
-  // Make sure this driver produced ChildHandle \r
-  // \r
+\r
+  //\r
+  // Make sure this driver produced ChildHandle\r
+  //\r

   Status = EfiTestChildHandle (\r
              ControllerHandle,\r
              ChildHandle,\r
   Status = EfiTestChildHandle (\r
              ControllerHandle,\r
              ChildHandle,\r


@@ -200,9 +200,9 @@ ArpComponentNameGetControllerName (
     return Status;\r
   }\r
 \r
     return Status;\r
   }\r
 \r

-  // \r
-  // Retrieve an instance of a produced protocol from ChildHandle  \r
-  // \r
+  //\r
+  // Retrieve an instance of a produced protocol from ChildHandle\r
+  //\r

   Status = gBS->OpenProtocol (\r
                   ChildHandle,\r
                   &gEfiArpProtocolGuid,\r
   Status = gBS->OpenProtocol (\r
                   ChildHandle,\r
                   &gEfiArpProtocolGuid,\r

diff --git a/MdeModulePkg/Universal/Network/Dhcp4Dxe/ComponentName.c b/MdeModulePkg/Universal/Network/Dhcp4Dxe/ComponentName.c
index 2ea07608f1c7d51eadcf5706ad341bb6a9181b09..0b4290617fc8bf67e11ca05dda1edbf0ff3ed07b 100644 (file)
--- a/MdeModulePkg/Universal/Network/Dhcp4Dxe/ComponentName.c
+++ b/MdeModulePkg/Universal/Network/Dhcp4Dxe/ComponentName.c
@@ -1,6 +1,6 @@
 /** @file\r
 \r
 /** @file\r
 \r

-Copyright (c) 2006 - 2012, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r

 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r


@@ -249,11 +249,11 @@ DhcpComponentNameGetDriverName (
 \r
   @param  Dhcp4[in]               A pointer to the EFI_DHCP4_PROTOCOL.\r
 \r
 \r
   @param  Dhcp4[in]               A pointer to the EFI_DHCP4_PROTOCOL.\r
 \r

-  \r
+\r

   @retval EFI_SUCCESS             Update the ControllerNameTable of this instance successfully.\r
   @retval EFI_INVALID_PARAMETER   The input parameter is invalid.\r
   @retval EFI_DEVICE_ERROR        DHCP is in unknown state.\r
   @retval EFI_SUCCESS             Update the ControllerNameTable of this instance successfully.\r
   @retval EFI_INVALID_PARAMETER   The input parameter is invalid.\r
   @retval EFI_DEVICE_ERROR        DHCP is in unknown state.\r

-  \r
+\r

 **/\r
 EFI_STATUS\r
 UpdateName (\r
 **/\r
 EFI_STATUS\r
 UpdateName (\r


@@ -274,16 +274,16 @@ UpdateName (
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r

-  \r
+\r

   if (gDhcpControllerNameTable != NULL) {\r
     FreeUnicodeStringTable (gDhcpControllerNameTable);\r
     gDhcpControllerNameTable = NULL;\r
   }\r
   if (gDhcpControllerNameTable != NULL) {\r
     FreeUnicodeStringTable (gDhcpControllerNameTable);\r
     gDhcpControllerNameTable = NULL;\r
   }\r

-  \r
+\r

   if (Dhcp4ModeData.State > Dhcp4Rebooting) {\r
     return EFI_DEVICE_ERROR;\r
   }\r
   if (Dhcp4ModeData.State > Dhcp4Rebooting) {\r
     return EFI_DEVICE_ERROR;\r
   }\r

-  \r
+\r

   Status = AddUnicodeString2 (\r
              "eng",\r
              gDhcp4ComponentName.SupportedLanguages,\r
   Status = AddUnicodeString2 (\r
              "eng",\r
              gDhcp4ComponentName.SupportedLanguages,\r


@@ -294,7 +294,7 @@ UpdateName (
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r

-  \r
+\r

   return AddUnicodeString2 (\r
            "en",\r
            gDhcp4ComponentName2.SupportedLanguages,\r
   return AddUnicodeString2 (\r
            "en",\r
            gDhcp4ComponentName2.SupportedLanguages,\r


@@ -391,10 +391,10 @@ DhcpComponentNameGetControllerName (
   if (ChildHandle == NULL) {\r
     return EFI_UNSUPPORTED;\r
   }\r
   if (ChildHandle == NULL) {\r
     return EFI_UNSUPPORTED;\r
   }\r

-  \r
-  // \r
-  // Make sure this driver produced ChildHandle \r
-  // \r
+\r
+  //\r
+  // Make sure this driver produced ChildHandle\r
+  //\r

   Status = EfiTestChildHandle (\r
              ControllerHandle,\r
              ChildHandle,\r
   Status = EfiTestChildHandle (\r
              ControllerHandle,\r
              ChildHandle,\r


@@ -404,9 +404,9 @@ DhcpComponentNameGetControllerName (
     return Status;\r
   }\r
 \r
     return Status;\r
   }\r
 \r

-  // \r
-  // Retrieve an instance of a produced protocol from ChildHandle  \r
-  // \r
+  //\r
+  // Retrieve an instance of a produced protocol from ChildHandle\r
+  //\r

   Status = gBS->OpenProtocol (\r
                   ChildHandle,\r
                   &gEfiDhcp4ProtocolGuid,\r
   Status = gBS->OpenProtocol (\r
                   ChildHandle,\r
                   &gEfiDhcp4ProtocolGuid,\r

diff --git a/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Driver.c b/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Driver.c
index 1f1e21c3cb252af02684f2b7e3d4e062cde42c3c..733af5edf8a376d3b9cdf06595bd7e6b098ad1f3 100644 (file)
--- a/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Driver.c
+++ b/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Driver.c
@@ -1,6 +1,6 @@
 /** @file\r
 \r
 /** @file\r
 \r

-Copyright (c) 2006 - 2016, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r

 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r


@@ -355,7 +355,7 @@ ON_ERROR:
 \r
 /**\r
   Callback function which provided by user to remove one node in NetDestroyLinkList process.\r
 \r
 /**\r
   Callback function which provided by user to remove one node in NetDestroyLinkList process.\r

-  \r
+\r

   @param[in]    Entry           The entry to be removed.\r
   @param[in]    Context         Pointer to the callback context corresponds to the Context in NetDestroyLinkList.\r
 \r
   @param[in]    Entry           The entry to be removed.\r
   @param[in]    Context         Pointer to the callback context corresponds to the Context in NetDestroyLinkList.\r
 \r


@@ -445,7 +445,7 @@ Dhcp4DriverBindingStop (
   if (!IsListEmpty (&DhcpSb->Children)) {\r
     //\r
     // Destroy all the children instances before destory the service.\r
   if (!IsListEmpty (&DhcpSb->Children)) {\r
     //\r
     // Destroy all the children instances before destory the service.\r

-    //  \r
+    //\r

     List = &DhcpSb->Children;\r
     Status = NetDestroyLinkList (\r
                List,\r
     List = &DhcpSb->Children;\r
     Status = NetDestroyLinkList (\r
                List,\r


@@ -481,7 +481,7 @@ Dhcp4DriverBindingStop (
       gDhcpControllerNameTable = NULL;\r
     }\r
     FreePool (DhcpSb);\r
       gDhcpControllerNameTable = NULL;\r
     }\r
     FreePool (DhcpSb);\r

-    \r
+\r

     Status = EFI_SUCCESS;\r
   }\r
 \r
     Status = EFI_SUCCESS;\r
   }\r
 \r

diff --git a/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Driver.h b/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Driver.h
index a74cb64488ff86c1f8172476cf14613cc8e2ba76..ef45d748fca69df6e6f9fa756c873b854743b422 100644 (file)
--- a/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Driver.h
+++ b/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Driver.h
@@ -1,7 +1,7 @@
 /** @file\r
   Header for the DHCP4 driver.\r
 /** @file\r
   Header for the DHCP4 driver.\r

-  \r
-Copyright (c) 2006 - 2016, Intel Corporation. All rights reserved.<BR>\r
+\r
+Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r

 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r


@@ -78,7 +78,7 @@ Dhcp4DriverBindingStart (
   restrictions for this service. DisconnectController()\r
   must follow these calling restrictions. If any other agent wishes\r
   to call Stop() it must also follow these calling restrictions.\r
   restrictions for this service. DisconnectController()\r
   must follow these calling restrictions. If any other agent wishes\r
   to call Stop() it must also follow these calling restrictions.\r

-  \r
+\r

   @param[in]  This              Protocol instance pointer.\r
   @param[in]  ControllerHandle  Handle of device to stop driver on\r
   @param[in]  NumberOfChildren  Number of Handles in ChildHandleBuffer. If number of\r
   @param[in]  This              Protocol instance pointer.\r
   @param[in]  ControllerHandle  Handle of device to stop driver on\r
   @param[in]  NumberOfChildren  Number of Handles in ChildHandleBuffer. If number of\r


@@ -100,14 +100,14 @@ Dhcp4DriverBindingStop (
 \r
 /**\r
   Creates a child handle and installs a protocol.\r
 \r
 /**\r
   Creates a child handle and installs a protocol.\r

-  \r
-  The CreateChild() function installs a protocol on ChildHandle. \r
-  If ChildHandle is a pointer to NULL, then a new handle is created and returned in ChildHandle. \r
+\r
+  The CreateChild() function installs a protocol on ChildHandle.\r
+  If ChildHandle is a pointer to NULL, then a new handle is created and returned in ChildHandle.\r

   If ChildHandle is not a pointer to NULL, then the protocol installs on the existing ChildHandle.\r
 \r
   @param  This        Pointer to the EFI_SERVICE_BINDING_PROTOCOL instance.\r
   @param  ChildHandle Pointer to the handle of the child to create. If it is NULL,\r
   If ChildHandle is not a pointer to NULL, then the protocol installs on the existing ChildHandle.\r
 \r
   @param  This        Pointer to the EFI_SERVICE_BINDING_PROTOCOL instance.\r
   @param  ChildHandle Pointer to the handle of the child to create. If it is NULL,\r

-                      then a new handle is created. If it is a pointer to an existing UEFI handle, \r
+                      then a new handle is created. If it is a pointer to an existing UEFI handle,\r

                       then the protocol is added to the existing UEFI handle.\r
 \r
   @retval EFI_SUCCES            The protocol was added to ChildHandle.\r
                       then the protocol is added to the existing UEFI handle.\r
 \r
   @retval EFI_SUCCES            The protocol was added to ChildHandle.\r


@@ -126,9 +126,9 @@ Dhcp4ServiceBindingCreateChild (
 \r
 /**\r
   Destroys a child handle with a protocol installed on it.\r
 \r
 /**\r
   Destroys a child handle with a protocol installed on it.\r

-  \r
-  The DestroyChild() function does the opposite of CreateChild(). It removes a protocol \r
-  that was installed by CreateChild() from ChildHandle. If the removed protocol is the \r
+\r
+  The DestroyChild() function does the opposite of CreateChild(). It removes a protocol\r
+  that was installed by CreateChild() from ChildHandle. If the removed protocol is the\r

   last protocol on ChildHandle, then ChildHandle is destroyed.\r
 \r
   @param  This        Pointer to the EFI_SERVICE_BINDING_PROTOCOL instance.\r
   last protocol on ChildHandle, then ChildHandle is destroyed.\r
 \r
   @param  This        Pointer to the EFI_SERVICE_BINDING_PROTOCOL instance.\r

diff --git a/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Dxe.inf b/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Dxe.inf
index 9b6c9c1dccb6df133abbb000ddab01c40899967d..e41bddb017168865f7d4ec6cd73bb7363ece1891 100644 (file)
--- a/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Dxe.inf
+++ b/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Dxe.inf
@@ -5,7 +5,7 @@
 #  capability to collect configuration information for the EFI IPv4 Protocol drivers\r
 #  and to provide DHCPv4 server and PXE boot server discovery services.\r
 #\r
 #  capability to collect configuration information for the EFI IPv4 Protocol drivers\r
 #  and to provide DHCPv4 server and PXE boot server discovery services.\r
 #\r

-#  Copyright (c) 2007 - 2014, Intel Corporation. All rights reserved.<BR>\r
+#  Copyright (c) 2007 - 2018, Intel Corporation. All rights reserved.<BR>\r

 #  This program and the accompanying materials\r
 #  are licensed and made available under the terms and conditions of the BSD License\r
 #  which accompanies this distribution. The full text of the license may be found at\r
 #  This program and the accompanying materials\r
 #  are licensed and made available under the terms and conditions of the BSD License\r
 #  which accompanies this distribution. The full text of the license may be found at\r


@@ -31,7 +31,7 @@
 #\r
 #  VALID_ARCHITECTURES           = IA32 X64 IPF EBC\r
 #\r
 #\r
 #  VALID_ARCHITECTURES           = IA32 X64 IPF EBC\r
 #\r

-#  DRIVER_BINDING                =  gDhcp4DriverBinding                        \r
+#  DRIVER_BINDING                =  gDhcp4DriverBinding\r

 #  COMPONENT_NAME                =  gDhcp4ComponentName\r
 #  COMPONENT_NAME2               =  gDhcp4ComponentName2\r
 #\r
 #  COMPONENT_NAME                =  gDhcp4ComponentName\r
 #  COMPONENT_NAME2               =  gDhcp4ComponentName2\r
 #\r

diff --git a/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Dxe.uni b/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Dxe.uni
index 1684cc592af1270ef66f1a3dcf5f9c19125f754d..7330aaefda743b38dc0e1c2f4b7f1fe31674f3d5 100644 (file)
--- a/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Dxe.uni
+++ b/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Dxe.uni
@@ -5,13 +5,13 @@
 // capability to collect configuration information for the EFI IPv4 Protocol drivers\r
 // and to provide DHCPv4 server and PXE boot server discovery services.\r
 //\r
 // capability to collect configuration information for the EFI IPv4 Protocol drivers\r
 // and to provide DHCPv4 server and PXE boot server discovery services.\r
 //\r

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

 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r
 // which accompanies this distribution. The full text of the license may be found at\r
 // http://opensource.org/licenses/bsd-license.php\r
 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r
 // which accompanies this distribution. The full text of the license may be found at\r
 // http://opensource.org/licenses/bsd-license.php\r

-// \r
+//\r

 // THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 // WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 //\r
 // THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 // WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 //\r

diff --git a/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4DxeExtra.uni b/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4DxeExtra.uni
index dca59ae45272ffbe862995bb4f124dfae69e4c3f..d9aaf47751179a78f7dff010e3d05b4f2a8374bd 100644 (file)
--- a/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4DxeExtra.uni
+++ b/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4DxeExtra.uni
@@ -1,7 +1,7 @@
 // /** @file\r
 // Dhcp4Dxe Localized Strings and Content\r
 //\r
 // /** @file\r
 // Dhcp4Dxe Localized Strings and Content\r
 //\r

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

 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r
 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r


@@ -13,8 +13,8 @@
 //\r
 // **/\r
 \r
 //\r
 // **/\r
 \r

-#string STR_PROPERTIES_MODULE_NAME \r
-#language en-US \r
+#string STR_PROPERTIES_MODULE_NAME\r
+#language en-US\r

 "DHCP v4 DXE Driver"\r
 \r
 \r
 "DHCP v4 DXE Driver"\r
 \r
 \r

diff --git a/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Impl.c b/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Impl.c
index 9e496ef02711de18e2761ca80b36798d778b5513..4cdebe68e7579db8bcf9a0383c4bf05040837859 100644 (file)
--- a/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Impl.c
+++ b/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Impl.c
@@ -1203,9 +1203,9 @@ Dhcp4InstanceConfigUdpIo (
   EFI_DHCP4_TRANSMIT_RECEIVE_TOKEN  *Token;\r
   EFI_UDP4_CONFIG_DATA              UdpConfigData;\r
   IP4_ADDR                          ClientAddr;\r
   EFI_DHCP4_TRANSMIT_RECEIVE_TOKEN  *Token;\r
   EFI_UDP4_CONFIG_DATA              UdpConfigData;\r
   IP4_ADDR                          ClientAddr;\r

-  IP4_ADDR                          Ip; \r
-  INTN                              Class; \r
-  IP4_ADDR                          SubnetMask;  \r
+  IP4_ADDR                          Ip;\r
+  INTN                              Class;\r
+  IP4_ADDR                          SubnetMask;\r

 \r
   Instance = (DHCP_PROTOCOL *) Context;\r
   DhcpSb   = Instance->Service;\r
 \r
   Instance = (DHCP_PROTOCOL *) Context;\r
   DhcpSb   = Instance->Service;\r


@@ -1238,7 +1238,7 @@ Dhcp4InstanceConfigUdpIo (
     if (Class >= IP4_ADDR_CLASSE) {\r
       return EFI_INVALID_PARAMETER;\r
     }\r
     if (Class >= IP4_ADDR_CLASSE) {\r
       return EFI_INVALID_PARAMETER;\r
     }\r

-    \r
+\r

     SubnetMask = gIp4AllMasks[Class << 3];\r
   } else {\r
     SubnetMask = DhcpSb->Netmask;\r
     SubnetMask = gIp4AllMasks[Class << 3];\r
   } else {\r
     SubnetMask = DhcpSb->Netmask;\r


@@ -1548,7 +1548,7 @@ EfiDhcp4TransmitReceive (
   }\r
 \r
   ClientAddr = EFI_NTOHL (Token->Packet->Dhcp4.Header.ClientAddr);\r
   }\r
 \r
   ClientAddr = EFI_NTOHL (Token->Packet->Dhcp4.Header.ClientAddr);\r

-  \r
+\r

   if (ClientAddr == 0) {\r
     return EFI_NO_MAPPING;\r
   }\r
   if (ClientAddr == 0) {\r
     return EFI_NO_MAPPING;\r
   }\r

diff --git a/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Impl.h b/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Impl.h
index ccca4a29af9e5738d091ffcaeea4e0bf65ec40de..0ae03ee489fc04ab44bd2e0dd3eb36fb51371fa3 100644 (file)
--- a/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Impl.h
+++ b/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Impl.h
@@ -5,7 +5,7 @@
   RFC 2132: DHCP Options and BOOTP Vendor Extensions\r
   RFC 1534: Interoperation Between DHCP and BOOTP\r
   RFC 3396: Encoding Long Options in DHCP.\r
   RFC 2132: DHCP Options and BOOTP Vendor Extensions\r
   RFC 1534: Interoperation Between DHCP and BOOTP\r
   RFC 3396: Encoding Long Options in DHCP.\r

-  \r
+\r

 Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r

diff --git a/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Io.c b/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Io.c
index 9532ca8f47efb260d32e3ec550b290aa07d87cb2..98a22a77b4473992c8993653a55c433c9a96727e 100644 (file)
--- a/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Io.c
+++ b/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Io.c
@@ -1,6 +1,6 @@
 /** @file\r
   EFI DHCP protocol implementation.\r
 /** @file\r
   EFI DHCP protocol implementation.\r

-  \r
+\r

 Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r


@@ -41,7 +41,7 @@ DhcpInitRequest (
   // Clear initial time to make sure that elapsed-time is set to 0 for first Discover or REQUEST message.\r
   //\r
   DhcpSb->ActiveChild->ElaspedTime= 0;\r
   // Clear initial time to make sure that elapsed-time is set to 0 for first Discover or REQUEST message.\r
   //\r
   DhcpSb->ActiveChild->ElaspedTime= 0;\r

-  \r
+\r

   if (DhcpSb->DhcpState == Dhcp4Init) {\r
     DhcpSetState (DhcpSb, Dhcp4Selecting, FALSE);\r
     Status = DhcpSendMessage (DhcpSb, NULL, NULL, DHCP_MSG_DISCOVER, NULL);\r
   if (DhcpSb->DhcpState == Dhcp4Init) {\r
     DhcpSetState (DhcpSb, Dhcp4Selecting, FALSE);\r
     Status = DhcpSendMessage (DhcpSb, NULL, NULL, DHCP_MSG_DISCOVER, NULL);\r


@@ -1381,13 +1381,13 @@ DhcpSendMessage (
   }\r
 \r
   ASSERT (UdpIo != NULL);\r
   }\r
 \r
   ASSERT (UdpIo != NULL);\r

-  \r
+\r

   Status = UdpIoSendDatagram (\r
   Status = UdpIoSendDatagram (\r

-             UdpIo, \r
-             Wrap, \r
-             &EndPoint, \r
-             NULL, \r
-             DhcpOnPacketSent, \r
+             UdpIo,\r
+             Wrap,\r
+             &EndPoint,\r
+             NULL,\r
+             DhcpOnPacketSent,\r

              DhcpSb\r
              );\r
 \r
              DhcpSb\r
              );\r
 \r


@@ -1509,7 +1509,7 @@ DhcpOnTimerTick (
   if (Instance != NULL && Instance->ElaspedTime < 0xffff) {\r
     Instance->ElaspedTime++;\r
   }\r
   if (Instance != NULL && Instance->ElaspedTime < 0xffff) {\r
     Instance->ElaspedTime++;\r
   }\r

-  \r
+\r

   //\r
   // Check the retransmit timer\r
   //\r
   //\r
   // Check the retransmit timer\r
   //\r


@@ -1531,7 +1531,7 @@ DhcpOnTimerTick (
         goto ON_EXIT;\r
       }\r
     }\r
         goto ON_EXIT;\r
       }\r
     }\r

-    \r
+\r

     if (++DhcpSb->CurRetry < DhcpSb->MaxRetries) {\r
       //\r
       // Still has another try\r
     if (++DhcpSb->CurRetry < DhcpSb->MaxRetries) {\r
       //\r
       // Still has another try\r


@@ -1570,7 +1570,7 @@ DhcpOnTimerTick (
       goto END_SESSION;\r
     }\r
   }\r
       goto END_SESSION;\r
     }\r
   }\r

-  \r
+\r

   //\r
   // If an address has been acquired, check whether need to\r
   // refresh or whether it has expired.\r
   //\r
   // If an address has been acquired, check whether need to\r
   // refresh or whether it has expired.\r


@@ -1602,8 +1602,8 @@ DhcpOnTimerTick (
 \r
       if (Instance != NULL) {\r
         Instance->ElaspedTime= 0;\r
 \r
       if (Instance != NULL) {\r
         Instance->ElaspedTime= 0;\r

-      }      \r
-      \r
+      }\r
+\r

       Status = DhcpSendMessage (\r
                  DhcpSb,\r
                  DhcpSb->Selected,\r
       Status = DhcpSendMessage (\r
                  DhcpSb,\r
                  DhcpSb->Selected,\r


@@ -1626,7 +1626,7 @@ DhcpOnTimerTick (
 \r
       if (Instance != NULL) {\r
         Instance->ElaspedTime= 0;\r
 \r
       if (Instance != NULL) {\r
         Instance->ElaspedTime= 0;\r

-      }    \r
+      }\r

 \r
       Status = DhcpSendMessage (\r
                  DhcpSb,\r
 \r
       Status = DhcpSendMessage (\r
                  DhcpSb,\r


@@ -1648,7 +1648,7 @@ ON_EXIT:
   //\r
   NET_LIST_FOR_EACH_SAFE (Entry, Next, &DhcpSb->Children) {\r
     Instance = NET_LIST_USER_STRUCT (Entry, DHCP_PROTOCOL, Link);\r
   //\r
   NET_LIST_FOR_EACH_SAFE (Entry, Next, &DhcpSb->Children) {\r
     Instance = NET_LIST_USER_STRUCT (Entry, DHCP_PROTOCOL, Link);\r

-    \r
+\r

     if ((Instance != NULL) && (Instance->Token != NULL)) {\r
       Instance->Timeout--;\r
       if (Instance->Timeout == 0) {\r
     if ((Instance != NULL) && (Instance->Token != NULL)) {\r
       Instance->Timeout--;\r
       if (Instance->Timeout == 0) {\r

diff --git a/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Io.h b/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Io.h
index 1e856515548d5179d0be49349d9b3978ff05b56b..f51575278138bd83f2f87124e132337895a9cede 100644 (file)
--- a/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Io.h
+++ b/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Io.h
@@ -1,7 +1,7 @@
 /** @file\r
   The DHCP4 protocol implementation.\r
 /** @file\r
   The DHCP4 protocol implementation.\r

-  \r
-Copyright (c) 2006 - 2009, Intel Corporation. All rights reserved.<BR>\r
+\r
+Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r

 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r

diff --git a/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Option.c b/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Option.c
index 485c9c98ed24f14625d43ae3b6a0fa1ad56ec20d..dd89beac522241b5e4654ed3153fd86227d761c8 100644 (file)
--- a/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Option.c
+++ b/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Option.c
@@ -1,7 +1,7 @@
 /** @file\r
   Function to validate, parse, process the DHCP options.\r
 /** @file\r
   Function to validate, parse, process the DHCP options.\r

-  \r
-Copyright (c) 2006 - 2016, Intel Corporation. All rights reserved.<BR>\r
+\r
+Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r

 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r

diff --git a/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Option.h b/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Option.h
index 02ffa25abac5fc2e6cb65a667fbb129a62db15b6..a22de6463cde4b871442473ead6ba151e9255149 100644 (file)
--- a/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Option.h
+++ b/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Option.h
@@ -1,7 +1,7 @@
 /** @file\r
   To validate, parse and process the DHCP options.\r
 /** @file\r
   To validate, parse and process the DHCP options.\r

-  \r
-Copyright (c) 2006 - 2016, Intel Corporation. All rights reserved.<BR>\r
+\r
+Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r

 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r


@@ -22,7 +22,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #define DHCP_OPTION_MAGIC         0x63538263 // Network byte order\r
 #define DHCP_MAX_OPTIONS          256\r
 \r
 #define DHCP_OPTION_MAGIC         0x63538263 // Network byte order\r
 #define DHCP_MAX_OPTIONS          256\r
 \r

- \r
+\r

 //\r
 // DHCP option types, this is used to validate the DHCP options.\r
 //\r
 //\r
 // DHCP option types, this is used to validate the DHCP options.\r
 //\r

diff --git a/MdeModulePkg/Universal/Network/DpcDxe/Dpc.c b/MdeModulePkg/Universal/Network/DpcDxe/Dpc.c
index c605f721ebab4971b9d648493ee93a7e94b57a97..dd88ab7a2fe67cd898614ffd5cd4c5926846a84c 100644 (file)
--- a/MdeModulePkg/Universal/Network/DpcDxe/Dpc.c
+++ b/MdeModulePkg/Universal/Network/DpcDxe/Dpc.c
@@ -1,6 +1,6 @@
 /** @file\r
 \r
 /** @file\r
 \r

-Copyright (c) 2007 - 2008, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2007 - 2018, Intel Corporation. All rights reserved.<BR>\r

 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r


@@ -337,7 +337,7 @@ DpcDriverEntryPoint (
   //\r
   Status = gBS->InstallMultipleProtocolInterfaces (\r
                   &mDpcHandle,\r
   //\r
   Status = gBS->InstallMultipleProtocolInterfaces (\r
                   &mDpcHandle,\r

-                  &gEfiDpcProtocolGuid, \r
+                  &gEfiDpcProtocolGuid,\r

                   &mDpc,\r
                   NULL\r
                   );\r
                   &mDpc,\r
                   NULL\r
                   );\r

diff --git a/MdeModulePkg/Universal/Network/DpcDxe/DpcDxe.uni b/MdeModulePkg/Universal/Network/DpcDxe/DpcDxe.uni
index db33b33b401d39c873bb218e191218ff185e1166..9c0c96bd82d04cafeab866ef79bcb2e427dc2dbc 100644 (file)
--- a/MdeModulePkg/Universal/Network/DpcDxe/DpcDxe.uni
+++ b/MdeModulePkg/Universal/Network/DpcDxe/DpcDxe.uni
@@ -3,13 +3,13 @@
 //\r
 // This module produces Deferred Procedure Call Protocol.\r
 //\r
 //\r
 // This module produces Deferred Procedure Call Protocol.\r
 //\r

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

 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r
 // which accompanies this distribution.  The full text of the license may be found at\r
 // http://opensource.org/licenses/bsd-license.php\r
 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r
 // which accompanies this distribution.  The full text of the license may be found at\r
 // http://opensource.org/licenses/bsd-license.php\r

-// \r
+//\r

 // THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 // WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 //\r
 // THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 // WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 //\r

diff --git a/MdeModulePkg/Universal/Network/DpcDxe/DpcDxeExtra.uni b/MdeModulePkg/Universal/Network/DpcDxe/DpcDxeExtra.uni
index 7c57022cb8990a0f36df07dfa96ebdc28dc9c152..0a5391765078c03c57ac4294d478908b58cef81e 100644 (file)
--- a/MdeModulePkg/Universal/Network/DpcDxe/DpcDxeExtra.uni
+++ b/MdeModulePkg/Universal/Network/DpcDxe/DpcDxeExtra.uni
@@ -1,7 +1,7 @@
 // /** @file\r
 // DpcDxe Localized Strings and Content\r
 //\r
 // /** @file\r
 // DpcDxe Localized Strings and Content\r
 //\r

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

 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r
 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r


@@ -13,8 +13,8 @@
 //\r
 // **/\r
 \r
 //\r
 // **/\r
 \r

-#string STR_PROPERTIES_MODULE_NAME \r
-#language en-US \r
+#string STR_PROPERTIES_MODULE_NAME\r
+#language en-US\r

 "Deferred Procedure Call DXE Driver"\r
 \r
 \r
 "Deferred Procedure Call DXE Driver"\r
 \r
 \r

diff --git a/MdeModulePkg/Universal/Network/IScsiDxe/ComponentName.c b/MdeModulePkg/Universal/Network/IScsiDxe/ComponentName.c
index 063b3722921ac9f630a706835fe573b43b343e70..3f561e93439dfd313d503c3cbf4f1f13e8843ef4 100644 (file)
--- a/MdeModulePkg/Universal/Network/IScsiDxe/ComponentName.c
+++ b/MdeModulePkg/Universal/Network/IScsiDxe/ComponentName.c
@@ -1,7 +1,7 @@
 /** @file\r
   UEFI Component Name(2) protocol implementation for iSCSI.\r
 \r
 /** @file\r
   UEFI Component Name(2) protocol implementation for iSCSI.\r
 \r

-Copyright (c) 2004 - 2015, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2004 - 2018, Intel Corporation. All rights reserved.<BR>\r

 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r


@@ -33,7 +33,7 @@ GLOBAL_REMOVE_IF_UNREFERENCED EFI_COMPONENT_NAME2_PROTOCOL    gIScsiComponentNam
 };\r
 \r
 GLOBAL_REMOVE_IF_UNREFERENCED EFI_UNICODE_STRING_TABLE mIScsiDriverNameTable[] = {\r
 };\r
 \r
 GLOBAL_REMOVE_IF_UNREFERENCED EFI_UNICODE_STRING_TABLE mIScsiDriverNameTable[] = {\r

-  {"eng;en", L"iSCSI Driver"}, \r
+  {"eng;en", L"iSCSI Driver"},\r

   {NULL, NULL}\r
 };\r
 \r
   {NULL, NULL}\r
 };\r
 \r


@@ -48,7 +48,7 @@ GLOBAL_REMOVE_IF_UNREFERENCED EFI_UNICODE_STRING_TABLE  *mIScsiControllerNameTab
   returned in DriverName, and EFI_SUCCESS is returned. If the driver specified\r
   by This does not support the language specified by Language,\r
   then EFI_UNSUPPORTED is returned.\r
   returned in DriverName, and EFI_SUCCESS is returned. If the driver specified\r
   by This does not support the language specified by Language,\r
   then EFI_UNSUPPORTED is returned.\r

-  \r
+\r

   @param[in]  This        A pointer to the EFI_COMPONENT_NAME_PROTOCOL instance.\r
   @param[in]  Language    A pointer to a three character ISO 639-2 language identifier.\r
                           This is the language of the driver name that that the caller\r
   @param[in]  This        A pointer to the EFI_COMPONENT_NAME_PROTOCOL instance.\r
   @param[in]  Language    A pointer to a three character ISO 639-2 language identifier.\r
                           This is the language of the driver name that that the caller\r


@@ -88,11 +88,11 @@ IScsiComponentNameGetDriverName (
   Update the component name for the iSCSI instance.\r
 \r
   @param[in]  IScsiExtScsiPassThru  A pointer to the EFI_EXT_SCSI_PASS_THRU_PROTOCOL instance.\r
   Update the component name for the iSCSI instance.\r
 \r
   @param[in]  IScsiExtScsiPassThru  A pointer to the EFI_EXT_SCSI_PASS_THRU_PROTOCOL instance.\r

-  \r
+\r

   @retval EFI_SUCCESS               Update the ControllerNameTable of this instance successfully.\r
   @retval EFI_INVALID_PARAMETER     The input parameter is invalid.\r
   @retval EFI_UNSUPPORTED           Can't get the corresponding NIC info from the Controller handle.\r
   @retval EFI_SUCCESS               Update the ControllerNameTable of this instance successfully.\r
   @retval EFI_INVALID_PARAMETER     The input parameter is invalid.\r
   @retval EFI_UNSUPPORTED           Can't get the corresponding NIC info from the Controller handle.\r

-  \r
+\r

 **/\r
 EFI_STATUS\r
 UpdateName (\r
 **/\r
 EFI_STATUS\r
 UpdateName (\r


@@ -110,7 +110,7 @@ UpdateName (
   if (IScsiExtScsiPassThru == NULL) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
   if (IScsiExtScsiPassThru == NULL) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r

-  \r
+\r

   Private  = ISCSI_DRIVER_DATA_FROM_EXT_SCSI_PASS_THRU (IScsiExtScsiPassThru);\r
 \r
   //\r
   Private  = ISCSI_DRIVER_DATA_FROM_EXT_SCSI_PASS_THRU (IScsiExtScsiPassThru);\r
 \r
   //\r


@@ -122,7 +122,7 @@ UpdateName (
   }\r
   VlanId = NetLibGetVlanId (Private->Controller);\r
   IScsiMacAddrToStr (&MacAddress, (UINT32) HwAddressSize, VlanId, MacString);\r
   }\r
   VlanId = NetLibGetVlanId (Private->Controller);\r
   IScsiMacAddrToStr (&MacAddress, (UINT32) HwAddressSize, VlanId, MacString);\r

-    \r
+\r

   UnicodeSPrint (\r
     HandleName,\r
     sizeof (HandleName),\r
   UnicodeSPrint (\r
     HandleName,\r
     sizeof (HandleName),\r


@@ -183,7 +183,7 @@ UpdateName (
 \r
   @retval EFI_SUCCESS           The Unicode string for the user readable name in the\r
                                 language specified by Language for the driver\r
 \r
   @retval EFI_SUCCESS           The Unicode string for the user readable name in the\r
                                 language specified by Language for the driver\r

-                                specified by This was returned in DriverName.                                \r
+                                specified by This was returned in DriverName.\r

   @retval EFI_INVALID_PARAMETER ControllerHandle is NULL.\r
   @retval EFI_INVALID_PARAMETER ChildHandle is not NULL and it is not a valid EFI_HANDLE.\r
   @retval EFI_INVALID_PARAMETER Language is NULL.\r
   @retval EFI_INVALID_PARAMETER ControllerHandle is NULL.\r
   @retval EFI_INVALID_PARAMETER ChildHandle is not NULL and it is not a valid EFI_HANDLE.\r
   @retval EFI_INVALID_PARAMETER Language is NULL.\r


@@ -271,7 +271,7 @@ IScsiComponentNameGetControllerName (
       return Status;\r
     }\r
   }\r
       return Status;\r
     }\r
   }\r

-  \r
+\r

   return LookupUnicodeString2 (\r
            Language,\r
            This->SupportedLanguages,\r
   return LookupUnicodeString2 (\r
            Language,\r
            This->SupportedLanguages,\r

diff --git a/MdeModulePkg/Universal/Network/IScsiDxe/ComponentName.h b/MdeModulePkg/Universal/Network/IScsiDxe/ComponentName.h
index b400abaa41a7c4758656160a6dd5aa06c4e19939..ee371d26744cbc268eb1b540ec4892d9a616408b 100644 (file)
--- a/MdeModulePkg/Universal/Network/IScsiDxe/ComponentName.h
+++ b/MdeModulePkg/Universal/Network/IScsiDxe/ComponentName.h
@@ -1,7 +1,7 @@
 /** @file\r
   The header file of UEFI Component Name(2) protocol.\r
 \r
 /** @file\r
   The header file of UEFI Component Name(2) protocol.\r
 \r

-Copyright (c) 2004 - 2011, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2004 - 2018, Intel Corporation. All rights reserved.<BR>\r

 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r


@@ -34,7 +34,7 @@ extern EFI_COMPONENT_NAME_PROTOCOL        gIScsiComponentName;
   returned in DriverName, and EFI_SUCCESS is returned. If the driver specified\r
   by This does not support the language specified by Language,\r
   then EFI_UNSUPPORTED is returned.\r
   returned in DriverName, and EFI_SUCCESS is returned. If the driver specified\r
   by This does not support the language specified by Language,\r
   then EFI_UNSUPPORTED is returned.\r

-  \r
+\r

   @param[in]  This        A pointer to the EFI_COMPONENT_NAME_PROTOCOL instance.\r
   @param[in]  Language    A pointer to a three characters ISO 639-2 language identifier.\r
                           This is the language of the driver name that that the caller\r
   @param[in]  This        A pointer to the EFI_COMPONENT_NAME_PROTOCOL instance.\r
   @param[in]  Language    A pointer to a three characters ISO 639-2 language identifier.\r
                           This is the language of the driver name that that the caller\r


@@ -89,7 +89,7 @@ IScsiComponentNameGetDriverName (
 \r
   @retval EFI_SUCCESS           The Unicode string for the user readable name in the\r
                                 language specified by Language for the driver\r
 \r
   @retval EFI_SUCCESS           The Unicode string for the user readable name in the\r
                                 language specified by Language for the driver\r

-                                specified by This was returned in DriverName.                                \r
+                                specified by This was returned in DriverName.\r

   @retval EFI_INVALID_PARAMETER ControllerHandle is NULL.\r
   @retval EFI_INVALID_PARAMETER ChildHandle is not NULL and it is not a valid EFI_HANDLE.\r
   @retval EFI_INVALID_PARAMETER Language is NULL.\r
   @retval EFI_INVALID_PARAMETER ControllerHandle is NULL.\r
   @retval EFI_INVALID_PARAMETER ChildHandle is not NULL and it is not a valid EFI_HANDLE.\r
   @retval EFI_INVALID_PARAMETER Language is NULL.\r


@@ -109,7 +109,7 @@ IScsiComponentNameGetControllerName (
   IN  CHAR8                         *Language,\r
   OUT CHAR16                        **ControllerName\r
   );\r
   IN  CHAR8                         *Language,\r
   OUT CHAR16                        **ControllerName\r
   );\r

-  \r
+\r

 //\r
 // EFI iSCSI Initiator Name Protocol for IScsi driver.\r
 //\r
 //\r
 // EFI iSCSI Initiator Name Protocol for IScsi driver.\r
 //\r

diff --git a/MdeModulePkg/Universal/Network/IScsiDxe/IScsi4Dxe.uni b/MdeModulePkg/Universal/Network/IScsiDxe/IScsi4Dxe.uni
index 80bdc2c7e2b75edf3d7e0035527e5105ab82b0ea..d3c020e45d3bde891358bbde0ee79a7bd091fb0c 100644 (file)
--- a/MdeModulePkg/Universal/Network/IScsiDxe/IScsi4Dxe.uni
+++ b/MdeModulePkg/Universal/Network/IScsiDxe/IScsi4Dxe.uni
@@ -6,13 +6,13 @@
 // data over TCP/IP. It installs EFI HII Configuration Access Protocol to provide\r
 // one way to configurate the iSCSI setting.\r
 //\r
 // data over TCP/IP. It installs EFI HII Configuration Access Protocol to provide\r
 // one way to configurate the iSCSI setting.\r
 //\r

-// Copyright (c) 2004 - 2014, Intel Corporation. All rights reserved.<BR>\r
+// Copyright (c) 2004 - 2018, Intel Corporation. All rights reserved.<BR>\r

 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r
 // which accompanies this distribution.  The full text of the license may be found at\r
 // http://opensource.org/licenses/bsd-license.php\r
 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r
 // which accompanies this distribution.  The full text of the license may be found at\r
 // http://opensource.org/licenses/bsd-license.php\r

-// \r
+//\r

 // THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 // WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 //\r
 // THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 // WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 //\r

diff --git a/MdeModulePkg/Universal/Network/IScsiDxe/IScsi4DxeExtra.uni b/MdeModulePkg/Universal/Network/IScsiDxe/IScsi4DxeExtra.uni
index 9b717d49d3e34f1cfd21c6d654a50fed3de7d90f..5ec75820a605aa25c0a1dac49dddcdedbef8aff3 100644 (file)
--- a/MdeModulePkg/Universal/Network/IScsiDxe/IScsi4DxeExtra.uni
+++ b/MdeModulePkg/Universal/Network/IScsiDxe/IScsi4DxeExtra.uni
@@ -1,7 +1,7 @@
 // /** @file\r
 // IScsi4Dxe Localized Strings and Content\r
 //\r
 // /** @file\r
 // IScsi4Dxe Localized Strings and Content\r
 //\r

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

 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r
 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r


@@ -13,8 +13,8 @@
 //\r
 // **/\r
 \r
 //\r
 // **/\r
 \r

-#string STR_PROPERTIES_MODULE_NAME \r
-#language en-US \r
+#string STR_PROPERTIES_MODULE_NAME\r
+#language en-US\r

 "iSCSI DXE Driver"\r
 \r
 \r
 "iSCSI DXE Driver"\r
 \r
 \r

diff --git a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiCHAP.h b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiCHAP.h
index f6a64e56dad97763773f253215085ca476cd7258..14a5658f754b04c0a9cbef04879794217d1109ca 100644 (file)
--- a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiCHAP.h
+++ b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiCHAP.h
@@ -1,7 +1,7 @@
 /** @file\r
   The header file of CHAP configuration.\r
 \r
 /** @file\r
   The header file of CHAP configuration.\r
 \r

-Copyright (c) 2004 - 2011, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2004 - 2018, Intel Corporation. All rights reserved.<BR>\r

 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r


@@ -29,9 +29,9 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 ///\r
 /// MD5_HASHSIZE\r
 ///\r
 ///\r
 /// MD5_HASHSIZE\r
 ///\r

-#define ISCSI_CHAP_RSP_LEN        16  \r
+#define ISCSI_CHAP_RSP_LEN        16\r

 \r
 \r

-#define ISCSI_CHAP_INITIAL        0 \r
+#define ISCSI_CHAP_INITIAL        0\r

 #define ISCSI_CHAP_STEP_ONE       1\r
 #define ISCSI_CHAP_STEP_TWO       2\r
 #define ISCSI_CHAP_STEP_THREE     3\r
 #define ISCSI_CHAP_STEP_ONE       1\r
 #define ISCSI_CHAP_STEP_TWO       2\r
 #define ISCSI_CHAP_STEP_THREE     3\r


@@ -73,7 +73,7 @@ typedef struct _ISCSI_CHAP_AUTH_DATA {
 /**\r
   This function checks the received iSCSI Login Response during the security\r
   negotiation stage.\r
 /**\r
   This function checks the received iSCSI Login Response during the security\r
   negotiation stage.\r

-  \r
+\r

   @param[in] Conn             The iSCSI connection.\r
 \r
   @retval EFI_SUCCESS          The Login Response passed the CHAP validation.\r
   @param[in] Conn             The iSCSI connection.\r
 \r
   @retval EFI_SUCCESS          The Login Response passed the CHAP validation.\r

diff --git a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiConfig.c b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiConfig.c
index ea727af1ffc3e2585845ae81b3d1a160d2d1b810..cb1eff1b690cc8494bc631e6f3e2c0497f64e992 100644 (file)
--- a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiConfig.c
+++ b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiConfig.c
@@ -1,7 +1,7 @@
 /** @file\r
   Helper functions for configuring or getting the parameters relating to iSCSI.\r
 \r
 /** @file\r
   Helper functions for configuring or getting the parameters relating to iSCSI.\r
 \r

-Copyright (c) 2004 - 2016, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2004 - 2018, Intel Corporation. All rights reserved.<BR>\r

 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r


@@ -39,7 +39,7 @@ HII_VENDOR_DEVICE_PATH  mIScsiHiiVendorDevicePath = {
   {\r
     END_DEVICE_PATH_TYPE,\r
     END_ENTIRE_DEVICE_PATH_SUBTYPE,\r
   {\r
     END_DEVICE_PATH_TYPE,\r
     END_ENTIRE_DEVICE_PATH_SUBTYPE,\r

-    { \r
+    {\r

       (UINT8) (END_DEVICE_PATH_LENGTH),\r
       (UINT8) ((END_DEVICE_PATH_LENGTH) >> 8)\r
     }\r
       (UINT8) (END_DEVICE_PATH_LENGTH),\r
       (UINT8) ((END_DEVICE_PATH_LENGTH) >> 8)\r
     }\r


@@ -180,7 +180,7 @@ IScsiConvertIsIdToString (
   Update the list of iSCSI devices the iSCSI driver is controlling.\r
 \r
   @retval EFI_SUCCESS            The callback successfully handled the action.\r
   Update the list of iSCSI devices the iSCSI driver is controlling.\r
 \r
   @retval EFI_SUCCESS            The callback successfully handled the action.\r

-  @retval Others                 Other errors as indicated.   \r
+  @retval Others                 Other errors as indicated.\r

 **/\r
 EFI_STATUS\r
 IScsiUpdateDeviceList (\r
 **/\r
 EFI_STATUS\r
 IScsiUpdateDeviceList (\r


@@ -445,7 +445,7 @@ IScsiConvertDeviceConfigDataToIfrNvData (
                                   would result in this type of\r
                                   error. In this case, the\r
                                   Progress parameter would be\r
                                   would result in this type of\r
                                   error. In this case, the\r
                                   Progress parameter would be\r

-                                  set to NULL. \r
+                                  set to NULL.\r

   @retval EFI_NOT_FOUND           Routing data doesn't match any\r
                                   known driver. Progress set to the\r
                                   first character in the routing header.\r
   @retval EFI_NOT_FOUND           Routing data doesn't match any\r
                                   known driver. Progress set to the\r
                                   first character in the routing header.\r


@@ -579,7 +579,7 @@ IScsiFormExtractConfig (
 \r
   @param[in]  This           Points to the EFI_HII_CONFIG_ACCESS_PROTOCOL.\r
   @param[in]  Configuration  A null-terminated Unicode string in\r
 \r
   @param[in]  This           Points to the EFI_HII_CONFIG_ACCESS_PROTOCOL.\r
   @param[in]  Configuration  A null-terminated Unicode string in\r

-                             <ConfigString> format.   \r
+                             <ConfigString> format.\r

   @param[out] Progress       A pointer to a string filled in with the\r
                              offset of the most recent '&' before the\r
                              first failing name / value pair (or the\r
   @param[out] Progress       A pointer to a string filled in with the\r
                              offset of the most recent '&' before the\r
                              first failing name / value pair (or the\r


@@ -589,7 +589,7 @@ IScsiFormExtractConfig (
                              successful.\r
 \r
   @retval EFI_SUCCESS             The results have been distributed or are\r
                              successful.\r
 \r
   @retval EFI_SUCCESS             The results have been distributed or are\r

-                                  awaiting distribution.  \r
+                                  awaiting distribution.\r

   @retval EFI_OUT_OF_RESOURCES    Not enough memory to store the\r
                                   parts of the results that must be\r
                                   stored awaiting possible future\r
   @retval EFI_OUT_OF_RESOURCES    Not enough memory to store the\r
                                   parts of the results that must be\r
                                   stored awaiting possible future\r


@@ -634,7 +634,7 @@ IScsiFormRouteConfig (
   @param[in]  Action             Specifies the type of action taken by the browser.\r
   @param[in]  QuestionId         A unique value which is sent to the original\r
                                  exporting driver so that it can identify the type\r
   @param[in]  Action             Specifies the type of action taken by the browser.\r
   @param[in]  QuestionId         A unique value which is sent to the original\r
                                  exporting driver so that it can identify the type\r

-                                 of data to expect. The format of the data tends to \r
+                                 of data to expect. The format of the data tends to\r

                                  vary based on the opcode that enerated the callback.\r
   @param[in]  Type               The type of value for the question.\r
   @param[in]  Value              A pointer to the data being sent to the original\r
                                  vary based on the opcode that enerated the callback.\r
   @param[in]  Type               The type of value for the question.\r
   @param[in]  Value              A pointer to the data being sent to the original\r


@@ -648,8 +648,8 @@ IScsiFormRouteConfig (
   @retval EFI_DEVICE_ERROR       The variable could not be saved.\r
   @retval EFI_UNSUPPORTED        The specified Action is not supported by the\r
                                  callback.Currently not implemented.\r
   @retval EFI_DEVICE_ERROR       The variable could not be saved.\r
   @retval EFI_UNSUPPORTED        The specified Action is not supported by the\r
                                  callback.Currently not implemented.\r

-  @retval EFI_INVALID_PARAMETERS Passing in wrong parameter. \r
-  @retval Others                 Other errors as indicated. \r
+  @retval EFI_INVALID_PARAMETERS Passing in wrong parameter.\r
+  @retval Others                 Other errors as indicated.\r

 **/\r
 EFI_STATUS\r
 EFIAPI\r
 **/\r
 EFI_STATUS\r
 EFIAPI\r


@@ -711,7 +711,7 @@ IScsiFormCallback (
       Private->Current = ConfigFormEntry;\r
     }\r
   } else if (Action == EFI_BROWSER_ACTION_CHANGED) {\r
       Private->Current = ConfigFormEntry;\r
     }\r
   } else if (Action == EFI_BROWSER_ACTION_CHANGED) {\r

-    switch (QuestionId) { \r
+    switch (QuestionId) {\r

     case KEY_INITIATOR_NAME:\r
       IScsiUnicodeStrToAsciiStr (IfrNvData->InitiatorName, IScsiName);\r
       BufferSize  = AsciiStrSize (IScsiName);\r
     case KEY_INITIATOR_NAME:\r
       IScsiUnicodeStrToAsciiStr (IfrNvData->InitiatorName, IScsiName);\r
       BufferSize  = AsciiStrSize (IScsiName);\r


@@ -727,8 +727,8 @@ IScsiFormCallback (
     case KEY_LOCAL_IP:\r
       IScsiUnicodeStrToAsciiStr (IfrNvData->LocalIp, Ip4String);\r
       Status = IScsiAsciiStrToIp (Ip4String, &HostIp.v4);\r
     case KEY_LOCAL_IP:\r
       IScsiUnicodeStrToAsciiStr (IfrNvData->LocalIp, Ip4String);\r
       Status = IScsiAsciiStrToIp (Ip4String, &HostIp.v4);\r

-      if (EFI_ERROR (Status) || \r
-          ((Private->Current->SessionConfigData.SubnetMask.Addr[0] != 0) && \r
+      if (EFI_ERROR (Status) ||\r
+          ((Private->Current->SessionConfigData.SubnetMask.Addr[0] != 0) &&\r

            !NetIp4IsUnicast (NTOHL (HostIp.Addr[0]), NTOHL(*(UINT32*)Private->Current->SessionConfigData.SubnetMask.Addr)))) {\r
         CreatePopUp (EFI_LIGHTGRAY | EFI_BACKGROUND_BLUE, &Key, L"Invalid IP address!", NULL);\r
         Status = EFI_INVALID_PARAMETER;\r
            !NetIp4IsUnicast (NTOHL (HostIp.Addr[0]), NTOHL(*(UINT32*)Private->Current->SessionConfigData.SubnetMask.Addr)))) {\r
         CreatePopUp (EFI_LIGHTGRAY | EFI_BACKGROUND_BLUE, &Key, L"Invalid IP address!", NULL);\r
         Status = EFI_INVALID_PARAMETER;\r


@@ -753,9 +753,9 @@ IScsiFormCallback (
     case KEY_GATE_WAY:\r
       IScsiUnicodeStrToAsciiStr (IfrNvData->Gateway, Ip4String);\r
       Status = IScsiAsciiStrToIp (Ip4String, &Gateway.v4);\r
     case KEY_GATE_WAY:\r
       IScsiUnicodeStrToAsciiStr (IfrNvData->Gateway, Ip4String);\r
       Status = IScsiAsciiStrToIp (Ip4String, &Gateway.v4);\r

-      if (EFI_ERROR (Status) || \r
-          ((Gateway.Addr[0] != 0) && \r
-           (Private->Current->SessionConfigData.SubnetMask.Addr[0] != 0) && \r
+      if (EFI_ERROR (Status) ||\r
+          ((Gateway.Addr[0] != 0) &&\r
+           (Private->Current->SessionConfigData.SubnetMask.Addr[0] != 0) &&\r

            !NetIp4IsUnicast (NTOHL (Gateway.Addr[0]), NTOHL(*(UINT32*)Private->Current->SessionConfigData.SubnetMask.Addr)))) {\r
         CreatePopUp (EFI_LIGHTGRAY | EFI_BACKGROUND_BLUE, &Key, L"Invalid Gateway!", NULL);\r
         Status = EFI_INVALID_PARAMETER;\r
            !NetIp4IsUnicast (NTOHL (Gateway.Addr[0]), NTOHL(*(UINT32*)Private->Current->SessionConfigData.SubnetMask.Addr)))) {\r
         CreatePopUp (EFI_LIGHTGRAY | EFI_BACKGROUND_BLUE, &Key, L"Invalid Gateway!", NULL);\r
         Status = EFI_INVALID_PARAMETER;\r


@@ -944,9 +944,9 @@ IScsiFormCallback (
     //\r
     HiiSetBrowserData (&gIp4IScsiConfigGuid, mVendorStorageName, sizeof (ISCSI_CONFIG_IFR_NVDATA), (UINT8 *) IfrNvData, NULL);\r
   }\r
     //\r
     HiiSetBrowserData (&gIp4IScsiConfigGuid, mVendorStorageName, sizeof (ISCSI_CONFIG_IFR_NVDATA), (UINT8 *) IfrNvData, NULL);\r
   }\r

-  \r
+\r

   FreePool (IfrNvData);\r
   FreePool (IfrNvData);\r

-  \r
+\r

   return Status;\r
 }\r
 \r
   return Status;\r
 }\r
 \r


@@ -1033,12 +1033,12 @@ IScsiConfigUpdateForm (
                       );\r
       if (EFI_ERROR (Status)) {\r
         ZeroMem (&ConfigFormEntry->SessionConfigData, sizeof (ConfigFormEntry->SessionConfigData));\r
                       );\r
       if (EFI_ERROR (Status)) {\r
         ZeroMem (&ConfigFormEntry->SessionConfigData, sizeof (ConfigFormEntry->SessionConfigData));\r

-        \r
+\r

         //\r
         // Generate OUI-format ISID based on MAC address.\r
         //\r
         CopyMem (ConfigFormEntry->SessionConfigData.IsId, &MacAddress, 6);\r
         //\r
         // Generate OUI-format ISID based on MAC address.\r
         //\r
         CopyMem (ConfigFormEntry->SessionConfigData.IsId, &MacAddress, 6);\r

-        ConfigFormEntry->SessionConfigData.IsId[0] = \r
+        ConfigFormEntry->SessionConfigData.IsId[0] =\r

           (UINT8) (ConfigFormEntry->SessionConfigData.IsId[0] & 0x3F);\r
       }\r
       //\r
           (UINT8) (ConfigFormEntry->SessionConfigData.IsId[0] & 0x3F);\r
       }\r
       //\r


@@ -1189,7 +1189,7 @@ IScsiConfigFormInit (
                   NULL\r
                   );\r
   ASSERT_EFI_ERROR (Status);\r
                   NULL\r
                   );\r
   ASSERT_EFI_ERROR (Status);\r

-  \r
+\r

   //\r
   // Publish our HII data\r
   //\r
   //\r
   // Publish our HII data\r
   //\r


@@ -1216,7 +1216,7 @@ IScsiConfigFormInit (
   free the resources used.\r
 \r
   @param[in]  DriverBindingHandle The iSCSI driverbinding handle.\r
   free the resources used.\r
 \r
   @param[in]  DriverBindingHandle The iSCSI driverbinding handle.\r

-  \r
+\r

   @retval EFI_SUCCESS             The iSCSI configuration form is unloaded.\r
   @retval EFI_OUT_OF_RESOURCES    Failed to allocate memory.\r
 **/\r
   @retval EFI_SUCCESS             The iSCSI configuration form is unloaded.\r
   @retval EFI_OUT_OF_RESOURCES    Failed to allocate memory.\r
 **/\r

diff --git a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiConfig.h b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiConfig.h
index ef881d88275bbdfaebca5ce5aa15dff6611d208a..c3d07f6f485918c843157bbfe400cc7a3de3a04b 100644 (file)
--- a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiConfig.h
+++ b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiConfig.h
@@ -1,7 +1,7 @@
 /** @file\r
   The header file of IScsiConfig.c.\r
 \r
 /** @file\r
   The header file of IScsiConfig.c.\r
 \r

-Copyright (c) 2004 - 2014, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2004 - 2018, Intel Corporation. All rights reserved.<BR>\r

 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r


@@ -35,23 +35,23 @@ extern UINT8  IScsi4DxeStrings[];
 \r
 \r
 /**\r
 \r
 \r
 /**\r

-  If the DEBUG_PROPERTY_DEBUG_ASSERT_ENABLED bit of PcdDebugProperyMask is clear, \r
+  If the DEBUG_PROPERTY_DEBUG_ASSERT_ENABLED bit of PcdDebugProperyMask is clear,\r

   then this macro return a pointer to a data structure ISCSI_FORM_CALLBACK_INFO.\r
 \r
   then this macro return a pointer to a data structure ISCSI_FORM_CALLBACK_INFO.\r
 \r

-  If the DEBUG_PROPERTY_DEBUG_ASSERT_ENABLED bit of PcdDebugProperyMask is set,  \r
-  The Signature field of the data structure ISCSI_FORM_CALLBACK_INFO \r
-  is compared to TestSignature.  If the signatures match, then a pointer \r
-  to the pointer to a data structure ISCSI_FORM_CALLBACK_INFO is returned.  \r
-  If the signatures do not match, then DebugAssert() is called with a description \r
-  of "CR has a bad signature" and Callback is returned.  \r
+  If the DEBUG_PROPERTY_DEBUG_ASSERT_ENABLED bit of PcdDebugProperyMask is set,\r
+  The Signature field of the data structure ISCSI_FORM_CALLBACK_INFO\r
+  is compared to TestSignature.  If the signatures match, then a pointer\r
+  to the pointer to a data structure ISCSI_FORM_CALLBACK_INFO is returned.\r
+  If the signatures do not match, then DebugAssert() is called with a description\r
+  of "CR has a bad signature" and Callback is returned.\r

 \r
   If the data type ISCSI_FORM_CALLBACK_INFO_SIGNATURE does not contain the field\r
   specified by Callback, then the module will not compile.\r
 \r
 \r
   If the data type ISCSI_FORM_CALLBACK_INFO_SIGNATURE does not contain the field\r
   specified by Callback, then the module will not compile.\r
 \r

-  If ISCSI_FORM_CALLBACK_INFO_SIGNATURE does not contain a field called Signature, \r
+  If ISCSI_FORM_CALLBACK_INFO_SIGNATURE does not contain a field called Signature,\r

   then the module will not compile.\r
 \r
   then the module will not compile.\r
 \r

-  @param   Callback      Pointer to the specified field within the data \r
+  @param   Callback      Pointer to the specified field within the data\r

                          structure ISCSI_FORM_CALLBACK_INFO.\r
   @return  A pointer to the pointer to a data structure ISCSI_FORM_CALLBACK_INFO.\r
   @retval  Others        Some unexpected error happened.\r
                          structure ISCSI_FORM_CALLBACK_INFO.\r
   @return  A pointer to the pointer to a data structure ISCSI_FORM_CALLBACK_INFO.\r
   @retval  Others        Some unexpected error happened.\r


@@ -154,7 +154,7 @@ IScsiConfigFormInit (
   free the resources used.\r
 \r
   @param[in]  DriverBindingHandle The iSCSI driverbinding handle.\r
   free the resources used.\r
 \r
   @param[in]  DriverBindingHandle The iSCSI driverbinding handle.\r

-  \r
+\r

   @retval EFI_SUCCESS             The iSCSI configuration form is unloaded.\r
   @retval EFI_OUT_OF_RESOURCES    Failed to allocate memory.\r
 **/\r
   @retval EFI_SUCCESS             The iSCSI configuration form is unloaded.\r
   @retval EFI_OUT_OF_RESOURCES    Failed to allocate memory.\r
 **/\r

diff --git a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiConfigDxe.vfr b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiConfigDxe.vfr
index 2456c51c8c33a05ad9dd9286883290a858499779..9e28d81fb40d2407513645c9c6133867934ad077 100644 (file)
--- a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiConfigDxe.vfr
+++ b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiConfigDxe.vfr
@@ -1,7 +1,7 @@
 /** @file\r
   Vfr file for iSCSI config.\r
 /** @file\r
   Vfr file for iSCSI config.\r

-  \r
-Copyright (c) 2004 - 2011, Intel Corporation. All rights reserved.<BR>\r
+\r
+Copyright (c) 2004 - 2018, Intel Corporation. All rights reserved.<BR>\r

 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r


@@ -16,7 +16,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #include "IScsiConfigNVDataStruc.h"\r
 #define EFI_NETWORK_DEVICE_CLASS  0x04\r
 \r
 #include "IScsiConfigNVDataStruc.h"\r
 #define EFI_NETWORK_DEVICE_CLASS  0x04\r
 \r

-formset \r
+formset\r

   guid     = IP4_ISCSI_CONFIG_GUID,\r
   title    = STRING_TOKEN(STR_ISCSI_CONFIG_FORM_TITLE),\r
   help     = STRING_TOKEN(STR_ISCSI_CONFIG_FORM_HELP),\r
   guid     = IP4_ISCSI_CONFIG_GUID,\r
   title    = STRING_TOKEN(STR_ISCSI_CONFIG_FORM_TITLE),\r
   help     = STRING_TOKEN(STR_ISCSI_CONFIG_FORM_HELP),\r


@@ -27,7 +27,7 @@ formset
   form formid = FORMID_MAIN_FORM,\r
     title  = STRING_TOKEN(STR_ISCSI_MAIN_FORM_TITLE);\r
 \r
   form formid = FORMID_MAIN_FORM,\r
     title  = STRING_TOKEN(STR_ISCSI_MAIN_FORM_TITLE);\r
 \r

-    string  varid   = ISCSI_CONFIG_IFR_NVDATA.InitiatorName, \r
+    string  varid   = ISCSI_CONFIG_IFR_NVDATA.InitiatorName,\r

             prompt  = STRING_TOKEN(STR_ISCSI_CONFIG_INIT_NAME),\r
             help    = STRING_TOKEN(STR_ISCSI_CONFIG_INIT_NAME_HELP),\r
             flags   = INTERACTIVE,\r
             prompt  = STRING_TOKEN(STR_ISCSI_CONFIG_INIT_NAME),\r
             help    = STRING_TOKEN(STR_ISCSI_CONFIG_INIT_NAME_HELP),\r
             flags   = INTERACTIVE,\r


@@ -57,8 +57,8 @@ formset
             key    = KEY_DHCP_ENABLE,\r
     endcheckbox;\r
 \r
             key    = KEY_DHCP_ENABLE,\r
     endcheckbox;\r
 \r

-    suppressif ideqval ISCSI_CONFIG_IFR_NVDATA.InitiatorInfoFromDhcp == 0x01; \r
-    string  varid   = ISCSI_CONFIG_IFR_NVDATA.LocalIp, \r
+    suppressif ideqval ISCSI_CONFIG_IFR_NVDATA.InitiatorInfoFromDhcp == 0x01;\r
+    string  varid   = ISCSI_CONFIG_IFR_NVDATA.LocalIp,\r

             prompt  = STRING_TOKEN(STR_ISCSI_LOCAL_IP_ADDRESS),\r
             help    = STRING_TOKEN(STR_ISCSI_IP_ADDRESS_HELP),\r
             flags   = INTERACTIVE,\r
             prompt  = STRING_TOKEN(STR_ISCSI_LOCAL_IP_ADDRESS),\r
             help    = STRING_TOKEN(STR_ISCSI_IP_ADDRESS_HELP),\r
             flags   = INTERACTIVE,\r


@@ -67,7 +67,7 @@ formset
             maxsize = IP_MAX_SIZE,\r
     endstring;\r
 \r
             maxsize = IP_MAX_SIZE,\r
     endstring;\r
 \r

-    string  varid   = ISCSI_CONFIG_IFR_NVDATA.SubnetMask, \r
+    string  varid   = ISCSI_CONFIG_IFR_NVDATA.SubnetMask,\r

             prompt  = STRING_TOKEN(STR_ISCSI_LOCAL_MASK),\r
             help    = STRING_TOKEN(STR_ISCSI_IP_ADDRESS_HELP),\r
             flags   = INTERACTIVE,\r
             prompt  = STRING_TOKEN(STR_ISCSI_LOCAL_MASK),\r
             help    = STRING_TOKEN(STR_ISCSI_IP_ADDRESS_HELP),\r
             flags   = INTERACTIVE,\r


@@ -76,7 +76,7 @@ formset
             maxsize = IP_MAX_SIZE,\r
     endstring;\r
 \r
             maxsize = IP_MAX_SIZE,\r
     endstring;\r
 \r

-    string  varid   = ISCSI_CONFIG_IFR_NVDATA.Gateway, \r
+    string  varid   = ISCSI_CONFIG_IFR_NVDATA.Gateway,\r

             prompt  = STRING_TOKEN(STR_ISCSI_LOCAL_GATEWAY),\r
             help    = STRING_TOKEN(STR_ISCSI_IP_ADDRESS_HELP),\r
             flags   = INTERACTIVE,\r
             prompt  = STRING_TOKEN(STR_ISCSI_LOCAL_GATEWAY),\r
             help    = STRING_TOKEN(STR_ISCSI_IP_ADDRESS_HELP),\r
             flags   = INTERACTIVE,\r


@@ -86,19 +86,19 @@ formset
     endstring;\r
     endif;\r
 \r
     endstring;\r
     endif;\r
 \r

-    subtitle text = STRING_TOKEN(STR_NULL); \r
+    subtitle text = STRING_TOKEN(STR_NULL);\r

 \r
 \r

-    suppressif ideqval ISCSI_CONFIG_IFR_NVDATA.InitiatorInfoFromDhcp == 0x00; \r
+    suppressif ideqval ISCSI_CONFIG_IFR_NVDATA.InitiatorInfoFromDhcp == 0x00;\r

     checkbox varid  = ISCSI_CONFIG_IFR_NVDATA.TargetInfoFromDhcp,\r
              prompt = STRING_TOKEN(STR_ISCSI_ENABLE_DHCP_ON_TARGET),\r
              help   = STRING_TOKEN(STR_ISCSI_ENABLE_DHCP_ON_TARGET),\r
              flags  = 0,\r
     endcheckbox;\r
     endif;\r
     checkbox varid  = ISCSI_CONFIG_IFR_NVDATA.TargetInfoFromDhcp,\r
              prompt = STRING_TOKEN(STR_ISCSI_ENABLE_DHCP_ON_TARGET),\r
              help   = STRING_TOKEN(STR_ISCSI_ENABLE_DHCP_ON_TARGET),\r
              flags  = 0,\r
     endcheckbox;\r
     endif;\r

-      \r
-    suppressif ideqval ISCSI_CONFIG_IFR_NVDATA.TargetInfoFromDhcp == 0x01; \r

 \r
 \r

-    string  varid   = ISCSI_CONFIG_IFR_NVDATA.TargetName, \r
+    suppressif ideqval ISCSI_CONFIG_IFR_NVDATA.TargetInfoFromDhcp == 0x01;\r
+\r
+    string  varid   = ISCSI_CONFIG_IFR_NVDATA.TargetName,\r

             prompt  = STRING_TOKEN(STR_ISCSI_TARGET_NAME),\r
             help    = STRING_TOKEN(STR_ISCSI_TARGET_NAME),\r
             flags   = INTERACTIVE,\r
             prompt  = STRING_TOKEN(STR_ISCSI_TARGET_NAME),\r
             help    = STRING_TOKEN(STR_ISCSI_TARGET_NAME),\r
             flags   = INTERACTIVE,\r


@@ -107,7 +107,7 @@ formset
             maxsize = ISCSI_NAME_IFR_MAX_SIZE,\r
     endstring;\r
 \r
             maxsize = ISCSI_NAME_IFR_MAX_SIZE,\r
     endstring;\r
 \r

-    string  varid   = ISCSI_CONFIG_IFR_NVDATA.TargetIp, \r
+    string  varid   = ISCSI_CONFIG_IFR_NVDATA.TargetIp,\r

             prompt  = STRING_TOKEN(STR_ISCSI_TARGET_IP_ADDRESS),\r
             help    = STRING_TOKEN(STR_ISCSI_IP_ADDRESS_HELP),\r
             flags   = INTERACTIVE,\r
             prompt  = STRING_TOKEN(STR_ISCSI_TARGET_IP_ADDRESS),\r
             help    = STRING_TOKEN(STR_ISCSI_IP_ADDRESS_HELP),\r
             flags   = INTERACTIVE,\r


@@ -115,17 +115,17 @@ formset
             minsize = IP_MIN_SIZE,\r
             maxsize = IP_MAX_SIZE,\r
     endstring;\r
             minsize = IP_MIN_SIZE,\r
             maxsize = IP_MAX_SIZE,\r
     endstring;\r

-    \r
-    numeric varid   = ISCSI_CONFIG_IFR_NVDATA.TargetPort, \r
+\r
+    numeric varid   = ISCSI_CONFIG_IFR_NVDATA.TargetPort,\r

             prompt  = STRING_TOKEN(STR_ISCSI_TARGET_PORT),\r
             help    = STRING_TOKEN(STR_ISCSI_TARGET_PORT),\r
             flags   = 0,\r
             minimum = TARGET_PORT_MIN_NUM,\r
             prompt  = STRING_TOKEN(STR_ISCSI_TARGET_PORT),\r
             help    = STRING_TOKEN(STR_ISCSI_TARGET_PORT),\r
             flags   = 0,\r
             minimum = TARGET_PORT_MIN_NUM,\r

-            maximum = TARGET_PORT_MAX_NUM,     \r
+            maximum = TARGET_PORT_MAX_NUM,\r

             step    = 0,\r
     endnumeric;\r
             step    = 0,\r
     endnumeric;\r

-    \r
-    string varid    = ISCSI_CONFIG_IFR_NVDATA.BootLun, \r
+\r
+    string varid    = ISCSI_CONFIG_IFR_NVDATA.BootLun,\r

             prompt  = STRING_TOKEN(STR_ISCSI_BOOT_LUN),\r
             help    = STRING_TOKEN(STR_ISCSI_BOOT_LUN_HELP),\r
             flags   = INTERACTIVE,\r
             prompt  = STRING_TOKEN(STR_ISCSI_BOOT_LUN),\r
             help    = STRING_TOKEN(STR_ISCSI_BOOT_LUN_HELP),\r
             flags   = INTERACTIVE,\r


@@ -135,19 +135,19 @@ formset
     endstring;\r
     endif;\r
 \r
     endstring;\r
     endif;\r
 \r

-    subtitle text = STRING_TOKEN(STR_NULL); \r
+    subtitle text = STRING_TOKEN(STR_NULL);\r

 \r
     oneof varid  = ISCSI_CONFIG_IFR_NVDATA.CHAPType,\r
           prompt = STRING_TOKEN(STR_CHAP_TYPE_PROMPT),\r
 \r
     oneof varid  = ISCSI_CONFIG_IFR_NVDATA.CHAPType,\r
           prompt = STRING_TOKEN(STR_CHAP_TYPE_PROMPT),\r

-          help   = STRING_TOKEN(STR_CHAP_TYPE_HELP),  \r
+          help   = STRING_TOKEN(STR_CHAP_TYPE_HELP),\r

           option text = STRING_TOKEN(STR_CHAP_TYPE_NONE),   value = ISCSI_CHAP_NONE,   flags = DEFAULT;\r
           option text = STRING_TOKEN(STR_CHAP_TYPE_UNI),    value = ISCSI_CHAP_UNI,    flags = 0;\r
           option text = STRING_TOKEN(STR_CHAP_TYPE_MUTUAL), value = ISCSI_CHAP_MUTUAL, flags = 0;\r
     endoneof;\r
 \r
           option text = STRING_TOKEN(STR_CHAP_TYPE_NONE),   value = ISCSI_CHAP_NONE,   flags = DEFAULT;\r
           option text = STRING_TOKEN(STR_CHAP_TYPE_UNI),    value = ISCSI_CHAP_UNI,    flags = 0;\r
           option text = STRING_TOKEN(STR_CHAP_TYPE_MUTUAL), value = ISCSI_CHAP_MUTUAL, flags = 0;\r
     endoneof;\r
 \r

-    suppressif ideqval ISCSI_CONFIG_IFR_NVDATA.CHAPType == ISCSI_CHAP_NONE; \r
+    suppressif ideqval ISCSI_CONFIG_IFR_NVDATA.CHAPType == ISCSI_CHAP_NONE;\r

 \r
 \r

-    string  varid   = ISCSI_CONFIG_IFR_NVDATA.CHAPName, \r
+    string  varid   = ISCSI_CONFIG_IFR_NVDATA.CHAPName,\r

             prompt  = STRING_TOKEN(STR_ISCSI_CHAP_NAME),\r
             help    = STRING_TOKEN(STR_ISCSI_CHAP_NAME),\r
             flags   = INTERACTIVE,\r
             prompt  = STRING_TOKEN(STR_ISCSI_CHAP_NAME),\r
             help    = STRING_TOKEN(STR_ISCSI_CHAP_NAME),\r
             flags   = INTERACTIVE,\r


@@ -156,7 +156,7 @@ formset
             maxsize = ISCSI_CHAP_NAME_MAX_LEN,\r
     endstring;\r
 \r
             maxsize = ISCSI_CHAP_NAME_MAX_LEN,\r
     endstring;\r
 \r

-    string  varid    = ISCSI_CONFIG_IFR_NVDATA.CHAPSecret, \r
+    string  varid    = ISCSI_CONFIG_IFR_NVDATA.CHAPSecret,\r

             prompt   = STRING_TOKEN(STR_ISCSI_CHAP_SECRET),\r
             help     = STRING_TOKEN(STR_ISCSI_CHAP_SECRET_HELP),\r
             flags    = INTERACTIVE,\r
             prompt   = STRING_TOKEN(STR_ISCSI_CHAP_SECRET),\r
             help     = STRING_TOKEN(STR_ISCSI_CHAP_SECRET_HELP),\r
             flags    = INTERACTIVE,\r


@@ -169,7 +169,7 @@ formset
 \r
     suppressif NOT ideqval ISCSI_CONFIG_IFR_NVDATA.CHAPType == ISCSI_CHAP_MUTUAL;\r
 \r
 \r
     suppressif NOT ideqval ISCSI_CONFIG_IFR_NVDATA.CHAPType == ISCSI_CHAP_MUTUAL;\r
 \r

-    string  varid   = ISCSI_CONFIG_IFR_NVDATA.ReverseCHAPName, \r
+    string  varid   = ISCSI_CONFIG_IFR_NVDATA.ReverseCHAPName,\r

             prompt  = STRING_TOKEN(STR_ISCSI_REVERSE_CHAP_NAME),\r
             help    = STRING_TOKEN(STR_ISCSI_REVERSE_CHAP_NAME),\r
             flags   = INTERACTIVE,\r
             prompt  = STRING_TOKEN(STR_ISCSI_REVERSE_CHAP_NAME),\r
             help    = STRING_TOKEN(STR_ISCSI_REVERSE_CHAP_NAME),\r
             flags   = INTERACTIVE,\r


@@ -178,7 +178,7 @@ formset
             maxsize = ISCSI_CHAP_NAME_MAX_LEN,\r
     endstring;\r
 \r
             maxsize = ISCSI_CHAP_NAME_MAX_LEN,\r
     endstring;\r
 \r

-    string  varid    = ISCSI_CONFIG_IFR_NVDATA.ReverseCHAPSecret, \r
+    string  varid    = ISCSI_CONFIG_IFR_NVDATA.ReverseCHAPSecret,\r

             prompt   = STRING_TOKEN(STR_ISCSI_REVERSE_CHAP_SECRET),\r
             help     = STRING_TOKEN(STR_ISCSI_CHAP_SECRET_HELP),\r
             flags    = INTERACTIVE,\r
             prompt   = STRING_TOKEN(STR_ISCSI_REVERSE_CHAP_SECRET),\r
             help     = STRING_TOKEN(STR_ISCSI_CHAP_SECRET_HELP),\r
             flags    = INTERACTIVE,\r


@@ -189,9 +189,9 @@ formset
 \r
     endif;\r
 \r
 \r
     endif;\r
 \r

-    subtitle text = STRING_TOKEN(STR_NULL); \r
+    subtitle text = STRING_TOKEN(STR_NULL);\r

 \r
 \r

-    string  varid   = ISCSI_CONFIG_IFR_NVDATA.IsId, \r
+    string  varid   = ISCSI_CONFIG_IFR_NVDATA.IsId,\r

             prompt  = STRING_TOKEN(STR_ISCSI_CONFIG_ISID),\r
             help    = STRING_TOKEN(STR_ISCSI_CONFIG_ISID_HELP),\r
             flags   = INTERACTIVE,\r
             prompt  = STRING_TOKEN(STR_ISCSI_CONFIG_ISID),\r
             help    = STRING_TOKEN(STR_ISCSI_CONFIG_ISID_HELP),\r
             flags   = INTERACTIVE,\r


@@ -200,16 +200,16 @@ formset
             maxsize = ISID_CONFIGURABLE_MAX_LEN,\r
     endstring;\r
 \r
             maxsize = ISID_CONFIGURABLE_MAX_LEN,\r
     endstring;\r
 \r

-    subtitle text = STRING_TOKEN(STR_NULL); \r
+    subtitle text = STRING_TOKEN(STR_NULL);\r

 \r
     text\r
       help   = STRING_TOKEN (STR_SAVE_CHANGES),\r
       text   = STRING_TOKEN (STR_SAVE_CHANGES),\r
       flags  = INTERACTIVE,\r
       key    = KEY_SAVE_CHANGES;\r
 \r
     text\r
       help   = STRING_TOKEN (STR_SAVE_CHANGES),\r
       text   = STRING_TOKEN (STR_SAVE_CHANGES),\r
       flags  = INTERACTIVE,\r
       key    = KEY_SAVE_CHANGES;\r

-      \r
-    goto FORMID_MAIN_FORM, \r
-    prompt = STRING_TOKEN (STR_RETURN_MAIN_FORM), \r
+\r
+    goto FORMID_MAIN_FORM,\r
+    prompt = STRING_TOKEN (STR_RETURN_MAIN_FORM),\r

     help   = STRING_TOKEN (STR_RETURN_MAIN_FORM),\r
     flags  = 0;\r
 \r
     help   = STRING_TOKEN (STR_RETURN_MAIN_FORM),\r
     flags  = 0;\r
 \r

diff --git a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiConfigDxeStrings.uni b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiConfigDxeStrings.uni
index 6acf139cd0cecda39dd7d93df0efdcc7430bc197..729c74ebfc1b917da0ff00d5f00ded4079351905 100644 (file)
--- a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiConfigDxeStrings.uni
+++ b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiConfigDxeStrings.uni
@@ -1,6 +1,6 @@
 // *++\r
 //\r
 // *++\r
 //\r

-// Copyright (c) 2004 - 2011, Intel Corporation. All rights reserved.<BR>\r
+// Copyright (c) 2004 - 2018, Intel Corporation. All rights reserved.<BR>\r

 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r
 // which accompanies this distribution.  The full text of the license may be found at\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r
 // which accompanies this distribution.  The full text of the license may be found at\r


@@ -12,13 +12,13 @@
 // Module Name:\r
 //\r
 //   IScsiConfigStrings.uni\r
 // Module Name:\r
 //\r
 //   IScsiConfigStrings.uni\r

-// \r
+//\r

 // Abstract:\r
 // Abstract:\r

-// \r
+//\r

 //   String definitions for iSCSI configuration.\r
 //   String definitions for iSCSI configuration.\r

-// \r
+//\r

 // Revision History:\r
 // Revision History:\r

-// \r
+//\r

 // --*/\r
 \r
 \r
 // --*/\r
 \r
 \r


@@ -26,23 +26,23 @@
 \r
 #langdef en-US "English"\r
 \r
 \r
 #langdef en-US "English"\r
 \r

-#string STR_ISCSI_CONFIG_FORM_TITLE     #language en-US "iSCSI Configuration"  \r
-#string STR_ISCSI_CONFIG_FORM_HELP      #language en-US "Configure the iSCSI parameters."   \r
+#string STR_ISCSI_CONFIG_FORM_TITLE     #language en-US "iSCSI Configuration"\r
+#string STR_ISCSI_CONFIG_FORM_HELP      #language en-US "Configure the iSCSI parameters."\r

 #string STR_ISCSI_MAIN_FORM_TITLE       #language en-US "iSCSI Configuration"\r
 #string STR_ISCSI_CONFIG_INIT_NAME      #language en-US "iSCSI Initiator Name"\r
 #string STR_ISCSI_CONFIG_INIT_NAME_HELP #language en-US "The worldwide unique name of the initiator. Only iqn. format is accepted."\r
 #string STR_ISCSI_DEVICE_FORM_TITLE     #language en-US ""\r
 #string STR_ISCSI_DEVICE_ENABLE         #language en-US "Enable iSCSI"\r
 #string STR_ISCSI_LOCAL_IP_ADDRESS      #language en-US "  Initiator IP Address"\r
 #string STR_ISCSI_MAIN_FORM_TITLE       #language en-US "iSCSI Configuration"\r
 #string STR_ISCSI_CONFIG_INIT_NAME      #language en-US "iSCSI Initiator Name"\r
 #string STR_ISCSI_CONFIG_INIT_NAME_HELP #language en-US "The worldwide unique name of the initiator. Only iqn. format is accepted."\r
 #string STR_ISCSI_DEVICE_FORM_TITLE     #language en-US ""\r
 #string STR_ISCSI_DEVICE_ENABLE         #language en-US "Enable iSCSI"\r
 #string STR_ISCSI_LOCAL_IP_ADDRESS      #language en-US "  Initiator IP Address"\r

-#string STR_ISCSI_LOCAL_MASK            #language en-US "  Initiator Subnet Mask" \r
+#string STR_ISCSI_LOCAL_MASK            #language en-US "  Initiator Subnet Mask"\r

 #string STR_ISCSI_LOCAL_GATEWAY         #language en-US "  Gateway"\r
 #string STR_ISCSI_LOCAL_GATEWAY         #language en-US "  Gateway"\r

-#string STR_ISCSI_IP_ADDRESS_HELP       #language en-US "Enter IP address in dotted-decimal notation."       \r
-#string STR_ISCSI_TARGET_NAME           #language en-US "  Target Name"     \r
-#string STR_ISCSI_TARGET_IP_ADDRESS     #language en-US "  Target IP Address"     \r
-#string STR_ISCSI_TARGET_PORT           #language en-US "  Target Port"     \r
+#string STR_ISCSI_IP_ADDRESS_HELP       #language en-US "Enter IP address in dotted-decimal notation."\r
+#string STR_ISCSI_TARGET_NAME           #language en-US "  Target Name"\r
+#string STR_ISCSI_TARGET_IP_ADDRESS     #language en-US "  Target IP Address"\r
+#string STR_ISCSI_TARGET_PORT           #language en-US "  Target Port"\r

 #string STR_ISCSI_BOOT_LUN              #language en-US "  Boot LUN"\r
 #string STR_ISCSI_BOOT_LUN_HELP         #language en-US "Hexadecimal representation of the LU number. Examples are: 4752-3A4F-6b7e-2F99, 6734-9-156f-127, 4186-9"\r
 #string STR_ISCSI_BOOT_LUN              #language en-US "  Boot LUN"\r
 #string STR_ISCSI_BOOT_LUN_HELP         #language en-US "Hexadecimal representation of the LU number. Examples are: 4752-3A4F-6b7e-2F99, 6734-9-156f-127, 4186-9"\r

-#string STR_ISCSI_ENABLE_DHCP           #language en-US "Enable DHCP"         \r
+#string STR_ISCSI_ENABLE_DHCP           #language en-US "Enable DHCP"\r

 #string STR_ISCSI_ENABLE_DHCP_ON_TARGET #language en-US "Get target info via DHCP"\r
 #string STR_CHAP_TYPE_PROMPT            #language en-US "CHAP Type"\r
 #string STR_CHAP_TYPE_HELP              #language en-US "None, One way CHAP or mutual CHAP"\r
 #string STR_ISCSI_ENABLE_DHCP_ON_TARGET #language en-US "Get target info via DHCP"\r
 #string STR_CHAP_TYPE_PROMPT            #language en-US "CHAP Type"\r
 #string STR_CHAP_TYPE_HELP              #language en-US "None, One way CHAP or mutual CHAP"\r


@@ -57,6 +57,6 @@
 #string STR_ISCSI_CONFIG_ISID           #language en-US "ISID"\r
 #string STR_ISCSI_CONFIG_ISID_HELP      #language en-US "OUI-format ISID in 6 bytes, default value are derived from MAC address. Only last 3 bytes are configurable. Example: update 0ABBCCDDEEFF to 0ABBCCF07901 by input F07901."\r
 #string STR_RETURN_MAIN_FORM            #language en-US "Back to Previous Page"\r
 #string STR_ISCSI_CONFIG_ISID           #language en-US "ISID"\r
 #string STR_ISCSI_CONFIG_ISID_HELP      #language en-US "OUI-format ISID in 6 bytes, default value are derived from MAC address. Only last 3 bytes are configurable. Example: update 0ABBCCDDEEFF to 0ABBCCF07901 by input F07901."\r
 #string STR_RETURN_MAIN_FORM            #language en-US "Back to Previous Page"\r

-#string STR_SAVE_CHANGES                #language en-US "Save Changes"                 \r
+#string STR_SAVE_CHANGES                #language en-US "Save Changes"\r

 #string STR_NULL                        #language en-US ""\r
 #string STR_NULL                        #language en-US ""\r

-  
\ No newline at end of file
+\r

diff --git a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiDhcp.c b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiDhcp.c
index 976fe5d436bec37453fe46ad1ac433a72a710358..6a876c8b69ddc718fd1f934f6fffea166de67504 100644 (file)
--- a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiDhcp.c
+++ b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiDhcp.c
@@ -1,7 +1,7 @@
 /** @file\r
   iSCSI DHCP related configuration routines.\r
 \r
 /** @file\r
   iSCSI DHCP related configuration routines.\r
 \r

-Copyright (c) 2004 - 2016, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2004 - 2018, Intel Corporation. All rights reserved.<BR>\r

 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r


@@ -95,7 +95,7 @@ IScsiDhcpExtractRootPath (
     Status = EFI_INVALID_PARAMETER;\r
     goto ON_EXIT;\r
   }\r
     Status = EFI_INVALID_PARAMETER;\r
     goto ON_EXIT;\r
   }\r

-  \r
+\r

     if ((Fields[RP_FIELD_IDX_SERVERNAME].Str == NULL) ||\r
       (Fields[RP_FIELD_IDX_TARGETNAME].Str == NULL) ||\r
       (Fields[RP_FIELD_IDX_PROTOCOL].Len > 1)\r
     if ((Fields[RP_FIELD_IDX_SERVERNAME].Str == NULL) ||\r
       (Fields[RP_FIELD_IDX_TARGETNAME].Str == NULL) ||\r
       (Fields[RP_FIELD_IDX_PROTOCOL].Len > 1)\r


@@ -170,14 +170,14 @@ ON_EXIT:
 /**\r
   The callback function registerd to the DHCP4 instance which is used to select\r
   the qualified DHCP OFFER.\r
 /**\r
   The callback function registerd to the DHCP4 instance which is used to select\r
   the qualified DHCP OFFER.\r

-  \r
+\r

   @param[in]  This         The DHCP4 protocol.\r
   @param[in]  Context      The context set when configuring the DHCP4 protocol.\r
   @param[in]  CurrentState The current state of the DHCP4 protocol.\r
   @param[in]  Dhcp4Event   The event occurs in the current state.\r
   @param[in]  This         The DHCP4 protocol.\r
   @param[in]  Context      The context set when configuring the DHCP4 protocol.\r
   @param[in]  CurrentState The current state of the DHCP4 protocol.\r
   @param[in]  Dhcp4Event   The event occurs in the current state.\r

-  @param[in]  Packet       The DHCP packet that is to be sent or already received. \r
+  @param[in]  Packet       The DHCP packet that is to be sent or already received.\r

   @param[out] NewPacket    The packet used to replace the above Packet.\r
   @param[out] NewPacket    The packet used to replace the above Packet.\r

-  \r
+\r

   @retval EFI_SUCCESS      Either the DHCP OFFER is qualified or we're not intereseted\r
                            in the Dhcp4Event.\r
   @retval EFI_NOT_READY    The DHCP OFFER packet doesn't match our requirements.\r
   @retval EFI_SUCCESS      Either the DHCP OFFER is qualified or we're not intereseted\r
                            in the Dhcp4Event.\r
   @retval EFI_NOT_READY    The DHCP OFFER packet doesn't match our requirements.\r


@@ -337,7 +337,7 @@ IScsiParseDhcpAck (
 \r
 /**\r
   Parse the DHCP ACK to get the address configuration and DNS information.\r
 \r
 /**\r
   Parse the DHCP ACK to get the address configuration and DNS information.\r

-  \r
+\r

   @param[in]       Image            The handle of the driver image.\r
   @param[in]       Controller       The handle of the controller;\r
   @param[in, out]  ConfigData       The session configuration data.\r
   @param[in]       Image            The handle of the driver image.\r
   @param[in]       Controller       The handle of the controller;\r
   @param[in, out]  ConfigData       The session configuration data.\r

diff --git a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiDhcp.h b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiDhcp.h
index 59f86727193ccac9073b68f3efce6acabac3e72d..4c4dcaa8f68d32d8fbc3a5d697e5d8bbd37a5c98 100644 (file)
--- a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiDhcp.h
+++ b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiDhcp.h
@@ -1,7 +1,7 @@
 /** @file\r
   The header file of IScsiDhcp.\r
 \r
 /** @file\r
   The header file of IScsiDhcp.\r
 \r

-Copyright (c) 2004 - 2016, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2004 - 2018, Intel Corporation. All rights reserved.<BR>\r

 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r


@@ -34,7 +34,7 @@ typedef struct _ISCSI_ROOT_PATH_FIELD {
 \r
 /**\r
   Parse the DHCP ACK to get the address configuration and DNS information.\r
 \r
 /**\r
   Parse the DHCP ACK to get the address configuration and DNS information.\r

-  \r
+\r

   @param[in]       Image            The handle of the driver image.\r
   @param[in]       Controller       The handle of the controller;\r
   @param[in, out]  ConfigData       The session configuration data.\r
   @param[in]       Image            The handle of the driver image.\r
   @param[in]       Controller       The handle of the controller;\r
   @param[in, out]  ConfigData       The session configuration data.\r

diff --git a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiDriver.c b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiDriver.c
index 5295d346ec26404bf5474ac4ac8e23e037babcc1..730f3e506bbcfec879c3af9b5339b638a64420d4 100644 (file)
--- a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiDriver.c
+++ b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiDriver.c
@@ -1,7 +1,7 @@
 /** @file\r
   The entry point of IScsi driver.\r
 \r
 /** @file\r
   The entry point of IScsi driver.\r
 \r

-Copyright (c) 2004 - 2016, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2004 - 2018, Intel Corporation. All rights reserved.<BR>\r

 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r


@@ -24,14 +24,14 @@ EFI_DRIVER_BINDING_PROTOCOL gIScsiDriverBinding = {
 };\r
 \r
 /**\r
 };\r
 \r
 /**\r

-  Tests to see if this driver supports the RemainingDevicePath. \r
-\r
-  @param[in]  RemainingDevicePath  A pointer to the remaining portion of a device path.  This \r
-                                   parameter is ignored by device drivers, and is optional for bus \r
-                                   drivers. For bus drivers, if this parameter is not NULL, then \r
-                                   the bus driver must determine if the bus controller specified \r
-                                   by ControllerHandle and the child controller specified \r
-                                   by RemainingDevicePath are both supported by this \r
+  Tests to see if this driver supports the RemainingDevicePath.\r
+\r
+  @param[in]  RemainingDevicePath  A pointer to the remaining portion of a device path.  This\r
+                                   parameter is ignored by device drivers, and is optional for bus\r
+                                   drivers. For bus drivers, if this parameter is not NULL, then\r
+                                   the bus driver must determine if the bus controller specified\r
+                                   by ControllerHandle and the child controller specified\r
+                                   by RemainingDevicePath are both supported by this\r

                                    bus driver.\r
 \r
   @retval EFI_SUCCESS              The RemainingDevicePath is supported or NULL.\r
                                    bus driver.\r
 \r
   @retval EFI_SUCCESS              The RemainingDevicePath is supported or NULL.\r


@@ -62,14 +62,14 @@ IScsiIsDevicePathSupported (
 }\r
 \r
 /**\r
 }\r
 \r
 /**\r

-  Tests to see if this driver supports a given controller. If a child device is provided, \r
+  Tests to see if this driver supports a given controller. If a child device is provided,\r

   it further tests to see if this driver supports creating a handle for the specified child device.\r
 \r
   @param[in]  This                 A pointer to the EFI_DRIVER_BINDING_PROTOCOL instance.\r
   it further tests to see if this driver supports creating a handle for the specified child device.\r
 \r
   @param[in]  This                 A pointer to the EFI_DRIVER_BINDING_PROTOCOL instance.\r

-  @param[in]  ControllerHandle     The handle of the controller to test. This handle \r
-                                   must support a protocol interface that supplies \r
+  @param[in]  ControllerHandle     The handle of the controller to test. This handle\r
+                                   must support a protocol interface that supplies\r

                                    an I/O abstraction to the driver.\r
                                    an I/O abstraction to the driver.\r

-  @param[in]  RemainingDevicePath  A pointer to the remaining portion of a device path. \r
+  @param[in]  RemainingDevicePath  A pointer to the remaining portion of a device path.\r

                                    This parameter is ignored by device drivers, and is optional for bus drivers.\r
 \r
 \r
                                    This parameter is ignored by device drivers, and is optional for bus drivers.\r
 \r
 \r


@@ -142,23 +142,23 @@ IScsiDriverBindingSupported (
 }\r
 \r
 /**\r
 }\r
 \r
 /**\r

-  Start this driver on ControllerHandle. \r
-  \r
-  The Start() function is designed to be invoked from the EFI boot service ConnectController(). \r
-  As a result, much of the error checking on the parameters to Start() has been moved into this \r
-  common boot service. It is legal to call Start() from other locations, but the following calling \r
+  Start this driver on ControllerHandle.\r
+\r
+  The Start() function is designed to be invoked from the EFI boot service ConnectController().\r
+  As a result, much of the error checking on the parameters to Start() has been moved into this\r
+  common boot service. It is legal to call Start() from other locations, but the following calling\r

   restrictions must be followed or the system behavior will not be deterministic.\r
   1. ControllerHandle must be a valid EFI_HANDLE.\r
   2. If RemainingDevicePath is not NULL, then it must be a pointer to a naturally aligned\r
      EFI_DEVICE_PATH_PROTOCOL.\r
   3. Prior to calling Start(), the Supported() function for the driver specified by This must\r
   restrictions must be followed or the system behavior will not be deterministic.\r
   1. ControllerHandle must be a valid EFI_HANDLE.\r
   2. If RemainingDevicePath is not NULL, then it must be a pointer to a naturally aligned\r
      EFI_DEVICE_PATH_PROTOCOL.\r
   3. Prior to calling Start(), the Supported() function for the driver specified by This must\r

-     have been called with the same calling parameters, and Supported() must have returned EFI_SUCCESS.  \r
+     have been called with the same calling parameters, and Supported() must have returned EFI_SUCCESS.\r

 \r
   @param[in]  This                 A pointer to the EFI_DRIVER_BINDING_PROTOCOL instance.\r
 \r
   @param[in]  This                 A pointer to the EFI_DRIVER_BINDING_PROTOCOL instance.\r

-  @param[in]  ControllerHandle     The handle of the controller to start. This handle \r
-                                   must support a protocol interface that supplies \r
+  @param[in]  ControllerHandle     The handle of the controller to start. This handle\r
+                                   must support a protocol interface that supplies\r

                                    an I/O abstraction to the driver.\r
                                    an I/O abstraction to the driver.\r

-  @param[in]  RemainingDevicePath  A pointer to the remaining portion of a device path. \r
+  @param[in]  RemainingDevicePath  A pointer to the remaining portion of a device path.\r

                                    This parameter is ignored by device drivers, and is optional for bus drivers.\r
 \r
   @retval EFI_SUCCESS              The device was started.\r
                                    This parameter is ignored by device drivers, and is optional for bus drivers.\r
 \r
   @retval EFI_SUCCESS              The device was started.\r


@@ -214,7 +214,7 @@ IScsiDriverBindingStart (
   }\r
 \r
   //\r
   }\r
 \r
   //\r

-  // Always install private protocol no matter what happens later. We need to \r
+  // Always install private protocol no matter what happens later. We need to\r

   // keep the relationship between ControllerHandle and ChildHandle.\r
   //\r
   Status = gBS->InstallProtocolInterface (\r
   // keep the relationship between ControllerHandle and ChildHandle.\r
   //\r
   Status = gBS->InstallProtocolInterface (\r


@@ -286,7 +286,7 @@ IScsiDriverBindingStart (
                   This->DriverBindingHandle,\r
                   Private->ExtScsiPassThruHandle,\r
                   EFI_OPEN_PROTOCOL_BY_CHILD_CONTROLLER\r
                   This->DriverBindingHandle,\r
                   Private->ExtScsiPassThruHandle,\r
                   EFI_OPEN_PROTOCOL_BY_CHILD_CONTROLLER\r

-                  );              \r
+                  );\r

   if (EFI_ERROR (Status)) {\r
     gBS->UninstallMultipleProtocolInterfaces (\r
            Private->ExtScsiPassThruHandle,\r
   if (EFI_ERROR (Status)) {\r
     gBS->UninstallMultipleProtocolInterfaces (\r
            Private->ExtScsiPassThruHandle,\r


@@ -296,7 +296,7 @@ IScsiDriverBindingStart (
            Private->DevicePath,\r
            NULL\r
            );\r
            Private->DevicePath,\r
            NULL\r
            );\r

-    \r
+\r

     goto ON_ERROR;\r
   }\r
 \r
     goto ON_ERROR;\r
   }\r
 \r


@@ -315,12 +315,12 @@ ON_ERROR:
 }\r
 \r
 /**\r
 }\r
 \r
 /**\r

-  Stop this driver on ControllerHandle. \r
-  \r
+  Stop this driver on ControllerHandle.\r
+\r

   Release the control of this controller and remove the IScsi functions. The Stop()\r
   Release the control of this controller and remove the IScsi functions. The Stop()\r

-  function is designed to be invoked from the EFI boot service DisconnectController(). \r
-  As a result, much of the error checking on the parameters to Stop() has been moved \r
-  into this common boot service. It is legal to call Stop() from other locations, \r
+  function is designed to be invoked from the EFI boot service DisconnectController().\r
+  As a result, much of the error checking on the parameters to Stop() has been moved\r
+  into this common boot service. It is legal to call Stop() from other locations,\r

   but the following calling restrictions must be followed or the system behavior will not be deterministic.\r
   1. ControllerHandle must be a valid EFI_HANDLE that was used on a previous call to this\r
      same driver's Start() function.\r
   but the following calling restrictions must be followed or the system behavior will not be deterministic.\r
   1. ControllerHandle must be a valid EFI_HANDLE that was used on a previous call to this\r
      same driver's Start() function.\r


@@ -328,13 +328,13 @@ ON_ERROR:
      EFI_HANDLE. In addition, all of these handles must have been created in this driver's\r
      Start() function, and the Start() function must have called OpenProtocol() on\r
      ControllerHandle with an Attribute of EFI_OPEN_PROTOCOL_BY_CHILD_CONTROLLER.\r
      EFI_HANDLE. In addition, all of these handles must have been created in this driver's\r
      Start() function, and the Start() function must have called OpenProtocol() on\r
      ControllerHandle with an Attribute of EFI_OPEN_PROTOCOL_BY_CHILD_CONTROLLER.\r

-  \r
+\r

   @param[in]  This              A pointer to the EFI_DRIVER_BINDING_PROTOCOL instance.\r
   @param[in]  This              A pointer to the EFI_DRIVER_BINDING_PROTOCOL instance.\r

-  @param[in]  ControllerHandle  A handle to the device being stopped. The handle must \r
-                                support a bus specific I/O protocol for the driver \r
+  @param[in]  ControllerHandle  A handle to the device being stopped. The handle must\r
+                                support a bus specific I/O protocol for the driver\r

                                 to use to stop the device.\r
   @param[in]  NumberOfChildren  The number of child device handles in ChildHandleBuffer.Not used.\r
                                 to use to stop the device.\r
   @param[in]  NumberOfChildren  The number of child device handles in ChildHandleBuffer.Not used.\r

-  @param[in]  ChildHandleBuffer An array of child handles to be freed. May be NULL \r
+  @param[in]  ChildHandleBuffer An array of child handles to be freed. May be NULL\r

                                 if NumberOfChildren is 0.Not used.\r
 \r
   @retval EFI_SUCCESS           The device was stopped.\r
                                 if NumberOfChildren is 0.Not used.\r
 \r
   @retval EFI_SUCCESS           The device was stopped.\r


@@ -390,7 +390,7 @@ IScsiDriverBindingStop (
            Private->Image,\r
            Private->ExtScsiPassThruHandle\r
            );\r
            Private->Image,\r
            Private->ExtScsiPassThruHandle\r
            );\r

-    \r
+\r

     gBS->CloseProtocol (\r
           Conn->Tcp4Io.Handle,\r
           &gEfiTcp4ProtocolGuid,\r
     gBS->CloseProtocol (\r
           Conn->Tcp4Io.Handle,\r
           &gEfiTcp4ProtocolGuid,\r


@@ -515,7 +515,7 @@ EfiIScsiUnload (
     if (EFI_ERROR (Status)) {\r
       goto ON_EXIT;\r
     }\r
     if (EFI_ERROR (Status)) {\r
       goto ON_EXIT;\r
     }\r

-  }  \r
+  }\r

 \r
   //\r
   // Unload the iSCSI configuration form.\r
 \r
   //\r
   // Unload the iSCSI configuration form.\r


@@ -545,7 +545,7 @@ EfiIScsiUnload (
       goto ON_EXIT;\r
     }\r
   }\r
       goto ON_EXIT;\r
     }\r
   }\r

-  \r
+\r

   Status = gBS->HandleProtocol (\r
                   gIScsiDriverBinding.DriverBindingHandle,\r
                   &gEfiComponentName2ProtocolGuid,\r
   Status = gBS->HandleProtocol (\r
                   gIScsiDriverBinding.DriverBindingHandle,\r
                   &gEfiComponentName2ProtocolGuid,\r


@@ -576,14 +576,14 @@ ON_EXIT:
   if (DeviceHandleBuffer != NULL) {\r
     FreePool (DeviceHandleBuffer);\r
   }\r
   if (DeviceHandleBuffer != NULL) {\r
     FreePool (DeviceHandleBuffer);\r
   }\r

-  \r
+\r

   return Status;\r
 }\r
 \r
 /**\r
   This is the declaration of an EFI image entry point. This entry point is\r
   the same for UEFI Applications, UEFI OS Loaders, and UEFI Drivers including\r
   return Status;\r
 }\r
 \r
 /**\r
   This is the declaration of an EFI image entry point. This entry point is\r
   the same for UEFI Applications, UEFI OS Loaders, and UEFI Drivers including\r

-  both device drivers and bus drivers. It initialize the global variables and \r
+  both device drivers and bus drivers. It initialize the global variables and\r

   publish the driver binding protocol.\r
 \r
   @param[in]   ImageHandle      The firmware allocated handle for the UEFI image.\r
   publish the driver binding protocol.\r
 \r
   @param[in]   ImageHandle      The firmware allocated handle for the UEFI image.\r


@@ -651,7 +651,7 @@ IScsiDriverEntryPoint (
             );\r
       return Status;\r
     }\r
             );\r
       return Status;\r
     }\r

-  \r
+\r

     //\r
     // Initialize the configuration form of iSCSI.\r
     //\r
     //\r
     // Initialize the configuration form of iSCSI.\r
     //\r

diff --git a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiDriver.h b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiDriver.h
index 14f640444f6282605da3472f27e717d29af1e01f..d6a619f00fc095b543287502e2fd77839a34230f 100644 (file)
--- a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiDriver.h
+++ b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiDriver.h
@@ -1,7 +1,7 @@
 /** @file\r
   The header file of IScsiDriver.c.\r
 \r
 /** @file\r
   The header file of IScsiDriver.c.\r
 \r

-Copyright (c) 2004 - 2011, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2004 - 2018, Intel Corporation. All rights reserved.<BR>\r

 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r


@@ -38,14 +38,14 @@ typedef struct _ISCSI_PRIVATE_PROTOCOL {
 //\r
 \r
 /**\r
 //\r
 \r
 /**\r

-  Tests to see if this driver supports a given controller. If a child device is provided, \r
+  Tests to see if this driver supports a given controller. If a child device is provided,\r

   it further tests to see if this driver supports creating a handle for the specified child device.\r
 \r
   @param[in]  This                 A pointer to the EFI_DRIVER_BINDING_PROTOCOL instance.\r
   it further tests to see if this driver supports creating a handle for the specified child device.\r
 \r
   @param[in]  This                 A pointer to the EFI_DRIVER_BINDING_PROTOCOL instance.\r

-  @param[in]  ControllerHandle     The handle of the controller to test. This handle \r
-                                   must support a protocol interface that supplies \r
+  @param[in]  ControllerHandle     The handle of the controller to test. This handle\r
+                                   must support a protocol interface that supplies\r

                                    an I/O abstraction to the driver.\r
                                    an I/O abstraction to the driver.\r

-  @param[in]  RemainingDevicePath  A pointer to the remaining portion of a device path. \r
+  @param[in]  RemainingDevicePath  A pointer to the remaining portion of a device path.\r

                                    This parameter is ignored by device drivers, and is optional for bus drivers.\r
 \r
 \r
                                    This parameter is ignored by device drivers, and is optional for bus drivers.\r
 \r
 \r


@@ -70,22 +70,22 @@ IScsiDriverBindingSupported (
   );\r
 \r
 /**\r
   );\r
 \r
 /**\r

-  Start this driver on ControllerHandle. The Start() function is designed to be \r
-  invoked from the EFI boot service ConnectController(). As a result, much of \r
-  the error checking on the parameters to Start() has been moved into this \r
-  common boot service. It is legal to call Start() from other locations, \r
+  Start this driver on ControllerHandle. The Start() function is designed to be\r
+  invoked from the EFI boot service ConnectController(). As a result, much of\r
+  the error checking on the parameters to Start() has been moved into this\r
+  common boot service. It is legal to call Start() from other locations,\r

   but the following calling restrictions must be followed or the system behavior will not be deterministic.\r
   1. ControllerHandle must be a valid EFI_HANDLE.\r
   2. If RemainingDevicePath is not NULL, then it must be a pointer to a naturally aligned\r
      EFI_DEVICE_PATH_PROTOCOL.\r
   3. Prior to calling Start(), the Supported() function for the driver specified by This must\r
   but the following calling restrictions must be followed or the system behavior will not be deterministic.\r
   1. ControllerHandle must be a valid EFI_HANDLE.\r
   2. If RemainingDevicePath is not NULL, then it must be a pointer to a naturally aligned\r
      EFI_DEVICE_PATH_PROTOCOL.\r
   3. Prior to calling Start(), the Supported() function for the driver specified by This must\r

-     have been called with the same calling parameters, and Supported() must have returned EFI_SUCCESS.  \r
+     have been called with the same calling parameters, and Supported() must have returned EFI_SUCCESS.\r

 \r
   @param[in]  This                 A pointer to the EFI_DRIVER_BINDING_PROTOCOL instance.\r
 \r
   @param[in]  This                 A pointer to the EFI_DRIVER_BINDING_PROTOCOL instance.\r

-  @param[in]  ControllerHandle     The handle of the controller to start. This handle \r
-                                   must support a protocol interface that supplies \r
+  @param[in]  ControllerHandle     The handle of the controller to start. This handle\r
+                                   must support a protocol interface that supplies\r

                                    an I/O abstraction to the driver.\r
                                    an I/O abstraction to the driver.\r

-  @param[in]  RemainingDevicePath  A pointer to the remaining portion of a device path. \r
+  @param[in]  RemainingDevicePath  A pointer to the remaining portion of a device path.\r

                                    This parameter is ignored by device drivers, and is optional for bus drivers.\r
 \r
   @retval EFI_SUCCESS              The device was started.\r
                                    This parameter is ignored by device drivers, and is optional for bus drivers.\r
 \r
   @retval EFI_SUCCESS              The device was started.\r


@@ -103,12 +103,12 @@ IScsiDriverBindingStart (
   );\r
 \r
 /**\r
   );\r
 \r
 /**\r

-  Stop this driver on ControllerHandle. \r
-  \r
+  Stop this driver on ControllerHandle.\r
+\r

   Release the control of this controller and remove the IScsi functions. The Stop()\r
   Release the control of this controller and remove the IScsi functions. The Stop()\r

-  function is designed to be invoked from the EFI boot service DisconnectController(). \r
-  As a result, much of the error checking on the parameters to Stop() has been moved \r
-  into this common boot service. It is legal to call Stop() from other locations, \r
+  function is designed to be invoked from the EFI boot service DisconnectController().\r
+  As a result, much of the error checking on the parameters to Stop() has been moved\r
+  into this common boot service. It is legal to call Stop() from other locations,\r

   but the following calling restrictions must be followed or the system behavior will not be deterministic.\r
   1. ControllerHandle must be a valid EFI_HANDLE that was used on a previous call to this\r
      same driver's Start() function.\r
   but the following calling restrictions must be followed or the system behavior will not be deterministic.\r
   1. ControllerHandle must be a valid EFI_HANDLE that was used on a previous call to this\r
      same driver's Start() function.\r


@@ -116,13 +116,13 @@ IScsiDriverBindingStart (
      EFI_HANDLE. In addition, all of these handles must have been created in this driver's\r
      Start() function, and the Start() function must have called OpenProtocol() on\r
      ControllerHandle with an Attribute of EFI_OPEN_PROTOCOL_BY_CHILD_CONTROLLER.\r
      EFI_HANDLE. In addition, all of these handles must have been created in this driver's\r
      Start() function, and the Start() function must have called OpenProtocol() on\r
      ControllerHandle with an Attribute of EFI_OPEN_PROTOCOL_BY_CHILD_CONTROLLER.\r

-  \r
+\r

   @param[in]  This              A pointer to the EFI_DRIVER_BINDING_PROTOCOL instance.\r
   @param[in]  This              A pointer to the EFI_DRIVER_BINDING_PROTOCOL instance.\r

-  @param[in]  ControllerHandle  A handle to the device being stopped. The handle must \r
-                                support a bus specific I/O protocol for the driver \r
+  @param[in]  ControllerHandle  A handle to the device being stopped. The handle must\r
+                                support a bus specific I/O protocol for the driver\r

                                 to use to stop the device.\r
   @param[in]  NumberOfChildren  The number of child device handles in ChildHandleBuffer.Not used.\r
                                 to use to stop the device.\r
   @param[in]  NumberOfChildren  The number of child device handles in ChildHandleBuffer.Not used.\r

-  @param[in]  ChildHandleBuffer An array of child handles to be freed. May be NULL \r
+  @param[in]  ChildHandleBuffer An array of child handles to be freed. May be NULL\r

                                 if NumberOfChildren is 0.Not used.\r
 \r
   @retval EFI_SUCCESS           The device was stopped.\r
                                 if NumberOfChildren is 0.Not used.\r
 \r
   @retval EFI_SUCCESS           The device was stopped.\r

diff --git a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiDxe.inf b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiDxe.inf
index 4fd2a62af980c7f3786a9a46f072a239f1e3c142..dce39681d16981235b8fad67cf72e8176a7323a7 100644 (file)
--- a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiDxe.inf
+++ b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiDxe.inf
@@ -6,7 +6,7 @@
 #  data over TCP/IP. It installs EFI HII Configuration Access Protocol to provide\r
 #  one way to configurate the iSCSI setting.\r
 #\r
 #  data over TCP/IP. It installs EFI HII Configuration Access Protocol to provide\r
 #  one way to configurate the iSCSI setting.\r
 #\r

-#  Copyright (c) 2004 - 2014, Intel Corporation. All rights reserved.<BR>\r
+#  Copyright (c) 2004 - 2018, Intel Corporation. All rights reserved.<BR>\r

 #  This program and the accompanying materials\r
 #  are licensed and made available under the terms and conditions of the BSD License\r
 #  which accompanies this distribution.  The full text of the license may be found at\r
 #  This program and the accompanying materials\r
 #  are licensed and made available under the terms and conditions of the BSD License\r
 #  which accompanies this distribution.  The full text of the license may be found at\r


@@ -122,4 +122,4 @@
   gIScsiCHAPAuthInfoGuid\r
 \r
 [UserExtensions.TianoCore."ExtraFiles"]\r
   gIScsiCHAPAuthInfoGuid\r
 \r
 [UserExtensions.TianoCore."ExtraFiles"]\r

-  IScsi4DxeExtra.uni
\ No newline at end of file
+  IScsi4DxeExtra.uni\r

diff --git a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiExtScsiPassThru.c b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiExtScsiPassThru.c
index e9e37b7e37e7b6aacf1a7ea5e9d67375b17b2706..db2d6d19366ec460c70e66cb8cb767f3b16ede2e 100644 (file)
--- a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiExtScsiPassThru.c
+++ b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiExtScsiPassThru.c
@@ -1,7 +1,7 @@
 /** @file\r
   The IScsi's EFI_EXT_SCSI_PASS_THRU_PROTOCOL driver.\r
 \r
 /** @file\r
   The IScsi's EFI_EXT_SCSI_PASS_THRU_PROTOCOL driver.\r
 \r

-Copyright (c) 2004 - 2015, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2004 - 2018, Intel Corporation. All rights reserved.<BR>\r

 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r


@@ -15,9 +15,9 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #include "IScsiImpl.h"\r
 \r
 /**\r
 #include "IScsiImpl.h"\r
 \r
 /**\r

-  Sends a SCSI Request Packet to a SCSI device that is attached to the SCSI channel. This function   \r
+  Sends a SCSI Request Packet to a SCSI device that is attached to the SCSI channel. This function\r

   supports both blocking I/O and nonblocking I/O. The blocking I/O functionality is required, and the\r
   supports both blocking I/O and nonblocking I/O. The blocking I/O functionality is required, and the\r

-  nonblocking I/O functionality is optional.                                                             \r
+  nonblocking I/O functionality is optional.\r

 \r
   @param[in]      This    A pointer to the EFI_EXT_SCSI_PASS_THRU_PROTOCOL instance.\r
   @param[in]      Target  The Target is an array of size TARGET_MAX_BYTES and it represents\r
 \r
   @param[in]      This    A pointer to the EFI_EXT_SCSI_PASS_THRU_PROTOCOL instance.\r
   @param[in]      Target  The Target is an array of size TARGET_MAX_BYTES and it represents\r


@@ -42,18 +42,18 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   @retval EFI_BAD_BUFFER_SIZE   The SCSI Request Packet was not executed. The number of bytes that\r
                                 could be transferred is returned in InTransferLength. For write\r
                                 and bi-directional commands, OutTransferLength bytes were\r
   @retval EFI_BAD_BUFFER_SIZE   The SCSI Request Packet was not executed. The number of bytes that\r
                                 could be transferred is returned in InTransferLength. For write\r
                                 and bi-directional commands, OutTransferLength bytes were\r

-                                transferred by OutDataBuffer. Currently not implemeted.                                \r
+                                transferred by OutDataBuffer. Currently not implemeted.\r

   @retval EFI_NOT_READY         The SCSI Request Packet could not be sent because there are too many\r
   @retval EFI_NOT_READY         The SCSI Request Packet could not be sent because there are too many\r

-                                SCSI Request Packets already queued. The caller may retry again later.                             \r
+                                SCSI Request Packets already queued. The caller may retry again later.\r

   @retval EFI_DEVICE_ERROR      A device error occurred while attempting to send the SCSI Request\r
   @retval EFI_DEVICE_ERROR      A device error occurred while attempting to send the SCSI Request\r

-                                Packet. \r
+                                Packet.\r

   @retval EFI_INVALID_PARAMETER Target, Lun, or the contents of ScsiRequestPacket are invalid.\r
   @retval EFI_UNSUPPORTED       The command described by the SCSI Request Packet is not supported\r
                                 by the host adapter. This includes the case of Bi-directional SCSI\r
                                 commands not supported by the implementation. The SCSI Request\r
                                 Packet was not sent, so no additional status information is available.\r
                                 Currently not implemeted.\r
   @retval EFI_INVALID_PARAMETER Target, Lun, or the contents of ScsiRequestPacket are invalid.\r
   @retval EFI_UNSUPPORTED       The command described by the SCSI Request Packet is not supported\r
                                 by the host adapter. This includes the case of Bi-directional SCSI\r
                                 commands not supported by the implementation. The SCSI Request\r
                                 Packet was not sent, so no additional status information is available.\r
                                 Currently not implemeted.\r

-  @retval EFI_TIMEOUT           A timeout occurred while waiting for the SCSI Request Packet to execute.                              \r
+  @retval EFI_TIMEOUT           A timeout occurred while waiting for the SCSI Request Packet to execute.\r

 **/\r
 EFI_STATUS\r
 EFIAPI\r
 **/\r
 EFI_STATUS\r
 EFIAPI\r


@@ -67,7 +67,7 @@ IScsiExtScsiPassThruFunction (
 {\r
   ISCSI_DRIVER_DATA           *Private;\r
   ISCSI_SESSION_CONFIG_NVDATA *ConfigNvData;\r
 {\r
   ISCSI_DRIVER_DATA           *Private;\r
   ISCSI_SESSION_CONFIG_NVDATA *ConfigNvData;\r

-  EFI_STATUS                  Status; \r
+  EFI_STATUS                  Status;\r

 \r
   Private       = ISCSI_DRIVER_DATA_FROM_EXT_SCSI_PASS_THRU (This);\r
   ConfigNvData  = &Private->Session.ConfigData.NvData;\r
 \r
   Private       = ISCSI_DRIVER_DATA_FROM_EXT_SCSI_PASS_THRU (This);\r
   ConfigNvData  = &Private->Session.ConfigData.NvData;\r


@@ -96,11 +96,11 @@ IScsiExtScsiPassThruFunction (
 }\r
 \r
 /**\r
 }\r
 \r
 /**\r

-  Used to retrieve the list of legal Target IDs and LUNs for SCSI devices on a SCSI channel. These       \r
+  Used to retrieve the list of legal Target IDs and LUNs for SCSI devices on a SCSI channel. These\r

   can either be the list SCSI devices that are actually present on the SCSI channel, or the list of legal\r
   can either be the list SCSI devices that are actually present on the SCSI channel, or the list of legal\r

-  Target Ids and LUNs for the SCSI channel. Regardless, the caller of this function must probe the       \r
-  Target ID and LUN returned to see if a SCSI device is actually present at that location on the SCSI    \r
-  channel.                                                                                               \r
+  Target Ids and LUNs for the SCSI channel. Regardless, the caller of this function must probe the\r
+  Target ID and LUN returned to see if a SCSI device is actually present at that location on the SCSI\r
+  channel.\r

 \r
   @param[in]       This    A pointer to the EFI_EXT_SCSI_PASS_THRU_PROTOCOL instance.\r
   @param[in, out]  Target  On input, a pointer to the Target ID (an array of size\r
 \r
   @param[in]       This    A pointer to the EFI_EXT_SCSI_PASS_THRU_PROTOCOL instance.\r
   @param[in, out]  Target  On input, a pointer to the Target ID (an array of size\r


@@ -310,7 +310,7 @@ IScsiExtScsiPassThruGetTargetLun (
 /**\r
   Resets a SCSI channel. This operation resets all the SCSI devices connected to the SCSI channel.\r
   Currently not implemented.\r
 /**\r
   Resets a SCSI channel. This operation resets all the SCSI devices connected to the SCSI channel.\r
   Currently not implemented.\r

-  \r
+\r

   @param[in]  This A pointer to the EFI_EXT_SCSI_PASS_THRU_PROTOCOL instance.\r
 \r
   @retval EFI_SUCCESS      The SCSI channel was reset.\r
   @param[in]  This A pointer to the EFI_EXT_SCSI_PASS_THRU_PROTOCOL instance.\r
 \r
   @retval EFI_SUCCESS      The SCSI channel was reset.\r


@@ -358,10 +358,10 @@ IScsiExtScsiPassThruResetTargetLun (
 }\r
 \r
 /**\r
 }\r
 \r
 /**\r

-  Used to retrieve the list of legal Target IDs for SCSI devices on a SCSI channel. These can either     \r
+  Used to retrieve the list of legal Target IDs for SCSI devices on a SCSI channel. These can either\r

   be the list SCSI devices that are actually present on the SCSI channel, or the list of legal Target IDs\r
   be the list SCSI devices that are actually present on the SCSI channel, or the list of legal Target IDs\r

-  for the SCSI channel. Regardless, the caller of this function must probe the Target ID returned to     \r
-  see if a SCSI device is actually present at that location on the SCSI channel.                         \r
+  for the SCSI channel. Regardless, the caller of this function must probe the Target ID returned to\r
+  see if a SCSI device is actually present at that location on the SCSI channel.\r

 \r
   @param[in]       This    A pointer to the EFI_EXT_SCSI_PASS_THRU_PROTOCOL instance.\r
   @param[in, out]  Target  (TARGET_MAX_BYTES) of a SCSI device present on the SCSI channel.\r
 \r
   @param[in]       This    A pointer to the EFI_EXT_SCSI_PASS_THRU_PROTOCOL instance.\r
   @param[in, out]  Target  (TARGET_MAX_BYTES) of a SCSI device present on the SCSI channel.\r

diff --git a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiIbft.c b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiIbft.c
index 45d89a6933de548689da2d7acfb89f9e44d07e4c..58c5447dcbd1074c4ce85c82d4fb8cedd3688b1d 100644 (file)
--- a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiIbft.c
+++ b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiIbft.c
@@ -1,7 +1,7 @@
 /** @file\r
   Implementation for iSCSI Boot Firmware Table publication.\r
 \r
 /** @file\r
   Implementation for iSCSI Boot Firmware Table publication.\r
 \r

-Copyright (c) 2004 - 2013, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2004 - 2018, Intel Corporation. All rights reserved.<BR>\r

 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r


@@ -19,7 +19,7 @@ UINTN   mTableKey;
 \r
 /**\r
   Initialize the header of the iSCSI Boot Firmware Table.\r
 \r
 /**\r
   Initialize the header of the iSCSI Boot Firmware Table.\r

-  \r
+\r

   @param[out]  Header     The header of the iSCSI Boot Firmware Table.\r
   @param[in]   OemId      The OEM ID.\r
   @param[in]   OemTableId The OEM table ID for the iBFT.\r
   @param[out]  Header     The header of the iSCSI Boot Firmware Table.\r
   @param[in]   OemId      The OEM ID.\r
   @param[in]   OemTableId The OEM table ID for the iBFT.\r


@@ -37,14 +37,14 @@ IScsiInitIbfTableHeader (
   Header->Length    = IBFT_HEAP_OFFSET;\r
   Header->Revision  = EFI_ACPI_ISCSI_BOOT_FIRMWARE_TABLE_REVISION;\r
   Header->Checksum  = 0;\r
   Header->Length    = IBFT_HEAP_OFFSET;\r
   Header->Revision  = EFI_ACPI_ISCSI_BOOT_FIRMWARE_TABLE_REVISION;\r
   Header->Checksum  = 0;\r

-  \r
+\r

   CopyMem (Header->OemId, OemId, sizeof (Header->OemId));\r
   CopyMem (&Header->OemTableId, OemTableId, sizeof (UINT64));\r
 }\r
 \r
 /**\r
   Initialize the control section of the iSCSI Boot Firmware Table.\r
   CopyMem (Header->OemId, OemId, sizeof (Header->OemId));\r
   CopyMem (&Header->OemTableId, OemTableId, sizeof (UINT64));\r
 }\r
 \r
 /**\r
   Initialize the control section of the iSCSI Boot Firmware Table.\r

-  \r
+\r

   @param[in]  Table       The ACPI table.\r
   @param[in]  HandleCount The number of the handles associated with iSCSI sessions, it's\r
                           equal to the number of iSCSI sessions.\r
   @param[in]  Table       The ACPI table.\r
   @param[in]  HandleCount The number of the handles associated with iSCSI sessions, it's\r
                           equal to the number of iSCSI sessions.\r

diff --git a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiMisc.c b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiMisc.c
index 19577ff1824228b1cda773e55fa68b882687c71c..d924a8b82427ef372ad3325cbcf3e0e29ce43518 100644 (file)
--- a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiMisc.c
+++ b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiMisc.c
@@ -19,8 +19,8 @@ GLOBAL_REMOVE_IF_UNREFERENCED CONST CHAR8  IScsiHexString[] = "0123456789ABCDEFa
 /**\r
   Removes (trims) specified leading and trailing characters from a string.\r
 \r
 /**\r
   Removes (trims) specified leading and trailing characters from a string.\r
 \r

-  @param[in, out]  Str  Pointer to the null-terminated string to be trimmed. On return, \r
-                        Str will hold the trimmed string. \r
+  @param[in, out]  Str  Pointer to the null-terminated string to be trimmed. On return,\r
+                        Str will hold the trimmed string.\r

 \r
   @param[in]      CharC Character will be trimmed from str.\r
 **/\r
 \r
   @param[in]      CharC Character will be trimmed from str.\r
 **/\r


@@ -32,18 +32,18 @@ StrTrim (
 {\r
   CHAR16  *Pointer1;\r
   CHAR16  *Pointer2;\r
 {\r
   CHAR16  *Pointer1;\r
   CHAR16  *Pointer2;\r

-  \r
+\r

   if (*Str == 0) {\r
     return;\r
   }\r
   if (*Str == 0) {\r
     return;\r
   }\r

-  \r
+\r

   //\r
   // Trim off the leading and trailing characters c\r
   //\r
   for (Pointer1 = Str; (*Pointer1 != 0) && (*Pointer1 == CharC); Pointer1++) {\r
     ;\r
   }\r
   //\r
   // Trim off the leading and trailing characters c\r
   //\r
   for (Pointer1 = Str; (*Pointer1 != 0) && (*Pointer1 == CharC); Pointer1++) {\r
     ;\r
   }\r

-  \r
+\r

   Pointer2 = Str;\r
   if (Pointer2 == Pointer1) {\r
     while (*Pointer1 != 0) {\r
   Pointer2 = Str;\r
   if (Pointer2 == Pointer1) {\r
     while (*Pointer1 != 0) {\r


@@ -51,19 +51,19 @@ StrTrim (
       Pointer1++;\r
     }\r
   } else {\r
       Pointer1++;\r
     }\r
   } else {\r

-    while (*Pointer1 != 0) {    \r
-    *Pointer2 = *Pointer1;    \r
+    while (*Pointer1 != 0) {\r
+    *Pointer2 = *Pointer1;\r

     Pointer1++;\r
     Pointer2++;\r
     }\r
     *Pointer2 = 0;\r
   }\r
     Pointer1++;\r
     Pointer2++;\r
     }\r
     *Pointer2 = 0;\r
   }\r

-  \r
-  \r
+\r
+\r

   for (Pointer1 = Str + StrLen(Str) - 1; Pointer1 >= Str && *Pointer1 == CharC; Pointer1--) {\r
     ;\r
   }\r
   for (Pointer1 = Str + StrLen(Str) - 1; Pointer1 >= Str && *Pointer1 == CharC; Pointer1--) {\r
     ;\r
   }\r

-  if  (Pointer1 !=  Str + StrLen(Str) - 1) { \r
+  if  (Pointer1 !=  Str + StrLen(Str) - 1) {\r

     *(Pointer1 + 1) = 0;\r
   }\r
 }\r
     *(Pointer1 + 1) = 0;\r
   }\r
 }\r


@@ -109,7 +109,7 @@ IScsiGetSubnetMaskPrefixLength (
 }\r
 \r
 /**\r
 }\r
 \r
 /**\r

-  Convert the hexadecimal encoded LUN string into the 64-bit LUN. \r
+  Convert the hexadecimal encoded LUN string into the 64-bit LUN.\r

 \r
   @param[in]   Str             The hexadecimal encoded LUN string.\r
   @param[out]  Lun             Storage to return the 64-bit LUN.\r
 \r
   @param[in]   Str             The hexadecimal encoded LUN string.\r
   @param[out]  Lun             Storage to return the 64-bit LUN.\r


@@ -127,11 +127,11 @@ IScsiAsciiStrToLun (
   CHAR8   TemStr[2];\r
   UINT8   TemValue;\r
   UINT16  Value[4];\r
   CHAR8   TemStr[2];\r
   UINT8   TemValue;\r
   UINT16  Value[4];\r

-  \r
+\r

   ZeroMem (Lun, 8);\r
   ZeroMem (TemStr, 2);\r
   ZeroMem ((UINT8 *) Value, sizeof (Value));\r
   ZeroMem (Lun, 8);\r
   ZeroMem (TemStr, 2);\r
   ZeroMem ((UINT8 *) Value, sizeof (Value));\r

-  SizeStr    = AsciiStrLen (Str);  \r
+  SizeStr    = AsciiStrLen (Str);\r

   IndexValue = 0;\r
   IndexNum   = 0;\r
 \r
   IndexValue = 0;\r
   IndexNum   = 0;\r
 \r


@@ -146,7 +146,7 @@ IScsiAsciiStrToLun (
         return EFI_INVALID_PARAMETER;\r
       }\r
     }\r
         return EFI_INVALID_PARAMETER;\r
       }\r
     }\r

-    \r
+\r

     if ((TemValue == 0) && (TemStr[0] == '-')) {\r
       //\r
       // Next Lun value\r
     if ((TemValue == 0) && (TemStr[0] == '-')) {\r
       //\r
       // Next Lun value\r


@@ -163,24 +163,24 @@ IScsiAsciiStrToLun (
       IndexNum = 0;\r
       continue;\r
     }\r
       IndexNum = 0;\r
       continue;\r
     }\r

-    \r
+\r

     if (++IndexNum > 4) {\r
     if (++IndexNum > 4) {\r

-      //     \r
+      //\r

       // Each Lun Str can't exceed size 4, because it will be as UINT16 value\r
       //\r
       return EFI_INVALID_PARAMETER;\r
     }\r
       // Each Lun Str can't exceed size 4, because it will be as UINT16 value\r
       //\r
       return EFI_INVALID_PARAMETER;\r
     }\r

-    \r
+\r

     //\r
     // Combine UINT16 value\r
     //\r
     Value[IndexValue] = (UINT16) ((Value[IndexValue] << 4) + TemValue);\r
   }\r
     //\r
     // Combine UINT16 value\r
     //\r
     Value[IndexValue] = (UINT16) ((Value[IndexValue] << 4) + TemValue);\r
   }\r

- \r
+\r

   for (Index = 0; Index <= IndexValue; Index ++) {\r
     *((UINT16 *) &Lun[Index * 2]) =  HTONS (Value[Index]);\r
   }\r
   for (Index = 0; Index <= IndexValue; Index ++) {\r
     *((UINT16 *) &Lun[Index * 2]) =  HTONS (Value[Index]);\r
   }\r

-  \r
+\r

   return EFI_SUCCESS;\r
 }\r
 \r
   return EFI_SUCCESS;\r
 }\r
 \r


@@ -392,7 +392,7 @@ IScsiMacAddrToStr (
   @param[in, out]  HexStr      Pointer to the string.\r
   @param[in, out]  HexLength   The length of the string.\r
 \r
   @param[in, out]  HexStr      Pointer to the string.\r
   @param[in, out]  HexLength   The length of the string.\r
 \r

-  @retval EFI_SUCCESS          The binary data is converted to the hexadecimal string \r
+  @retval EFI_SUCCESS          The binary data is converted to the hexadecimal string\r

                                and the length of the string is updated.\r
   @retval EFI_BUFFER_TOO_SMALL The string is too small.\r
   @retval EFI_INVALID_PARAMETER The IP string is malformatted.\r
                                and the length of the string is updated.\r
   @retval EFI_BUFFER_TOO_SMALL The string is too small.\r
   @retval EFI_INVALID_PARAMETER The IP string is malformatted.\r


@@ -455,7 +455,7 @@ IScsiHexToBin (
   UINTN   Length;\r
   UINT8   Digit;\r
   CHAR8   TemStr[2];\r
   UINTN   Length;\r
   UINT8   Digit;\r
   CHAR8   TemStr[2];\r

-  \r
+\r

   ZeroMem (TemStr, sizeof (TemStr));\r
 \r
   //\r
   ZeroMem (TemStr, sizeof (TemStr));\r
 \r
   //\r


@@ -464,7 +464,7 @@ IScsiHexToBin (
   if ((HexStr[0] == '0') && ((HexStr[1] == 'x') || (HexStr[1] == 'X'))) {\r
     HexStr += 2;\r
   }\r
   if ((HexStr[0] == '0') && ((HexStr[1] == 'x') || (HexStr[1] == 'X'))) {\r
     HexStr += 2;\r
   }\r

-  \r
+\r

   Length = AsciiStrLen (HexStr);\r
 \r
   for (Index = 0; Index < Length; Index ++) {\r
   Length = AsciiStrLen (HexStr);\r
 \r
   for (Index = 0; Index < Length; Index ++) {\r


@@ -482,7 +482,7 @@ IScsiHexToBin (
       BinBuffer [Index/2] = (UINT8) ((BinBuffer [Index/2] << 4) + Digit);\r
     }\r
   }\r
       BinBuffer [Index/2] = (UINT8) ((BinBuffer [Index/2] << 4) + Digit);\r
     }\r
   }\r

-  \r
+\r

   *BinLength = (UINT32) ((Index + 1)/2);\r
 \r
   return EFI_SUCCESS;\r
   *BinLength = (UINT32) ((Index + 1)/2);\r
 \r
   return EFI_SUCCESS;\r


@@ -601,7 +601,7 @@ IScsiCleanDriverData (
   EFI_STATUS             Status;\r
 \r
   Status = EFI_SUCCESS;\r
   EFI_STATUS             Status;\r
 \r
   Status = EFI_SUCCESS;\r

-  \r
+\r

   if (Private->DevicePath != NULL) {\r
     Status = gBS->UninstallProtocolInterface (\r
                     Private->ExtScsiPassThruHandle,\r
   if (Private->DevicePath != NULL) {\r
     Status = gBS->UninstallProtocolInterface (\r
                     Private->ExtScsiPassThruHandle,\r


@@ -627,7 +627,7 @@ EXIT:
   if (Private->ExitBootServiceEvent != NULL) {\r
     gBS->CloseEvent (Private->ExitBootServiceEvent);\r
   }\r
   if (Private->ExitBootServiceEvent != NULL) {\r
     gBS->CloseEvent (Private->ExitBootServiceEvent);\r
   }\r

-  \r
+\r

   FreePool (Private);\r
   return Status;\r
 }\r
   FreePool (Private);\r
   return Status;\r
 }\r


@@ -636,10 +636,10 @@ EXIT:
   Check wheather the Controller is configured to use DHCP protocol.\r
 \r
   @param[in]  Controller           The handle of the controller.\r
   Check wheather the Controller is configured to use DHCP protocol.\r
 \r
   @param[in]  Controller           The handle of the controller.\r

-  \r
+\r

   @retval TRUE                     The handle of the controller need the Dhcp protocol.\r
   @retval FALSE                    The handle of the controller does not need the Dhcp protocol.\r
   @retval TRUE                     The handle of the controller need the Dhcp protocol.\r
   @retval FALSE                    The handle of the controller does not need the Dhcp protocol.\r

-  \r
+\r

 **/\r
 BOOLEAN\r
 IScsiDhcpIsConfigured (\r
 **/\r
 BOOLEAN\r
 IScsiDhcpIsConfigured (\r


@@ -826,7 +826,7 @@ IScsiGetTcpConnDevicePath (
         ) {\r
 \r
       DPathNode->Ipv4.LocalPort       = 0;\r
         ) {\r
 \r
       DPathNode->Ipv4.LocalPort       = 0;\r

-      DPathNode->Ipv4.StaticIpAddress = \r
+      DPathNode->Ipv4.StaticIpAddress =\r

         (BOOLEAN) (!Session->ConfigData.NvData.InitiatorInfoFromDhcp);\r
 \r
       //\r
         (BOOLEAN) (!Session->ConfigData.NvData.InitiatorInfoFromDhcp);\r
 \r
       //\r


@@ -835,7 +835,7 @@ IScsiGetTcpConnDevicePath (
       //  do not exist.\r
       //  In new version of IPv4_DEVICE_PATH, structcure length is 27.\r
       //\r
       //  do not exist.\r
       //  In new version of IPv4_DEVICE_PATH, structcure length is 27.\r
       //\r

-      if (DevicePathNodeLength (&DPathNode->Ipv4) == IP4_NODE_LEN_NEW_VERSIONS) {  \r
+      if (DevicePathNodeLength (&DPathNode->Ipv4) == IP4_NODE_LEN_NEW_VERSIONS) {\r

 \r
         IP4_COPY_ADDRESS (\r
           &DPathNode->Ipv4.GatewayIpAddress,\r
 \r
         IP4_COPY_ADDRESS (\r
           &DPathNode->Ipv4.GatewayIpAddress,\r


@@ -873,7 +873,7 @@ IScsiOnExitBootService (
   ISCSI_DRIVER_DATA *Private;\r
 \r
   Private = (ISCSI_DRIVER_DATA *) Context;\r
   ISCSI_DRIVER_DATA *Private;\r
 \r
   Private = (ISCSI_DRIVER_DATA *) Context;\r

-  \r
+\r

   gBS->CloseEvent (Private->ExitBootServiceEvent);\r
   Private->ExitBootServiceEvent = NULL;\r
 \r
   gBS->CloseEvent (Private->ExitBootServiceEvent);\r
   Private->ExitBootServiceEvent = NULL;\r
 \r


@@ -887,7 +887,7 @@ IScsiOnExitBootService (
   currently managing the controller specified by ControllerHandle.  This test\r
   is performed by evaluating if the the protocol specified by ProtocolGuid is\r
   present on ControllerHandle and is was opened by DriverBindingHandle and Nic\r
   currently managing the controller specified by ControllerHandle.  This test\r
   is performed by evaluating if the the protocol specified by ProtocolGuid is\r
   present on ControllerHandle and is was opened by DriverBindingHandle and Nic\r

-  Device handle with an attribute of EFI_OPEN_PROTOCOL_BY_DRIVER. \r
+  Device handle with an attribute of EFI_OPEN_PROTOCOL_BY_DRIVER.\r

   If ProtocolGuid is NULL, then ASSERT().\r
 \r
   @param  ControllerHandle     A handle for a controller to test.\r
   If ProtocolGuid is NULL, then ASSERT().\r
 \r
   @param  ControllerHandle     A handle for a controller to test.\r

diff --git a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiMisc.h b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiMisc.h
index 0ab44d06aebd000f66e5802a53575c91eb2be1b4..500e00373b25ad8569aef0900ec3e9e71512ac3e 100644 (file)
--- a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiMisc.h
+++ b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiMisc.h
@@ -1,7 +1,7 @@
 /** @file\r
   Miscellaneous definitions for iSCSI driver.\r
 \r
 /** @file\r
   Miscellaneous definitions for iSCSI driver.\r
 \r

-Copyright (c) 2004 - 2016, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2004 - 2018, Intel Corporation. All rights reserved.<BR>\r

 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r


@@ -65,7 +65,7 @@ IScsiGetSubnetMaskPrefixLength (
   );\r
 \r
 /**\r
   );\r
 \r
 /**\r

-  Convert the hexadecimal encoded LUN string into the 64-bit LUN. \r
+  Convert the hexadecimal encoded LUN string into the 64-bit LUN.\r

 \r
   @param[in]   Str             The hexadecimal encoded LUN string.\r
   @param[out]  Lun             Storage to return the 64-bit LUN.\r
 \r
   @param[in]   Str             The hexadecimal encoded LUN string.\r
   @param[out]  Lun             Storage to return the 64-bit LUN.\r


@@ -158,7 +158,7 @@ IScsiAsciiStrToIp (
   @param[in, out]  HexStr      Pointer to the string.\r
   @param[in, out]  HexLength   The length of the string.\r
 \r
   @param[in, out]  HexStr      Pointer to the string.\r
   @param[in, out]  HexLength   The length of the string.\r
 \r

-  @retval EFI_SUCCESS          The binary data is converted to the hexadecimal string \r
+  @retval EFI_SUCCESS          The binary data is converted to the hexadecimal string\r

                                and the length of the string is updated.\r
   @retval EFI_BUFFER_TOO_SMALL The string is too small.\r
   @retval EFI_INVALID_PARAMETER The IP string is malformatted.\r
                                and the length of the string is updated.\r
   @retval EFI_BUFFER_TOO_SMALL The string is too small.\r
   @retval EFI_INVALID_PARAMETER The IP string is malformatted.\r


@@ -233,10 +233,10 @@ IScsiCleanDriverData (
   Check wheather the Controller is configured to use DHCP protocol.\r
 \r
   @param[in]  Controller           The handle of the controller.\r
   Check wheather the Controller is configured to use DHCP protocol.\r
 \r
   @param[in]  Controller           The handle of the controller.\r

-  \r
+\r

   @retval TRUE                     The handle of the controller need the Dhcp protocol.\r
   @retval FALSE                    The handle of the controller does not need the Dhcp protocol.\r
   @retval TRUE                     The handle of the controller need the Dhcp protocol.\r
   @retval FALSE                    The handle of the controller does not need the Dhcp protocol.\r

-  \r
+\r

 **/\r
 BOOLEAN\r
 IScsiDhcpIsConfigured (\r
 **/\r
 BOOLEAN\r
 IScsiDhcpIsConfigured (\r


@@ -290,7 +290,7 @@ IScsiOnExitBootService (
   currently managing the controller specified by ControllerHandle.  This test\r
   is performed by evaluating if the the protocol specified by ProtocolGuid is\r
   present on ControllerHandle and is was opened by DriverBindingHandle and Nic\r
   currently managing the controller specified by ControllerHandle.  This test\r
   is performed by evaluating if the the protocol specified by ProtocolGuid is\r
   present on ControllerHandle and is was opened by DriverBindingHandle and Nic\r

-  Device handle with an attribute of EFI_OPEN_PROTOCOL_BY_DRIVER. \r
+  Device handle with an attribute of EFI_OPEN_PROTOCOL_BY_DRIVER.\r

   If ProtocolGuid is NULL, then ASSERT().\r
 \r
   @param  ControllerHandle     A handle for a controller to test.\r
   If ProtocolGuid is NULL, then ASSERT().\r
 \r
   @param  ControllerHandle     A handle for a controller to test.\r

diff --git a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiProto.c b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiProto.c
index 4317de258db9a568cd693a077cb629c94f8b54be..9fb848080af37cd24a291829b4cab1f5d1f8d6bc 100644 (file)
--- a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiProto.c
+++ b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiProto.c
@@ -1,7 +1,7 @@
 /** @file\r
   The implementation of iSCSI protocol based on RFC3720.\r
 \r
 /** @file\r
   The implementation of iSCSI protocol based on RFC3720.\r
 \r

-Copyright (c) 2004 - 2015, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2004 - 2018, Intel Corporation. All rights reserved.<BR>\r

 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r


@@ -17,7 +17,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 UINT32 mDataSegPad = 0;\r
 \r
 /**\r
 UINT32 mDataSegPad = 0;\r
 \r
 /**\r

-  Attach the iSCSI connection to the iSCSI session. \r
+  Attach the iSCSI connection to the iSCSI session.\r

 \r
   @param[in, out]  Session The iSCSI session.\r
   @param[in, out]  Conn    The iSCSI connection.\r
 \r
   @param[in, out]  Session The iSCSI session.\r
   @param[in, out]  Conn    The iSCSI connection.\r


@@ -34,7 +34,7 @@ IScsiAttatchConnection (
 }\r
 \r
 /**\r
 }\r
 \r
 /**\r

-  Detach the iSCSI connection from the session it belongs to. \r
+  Detach the iSCSI connection from the session it belongs to.\r

 \r
   @param[in, out]  Conn The iSCSI connection.\r
 **/\r
 \r
   @param[in, out]  Conn The iSCSI connection.\r
 **/\r


@@ -49,7 +49,7 @@ IScsiDetatchConnection (
 }\r
 \r
 /**\r
 }\r
 \r
 /**\r

-  Check the sequence number according to RFC3720. \r
+  Check the sequence number according to RFC3720.\r

 \r
   @param[in, out]  ExpSN   The currently expected sequence number.\r
   @param[in]       NewSN   The sequence number to check.\r
 \r
   @param[in, out]  ExpSN   The currently expected sequence number.\r
   @param[in]       NewSN   The sequence number to check.\r


@@ -116,7 +116,7 @@ IScsiUpdateCmdSN (
 \r
   @retval EFI_SUCCESS        The iSCSI connection is logged into the iSCSI target.\r
   @retval EFI_TIMEOUT        Timeout happened during the login procedure.\r
 \r
   @retval EFI_SUCCESS        The iSCSI connection is logged into the iSCSI target.\r
   @retval EFI_TIMEOUT        Timeout happened during the login procedure.\r

-  @retval Others             Other errors as indicated.  \r
+  @retval Others             Other errors as indicated.\r

 **/\r
 EFI_STATUS\r
 IScsiConnLogin (\r
 **/\r
 EFI_STATUS\r
 IScsiConnLogin (\r


@@ -381,7 +381,7 @@ IScsiSendLoginReq (
   Receive and process the iSCSI login response.\r
 \r
   @param[in]  Conn             The connection in the iSCSI login phase.\r
   Receive and process the iSCSI login response.\r
 \r
   @param[in]  Conn             The connection in the iSCSI login phase.\r

-  \r
+\r

   @retval EFI_SUCCESS          The iSCSI login response PDU is received and processed.\r
   @retval Others               Other errors as indicated.\r
 **/\r
   @retval EFI_SUCCESS          The iSCSI login response PDU is received and processed.\r
   @retval Others               Other errors as indicated.\r
 **/\r


@@ -807,7 +807,7 @@ IScsiProcessLoginRsp (
   @param[in]      Data         The data segment which should contain the\r
                                TargetAddress key-value list.\r
   @param[in]      Len          Length of the data.\r
   @param[in]      Data         The data segment which should contain the\r
                                TargetAddress key-value list.\r
   @param[in]      Len          Length of the data.\r

-  \r
+\r

   @retval EFI_SUCCESS          The target address is updated.\r
   @retval EFI_OUT_OF_RESOURCES Failed to allocate memory.\r
   @retval EFI_NOT_FOUND        The TargetAddress key is not found.\r
   @retval EFI_SUCCESS          The target address is updated.\r
   @retval EFI_OUT_OF_RESOURCES Failed to allocate memory.\r
   @retval EFI_NOT_FOUND        The TargetAddress key is not found.\r


@@ -1866,7 +1866,7 @@ IScsiNewScsiCmdPdu (
   if (ScsiCmd == NULL) {\r
     NetbufFree (PduHeader);\r
     return NULL;\r
   if (ScsiCmd == NULL) {\r
     NetbufFree (PduHeader);\r
     return NULL;\r

-  }    \r
+  }\r

   Header  = (ISCSI_ADDITIONAL_HEADER *) (ScsiCmd + 1);\r
 \r
   ZeroMem (ScsiCmd, Length);\r
   Header  = (ISCSI_ADDITIONAL_HEADER *) (ScsiCmd + 1);\r
 \r
   ZeroMem (ScsiCmd, Length);\r


@@ -2522,8 +2522,8 @@ IScsiOnNopInRcvd (
   @param[in]       Lun       The LUN.\r
   @param[in, out]  Packet    The request packet containing IO request, SCSI command\r
                              buffer and buffers to read/write.\r
   @param[in]       Lun       The LUN.\r
   @param[in, out]  Packet    The request packet containing IO request, SCSI command\r
                              buffer and buffers to read/write.\r

-                             \r
-  @retval EFI_SUCCES           The SCSI command is executed and the result is updated to \r
+\r
+  @retval EFI_SUCCES           The SCSI command is executed and the result is updated to\r

                                the Packet.\r
   @retval EFI_DEVICE_ERROR     Session state was not as required.\r
   @retval EFI_OUT_OF_RESOURCES Failed to allocate memory.\r
                                the Packet.\r
   @retval EFI_DEVICE_ERROR     Session state was not as required.\r
   @retval EFI_OUT_OF_RESOURCES Failed to allocate memory.\r


@@ -2640,7 +2640,7 @@ IScsiExecuteScsiCommand (
       if (EFI_ERROR (Status)) {\r
         goto ON_EXIT;\r
       }\r
       if (EFI_ERROR (Status)) {\r
         goto ON_EXIT;\r
       }\r

-      TimeoutEvent = Conn->TimeoutEvent; \r
+      TimeoutEvent = Conn->TimeoutEvent;\r

     }\r
     //\r
     // try to receive PDU from target.\r
     }\r
     //\r
     // try to receive PDU from target.\r

diff --git a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiProto.h b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiProto.h
index 2f953236fd4a4c7aa0e38b7ccb0d1291b07d3fcb..6469df0434a12042507ea1c9813d540048757707 100644 (file)
--- a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiProto.h
+++ b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiProto.h
@@ -1,7 +1,7 @@
 /** @file\r
   The header file of iSCSI Protocol that defines many specific data structures.\r
 \r
 /** @file\r
   The header file of iSCSI Protocol that defines many specific data structures.\r
 \r

-Copyright (c) 2004 - 2014, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2004 - 2018, Intel Corporation. All rights reserved.<BR>\r

 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r


@@ -624,7 +624,7 @@ typedef struct _ISCSI_KEY_VALUE_PAIR {
 } ISCSI_KEY_VALUE_PAIR;\r
 \r
 /**\r
 } ISCSI_KEY_VALUE_PAIR;\r
 \r
 /**\r

-  Attach the iSCSI connection to the iSCSI session. \r
+  Attach the iSCSI connection to the iSCSI session.\r

 \r
   @param[in, out]  Session The iSCSI session.\r
   @param[in, out]  Conn    The iSCSI connection.\r
 \r
   @param[in, out]  Session The iSCSI session.\r
   @param[in, out]  Conn    The iSCSI connection.\r


@@ -636,7 +636,7 @@ IScsiAttatchConnection (
   );\r
 \r
 /**\r
   );\r
 \r
 /**\r

-  Detach the iSCSI connection from the session it belongs to. \r
+  Detach the iSCSI connection from the session it belongs to.\r

 \r
   @param[in, out]  Conn The iSCSI connection.\r
 **/\r
 \r
   @param[in, out]  Conn The iSCSI connection.\r
 **/\r


@@ -652,7 +652,7 @@ IScsiDetatchConnection (
 \r
   @retval EFI_SUCCESS        The iSCSI connection is logged into the iSCSI target.\r
   @retval EFI_TIMEOUT        Timeout happened during the login procedure.\r
 \r
   @retval EFI_SUCCESS        The iSCSI connection is logged into the iSCSI target.\r
   @retval EFI_TIMEOUT        Timeout happened during the login procedure.\r

-  @retval Others             Other errors as indicated.  \r
+  @retval Others             Other errors as indicated.\r

 **/\r
 EFI_STATUS\r
 IScsiConnLogin (\r
 **/\r
 EFI_STATUS\r
 IScsiConnLogin (\r


@@ -719,7 +719,7 @@ IScsiSendLoginReq (
   Receive and process the iSCSI login response.\r
 \r
   @param[in]  Conn             The connection in the iSCSI login phase.\r
   Receive and process the iSCSI login response.\r
 \r
   @param[in]  Conn             The connection in the iSCSI login phase.\r

-  \r
+\r

   @retval EFI_SUCCESS          The iSCSI login response PDU is received and processed.\r
   @retval Others               Other errors as indicated.\r
 **/\r
   @retval EFI_SUCCESS          The iSCSI login response PDU is received and processed.\r
   @retval Others               Other errors as indicated.\r
 **/\r


@@ -788,7 +788,7 @@ IScsiProcessLoginRsp (
   @param[in]      Data         The data segment which should contain the\r
                                TargetAddress key-value list.\r
   @param[in]      Len          Length of the data.\r
   @param[in]      Data         The data segment which should contain the\r
                                TargetAddress key-value list.\r
   @param[in]      Len          Length of the data.\r

-  \r
+\r

   @retval EFI_SUCCESS          The target address is updated.\r
   @retval EFI_OUT_OF_RESOURCES Failed to allocate memory.\r
   @retval EFI_NOT_FOUND        The TargetAddress key is not found.\r
   @retval EFI_SUCCESS          The target address is updated.\r
   @retval EFI_OUT_OF_RESOURCES Failed to allocate memory.\r
   @retval EFI_NOT_FOUND        The TargetAddress key is not found.\r


@@ -948,8 +948,8 @@ IScsiNormalizeName (
   @param[in]       Lun       The LUN.\r
   @param[in, out]  Packet    The request packet containing IO request, SCSI command\r
                              buffer and buffers to read/write.\r
   @param[in]       Lun       The LUN.\r
   @param[in, out]  Packet    The request packet containing IO request, SCSI command\r
                              buffer and buffers to read/write.\r

-                             \r
-  @retval EFI_SUCCES           The SCSI command is executed and the result is updated to \r
+\r
+  @retval EFI_SUCCES           The SCSI command is executed and the result is updated to\r

                                the Packet.\r
   @retval EFI_DEVICE_ERROR     Session state was not as required.\r
   @retval EFI_OUT_OF_RESOURCES Failed to allocate memory.\r
                                the Packet.\r
   @retval EFI_DEVICE_ERROR     Session state was not as required.\r
   @retval EFI_OUT_OF_RESOURCES Failed to allocate memory.\r


@@ -988,7 +988,7 @@ IScsiSessionInit (
   IN OUT ISCSI_SESSION  *Session,\r
   IN BOOLEAN            Recovery\r
   );\r
   IN OUT ISCSI_SESSION  *Session,\r
   IN BOOLEAN            Recovery\r
   );\r

-  \r
+\r

 /**\r
   Abort the iSCSI session, that is, reset all the connection and free the\r
   resources.\r
 /**\r
   Abort the iSCSI session, that is, reset all the connection and free the\r
   resources.\r

diff --git a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiTcp4Io.c b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiTcp4Io.c
index e73a6dd5f78e4bca08b2c3de0ac34d8cb00dc24f..901b38e92fc0c0e479fb16ad48d5f58d74debded 100644 (file)
--- a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiTcp4Io.c
+++ b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiTcp4Io.c
@@ -1,7 +1,7 @@
 /** @file\r
   The wrap of TCP/IP Socket interface.\r
 \r
 /** @file\r
   The wrap of TCP/IP Socket interface.\r
 \r

-Copyright (c) 2004 - 2009, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2004 - 2018, Intel Corporation. All rights reserved.<BR>\r

 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r


@@ -15,7 +15,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #include "IScsiImpl.h"\r
 \r
 /**\r
 #include "IScsiImpl.h"\r
 \r
 /**\r

-  The common notify function associated with various Tcp4Io events. \r
+  The common notify function associated with various Tcp4Io events.\r

 \r
   @param[in]  Event   The event signaled.\r
   @param[in]  Context The context.\r
 \r
   @param[in]  Event   The event signaled.\r
   @param[in]  Context The context.\r


@@ -31,13 +31,13 @@ Tcp4IoCommonNotify (
 }\r
 \r
 /**\r
 }\r
 \r
 /**\r

-  Create a TCP socket with the specified configuration data. \r
+  Create a TCP socket with the specified configuration data.\r

 \r
   @param[in]  Image      The handle of the driver image.\r
   @param[in]  Controller The handle of the controller.\r
   @param[in]  ConfigData The Tcp4 configuration data.\r
   @param[in]  Tcp4Io     The Tcp4Io.\r
 \r
   @param[in]  Image      The handle of the driver image.\r
   @param[in]  Controller The handle of the controller.\r
   @param[in]  ConfigData The Tcp4 configuration data.\r
   @param[in]  Tcp4Io     The Tcp4Io.\r

-  \r
+\r

   @retval EFI_SUCCESS    The TCP socket is created and configured.\r
   @retval Others         Failed to create the TCP socket or configure it.\r
 **/\r
   @retval EFI_SUCCESS    The TCP socket is created and configured.\r
   @retval Others         Failed to create the TCP socket or configure it.\r
 **/\r


@@ -230,7 +230,7 @@ ON_ERROR:
 }\r
 \r
 /**\r
 }\r
 \r
 /**\r

-  Destroy the socket. \r
+  Destroy the socket.\r

 \r
   @param[in]  Tcp4Io The Tcp4Io which wraps the socket to be destroyeds.\r
 **/\r
 \r
   @param[in]  Tcp4Io The Tcp4Io which wraps the socket to be destroyeds.\r
 **/\r


@@ -269,7 +269,7 @@ Tcp4IoDestroySocket (
 \r
   @param[in, out]  Tcp4Io    The Tcp4Io wrapping the TCP socket.\r
   @param[in]       Timeout   The time to wait for connection done.\r
 \r
   @param[in, out]  Tcp4Io    The Tcp4Io wrapping the TCP socket.\r
   @param[in]       Timeout   The time to wait for connection done.\r

-  \r
+\r

   @retval EFI_SUCCESS          Connect to the other endpoint of the TCP socket successfully.\r
   @retval EFI_TIMEOUT          Failed to connect to the other endpoint of the TCP socket in the                               specified time period.\r
   @retval Others               Other errors as indicated.\r
   @retval EFI_SUCCESS          Connect to the other endpoint of the TCP socket successfully.\r
   @retval EFI_TIMEOUT          Failed to connect to the other endpoint of the TCP socket in the                               specified time period.\r
   @retval Others               Other errors as indicated.\r


@@ -335,7 +335,7 @@ Tcp4IoReset (
 \r
   @param[in]   Tcp4Io          The Tcp4Io wrapping the TCP socket.\r
   @param[in]   Packet          The packet to transmit.\r
 \r
   @param[in]   Tcp4Io          The Tcp4Io wrapping the TCP socket.\r
   @param[in]   Packet          The packet to transmit.\r

-  \r
+\r

   @retval EFI_SUCCESS          The packet is trasmitted.\r
   @retval EFI_OUT_OF_RESOURCES Failed to allocate memory.\r
   @retval Others               Other errors as indicated.\r
   @retval EFI_SUCCESS          The packet is trasmitted.\r
   @retval EFI_OUT_OF_RESOURCES Failed to allocate memory.\r
   @retval Others               Other errors as indicated.\r

diff --git a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiTcp4Io.h b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiTcp4Io.h
index 2b3c0b77d98fe0a8058bdf253651d6de3023d79b..9e0f1e0f02c2c65754d4fe70c0e2d6f3c9f2239b 100644 (file)
--- a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiTcp4Io.h
+++ b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiTcp4Io.h
@@ -1,7 +1,7 @@
 /** @file\r
   iSCSI Tcp4 IO related definitions.\r
 \r
 /** @file\r
   iSCSI Tcp4 IO related definitions.\r
 \r

-Copyright (c) 2004 - 2008, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2004 - 2018, Intel Corporation. All rights reserved.<BR>\r

 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r


@@ -46,13 +46,13 @@ typedef struct _TCP4_IO {
 } TCP4_IO;\r
 \r
 /**\r
 } TCP4_IO;\r
 \r
 /**\r

-  Create a TCP socket with the specified configuration data. \r
+  Create a TCP socket with the specified configuration data.\r

 \r
   @param[in]  Image      The handle of the driver image.\r
   @param[in]  Controller The handle of the controller.\r
   @param[in]  ConfigData The Tcp4 configuration data.\r
   @param[in]  Tcp4Io     The Tcp4Io.\r
 \r
   @param[in]  Image      The handle of the driver image.\r
   @param[in]  Controller The handle of the controller.\r
   @param[in]  ConfigData The Tcp4 configuration data.\r
   @param[in]  Tcp4Io     The Tcp4Io.\r

-  \r
+\r

   @retval EFI_SUCCESS    The TCP socket is created and configured.\r
   @retval Others         Failed to create the TCP socket or configure it.\r
 **/\r
   @retval EFI_SUCCESS    The TCP socket is created and configured.\r
   @retval Others         Failed to create the TCP socket or configure it.\r
 **/\r


@@ -65,7 +65,7 @@ Tcp4IoCreateSocket (
   );\r
 \r
 /**\r
   );\r
 \r
 /**\r

-  Destroy the socket. \r
+  Destroy the socket.\r

 \r
   @param[in]  Tcp4Io The Tcp4Io which wraps the socket to be destroyeds.\r
 **/\r
 \r
   @param[in]  Tcp4Io The Tcp4Io which wraps the socket to be destroyeds.\r
 **/\r


@@ -79,7 +79,7 @@ Tcp4IoDestroySocket (
 \r
   @param[in, out]  Tcp4Io    The Tcp4Io wrapping the TCP socket.\r
   @param[in]       Timeout   The time to wait for connection done.\r
 \r
   @param[in, out]  Tcp4Io    The Tcp4Io wrapping the TCP socket.\r
   @param[in]       Timeout   The time to wait for connection done.\r

-  \r
+\r

   @retval EFI_SUCCESS          Connect to the other endpoint of the TCP socket successfully.\r
   @retval EFI_TIMEOUT          Failed to connect to the other endpoint of the TCP socket in the                               specified time period.\r
   @retval Others               Other errors as indicated.\r
   @retval EFI_SUCCESS          Connect to the other endpoint of the TCP socket successfully.\r
   @retval EFI_TIMEOUT          Failed to connect to the other endpoint of the TCP socket in the                               specified time period.\r
   @retval Others               Other errors as indicated.\r


@@ -105,7 +105,7 @@ Tcp4IoReset (
 \r
   @param[in]   Tcp4Io          The Tcp4Io wrapping the TCP socket.\r
   @param[in]   Packet          The packet to transmit.\r
 \r
   @param[in]   Tcp4Io          The Tcp4Io wrapping the TCP socket.\r
   @param[in]   Packet          The packet to transmit.\r

-  \r
+\r

   @retval EFI_SUCCESS          The packet is trasmitted.\r
   @retval EFI_OUT_OF_RESOURCES Failed to allocate memory.\r
   @retval Others               Other errors as indicated.\r
   @retval EFI_SUCCESS          The packet is trasmitted.\r
   @retval EFI_OUT_OF_RESOURCES Failed to allocate memory.\r
   @retval Others               Other errors as indicated.\r

diff --git a/MdeModulePkg/Universal/Network/IScsiDxe/Md5.c b/MdeModulePkg/Universal/Network/IScsiDxe/Md5.c
index 5dc7d994d67ff22a200e57de5eaaab0b36042bdb..3555f1a2ebe3d930bfd9e7e1bc983783b643c511 100644 (file)
--- a/MdeModulePkg/Universal/Network/IScsiDxe/Md5.c
+++ b/MdeModulePkg/Universal/Network/IScsiDxe/Md5.c
@@ -1,7 +1,7 @@
 /** @file\r
   Implementation of MD5 algorithm.\r
 \r
 /** @file\r
   Implementation of MD5 algorithm.\r
 \r

-Copyright (c) 2004 - 2008, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2004 - 2018, Intel Corporation. All rights reserved.<BR>\r

 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r


@@ -57,14 +57,14 @@ CONST UINT8 Md5HashPadding[] =
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\r
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\r
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\r
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\r
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\r
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\r

-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \r

   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\r
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\r
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\r
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\r
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\r
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\r
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\r
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\r
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\r
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\r
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\r
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\r

-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 \r
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\r
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00\r

 };\r
 \r
 //\r
 };\r
 \r
 //\r


@@ -79,18 +79,18 @@ CONST UINT8 Md5HashPadding[] =
 \r
 /**\r
   Tf1 is one basic MD5 transform function.\r
 \r
 /**\r
   Tf1 is one basic MD5 transform function.\r

-  \r
+\r

   @param[in]  A      A  32-bit quantity.\r
   @param[in]  A      A  32-bit quantity.\r

-  @param[in]  B      A  32-bit quantity. \r
+  @param[in]  B      A  32-bit quantity.\r

   @param[in]  C      A  32-bit quantity.\r
 \r
   @return             Output was produced as a 32-bit quantity based on the\r
   @param[in]  C      A  32-bit quantity.\r
 \r
   @return             Output was produced as a 32-bit quantity based on the\r

-                      three 32-bit input quantity.   \r
+                      three 32-bit input quantity.\r

 **/\r
 **/\r

-UINT32 \r
+UINT32\r

 Tf1 (\r
 Tf1 (\r

-  IN UINT32 A, \r
-  IN UINT32 B, \r
+  IN UINT32 A,\r
+  IN UINT32 B,\r

   IN UINT32 C\r
   )\r
 {\r
   IN UINT32 C\r
   )\r
 {\r


@@ -99,18 +99,18 @@ Tf1 (
 \r
 /**\r
   Tf2 is one basic MD5 transform function.\r
 \r
 /**\r
   Tf2 is one basic MD5 transform function.\r

-  \r
+\r

   @param[in]  A      A  32-bit quantity.\r
   @param[in]  A      A  32-bit quantity.\r

-  @param[in]  B      A  32-bit quantity. \r
+  @param[in]  B      A  32-bit quantity.\r

   @param[in]  C      A  32-bit quantity.\r
 \r
   @return             Output was produced as a 32-bit quantity based on the\r
   @param[in]  C      A  32-bit quantity.\r
 \r
   @return             Output was produced as a 32-bit quantity based on the\r

-                      three 32-bit input quantity.   \r
+                      three 32-bit input quantity.\r

 **/\r
 **/\r

-UINT32 \r
+UINT32\r

 Tf2 (\r
 Tf2 (\r

-  IN UINT32 A, \r
-  IN UINT32 B, \r
+  IN UINT32 A,\r
+  IN UINT32 B,\r

   IN UINT32 C\r
   )\r
 {\r
   IN UINT32 C\r
   )\r
 {\r


@@ -119,18 +119,18 @@ Tf2 (
 \r
 /**\r
   Tf3 is one basic MD5 transform function.\r
 \r
 /**\r
   Tf3 is one basic MD5 transform function.\r

-  \r
+\r

   @param[in]  A      A  32-bit quantity.\r
   @param[in]  A      A  32-bit quantity.\r

-  @param[in]  B      A  32-bit quantity. \r
+  @param[in]  B      A  32-bit quantity.\r

   @param[in]  C      A  32-bit quantity.\r
 \r
   @return             Output was produced as a 32-bit quantity based on the\r
   @param[in]  C      A  32-bit quantity.\r
 \r
   @return             Output was produced as a 32-bit quantity based on the\r

-                      three 32-bit input quantity.   \r
+                      three 32-bit input quantity.\r

 **/\r
 **/\r

-UINT32 \r
+UINT32\r

 Tf3 (\r
 Tf3 (\r

-  IN UINT32 A, \r
-  IN UINT32 B, \r
+  IN UINT32 A,\r
+  IN UINT32 B,\r

   IN UINT32 C\r
   )\r
 {\r
   IN UINT32 C\r
   )\r
 {\r


@@ -139,18 +139,18 @@ Tf3 (
 \r
 /**\r
   Tf4 is one basic MD5 transform function.\r
 \r
 /**\r
   Tf4 is one basic MD5 transform function.\r

-  \r
+\r

   @param[in]  A      A  32-bit quantity.\r
   @param[in]  A      A  32-bit quantity.\r

-  @param[in]  B      A  32-bit quantity. \r
+  @param[in]  B      A  32-bit quantity.\r

   @param[in]  C      A  32-bit quantity.\r
 \r
   @return             Output was produced as a 32-bit quantity based on the\r
   @param[in]  C      A  32-bit quantity.\r
 \r
   @return             Output was produced as a 32-bit quantity based on the\r

-                      three 32-bit input quantity.   \r
+                      three 32-bit input quantity.\r

 **/\r
 **/\r

-UINT32 \r
+UINT32\r

 Tf4 (\r
 Tf4 (\r

-  IN UINT32 A, \r
-  IN UINT32 B, \r
+  IN UINT32 A,\r
+  IN UINT32 B,\r

   IN UINT32 C\r
   )\r
 {\r
   IN UINT32 C\r
   )\r
 {\r


@@ -220,7 +220,7 @@ MD5Transform (
   Copy data segment into the M field of MD5_CTX structure for later transform.\r
   If the length of data segment is larger than 64 bytes, then does the transform\r
   immediately and the generated Md5 code is stored in the States field of MD5_CTX\r
   Copy data segment into the M field of MD5_CTX structure for later transform.\r
   If the length of data segment is larger than 64 bytes, then does the transform\r
   immediately and the generated Md5 code is stored in the States field of MD5_CTX\r

-  data struct for later accumulation. \r
+  data struct for later accumulation.\r

   All of Md5 code generated for the sequential 64-bytes data segaments are be\r
   accumulated in MD5Final() function.\r
 \r
   All of Md5 code generated for the sequential 64-bytes data segaments are be\r
   accumulated in MD5Final() function.\r
 \r


@@ -241,7 +241,7 @@ MD5UpdateBlock (
   for (Limit = 64 - Md5Ctx->Count; DataLen >= 64 - Md5Ctx->Count; Limit = 64) {\r
     CopyMem (Md5Ctx->M + Md5Ctx->Count, (VOID *)Data, Limit);\r
     MD5Transform (Md5Ctx);\r
   for (Limit = 64 - Md5Ctx->Count; DataLen >= 64 - Md5Ctx->Count; Limit = 64) {\r
     CopyMem (Md5Ctx->M + Md5Ctx->Count, (VOID *)Data, Limit);\r
     MD5Transform (Md5Ctx);\r

-    \r
+\r

     Md5Ctx->Count = 0;\r
     Data         += Limit;\r
     DataLen      -= Limit;\r
     Md5Ctx->Count = 0;\r
     Data         += Limit;\r
     DataLen      -= Limit;\r


@@ -271,7 +271,7 @@ MD5Init (
   Md5Ctx->States[0] = 0x67452301;\r
   Md5Ctx->States[1] = 0xefcdab89;\r
   Md5Ctx->States[2] = 0x98badcfe;\r
   Md5Ctx->States[0] = 0x67452301;\r
   Md5Ctx->States[1] = 0xefcdab89;\r
   Md5Ctx->States[2] = 0x98badcfe;\r

-  Md5Ctx->States[3] = 0x10325476;  \r
+  Md5Ctx->States[3] = 0x10325476;\r

 \r
   return EFI_SUCCESS;\r
 }\r
 \r
   return EFI_SUCCESS;\r
 }\r


@@ -328,7 +328,7 @@ MD5Final (
     //\r
     CopyMem (HashVal, (UINT8 *) Md5Ctx->States, MD5_HASHSIZE);\r
     ZeroMem ((UINT8 *)Md5Ctx, sizeof (*Md5Ctx));\r
     //\r
     CopyMem (HashVal, (UINT8 *) Md5Ctx->States, MD5_HASHSIZE);\r
     ZeroMem ((UINT8 *)Md5Ctx, sizeof (*Md5Ctx));\r

-    \r
+\r

     return EFI_SUCCESS;\r
   }\r
 \r
     return EFI_SUCCESS;\r
   }\r
 \r

diff --git a/MdeModulePkg/Universal/Network/IScsiDxe/Md5.h b/MdeModulePkg/Universal/Network/IScsiDxe/Md5.h
index 8de4e869b4b4e9089b57293231d53efafde5176f..1541b2d8ece1799a2beab6b1578c235597fae188 100644 (file)
--- a/MdeModulePkg/Universal/Network/IScsiDxe/Md5.h
+++ b/MdeModulePkg/Universal/Network/IScsiDxe/Md5.h
@@ -1,7 +1,7 @@
 /** @file\r
   Header file for Md5.\r
 \r
 /** @file\r
   Header file for Md5.\r
 \r

-Copyright (c) 2004 - 2008, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2004 - 2018, Intel Corporation. All rights reserved.<BR>\r

 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r


@@ -19,7 +19,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #include <Library/BaseLib.h>\r
 #include <Library/BaseMemoryLib.h>\r
 #include <Library/NetLib.h>\r
 #include <Library/BaseLib.h>\r
 #include <Library/BaseMemoryLib.h>\r
 #include <Library/NetLib.h>\r

- \r
+\r

 #define MD5_HASHSIZE  16\r
 \r
 typedef struct _MD5_CTX {\r
 #define MD5_HASHSIZE  16\r
 \r
 typedef struct _MD5_CTX {\r


@@ -77,4 +77,4 @@ MD5Final (
   OUT UINT8        *HashVal\r
   );\r
 \r
   OUT UINT8        *HashVal\r
   );\r
 \r

-#endif \r
+#endif\r

diff --git a/MdeModulePkg/Universal/Network/Ip4Dxe/ComponentName.c b/MdeModulePkg/Universal/Network/Ip4Dxe/ComponentName.c
index 2ccfb3cc1ce6edc49d3198db92d532ddb3c3abe3..5ea1ae1aff29047c9575e3d4131540f6584346ad 100644 (file)
--- a/MdeModulePkg/Universal/Network/Ip4Dxe/ComponentName.c
+++ b/MdeModulePkg/Universal/Network/Ip4Dxe/ComponentName.c
@@ -1,6 +1,6 @@
 /** @file\r
 /** @file\r

-  \r
-Copyright (c) 2005 - 2012, Intel Corporation. All rights reserved.<BR>\r
+\r
+Copyright (c) 2005 - 2018, Intel Corporation. All rights reserved.<BR>\r

 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at<BR>\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at<BR>\r


@@ -237,10 +237,10 @@ Ip4ComponentNameGetDriverName (
 \r
   @param  Ip4[in]                 A pointer to the EFI_IP4_PROTOCOL.\r
 \r
 \r
   @param  Ip4[in]                 A pointer to the EFI_IP4_PROTOCOL.\r
 \r

-  \r
+\r

   @retval EFI_SUCCESS             Update the ControllerNameTable of this instance successfully.\r
   @retval EFI_INVALID_PARAMETER   The input parameter is invalid.\r
   @retval EFI_SUCCESS             Update the ControllerNameTable of this instance successfully.\r
   @retval EFI_INVALID_PARAMETER   The input parameter is invalid.\r

-  \r
+\r

 **/\r
 EFI_STATUS\r
 UpdateName (\r
 **/\r
 EFI_STATUS\r
 UpdateName (\r


@@ -290,7 +290,7 @@ UpdateName (
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r

-  \r
+\r

   return AddUnicodeString2 (\r
            "en",\r
            gIp4ComponentName2.SupportedLanguages,\r
   return AddUnicodeString2 (\r
            "en",\r
            gIp4ComponentName2.SupportedLanguages,\r


@@ -378,9 +378,9 @@ Ip4ComponentNameGetControllerName (
   OUT CHAR16                                          **ControllerName\r
   )\r
 {\r
   OUT CHAR16                                          **ControllerName\r
   )\r
 {\r

-  EFI_STATUS                    Status;  \r
+  EFI_STATUS                    Status;\r

   EFI_IP4_PROTOCOL              *Ip4;\r
   EFI_IP4_PROTOCOL              *Ip4;\r

-  \r
+\r

   //\r
   // Only provide names for child handles.\r
   //\r
   //\r
   // Only provide names for child handles.\r
   //\r


@@ -388,9 +388,9 @@ Ip4ComponentNameGetControllerName (
     return EFI_UNSUPPORTED;\r
   }\r
 \r
     return EFI_UNSUPPORTED;\r
   }\r
 \r

-  // \r
-  // Make sure this driver produced ChildHandle \r
-  // \r
+  //\r
+  // Make sure this driver produced ChildHandle\r
+  //\r

   Status = EfiTestChildHandle (\r
              ControllerHandle,\r
              ChildHandle,\r
   Status = EfiTestChildHandle (\r
              ControllerHandle,\r
              ChildHandle,\r


@@ -400,9 +400,9 @@ Ip4ComponentNameGetControllerName (
     return Status;\r
   }\r
 \r
     return Status;\r
   }\r
 \r

-  // \r
-  // Retrieve an instance of a produced protocol from ChildHandle  \r
-  // \r
+  //\r
+  // Retrieve an instance of a produced protocol from ChildHandle\r
+  //\r

   Status = gBS->OpenProtocol (\r
                   ChildHandle,\r
                   &gEfiIp4ProtocolGuid,\r
   Status = gBS->OpenProtocol (\r
                   ChildHandle,\r
                   &gEfiIp4ProtocolGuid,\r

diff --git a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Common.h b/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Common.h
index 9689f373cf06504cb21813a10dd9aa9e9884aee7..e0fffc9d0da20eeb5dcdb31a62cc3dfd7bb3dc63 100644 (file)
--- a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Common.h
+++ b/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Common.h
@@ -1,7 +1,7 @@
 /** @file\r
   Common definition for IP4.\r
 /** @file\r
   Common definition for IP4.\r

-  \r
-Copyright (c) 2005 - 2017, Intel Corporation. All rights reserved.<BR>\r
+\r
+Copyright (c) 2005 - 2018, Intel Corporation. All rights reserved.<BR>\r

 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r

diff --git a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Config2.vfr b/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Config2.vfr
index 1f45e9f066a4474b0b8ee19b88bad22734425def..35bb75d422e5f45236bc76d5bf2bf8e187ba6a20 100644 (file)
--- a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Config2.vfr
+++ b/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Config2.vfr
@@ -1,7 +1,7 @@
 /** @file\r
   Vfr file for IP4Dxe.\r
 \r
 /** @file\r
   Vfr file for IP4Dxe.\r
 \r

-Copyright (c) 2015 - 2017, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2015 - 2018, Intel Corporation. All rights reserved.<BR>\r

 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r


@@ -87,13 +87,13 @@ formset
     endif;\r
 \r
     subtitle text = STRING_TOKEN(STR_NULL);\r
     endif;\r
 \r
     subtitle text = STRING_TOKEN(STR_NULL);\r

-    \r
+\r

     text\r
       help   = STRING_TOKEN(STR_SAVE_CHANGES),\r
       text   = STRING_TOKEN(STR_SAVE_CHANGES),\r
       flags  = INTERACTIVE,\r
       key    = KEY_SAVE_CHANGES;\r
     text\r
       help   = STRING_TOKEN(STR_SAVE_CHANGES),\r
       text   = STRING_TOKEN(STR_SAVE_CHANGES),\r
       flags  = INTERACTIVE,\r
       key    = KEY_SAVE_CHANGES;\r

-      \r
+\r

   endform;\r
 \r
 endformset;\r
   endform;\r
 \r
 endformset;\r

diff --git a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Config2Impl.c b/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Config2Impl.c
index 488b3f59b8141873e5424b59ac1045fc7a54660d..043341d6e947b0687262a79eae3a437f303b0276 100644 (file)
--- a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Config2Impl.c
+++ b/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Config2Impl.c
@@ -1,7 +1,7 @@
 /** @file\r
   The implementation of EFI IPv4 Configuration II Protocol.\r
 \r
 /** @file\r
   The implementation of EFI IPv4 Configuration II Protocol.\r
 \r

-  Copyright (c) 2015 - 2017, Intel Corporation. All rights reserved.<BR>\r
+  Copyright (c) 2015 - 2018, Intel Corporation. All rights reserved.<BR>\r

   (C) Copyright 2015-2016 Hewlett Packard Enterprise Development LP<BR>\r
 \r
   This program and the accompanying materials\r
   (C) Copyright 2015-2016 Hewlett Packard Enterprise Development LP<BR>\r
 \r
   This program and the accompanying materials\r


@@ -82,7 +82,7 @@ Ip4Config2DestroyDhcp4 (
 \r
   Instance->Dhcp4Handle = NULL;\r
 \r
 \r
   Instance->Dhcp4Handle = NULL;\r
 \r

-  return Status;  \r
+  return Status;\r

 }\r
 \r
 /**\r
 }\r
 \r
 /**\r


@@ -112,7 +112,7 @@ Ip4Config2OnPolicyChanged (
   if (IpSb->DefaultInterface != NULL) {\r
     if (IpSb->DefaultRouteTable != NULL) {\r
       Ip4FreeRouteTable (IpSb->DefaultRouteTable);\r
   if (IpSb->DefaultInterface != NULL) {\r
     if (IpSb->DefaultRouteTable != NULL) {\r
       Ip4FreeRouteTable (IpSb->DefaultRouteTable);\r

-      IpSb->DefaultRouteTable = NULL;    \r
+      IpSb->DefaultRouteTable = NULL;\r

     }\r
 \r
     Ip4CancelReceive (IpSb->DefaultInterface);\r
     }\r
 \r
     Ip4CancelReceive (IpSb->DefaultInterface);\r


@@ -125,7 +125,7 @@ Ip4Config2OnPolicyChanged (
 \r
   //\r
   // Create new default interface and route table.\r
 \r
   //\r
   // Create new default interface and route table.\r

-  //    \r
+  //\r

   IpIf = Ip4CreateInterface (IpSb->Mnp, IpSb->Controller, IpSb->Image);\r
   if (IpIf == NULL) {\r
     return ;\r
   IpIf = Ip4CreateInterface (IpSb->Mnp, IpSb->Controller, IpSb->Image);\r
   if (IpIf == NULL) {\r
     return ;\r


@@ -136,7 +136,7 @@ Ip4Config2OnPolicyChanged (
     Ip4FreeInterface (IpIf, NULL);\r
     return ;\r
   }\r
     Ip4FreeInterface (IpIf, NULL);\r
     return ;\r
   }\r

-  \r
+\r

   IpSb->DefaultInterface  = IpIf;\r
   InsertHeadList (&IpSb->Interfaces, &IpIf->Link);\r
   IpSb->DefaultRouteTable = RouteTable;\r
   IpSb->DefaultInterface  = IpIf;\r
   InsertHeadList (&IpSb->Interfaces, &IpIf->Link);\r
   IpSb->DefaultRouteTable = RouteTable;\r


@@ -255,7 +255,7 @@ Ip4Config2ReadConfigData (
       return EFI_NOT_FOUND;\r
     }\r
 \r
       return EFI_NOT_FOUND;\r
     }\r
 \r

- \r
+\r

     for (Index = 0; Index < Variable->DataRecordCount; Index++) {\r
 \r
       CopyMem (&DataRecord, &Variable->DataRecord[Index], sizeof (DataRecord));\r
     for (Index = 0; Index < Variable->DataRecordCount; Index++) {\r
 \r
       CopyMem (&DataRecord, &Variable->DataRecord[Index], sizeof (DataRecord));\r


@@ -375,8 +375,8 @@ Ip4Config2WriteConfigData (
 \r
 \r
 /**\r
 \r
 \r
 /**\r

-  Build a EFI_IP4_ROUTE_TABLE to be returned to the caller of GetModeData. \r
-  The EFI_IP4_ROUTE_TABLE is clumsy to use in the internal operation of the \r
+  Build a EFI_IP4_ROUTE_TABLE to be returned to the caller of GetModeData.\r
+  The EFI_IP4_ROUTE_TABLE is clumsy to use in the internal operation of the\r

   IP4 driver.\r
 \r
   @param[in]   IpSb        The IP4 service binding instance.\r
   IP4 driver.\r
 \r
   @param[in]   IpSb        The IP4 service binding instance.\r


@@ -392,7 +392,7 @@ Ip4Config2BuildDefaultRouteTable (
   OUT EFI_IP4_ROUTE_TABLE       *Table\r
   )\r
 {\r
   OUT EFI_IP4_ROUTE_TABLE       *Table\r
   )\r
 {\r

-  LIST_ENTRY                *Entry; \r
+  LIST_ENTRY                *Entry;\r

   IP4_ROUTE_ENTRY           *RtEntry;\r
   UINT32                    Count;\r
   INT32                     Index;\r
   IP4_ROUTE_ENTRY           *RtEntry;\r
   UINT32                    Count;\r
   INT32                     Index;\r


@@ -468,8 +468,8 @@ Ip4Config2OnDhcp4SbInstalled (
   @param[in]  StationAddress     Ip address to be set.\r
   @param[in]  SubnetMask         Subnet to be set.\r
 \r
   @param[in]  StationAddress     Ip address to be set.\r
   @param[in]  SubnetMask         Subnet to be set.\r
 \r

-  @retval EFI_SUCCESS   Set default address successful.     \r
-  @retval Others        Some errors occur in setting.     \r
+  @retval EFI_SUCCESS   Set default address successful.\r
+  @retval Others        Some errors occur in setting.\r

 \r
 **/\r
 EFI_STATUS\r
 \r
 **/\r
 EFI_STATUS\r


@@ -501,7 +501,7 @@ Ip4Config2SetDefaultAddr (
     //\r
     if (IpSb->DefaultRouteTable != NULL) {\r
       Ip4FreeRouteTable (IpSb->DefaultRouteTable);\r
     //\r
     if (IpSb->DefaultRouteTable != NULL) {\r
       Ip4FreeRouteTable (IpSb->DefaultRouteTable);\r

-      IpSb->DefaultRouteTable = NULL;    \r
+      IpSb->DefaultRouteTable = NULL;\r

     }\r
 \r
     Ip4CancelReceive (IpSb->DefaultInterface);\r
     }\r
 \r
     Ip4CancelReceive (IpSb->DefaultInterface);\r


@@ -509,7 +509,7 @@ Ip4Config2SetDefaultAddr (
     IpSb->DefaultInterface = NULL;\r
     //\r
     // Create new default interface and route table.\r
     IpSb->DefaultInterface = NULL;\r
     //\r
     // Create new default interface and route table.\r

-    //    \r
+    //\r

     IpIf = Ip4CreateInterface (IpSb->Mnp, IpSb->Controller, IpSb->Image);\r
     if (IpIf == NULL) {\r
       return EFI_OUT_OF_RESOURCES;\r
     IpIf = Ip4CreateInterface (IpSb->Mnp, IpSb->Controller, IpSb->Image);\r
     if (IpIf == NULL) {\r
       return EFI_OUT_OF_RESOURCES;\r


@@ -520,7 +520,7 @@ Ip4Config2SetDefaultAddr (
       Ip4FreeInterface (IpIf, NULL);\r
       return EFI_OUT_OF_RESOURCES;\r
     }\r
       Ip4FreeInterface (IpIf, NULL);\r
       return EFI_OUT_OF_RESOURCES;\r
     }\r

-    \r
+\r

     IpSb->DefaultInterface  = IpIf;\r
     InsertHeadList (&IpSb->Interfaces, &IpIf->Link);\r
     IpSb->DefaultRouteTable = RouteTable;\r
     IpSb->DefaultInterface  = IpIf;\r
     InsertHeadList (&IpSb->Interfaces, &IpIf->Link);\r
     IpSb->DefaultRouteTable = RouteTable;\r


@@ -537,8 +537,8 @@ Ip4Config2SetDefaultAddr (
   }\r
 \r
   if (IpIf->Arp != NULL) {\r
   }\r
 \r
   if (IpIf->Arp != NULL) {\r

-    //   \r
-    // A non-NULL IpIf->Arp here means a new ARP child is created when setting default address, \r
+    //\r
+    // A non-NULL IpIf->Arp here means a new ARP child is created when setting default address,\r

     // but some IP children may have referenced the default interface before it is configured,\r
     // these IP instances also consume this ARP protocol so they need to open it BY_CHILD_CONTROLLER.\r
     //\r
     // but some IP children may have referenced the default interface before it is configured,\r
     // these IP instances also consume this ARP protocol so they need to open it BY_CHILD_CONTROLLER.\r
     //\r


@@ -580,20 +580,20 @@ Ip4Config2SetDefaultAddr (
 \r
   IpSb->State = IP4_SERVICE_CONFIGED;\r
   IpSb->Reconfig = FALSE;\r
 \r
   IpSb->State = IP4_SERVICE_CONFIGED;\r
   IpSb->Reconfig = FALSE;\r

-  \r
+\r

   return EFI_SUCCESS;\r
 }\r
 \r
 /**\r
   Set the station address, subnetmask and gateway address for the default interface.\r
 \r
   return EFI_SUCCESS;\r
 }\r
 \r
 /**\r
   Set the station address, subnetmask and gateway address for the default interface.\r
 \r

-  @param[in]  Instance         The pointer to the IP4 config2 instance data.  \r
+  @param[in]  Instance         The pointer to the IP4 config2 instance data.\r

   @param[in]  StationAddress   Ip address to be set.\r
   @param[in]  SubnetMask       Subnet to be set.\r
   @param[in]  GatewayAddress   Gateway to be set.\r
 \r
   @param[in]  StationAddress   Ip address to be set.\r
   @param[in]  SubnetMask       Subnet to be set.\r
   @param[in]  GatewayAddress   Gateway to be set.\r
 \r

-  @retval EFI_SUCCESS     Set default If successful.    \r
-  @retval Others          Errors occur as indicated.  \r
+  @retval EFI_SUCCESS     Set default If successful.\r
+  @retval Others          Errors occur as indicated.\r

 \r
 **/\r
 EFI_STATUS\r
 \r
 **/\r
 EFI_STATUS\r


@@ -630,7 +630,7 @@ Ip4Config2SetDefaultIf (
       IP4_ALLZERO_ADDRESS,\r
       IP4_ALLZERO_ADDRESS,\r
       GatewayAddress\r
       IP4_ALLZERO_ADDRESS,\r
       IP4_ALLZERO_ADDRESS,\r
       GatewayAddress\r

-      );        \r
+      );\r

   }\r
 \r
   return EFI_SUCCESS;\r
   }\r
 \r
   return EFI_SUCCESS;\r


@@ -687,7 +687,7 @@ Ip4Config2CleanDhcp4 (
 /**\r
   This worker function sets the DNS server list for the EFI IPv4 network\r
   stack running on the communication device that this EFI_IP4_CONFIG2_PROTOCOL\r
 /**\r
   This worker function sets the DNS server list for the EFI IPv4 network\r
   stack running on the communication device that this EFI_IP4_CONFIG2_PROTOCOL\r

-  manages. The DNS server addresses must be unicast IPv4 addresses. \r
+  manages. The DNS server addresses must be unicast IPv4 addresses.\r

 \r
   @param[in]     Instance        The pointer to the IP4 config2 instance data.\r
   @param[in]     DataSize        The size of the buffer pointed to by Data in bytes.\r
 \r
   @param[in]     Instance        The pointer to the IP4 config2 instance data.\r
   @param[in]     DataSize        The size of the buffer pointed to by Data in bytes.\r


@@ -728,7 +728,7 @@ Ip4Config2SetDnsServerWorker (
   Item        = &Instance->DataItem[Ip4Config2DataTypeDnsServer];\r
   NewDns      = (EFI_IPv4_ADDRESS *) Data;\r
   OldDns      = Item->Data.DnsServers;\r
   Item        = &Instance->DataItem[Ip4Config2DataTypeDnsServer];\r
   NewDns      = (EFI_IPv4_ADDRESS *) Data;\r
   OldDns      = Item->Data.DnsServers;\r

-  NewDnsCount = DataSize / sizeof (EFI_IPv4_ADDRESS);  \r
+  NewDnsCount = DataSize / sizeof (EFI_IPv4_ADDRESS);\r

   OldDnsCount = Item->DataSize / sizeof (EFI_IPv4_ADDRESS);\r
   OneAdded    = FALSE;\r
 \r
   OldDnsCount = Item->DataSize / sizeof (EFI_IPv4_ADDRESS);\r
   OneAdded    = FALSE;\r
 \r


@@ -785,7 +785,7 @@ Ip4Config2SetDnsServerWorker (
     if (Tmp != NULL) {\r
       if (Item->Data.Ptr != NULL) {\r
         FreePool (Item->Data.Ptr);\r
     if (Tmp != NULL) {\r
       if (Item->Data.Ptr != NULL) {\r
         FreePool (Item->Data.Ptr);\r

-      }      \r
+      }\r

       Item->Data.Ptr = Tmp;\r
     }\r
 \r
       Item->Data.Ptr = Tmp;\r
     }\r
 \r


@@ -846,7 +846,7 @@ Ip4Config2OnDhcp4Complete (
     if (EFI_ERROR (Status)) {\r
       goto Exit;\r
     }\r
     if (EFI_ERROR (Status)) {\r
       goto Exit;\r
     }\r

-  \r
+\r

     //\r
     // Parse the ACK to get required DNS server information.\r
     //\r
     //\r
     // Parse the ACK to get required DNS server information.\r
     //\r


@@ -916,7 +916,7 @@ Ip4StartAutoConfig (
   EFI_DHCP4_PACKET_OPTION        *OptionList[1];\r
   IP4_CONFIG2_DHCP4_OPTION       ParaList;\r
   EFI_STATUS                     Status;\r
   EFI_DHCP4_PACKET_OPTION        *OptionList[1];\r
   IP4_CONFIG2_DHCP4_OPTION       ParaList;\r
   EFI_STATUS                     Status;\r

- \r
+\r

   IpSb = IP4_SERVICE_FROM_IP4_CONFIG2_INSTANCE (Instance);\r
 \r
   if (IpSb->State > IP4_SERVICE_UNSTARTED) {\r
   IpSb = IP4_SERVICE_FROM_IP4_CONFIG2_INSTANCE (Instance);\r
 \r
   if (IpSb->State > IP4_SERVICE_UNSTARTED) {\r


@@ -978,7 +978,7 @@ Ip4StartAutoConfig (
       );\r
 \r
     Instance->Dhcp4Handle = NULL;\r
       );\r
 \r
     Instance->Dhcp4Handle = NULL;\r

-    \r
+\r

     return Status;\r
   }\r
 \r
     return Status;\r
   }\r
 \r


@@ -990,7 +990,7 @@ Ip4StartAutoConfig (
   Status = Dhcp4->GetModeData (Dhcp4, &Dhcp4Mode);\r
   if (Dhcp4Mode.State == Dhcp4Bound) {\r
     Ip4Config2OnDhcp4Complete (NULL, Instance);\r
   Status = Dhcp4->GetModeData (Dhcp4, &Dhcp4Mode);\r
   if (Dhcp4Mode.State == Dhcp4Bound) {\r
     Ip4Config2OnDhcp4Complete (NULL, Instance);\r

-    \r
+\r

     return EFI_SUCCESS;\r
   }\r
 \r
     return EFI_SUCCESS;\r
   }\r
 \r


@@ -1023,14 +1023,14 @@ Ip4StartAutoConfig (
       &gEfiDhcp4ServiceBindingProtocolGuid,\r
       Instance->Dhcp4Handle\r
       );\r
       &gEfiDhcp4ServiceBindingProtocolGuid,\r
       Instance->Dhcp4Handle\r
       );\r

-    \r
+\r

     Instance->Dhcp4 = NULL;\r
     Instance->Dhcp4 = NULL;\r

-    \r
+\r

     Instance->Dhcp4Handle = NULL;\r
     Instance->Dhcp4Handle = NULL;\r

-    \r
+\r

     return Status;\r
   }\r
     return Status;\r
   }\r

-  \r
+\r

   //\r
   // Start the DHCP process\r
   //\r
   //\r
   // Start the DHCP process\r
   //\r


@@ -1051,20 +1051,20 @@ Ip4StartAutoConfig (
     Ip4Config2DestroyDhcp4 (Instance);\r
     gBS->CloseEvent (Instance->Dhcp4Event);\r
     Instance->Dhcp4Event = NULL;\r
     Ip4Config2DestroyDhcp4 (Instance);\r
     gBS->CloseEvent (Instance->Dhcp4Event);\r
     Instance->Dhcp4Event = NULL;\r

-    \r
+\r

     return Status;\r
   }\r
     return Status;\r
   }\r

- \r
+\r

   IpSb->State = IP4_SERVICE_STARTED;\r
   DispatchDpc ();\r
   IpSb->State = IP4_SERVICE_STARTED;\r
   DispatchDpc ();\r

-  \r
+\r

   return EFI_SUCCESS;\r
 }\r
 \r
 \r
 \r
 /**\r
   return EFI_SUCCESS;\r
 }\r
 \r
 \r
 \r
 /**\r

-  The work function is to get the interface information of the communication \r
+  The work function is to get the interface information of the communication\r

   device this IP4_CONFIG2_INSTANCE manages.\r
 \r
   @param[in]      Instance Pointer to the IP4 config2 instance data.\r
   device this IP4_CONFIG2_INSTANCE manages.\r
 \r
   @param[in]      Instance Pointer to the IP4 config2 instance data.\r


@@ -1099,7 +1099,7 @@ Ip4Config2GetIfInfo (
   if (IpSb->DefaultRouteTable != NULL) {\r
     Length += IpSb->DefaultRouteTable->TotalNum * sizeof (EFI_IP4_ROUTE_TABLE);\r
   }\r
   if (IpSb->DefaultRouteTable != NULL) {\r
     Length += IpSb->DefaultRouteTable->TotalNum * sizeof (EFI_IP4_ROUTE_TABLE);\r
   }\r

-  \r
+\r

   if (*DataSize < Length) {\r
     *DataSize = Length;\r
     return EFI_BUFFER_TOO_SMALL;\r
   if (*DataSize < Length) {\r
     *DataSize = Length;\r
     return EFI_BUFFER_TOO_SMALL;\r


@@ -1126,14 +1126,14 @@ Ip4Config2GetIfInfo (
     IfInfo->RouteTableSize = IpSb->DefaultRouteTable->TotalNum;\r
     IfInfo->RouteTable   = (EFI_IP4_ROUTE_TABLE *) ((UINT8 *) Data + sizeof (EFI_IP4_CONFIG2_INTERFACE_INFO));\r
 \r
     IfInfo->RouteTableSize = IpSb->DefaultRouteTable->TotalNum;\r
     IfInfo->RouteTable   = (EFI_IP4_ROUTE_TABLE *) ((UINT8 *) Data + sizeof (EFI_IP4_CONFIG2_INTERFACE_INFO));\r
 \r

-    Ip4Config2BuildDefaultRouteTable (IpSb, IfInfo->RouteTable);  \r
+    Ip4Config2BuildDefaultRouteTable (IpSb, IfInfo->RouteTable);\r

   }\r
   }\r

-  \r
+\r

   return EFI_SUCCESS;\r
 }\r
 \r
 /**\r
   return EFI_SUCCESS;\r
 }\r
 \r
 /**\r

-  The work function is to set the general configuration policy for the EFI IPv4 network \r
+  The work function is to set the general configuration policy for the EFI IPv4 network\r

   stack that is running on the communication device managed by this IP4_CONFIG2_INSTANCE.\r
   The policy will affect other configuration settings.\r
 \r
   stack that is running on the communication device managed by this IP4_CONFIG2_INSTANCE.\r
   The policy will affect other configuration settings.\r
 \r


@@ -1175,7 +1175,7 @@ Ip4Config2SetPolicy (
     }\r
   } else {\r
     //\r
     }\r
   } else {\r
     //\r

-    // The policy is changed. Clean the ManualAddress, Gateway and DnsServers, \r
+    // The policy is changed. Clean the ManualAddress, Gateway and DnsServers,\r

     // shrink the variable data size, and fire up all the related events.\r
     //\r
     DataItem           = &Instance->DataItem[Ip4Config2DataTypeManualAddress];\r
     // shrink the variable data size, and fire up all the related events.\r
     //\r
     DataItem           = &Instance->DataItem[Ip4Config2DataTypeManualAddress];\r


@@ -1204,7 +1204,7 @@ Ip4Config2SetPolicy (
     DataItem->DataSize = 0;\r
     DataItem->Status   = EFI_NOT_FOUND;\r
     NetMapIterate (&DataItem->EventMap, Ip4Config2SignalEvent, NULL);\r
     DataItem->DataSize = 0;\r
     DataItem->Status   = EFI_NOT_FOUND;\r
     NetMapIterate (&DataItem->EventMap, Ip4Config2SignalEvent, NULL);\r

-    \r
+\r

     if (NewPolicy == Ip4Config2PolicyDhcp) {\r
       SET_DATA_ATTRIB (DataItem->Attribute, DATA_ATTRIB_VOLATILE);\r
     } else {\r
     if (NewPolicy == Ip4Config2PolicyDhcp) {\r
       SET_DATA_ATTRIB (DataItem->Attribute, DATA_ATTRIB_VOLATILE);\r
     } else {\r


@@ -1215,7 +1215,7 @@ Ip4Config2SetPolicy (
       if (Instance->Dhcp4Handle != NULL) {\r
         Ip4Config2DestroyDhcp4 (Instance);\r
       }\r
       if (Instance->Dhcp4Handle != NULL) {\r
         Ip4Config2DestroyDhcp4 (Instance);\r
       }\r

-      \r
+\r

       //\r
       // Close the event.\r
       //\r
       //\r
       // Close the event.\r
       //\r


@@ -1235,7 +1235,7 @@ Ip4Config2SetPolicy (
 }\r
 \r
 /**\r
 }\r
 \r
 /**\r

-  The work function is to set the station addresses manually for the EFI IPv4 \r
+  The work function is to set the station addresses manually for the EFI IPv4\r

   network stack. It is only configurable when the policy is Ip4Config2PolicyStatic.\r
 \r
   @param[in]     Instance Pointer to the IP4 config2 instance data.\r
   network stack. It is only configurable when the policy is Ip4Config2PolicyStatic.\r
 \r
   @param[in]     Instance Pointer to the IP4 config2 instance data.\r


@@ -1317,7 +1317,7 @@ Ip4Config2SetManualAddress (
     if (DataItem->Data.Ptr != NULL) {\r
       FreePool (DataItem->Data.Ptr);\r
     }\r
     if (DataItem->Data.Ptr != NULL) {\r
       FreePool (DataItem->Data.Ptr);\r
     }\r

-    \r
+\r

     DataItem->Data.Ptr = Ptr;\r
     DataItem->DataSize = DataSize;\r
     DataItem->Status   = EFI_NOT_READY;\r
     DataItem->Data.Ptr = Ptr;\r
     DataItem->DataSize = DataSize;\r
     DataItem->Status   = EFI_NOT_READY;\r


@@ -1331,7 +1331,7 @@ Ip4Config2SetManualAddress (
       if (Ptr != NULL) {\r
         FreePool (Ptr);\r
       }\r
       if (Ptr != NULL) {\r
         FreePool (Ptr);\r
       }\r

-      DataItem->Data.Ptr = NULL; \r
+      DataItem->Data.Ptr = NULL;\r

     }\r
   } else {\r
     //\r
     }\r
   } else {\r
     //\r


@@ -1350,7 +1350,7 @@ Ip4Config2SetManualAddress (
     if (IpSb->DefaultInterface != NULL) {\r
       if (IpSb->DefaultRouteTable != NULL) {\r
         Ip4FreeRouteTable (IpSb->DefaultRouteTable);\r
     if (IpSb->DefaultInterface != NULL) {\r
       if (IpSb->DefaultRouteTable != NULL) {\r
         Ip4FreeRouteTable (IpSb->DefaultRouteTable);\r

-        IpSb->DefaultRouteTable = NULL;    \r
+        IpSb->DefaultRouteTable = NULL;\r

       }\r
 \r
       Ip4CancelReceive (IpSb->DefaultInterface);\r
       }\r
 \r
       Ip4CancelReceive (IpSb->DefaultInterface);\r


@@ -1363,7 +1363,7 @@ Ip4Config2SetManualAddress (
 \r
     //\r
     // Create new default interface and route table.\r
 \r
     //\r
     // Create new default interface and route table.\r

-    //    \r
+    //\r

     IpIf = Ip4CreateInterface (IpSb->Mnp, IpSb->Controller, IpSb->Image);\r
     if (IpIf == NULL) {\r
       return EFI_OUT_OF_RESOURCES;\r
     IpIf = Ip4CreateInterface (IpSb->Mnp, IpSb->Controller, IpSb->Image);\r
     if (IpIf == NULL) {\r
       return EFI_OUT_OF_RESOURCES;\r


@@ -1374,14 +1374,14 @@ Ip4Config2SetManualAddress (
       Ip4FreeInterface (IpIf, NULL);\r
       return EFI_OUT_OF_RESOURCES;\r
     }\r
       Ip4FreeInterface (IpIf, NULL);\r
       return EFI_OUT_OF_RESOURCES;\r
     }\r

-    \r
+\r

     IpSb->DefaultInterface  = IpIf;\r
     InsertHeadList (&IpSb->Interfaces, &IpIf->Link);\r
     IpSb->DefaultRouteTable = RouteTable;\r
     Ip4ReceiveFrame (IpIf, NULL, Ip4AccpetFrame, IpSb);\r
 \r
     //\r
     IpSb->DefaultInterface  = IpIf;\r
     InsertHeadList (&IpSb->Interfaces, &IpIf->Link);\r
     IpSb->DefaultRouteTable = RouteTable;\r
     Ip4ReceiveFrame (IpIf, NULL, Ip4AccpetFrame, IpSb);\r
 \r
     //\r

-    // Reset the State to unstarted. \r
+    // Reset the State to unstarted.\r

     //\r
     if (IpSb->State == IP4_SERVICE_CONFIGED || IpSb->State == IP4_SERVICE_STARTED) {\r
       IpSb->State = IP4_SERVICE_UNSTARTED;\r
     //\r
     if (IpSb->State == IP4_SERVICE_CONFIGED || IpSb->State == IP4_SERVICE_STARTED) {\r
       IpSb->State = IP4_SERVICE_UNSTARTED;\r


@@ -1392,8 +1392,8 @@ Ip4Config2SetManualAddress (
 }\r
 \r
 /**\r
 }\r
 \r
 /**\r

-  The work function is to set the gateway addresses manually for the EFI IPv4 \r
-  network stack that is running on the communication device that this EFI IPv4 \r
+  The work function is to set the gateway addresses manually for the EFI IPv4\r
+  network stack that is running on the communication device that this EFI IPv4\r

   Configuration Protocol manages. It is not configurable when the policy is\r
   Ip4Config2PolicyDhcp. The gateway addresses must be unicast IPv4 addresses.\r
 \r
   Configuration Protocol manages. It is not configurable when the policy is\r
   Ip4Config2PolicyDhcp. The gateway addresses must be unicast IPv4 addresses.\r
 \r


@@ -1474,7 +1474,7 @@ Ip4Config2SetGateway (
     for (Index1 = 0; Index1 < NewGatewayCount; Index1++) {\r
       CopyMem (&Gateway, NewGateway + Index1, sizeof (IP4_ADDR));\r
 \r
     for (Index1 = 0; Index1 < NewGatewayCount; Index1++) {\r
       CopyMem (&Gateway, NewGateway + Index1, sizeof (IP4_ADDR));\r
 \r

-      if ((IpSb->DefaultInterface->SubnetMask != 0) && \r
+      if ((IpSb->DefaultInterface->SubnetMask != 0) &&\r

           !NetIp4IsUnicast (NTOHL (Gateway), IpSb->DefaultInterface->SubnetMask)) {\r
         return EFI_INVALID_PARAMETER;\r
       }\r
           !NetIp4IsUnicast (NTOHL (Gateway), IpSb->DefaultInterface->SubnetMask)) {\r
         return EFI_INVALID_PARAMETER;\r
       }\r


@@ -1505,7 +1505,7 @@ Ip4Config2SetGateway (
         IP4_ALLZERO_ADDRESS,\r
         IP4_ALLZERO_ADDRESS,\r
         NTOHL (Gateway)\r
         IP4_ALLZERO_ADDRESS,\r
         IP4_ALLZERO_ADDRESS,\r
         NTOHL (Gateway)\r

-        );    \r
+        );\r

 \r
       OneAdded = TRUE;\r
     }\r
 \r
       OneAdded = TRUE;\r
     }\r


@@ -1541,9 +1541,9 @@ Ip4Config2SetGateway (
 }\r
 \r
 /**\r
 }\r
 \r
 /**\r

-  The work function is to set the DNS server list for the EFI IPv4 network \r
-  stack running on the communication device that this EFI_IP4_CONFIG2_PROTOCOL \r
-  manages. It is not configurable when the policy is Ip4Config2PolicyDhcp. \r
+  The work function is to set the DNS server list for the EFI IPv4 network\r
+  stack running on the communication device that this EFI_IP4_CONFIG2_PROTOCOL\r
+  manages. It is not configurable when the policy is Ip4Config2PolicyDhcp.\r

   The DNS server addresses must be unicast IPv4 addresses.\r
 \r
   @param[in]     Instance The pointer to the IP4 config2 instance data.\r
   The DNS server addresses must be unicast IPv4 addresses.\r
 \r
   @param[in]     Instance The pointer to the IP4 config2 instance data.\r


@@ -1589,7 +1589,7 @@ Ip4Config2SetDnsServer (
     Status = Ip4Config2SetDnsServerWorker (Instance, DataSize, Data);\r
   } else {\r
     //\r
     Status = Ip4Config2SetDnsServerWorker (Instance, DataSize, Data);\r
   } else {\r
     //\r

-    // DataSize is 0 and Data is NULL, clean up the DnsServer address. \r
+    // DataSize is 0 and Data is NULL, clean up the DnsServer address.\r

     //\r
     if (Item->Data.Ptr != NULL) {\r
       FreePool (Item->Data.Ptr);\r
     //\r
     if (Item->Data.Ptr != NULL) {\r
       FreePool (Item->Data.Ptr);\r


@@ -1598,7 +1598,7 @@ Ip4Config2SetDnsServer (
     Item->DataSize = 0;\r
     Item->Status   = EFI_NOT_FOUND;\r
   }\r
     Item->DataSize = 0;\r
     Item->Status   = EFI_NOT_FOUND;\r
   }\r

-  \r
+\r

   return Status;\r
 }\r
 \r
   return Status;\r
 }\r
 \r


@@ -1678,7 +1678,7 @@ Ip4Config2OnDhcp4Event (
                                 network stack was set successfully.\r
   @retval EFI_INVALID_PARAMETER One or more of the following are TRUE:\r
                                 - This is NULL.\r
                                 network stack was set successfully.\r
   @retval EFI_INVALID_PARAMETER One or more of the following are TRUE:\r
                                 - This is NULL.\r

-                                - One or more fields in Data and DataSize do not match the \r
+                                - One or more fields in Data and DataSize do not match the\r

                                   requirement of the data type indicated by DataType.\r
   @retval EFI_WRITE_PROTECTED   The specified configuration data is read-only or the specified\r
                                 configuration data cannot be set under the current policy.\r
                                   requirement of the data type indicated by DataType.\r
   @retval EFI_WRITE_PROTECTED   The specified configuration data is read-only or the specified\r
                                 configuration data cannot be set under the current policy.\r


@@ -2031,7 +2031,7 @@ Ip4Config2InitInstance (
     NetMapInit (&Instance->DataItem[Index].EventMap);\r
   }\r
 \r
     NetMapInit (&Instance->DataItem[Index].EventMap);\r
   }\r
 \r

-  \r
+\r

   //\r
   // Initialize each data type: associate storage and set data size for the\r
   // fixed size data types, hook the SetData function, set the data attribute.\r
   //\r
   // Initialize each data type: associate storage and set data size for the\r
   // fixed size data types, hook the SetData function, set the data attribute.\r


@@ -2066,7 +2066,7 @@ Ip4Config2InitInstance (
 \r
   //\r
   // Try to read the config data from NV variable.\r
 \r
   //\r
   // Try to read the config data from NV variable.\r

-  // If not found, write initialized config data into NV variable \r
+  // If not found, write initialized config data into NV variable\r

   // as a default config data.\r
   //\r
   Status = Ip4Config2ReadConfigData (IpSb->MacString, Instance);\r
   // as a default config data.\r
   //\r
   Status = Ip4Config2ReadConfigData (IpSb->MacString, Instance);\r


@@ -2077,7 +2077,7 @@ Ip4Config2InitInstance (
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r

-  \r
+\r

   Instance->Ip4Config2.SetData              = EfiIp4Config2SetData;\r
   Instance->Ip4Config2.GetData              = EfiIp4Config2GetData;\r
   Instance->Ip4Config2.RegisterDataNotify   = EfiIp4Config2RegisterDataNotify;\r
   Instance->Ip4Config2.SetData              = EfiIp4Config2SetData;\r
   Instance->Ip4Config2.GetData              = EfiIp4Config2GetData;\r
   Instance->Ip4Config2.RegisterDataNotify   = EfiIp4Config2RegisterDataNotify;\r


@@ -2166,7 +2166,7 @@ Ip4AutoReconfigCallBackDpc (
   if (IpSb->State > IP4_SERVICE_UNSTARTED) {\r
     IpSb->State = IP4_SERVICE_UNSTARTED;\r
   }\r
   if (IpSb->State > IP4_SERVICE_UNSTARTED) {\r
     IpSb->State = IP4_SERVICE_UNSTARTED;\r
   }\r

-  \r
+\r

   IpSb->Reconfig = TRUE;\r
 \r
   Ip4StartAutoConfig (&IpSb->Ip4Config2Instance);\r
   IpSb->Reconfig = TRUE;\r
 \r
   Ip4StartAutoConfig (&IpSb->Ip4Config2Instance);\r

diff --git a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Config2Impl.h b/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Config2Impl.h
index a431f6f732cdc6f0ae1dfc17761e29609041d278..127588e20b9d56ab718215c126543d5d0e339aba 100644 (file)
--- a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Config2Impl.h
+++ b/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Config2Impl.h
@@ -1,7 +1,7 @@
 /** @file\r
   Definitions for EFI IPv4 Configuration II Protocol implementation.\r
 \r
 /** @file\r
   Definitions for EFI IPv4 Configuration II Protocol implementation.\r
 \r

-  Copyright (c) 2015 - 2016, Intel Corporation. All rights reserved.<BR>\r
+  Copyright (c) 2015 - 2018, Intel Corporation. All rights reserved.<BR>\r

   (C) Copyright 2015 Hewlett Packard Enterprise Development LP<BR>\r
 \r
   This program and the accompanying materials\r
   (C) Copyright 2015 Hewlett Packard Enterprise Development LP<BR>\r
 \r
   This program and the accompanying materials\r


@@ -70,7 +70,7 @@ typedef struct _IP4_CONFIG2_INSTANCE IP4_CONFIG2_INSTANCE;
                                8 bytes.\r
   @retval EFI_SUCCESS          The specified configuration data for the EFI IPv4\r
                                network stack was set successfully.\r
                                8 bytes.\r
   @retval EFI_SUCCESS          The specified configuration data for the EFI IPv4\r
                                network stack was set successfully.\r

-  \r
+\r

 **/\r
 typedef\r
 EFI_STATUS\r
 **/\r
 typedef\r
 EFI_STATUS\r


@@ -87,14 +87,14 @@ EFI_STATUS
   @param[in, out] DataSize On input, in bytes, the size of Data. On output, in\r
                            bytes, the size of buffer required to store the specified\r
                            configuration data.\r
   @param[in, out] DataSize On input, in bytes, the size of Data. On output, in\r
                            bytes, the size of buffer required to store the specified\r
                            configuration data.\r

-  @param[in]      Data     The data buffer in which the configuration data is returned.  \r
+  @param[in]      Data     The data buffer in which the configuration data is returned.\r

                            Ignored if DataSize is ZERO.\r
 \r
   @retval EFI_BUFFER_TOO_SMALL The size of Data is too small for the specified\r
                            Ignored if DataSize is ZERO.\r
 \r
   @retval EFI_BUFFER_TOO_SMALL The size of Data is too small for the specified\r

-                               configuration data, and the required size is \r
+                               configuration data, and the required size is\r

                                returned in DataSize.\r
                                returned in DataSize.\r

-  @retval EFI_SUCCESS          The specified configuration data was obtained successfully.                               \r
-  \r
+  @retval EFI_SUCCESS          The specified configuration data was obtained successfully.\r
+\r

 **/\r
 typedef\r
 EFI_STATUS\r
 **/\r
 typedef\r
 EFI_STATUS\r


@@ -151,7 +151,7 @@ typedef struct {
 #pragma pack()\r
 \r
 typedef struct {\r
 #pragma pack()\r
 \r
 typedef struct {\r

-  EFI_IP4_CONFIG2_POLICY                   Policy;               ///< manual or automatic  \r
+  EFI_IP4_CONFIG2_POLICY                   Policy;               ///< manual or automatic\r

   EFI_IP4_CONFIG2_MANUAL_ADDRESS           *ManualAddress;       ///< IP addresses\r
   UINT32                                   ManualAddressCount;   ///< IP addresses count\r
   EFI_IPv4_ADDRESS                         *GatewayAddress;      ///< Gateway address\r
   EFI_IP4_CONFIG2_MANUAL_ADDRESS           *ManualAddress;       ///< IP addresses\r
   UINT32                                   ManualAddressCount;   ///< IP addresses count\r
   EFI_IPv4_ADDRESS                         *GatewayAddress;      ///< Gateway address\r


@@ -177,7 +177,7 @@ struct _IP4_CONFIG2_INSTANCE {
   EFI_IP4_CONFIG2_PROTOCOL                  Ip4Config2;\r
 \r
   EFI_IP4_CONFIG2_INTERFACE_INFO            InterfaceInfo;\r
   EFI_IP4_CONFIG2_PROTOCOL                  Ip4Config2;\r
 \r
   EFI_IP4_CONFIG2_INTERFACE_INFO            InterfaceInfo;\r

-  EFI_IP4_CONFIG2_POLICY                    Policy;  \r
+  EFI_IP4_CONFIG2_POLICY                    Policy;\r

   IP4_CONFIG2_DATA_ITEM                     DataItem[Ip4Config2DataTypeMaximum];\r
 \r
   EFI_EVENT                                 Dhcp4SbNotifyEvent;\r
   IP4_CONFIG2_DATA_ITEM                     DataItem[Ip4Config2DataTypeMaximum];\r
 \r
   EFI_EVENT                                 Dhcp4SbNotifyEvent;\r


@@ -190,7 +190,7 @@ struct _IP4_CONFIG2_INSTANCE {
   UINT32                                    FailedIaAddressCount;\r
   EFI_IPv4_ADDRESS                          *DeclineAddress;\r
   UINT32                                    DeclineAddressCount;\r
   UINT32                                    FailedIaAddressCount;\r
   EFI_IPv4_ADDRESS                          *DeclineAddress;\r
   UINT32                                    DeclineAddressCount;\r

-  \r
+\r

   IP4_FORM_CALLBACK_INFO                    CallbackInfo;\r
 \r
   IP4_CONFIG2_NVDATA                        Ip4NvData;\r
   IP4_FORM_CALLBACK_INFO                    CallbackInfo;\r
 \r
   IP4_CONFIG2_NVDATA                        Ip4NvData;\r

diff --git a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Config2Nv.c b/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Config2Nv.c
index 694a2d0e1f15d93be1c8854d3804d7f70729dabb..8dbb6a929fe4fd4f17b566b050d7ae00df53dbcb 100644 (file)
--- a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Config2Nv.c
+++ b/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Config2Nv.c
@@ -1,7 +1,7 @@
 /** @file\r
   Helper functions for configuring or getting the parameters relating to Ip4.\r
 \r
 /** @file\r
   Helper functions for configuring or getting the parameters relating to Ip4.\r
 \r

-Copyright (c) 2015 - 2017, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2015 - 2018, Intel Corporation. All rights reserved.<BR>\r

 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r


@@ -23,7 +23,7 @@ CHAR16    mIp4Config2StorageName[]     = L"IP4_CONFIG2_IFR_NVDATA";
 \r
   @return The prefix length of the subnet mask.\r
   @retval 0 Other errors as indicated.\r
 \r
   @return The prefix length of the subnet mask.\r
   @retval 0 Other errors as indicated.\r

-  \r
+\r

 **/\r
 UINT8\r
 GetSubnetMaskPrefixLength (\r
 **/\r
 UINT8\r
 GetSubnetMaskPrefixLength (\r


@@ -65,7 +65,7 @@ GetSubnetMaskPrefixLength (
 \r
   @retval EFI_SUCCESS           The binary IP address is returned in Ip.\r
   @retval EFI_INVALID_PARAMETER The IP string is malformatted.\r
 \r
   @retval EFI_SUCCESS           The binary IP address is returned in Ip.\r
   @retval EFI_INVALID_PARAMETER The IP string is malformatted.\r

-  \r
+\r

 **/\r
 EFI_STATUS\r
 Ip4Config2StrToIp (\r
 **/\r
 EFI_STATUS\r
 Ip4Config2StrToIp (\r


@@ -131,7 +131,7 @@ Ip4Config2StrToIp (
   @retval EFI_SUCCESS           The binary IP address list is returned in PtrIpList.\r
   @retval EFI_OUT_OF_RESOURCES  Error occurs in allocating memory.\r
   @retval EFI_INVALID_PARAMETER The IP string is malformatted.\r
   @retval EFI_SUCCESS           The binary IP address list is returned in PtrIpList.\r
   @retval EFI_OUT_OF_RESOURCES  Error occurs in allocating memory.\r
   @retval EFI_INVALID_PARAMETER The IP string is malformatted.\r

-  \r
+\r

 **/\r
 EFI_STATUS\r
 Ip4Config2StrToIpList (\r
 **/\r
 EFI_STATUS\r
 Ip4Config2StrToIpList (\r


@@ -141,19 +141,19 @@ Ip4Config2StrToIpList (
   )\r
 {\r
   UINTN              BeginIndex;\r
   )\r
 {\r
   UINTN              BeginIndex;\r

-  UINTN              EndIndex; \r
+  UINTN              EndIndex;\r

   UINTN              Index;\r
   UINTN              IpIndex;\r
   CHAR16             *StrTemp;\r
   BOOLEAN            SpaceTag;\r
   UINTN              Index;\r
   UINTN              IpIndex;\r
   CHAR16             *StrTemp;\r
   BOOLEAN            SpaceTag;\r

-  \r
+\r

   BeginIndex = 0;\r
   EndIndex   = BeginIndex;\r
   Index      = 0;\r
   IpIndex    = 0;\r
   StrTemp    = NULL;\r
   SpaceTag   = TRUE;\r
   BeginIndex = 0;\r
   EndIndex   = BeginIndex;\r
   Index      = 0;\r
   IpIndex    = 0;\r
   StrTemp    = NULL;\r
   SpaceTag   = TRUE;\r

-  \r
+\r

   *PtrIpList = NULL;\r
   *IpCount   = 0;\r
 \r
   *PtrIpList = NULL;\r
   *IpCount   = 0;\r
 \r


@@ -173,14 +173,14 @@ Ip4Config2StrToIpList (
         SpaceTag = FALSE;\r
       }\r
     }\r
         SpaceTag = FALSE;\r
       }\r
     }\r

-     \r
+\r

     Index++;\r
   }\r
 \r
   if (*IpCount == 0) {\r
     return EFI_SUCCESS;\r
   }\r
     Index++;\r
   }\r
 \r
   if (*IpCount == 0) {\r
     return EFI_SUCCESS;\r
   }\r

-  \r
+\r

   //\r
   // Allocate buffer for IpList.\r
   //\r
   //\r
   // Allocate buffer for IpList.\r
   //\r


@@ -203,10 +203,10 @@ Ip4Config2StrToIpList (
           *IpCount = 0;\r
           return EFI_OUT_OF_RESOURCES;\r
         }\r
           *IpCount = 0;\r
           return EFI_OUT_OF_RESOURCES;\r
         }\r

-        \r
+\r

         CopyMem (StrTemp, Str + BeginIndex, (EndIndex - BeginIndex) * sizeof(CHAR16));\r
         *(StrTemp + (EndIndex - BeginIndex)) = L'\0';\r
         CopyMem (StrTemp, Str + BeginIndex, (EndIndex - BeginIndex) * sizeof(CHAR16));\r
         *(StrTemp + (EndIndex - BeginIndex)) = L'\0';\r

-          \r
+\r

         if (Ip4Config2StrToIp (StrTemp, &((*PtrIpList)[IpIndex])) != EFI_SUCCESS) {\r
           FreePool(StrTemp);\r
           FreePool(*PtrIpList);\r
         if (Ip4Config2StrToIp (StrTemp, &((*PtrIpList)[IpIndex])) != EFI_SUCCESS) {\r
           FreePool(StrTemp);\r
           FreePool(*PtrIpList);\r


@@ -214,7 +214,7 @@ Ip4Config2StrToIpList (
           *IpCount = 0;\r
           return EFI_INVALID_PARAMETER;\r
         }\r
           *IpCount = 0;\r
           return EFI_INVALID_PARAMETER;\r
         }\r

-          \r
+\r

         BeginIndex = EndIndex;\r
         IpIndex++;\r
 \r
         BeginIndex = EndIndex;\r
         IpIndex++;\r
 \r


@@ -228,9 +228,9 @@ Ip4Config2StrToIpList (
       EndIndex++;\r
       SpaceTag = FALSE;\r
     }\r
       EndIndex++;\r
       SpaceTag = FALSE;\r
     }\r

-    \r
+\r

     Index++;\r
     Index++;\r

-    \r
+\r

     if (*(Str + Index) == L'\0') {\r
       if (!SpaceTag) {\r
         StrTemp = AllocateZeroPool((EndIndex - BeginIndex + 1) * sizeof(CHAR16));\r
     if (*(Str + Index) == L'\0') {\r
       if (!SpaceTag) {\r
         StrTemp = AllocateZeroPool((EndIndex - BeginIndex + 1) * sizeof(CHAR16));\r


@@ -240,10 +240,10 @@ Ip4Config2StrToIpList (
           *IpCount = 0;\r
           return EFI_OUT_OF_RESOURCES;\r
         }\r
           *IpCount = 0;\r
           return EFI_OUT_OF_RESOURCES;\r
         }\r

-        \r
+\r

         CopyMem (StrTemp, Str + BeginIndex, (EndIndex - BeginIndex) * sizeof(CHAR16));\r
         *(StrTemp + (EndIndex - BeginIndex)) = L'\0';\r
         CopyMem (StrTemp, Str + BeginIndex, (EndIndex - BeginIndex) * sizeof(CHAR16));\r
         *(StrTemp + (EndIndex - BeginIndex)) = L'\0';\r

-        \r
+\r

         if (Ip4Config2StrToIp (StrTemp, &((*PtrIpList)[IpIndex])) != EFI_SUCCESS) {\r
           FreePool(StrTemp);\r
           FreePool(*PtrIpList);\r
         if (Ip4Config2StrToIp (StrTemp, &((*PtrIpList)[IpIndex])) != EFI_SUCCESS) {\r
           FreePool(StrTemp);\r
           FreePool(*PtrIpList);\r


@@ -255,7 +255,7 @@ Ip4Config2StrToIpList (
         FreePool(StrTemp);\r
       }\r
     }\r
         FreePool(StrTemp);\r
       }\r
     }\r

-  } \r
+  }\r

 \r
   return EFI_SUCCESS;\r
 }\r
 \r
   return EFI_SUCCESS;\r
 }\r


@@ -265,7 +265,7 @@ Ip4Config2StrToIpList (
 \r
   @param[in]   Ip   The IPv4 address.\r
   @param[out]  Str  The dotted IP string.\r
 \r
   @param[in]   Ip   The IPv4 address.\r
   @param[out]  Str  The dotted IP string.\r

-  \r
+\r

 **/\r
 VOID\r
 Ip4Config2IpToStr (\r
 **/\r
 VOID\r
 Ip4Config2IpToStr (\r


@@ -275,8 +275,8 @@ Ip4Config2IpToStr (
 {\r
   UnicodeSPrint (\r
     Str,\r
 {\r
   UnicodeSPrint (\r
     Str,\r

-    2 * IP4_STR_MAX_SIZE, \r
-    L"%d.%d.%d.%d", \r
+    2 * IP4_STR_MAX_SIZE,\r
+    L"%d.%d.%d.%d",\r

     Ip->Addr[0],\r
     Ip->Addr[1],\r
     Ip->Addr[2],\r
     Ip->Addr[0],\r
     Ip->Addr[1],\r
     Ip->Addr[2],\r


@@ -286,13 +286,13 @@ Ip4Config2IpToStr (
 \r
 \r
 /**\r
 \r
 \r
 /**\r

-  Convert the IPv4 address list into string consists of several decimal \r
+  Convert the IPv4 address list into string consists of several decimal\r

   dotted IPv4 addresses separated by space.\r
 \r
   @param[in]   Ip        The IPv4 address list.\r
   @param[in]   IpCount   The size of IPv4 address list.\r
   @param[out]  Str       The string contains several decimal dotted\r
   dotted IPv4 addresses separated by space.\r
 \r
   @param[in]   Ip        The IPv4 address list.\r
   @param[in]   IpCount   The size of IPv4 address list.\r
   @param[out]  Str       The string contains several decimal dotted\r

-                         IPv4 addresses separated by space.       \r
+                         IPv4 addresses separated by space.\r

 \r
   @retval EFI_SUCCESS           Operation is success.\r
   @retval EFI_OUT_OF_RESOURCES  Error occurs in allocating memory.\r
 \r
   @retval EFI_SUCCESS           Operation is success.\r
   @retval EFI_OUT_OF_RESOURCES  Error occurs in allocating memory.\r


@@ -310,7 +310,7 @@ Ip4Config2IpListToStr (
   UINTN            StrIndex;\r
   CHAR16           *TempStr;\r
   EFI_IPv4_ADDRESS *TempIp;\r
   UINTN            StrIndex;\r
   CHAR16           *TempStr;\r
   EFI_IPv4_ADDRESS *TempIp;\r

-  \r
+\r

   Index    = 0;\r
   TemIndex = 0;\r
   StrIndex = 0;\r
   Index    = 0;\r
   TemIndex = 0;\r
   StrIndex = 0;\r


@@ -327,9 +327,9 @@ Ip4Config2IpListToStr (
     }\r
 \r
     UnicodeSPrint (\r
     }\r
 \r
     UnicodeSPrint (\r

-      TempStr, \r
-      2 * IP4_STR_MAX_SIZE, \r
-      L"%d.%d.%d.%d", \r
+      TempStr,\r
+      2 * IP4_STR_MAX_SIZE,\r
+      L"%d.%d.%d.%d",\r

       TempIp->Addr[0],\r
       TempIp->Addr[1],\r
       TempIp->Addr[2],\r
       TempIp->Addr[0],\r
       TempIp->Addr[1],\r
       TempIp->Addr[2],\r


@@ -342,7 +342,7 @@ Ip4Config2IpListToStr (
           Str[StrIndex++] = L'\0';\r
         } else {\r
           Str[StrIndex++] = L' ';\r
           Str[StrIndex++] = L'\0';\r
         } else {\r
           Str[StrIndex++] = L' ';\r

-        }  \r
+        }\r

         break;\r
       } else {\r
         Str[StrIndex++] = *(TempStr + TemIndex);\r
         break;\r
       } else {\r
         Str[StrIndex++] = *(TempStr + TemIndex);\r


@@ -362,7 +362,7 @@ Ip4Config2IpListToStr (
 \r
   @param[in]    Event        The pointer of Event.\r
   @param[in]    Context      The pointer of Context.\r
 \r
   @param[in]    Event        The pointer of Event.\r
   @param[in]    Context      The pointer of Context.\r

-  \r
+\r

 **/\r
 VOID\r
 EFIAPI\r
 **/\r
 VOID\r
 EFIAPI\r


@@ -384,7 +384,7 @@ Ip4Config2ManualAddressNotify (
                                  set successfully.\r
   @retval EFI_INVALID_PARAMETER  Source instance or target IFR data is not available.\r
   @retval Others                 Other errors as indicated.\r
                                  set successfully.\r
   @retval EFI_INVALID_PARAMETER  Source instance or target IFR data is not available.\r
   @retval Others                 Other errors as indicated.\r

-  \r
+\r

 **/\r
 EFI_STATUS\r
 Ip4Config2ConvertConfigNvDataToIfrNvData (\r
 **/\r
 EFI_STATUS\r
 Ip4Config2ConvertConfigNvDataToIfrNvData (\r


@@ -409,11 +409,11 @@ Ip4Config2ConvertConfigNvDataToIfrNvData (
   Ip4Info     = NULL;\r
   DnsAddress  = NULL;\r
   GatewaySize = sizeof (EFI_IPv4_ADDRESS);\r
   Ip4Info     = NULL;\r
   DnsAddress  = NULL;\r
   GatewaySize = sizeof (EFI_IPv4_ADDRESS);\r

-  \r
+\r

   if ((IfrNvData == NULL) || (Instance == NULL)) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
   if ((IfrNvData == NULL) || (Instance == NULL)) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r

-  \r
+\r

   NET_CHECK_SIGNATURE (Instance, IP4_CONFIG2_INSTANCE_SIGNATURE);\r
 \r
   IpSb = IP4_SERVICE_FROM_IP4_CONFIG2_INSTANCE (Instance);\r
   NET_CHECK_SIGNATURE (Instance, IP4_CONFIG2_INSTANCE_SIGNATURE);\r
 \r
   IpSb = IP4_SERVICE_FROM_IP4_CONFIG2_INSTANCE (Instance);\r


@@ -427,7 +427,7 @@ Ip4Config2ConvertConfigNvDataToIfrNvData (
 \r
   //\r
   // Get the Policy info.\r
 \r
   //\r
   // Get the Policy info.\r

-  // \r
+  //\r

   DataSize = sizeof (EFI_IP4_CONFIG2_POLICY);\r
   Status   = Ip4Config2->GetData (\r
                            Ip4Config2,\r
   DataSize = sizeof (EFI_IP4_CONFIG2_POLICY);\r
   Status   = Ip4Config2->GetData (\r
                            Ip4Config2,\r


@@ -438,14 +438,14 @@ Ip4Config2ConvertConfigNvDataToIfrNvData (
   if (EFI_ERROR (Status)) {\r
     goto Exit;\r
   }\r
   if (EFI_ERROR (Status)) {\r
     goto Exit;\r
   }\r

-  \r
+\r

   if (Policy == Ip4Config2PolicyStatic) {\r
     IfrNvData->DhcpEnable = FALSE;\r
   } else if (Policy == Ip4Config2PolicyDhcp) {\r
     IfrNvData->DhcpEnable = TRUE;\r
     goto Exit;\r
   }\r
   if (Policy == Ip4Config2PolicyStatic) {\r
     IfrNvData->DhcpEnable = FALSE;\r
   } else if (Policy == Ip4Config2PolicyDhcp) {\r
     IfrNvData->DhcpEnable = TRUE;\r
     goto Exit;\r
   }\r

-  \r
+\r

   //\r
   // Get the interface info.\r
   //\r
   //\r
   // Get the interface info.\r
   //\r


@@ -459,7 +459,7 @@ Ip4Config2ConvertConfigNvDataToIfrNvData (
   if (Status != EFI_BUFFER_TOO_SMALL) {\r
     return Status;\r
   }\r
   if (Status != EFI_BUFFER_TOO_SMALL) {\r
     return Status;\r
   }\r

-  \r
+\r

   Ip4Info = AllocateZeroPool (DataSize);\r
   if (Ip4Info == NULL) {\r
     Status = EFI_OUT_OF_RESOURCES;\r
   Ip4Info = AllocateZeroPool (DataSize);\r
   if (Ip4Info == NULL) {\r
     Status = EFI_OUT_OF_RESOURCES;\r


@@ -475,7 +475,7 @@ Ip4Config2ConvertConfigNvDataToIfrNvData (
   if (EFI_ERROR (Status)) {\r
     goto Exit;\r
   }\r
   if (EFI_ERROR (Status)) {\r
     goto Exit;\r
   }\r

-  \r
+\r

   //\r
   // Get the Gateway info.\r
   //\r
   //\r
   // Get the Gateway info.\r
   //\r


@@ -502,7 +502,7 @@ Ip4Config2ConvertConfigNvDataToIfrNvData (
   if ((Status != EFI_BUFFER_TOO_SMALL) && (Status != EFI_NOT_FOUND)) {\r
     goto Exit;\r
   }\r
   if ((Status != EFI_BUFFER_TOO_SMALL) && (Status != EFI_NOT_FOUND)) {\r
     goto Exit;\r
   }\r

-  \r
+\r

   DnsCount = (UINT32) (DnsSize / sizeof (EFI_IPv4_ADDRESS));\r
 \r
   if (DnsSize > 0) {\r
   DnsCount = (UINT32) (DnsSize / sizeof (EFI_IPv4_ADDRESS));\r
 \r
   if (DnsSize > 0) {\r


@@ -511,7 +511,7 @@ Ip4Config2ConvertConfigNvDataToIfrNvData (
       Status = EFI_OUT_OF_RESOURCES;\r
       goto Exit;\r
     }\r
       Status = EFI_OUT_OF_RESOURCES;\r
       goto Exit;\r
     }\r

-    \r
+\r

     Status = Ip4Config2->GetData (\r
                            Ip4Config2,\r
                            Ip4Config2DataTypeDnsServer,\r
     Status = Ip4Config2->GetData (\r
                            Ip4Config2,\r
                            Ip4Config2DataTypeDnsServer,\r


@@ -537,7 +537,7 @@ Exit:
   if (Ip4Info != NULL) {\r
     FreePool(Ip4Info);\r
   }\r
   if (Ip4Info != NULL) {\r
     FreePool(Ip4Info);\r
   }\r

-  \r
+\r

   return Status;\r
 }\r
 \r
   return Status;\r
 }\r
 \r


@@ -552,7 +552,7 @@ Exit:
                                  set successfully.\r
   @retval EFI_INVALID_PARAMETER  The address information for setting is invalid.\r
   @retval Others                 Other errors as indicated.\r
                                  set successfully.\r
   @retval EFI_INVALID_PARAMETER  The address information for setting is invalid.\r
   @retval Others                 Other errors as indicated.\r

-  \r
+\r

 **/\r
 EFI_STATUS\r
 Ip4Config2ConvertIfrNvDataToConfigNvData (\r
 **/\r
 EFI_STATUS\r
 Ip4Config2ConvertIfrNvDataToConfigNvData (\r


@@ -560,9 +560,9 @@ Ip4Config2ConvertIfrNvDataToConfigNvData (
   IN OUT IP4_CONFIG2_INSTANCE       *Instance\r
   )\r
 {\r
   IN OUT IP4_CONFIG2_INSTANCE       *Instance\r
   )\r
 {\r

-  EFI_STATUS                       Status;  \r
+  EFI_STATUS                       Status;\r

   EFI_IP4_CONFIG2_PROTOCOL         *Ip4Cfg2;\r
   EFI_IP4_CONFIG2_PROTOCOL         *Ip4Cfg2;\r

-  IP4_CONFIG2_NVDATA               *Ip4NvData; \r
+  IP4_CONFIG2_NVDATA               *Ip4NvData;\r

 \r
   EFI_IP_ADDRESS                   StationAddress;\r
   EFI_IP_ADDRESS                   SubnetMask;\r
 \r
   EFI_IP_ADDRESS                   StationAddress;\r
   EFI_IP_ADDRESS                   SubnetMask;\r


@@ -581,15 +581,15 @@ Ip4Config2ConvertIfrNvDataToConfigNvData (
   Status          = EFI_SUCCESS;\r
   Ip4Cfg2         = &Instance->Ip4Config2;\r
   Ip4NvData       = &Instance->Ip4NvData;\r
   Status          = EFI_SUCCESS;\r
   Ip4Cfg2         = &Instance->Ip4Config2;\r
   Ip4NvData       = &Instance->Ip4NvData;\r

-  \r
+\r

   DnsCount        = 0;\r
   DnsCount        = 0;\r

-  DnsAddress      = NULL; \r
-  \r
+  DnsAddress      = NULL;\r
+\r

   TimeoutEvent    = NULL;\r
   SetAddressEvent = NULL;\r
 \r
 \r
   TimeoutEvent    = NULL;\r
   SetAddressEvent = NULL;\r
 \r
 \r

-  \r
+\r

   if (Instance == NULL || IfrFormNvData == NULL) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
   if (Instance == NULL || IfrFormNvData == NULL) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r


@@ -597,10 +597,10 @@ Ip4Config2ConvertIfrNvDataToConfigNvData (
   if (IfrFormNvData->Configure != TRUE) {\r
     return EFI_SUCCESS;\r
   }\r
   if (IfrFormNvData->Configure != TRUE) {\r
     return EFI_SUCCESS;\r
   }\r

-  \r
+\r

   if (IfrFormNvData->DhcpEnable == TRUE) {\r
     Ip4NvData->Policy = Ip4Config2PolicyDhcp;\r
   if (IfrFormNvData->DhcpEnable == TRUE) {\r
     Ip4NvData->Policy = Ip4Config2PolicyDhcp;\r

-    \r
+\r

     Status = Ip4Cfg2->SetData (\r
                         Ip4Cfg2,\r
                         Ip4Config2DataTypePolicy,\r
     Status = Ip4Cfg2->SetData (\r
                         Ip4Cfg2,\r
                         Ip4Config2DataTypePolicy,\r


@@ -623,15 +623,15 @@ Ip4Config2ConvertIfrNvDataToConfigNvData (
     }\r
 \r
     Status = Ip4Config2StrToIp (IfrFormNvData->StationAddress, &StationAddress.v4);\r
     }\r
 \r
     Status = Ip4Config2StrToIp (IfrFormNvData->StationAddress, &StationAddress.v4);\r

-    if (EFI_ERROR (Status) || \r
-        (SubnetMask.Addr[0] != 0 && !NetIp4IsUnicast (NTOHL (StationAddress.Addr[0]), NTOHL (SubnetMask.Addr[0]))) || \r
+    if (EFI_ERROR (Status) ||\r
+        (SubnetMask.Addr[0] != 0 && !NetIp4IsUnicast (NTOHL (StationAddress.Addr[0]), NTOHL (SubnetMask.Addr[0]))) ||\r

         !Ip4StationAddressValid (NTOHL (StationAddress.Addr[0]), NTOHL (SubnetMask.Addr[0]))) {\r
       CreatePopUp (EFI_LIGHTGRAY | EFI_BACKGROUND_BLUE, &Key, L"Invalid IP address!", NULL);\r
       return EFI_INVALID_PARAMETER;\r
     }\r
         !Ip4StationAddressValid (NTOHL (StationAddress.Addr[0]), NTOHL (SubnetMask.Addr[0]))) {\r
       CreatePopUp (EFI_LIGHTGRAY | EFI_BACKGROUND_BLUE, &Key, L"Invalid IP address!", NULL);\r
       return EFI_INVALID_PARAMETER;\r
     }\r

-    \r
+\r

     Status = Ip4Config2StrToIp (IfrFormNvData->GatewayAddress, &Gateway.v4);\r
     Status = Ip4Config2StrToIp (IfrFormNvData->GatewayAddress, &Gateway.v4);\r

-    if (EFI_ERROR (Status) || \r
+    if (EFI_ERROR (Status) ||\r

         (Gateway.Addr[0] != 0 && SubnetMask.Addr[0] != 0 && !NetIp4IsUnicast (NTOHL (Gateway.Addr[0]), NTOHL (SubnetMask.Addr[0])))) {\r
       CreatePopUp (EFI_LIGHTGRAY | EFI_BACKGROUND_BLUE, &Key, L"Invalid Gateway!", NULL);\r
       return EFI_INVALID_PARAMETER;\r
         (Gateway.Addr[0] != 0 && SubnetMask.Addr[0] != 0 && !NetIp4IsUnicast (NTOHL (Gateway.Addr[0]), NTOHL (SubnetMask.Addr[0])))) {\r
       CreatePopUp (EFI_LIGHTGRAY | EFI_BACKGROUND_BLUE, &Key, L"Invalid Gateway!", NULL);\r
       return EFI_INVALID_PARAMETER;\r


@@ -645,16 +645,16 @@ Ip4Config2ConvertIfrNvDataToConfigNvData (
           CreatePopUp (EFI_LIGHTGRAY | EFI_BACKGROUND_BLUE, &Key, L"Invalid Dns Server!", NULL);\r
           FreePool(DnsAddress);\r
           return EFI_INVALID_PARAMETER;\r
           CreatePopUp (EFI_LIGHTGRAY | EFI_BACKGROUND_BLUE, &Key, L"Invalid Dns Server!", NULL);\r
           FreePool(DnsAddress);\r
           return EFI_INVALID_PARAMETER;\r

-        } \r
-      } \r
+        }\r
+      }\r

     } else {\r
       if (EFI_ERROR (Status)) {\r
         CreatePopUp (EFI_LIGHTGRAY | EFI_BACKGROUND_BLUE, &Key, L"Invalid Dns Server!", NULL);\r
       }\r
     }\r
     } else {\r
       if (EFI_ERROR (Status)) {\r
         CreatePopUp (EFI_LIGHTGRAY | EFI_BACKGROUND_BLUE, &Key, L"Invalid Dns Server!", NULL);\r
       }\r
     }\r

-    \r
+\r

     if (Ip4NvData->ManualAddress != NULL) {\r
     if (Ip4NvData->ManualAddress != NULL) {\r

-      FreePool(Ip4NvData->ManualAddress); \r
+      FreePool(Ip4NvData->ManualAddress);\r

     }\r
     Ip4NvData->ManualAddressCount = 1;\r
     Ip4NvData->ManualAddress = AllocateZeroPool(sizeof(EFI_IP4_CONFIG2_MANUAL_ADDRESS));\r
     }\r
     Ip4NvData->ManualAddressCount = 1;\r
     Ip4NvData->ManualAddress = AllocateZeroPool(sizeof(EFI_IP4_CONFIG2_MANUAL_ADDRESS));\r


@@ -662,14 +662,14 @@ Ip4Config2ConvertIfrNvDataToConfigNvData (
       if (DnsAddress != NULL) {\r
         FreePool(DnsAddress);\r
       }\r
       if (DnsAddress != NULL) {\r
         FreePool(DnsAddress);\r
       }\r

-      \r
+\r

       return EFI_OUT_OF_RESOURCES;\r
     }\r
     CopyMem(&Ip4NvData->ManualAddress->Address, &StationAddress.v4, sizeof(EFI_IPv4_ADDRESS));\r
     CopyMem(&Ip4NvData->ManualAddress->SubnetMask, &SubnetMask.v4, sizeof(EFI_IPv4_ADDRESS));\r
       return EFI_OUT_OF_RESOURCES;\r
     }\r
     CopyMem(&Ip4NvData->ManualAddress->Address, &StationAddress.v4, sizeof(EFI_IPv4_ADDRESS));\r
     CopyMem(&Ip4NvData->ManualAddress->SubnetMask, &SubnetMask.v4, sizeof(EFI_IPv4_ADDRESS));\r

-    \r
+\r

     if (Ip4NvData->GatewayAddress != NULL) {\r
     if (Ip4NvData->GatewayAddress != NULL) {\r

-      FreePool(Ip4NvData->GatewayAddress); \r
+      FreePool(Ip4NvData->GatewayAddress);\r

     }\r
     Ip4NvData->GatewayAddressCount = 1;\r
     Ip4NvData->GatewayAddress = AllocateZeroPool(sizeof(EFI_IPv4_ADDRESS));\r
     }\r
     Ip4NvData->GatewayAddressCount = 1;\r
     Ip4NvData->GatewayAddress = AllocateZeroPool(sizeof(EFI_IPv4_ADDRESS));\r


@@ -680,9 +680,9 @@ Ip4Config2ConvertIfrNvDataToConfigNvData (
       return EFI_OUT_OF_RESOURCES;\r
     }\r
     CopyMem(Ip4NvData->GatewayAddress, &Gateway.v4, sizeof(EFI_IPv4_ADDRESS));\r
       return EFI_OUT_OF_RESOURCES;\r
     }\r
     CopyMem(Ip4NvData->GatewayAddress, &Gateway.v4, sizeof(EFI_IPv4_ADDRESS));\r

-    \r
+\r

     if (Ip4NvData->DnsAddress != NULL) {\r
     if (Ip4NvData->DnsAddress != NULL) {\r

-      FreePool(Ip4NvData->DnsAddress); \r
+      FreePool(Ip4NvData->DnsAddress);\r

     }\r
     Ip4NvData->DnsAddressCount = (UINT32) DnsCount;\r
     Ip4NvData->DnsAddress      = DnsAddress;\r
     }\r
     Ip4NvData->DnsAddressCount = (UINT32) DnsCount;\r
     Ip4NvData->DnsAddress      = DnsAddress;\r


@@ -726,7 +726,7 @@ Ip4Config2ConvertIfrNvDataToConfigNvData (
     }\r
 \r
     IsAddressOk = FALSE;\r
     }\r
 \r
     IsAddressOk = FALSE;\r

-    \r
+\r

     Status = Ip4Cfg2->RegisterDataNotify (\r
                         Ip4Cfg2,\r
                         Ip4Config2DataTypeManualAddress,\r
     Status = Ip4Cfg2->RegisterDataNotify (\r
                         Ip4Cfg2,\r
                         Ip4Config2DataTypeManualAddress,\r


@@ -791,12 +791,12 @@ Ip4Config2ConvertIfrNvDataToConfigNvData (
                           DataSize,\r
                           Ip4NvData->DnsAddress\r
                           );\r
                           DataSize,\r
                           Ip4NvData->DnsAddress\r
                           );\r

-      \r
+\r

       if (EFI_ERROR (Status)) {\r
         goto Exit;\r
       if (EFI_ERROR (Status)) {\r
         goto Exit;\r

-      } \r
-    } \r
-  } \r
+      }\r
+    }\r
+  }\r

 \r
 Exit:\r
   if (SetAddressEvent != NULL) {\r
 \r
 Exit:\r
   if (SetAddressEvent != NULL) {\r


@@ -875,12 +875,12 @@ Ip4FormExtractConfig (
   OUT EFI_STRING                             *Results\r
   )\r
 {\r
   OUT EFI_STRING                             *Results\r
   )\r
 {\r

-  EFI_STATUS                       Status;  \r
+  EFI_STATUS                       Status;\r

   IP4_CONFIG2_INSTANCE             *Ip4Config2Instance;\r
   IP4_CONFIG2_INSTANCE             *Ip4Config2Instance;\r

-  IP4_FORM_CALLBACK_INFO           *Private;  \r
+  IP4_FORM_CALLBACK_INFO           *Private;\r

   IP4_CONFIG2_IFR_NVDATA           *IfrFormNvData;\r
   EFI_STRING                       ConfigRequestHdr;\r
   IP4_CONFIG2_IFR_NVDATA           *IfrFormNvData;\r
   EFI_STRING                       ConfigRequestHdr;\r

-  EFI_STRING                       ConfigRequest;  \r
+  EFI_STRING                       ConfigRequest;\r

   BOOLEAN                          AllocatedRequest;\r
   EFI_STRING                       FormResult;\r
   UINTN                            Size;\r
   BOOLEAN                          AllocatedRequest;\r
   EFI_STRING                       FormResult;\r
   UINTN                            Size;\r


@@ -889,19 +889,19 @@ Ip4FormExtractConfig (
   if (Progress == NULL || Results == NULL) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
   if (Progress == NULL || Results == NULL) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r

-  \r
-  Status             = EFI_SUCCESS; \r
+\r
+  Status             = EFI_SUCCESS;\r

   IfrFormNvData      = NULL;\r
   ConfigRequest      = NULL;\r
   IfrFormNvData      = NULL;\r
   ConfigRequest      = NULL;\r

-  FormResult         = NULL; \r
+  FormResult         = NULL;\r

   Size               = 0;\r
   Size               = 0;\r

-  AllocatedRequest   = FALSE;    \r
-  ConfigRequest      = Request; \r
+  AllocatedRequest   = FALSE;\r
+  ConfigRequest      = Request;\r

   Private            = IP4_FORM_CALLBACK_INFO_FROM_CONFIG_ACCESS(This);\r
   Ip4Config2Instance = IP4_CONFIG2_INSTANCE_FROM_FORM_CALLBACK(Private);\r
   BufferSize         = sizeof (IP4_CONFIG2_IFR_NVDATA);\r
   *Progress          = Request;\r
   Private            = IP4_FORM_CALLBACK_INFO_FROM_CONFIG_ACCESS(This);\r
   Ip4Config2Instance = IP4_CONFIG2_INSTANCE_FROM_FORM_CALLBACK(Private);\r
   BufferSize         = sizeof (IP4_CONFIG2_IFR_NVDATA);\r
   *Progress          = Request;\r

-  \r
+\r

   //\r
   // Check Request data in <ConfigHdr>.\r
   //\r
   //\r
   // Check Request data in <ConfigHdr>.\r
   //\r


@@ -910,9 +910,9 @@ Ip4FormExtractConfig (
     if (IfrFormNvData == NULL) {\r
       return EFI_OUT_OF_RESOURCES;\r
     }\r
     if (IfrFormNvData == NULL) {\r
       return EFI_OUT_OF_RESOURCES;\r
     }\r

-    \r
+\r

     Ip4Config2ConvertConfigNvDataToIfrNvData (Ip4Config2Instance, IfrFormNvData);\r
     Ip4Config2ConvertConfigNvDataToIfrNvData (Ip4Config2Instance, IfrFormNvData);\r

-    \r
+\r

     if ((Request == NULL) || (StrStr (Request, L"OFFSET") == NULL)) {\r
       //\r
       // Request has no request element, construct full request string.\r
     if ((Request == NULL) || (StrStr (Request, L"OFFSET") == NULL)) {\r
       //\r
       // Request has no request element, construct full request string.\r


@@ -927,7 +927,7 @@ Ip4FormExtractConfig (
         goto Failure;\r
       }\r
       AllocatedRequest = TRUE;\r
         goto Failure;\r
       }\r
       AllocatedRequest = TRUE;\r

-      \r
+\r

       UnicodeSPrint (ConfigRequest, Size, L"%s&OFFSET=0&WIDTH=%016LX", ConfigRequestHdr, (UINT64)BufferSize);\r
       FreePool (ConfigRequestHdr);\r
     }\r
       UnicodeSPrint (ConfigRequest, Size, L"%s&OFFSET=0&WIDTH=%016LX", ConfigRequestHdr, (UINT64)BufferSize);\r
       FreePool (ConfigRequestHdr);\r
     }\r


@@ -945,7 +945,7 @@ Ip4FormExtractConfig (
                                   );\r
 \r
     FreePool (IfrFormNvData);\r
                                   );\r
 \r
     FreePool (IfrFormNvData);\r

-    \r
+\r

     //\r
     // Free the allocated config request string.\r
     //\r
     //\r
     // Free the allocated config request string.\r
     //\r


@@ -958,7 +958,7 @@ Ip4FormExtractConfig (
       goto Failure;\r
     }\r
   }\r
       goto Failure;\r
     }\r
   }\r

-  \r
+\r

   if (Request == NULL || HiiIsConfigHdrMatch (Request, &gIp4Config2NvDataGuid, mIp4Config2StorageName)) {\r
     *Results = FormResult;\r
   } else {\r
   if (Request == NULL || HiiIsConfigHdrMatch (Request, &gIp4Config2NvDataGuid, mIp4Config2StorageName)) {\r
     *Results = FormResult;\r
   } else {\r


@@ -1107,7 +1107,7 @@ Ip4FormRouteConfig (
                                  callback.Currently not implemented.\r
   @retval EFI_INVALID_PARAMETERS Passing in wrong parameter.\r
   @retval Others                 Other errors as indicated.\r
                                  callback.Currently not implemented.\r
   @retval EFI_INVALID_PARAMETERS Passing in wrong parameter.\r
   @retval Others                 Other errors as indicated.\r

-  \r
+\r

 **/\r
 EFI_STATUS\r
 EFIAPI\r
 **/\r
 EFI_STATUS\r
 EFIAPI\r


@@ -1124,7 +1124,7 @@ Ip4FormCallback (
   IP4_CONFIG2_INSTANCE      *Instance;\r
   IP4_CONFIG2_IFR_NVDATA    *IfrFormNvData;\r
   IP4_FORM_CALLBACK_INFO    *Private;\r
   IP4_CONFIG2_INSTANCE      *Instance;\r
   IP4_CONFIG2_IFR_NVDATA    *IfrFormNvData;\r
   IP4_FORM_CALLBACK_INFO    *Private;\r

-  \r
+\r

   EFI_IP_ADDRESS            StationAddress;\r
   EFI_IP_ADDRESS            SubnetMask;\r
   EFI_IP_ADDRESS            Gateway;\r
   EFI_IP_ADDRESS            StationAddress;\r
   EFI_IP_ADDRESS            SubnetMask;\r
   EFI_IP_ADDRESS            Gateway;\r


@@ -1133,15 +1133,15 @@ Ip4FormCallback (
   UINTN                     DnsCount;\r
   UINTN                     Index;\r
   EFI_INPUT_KEY             Key;\r
   UINTN                     DnsCount;\r
   UINTN                     Index;\r
   EFI_INPUT_KEY             Key;\r

-  \r
+\r

   IfrFormNvData = NULL;\r
   DnsCount      = 0;\r
   IfrFormNvData = NULL;\r
   DnsCount      = 0;\r

-  DnsAddress    = NULL; \r
+  DnsAddress    = NULL;\r

 \r
   if (Action == EFI_BROWSER_ACTION_CHANGED) {\r
     Private = IP4_FORM_CALLBACK_INFO_FROM_CONFIG_ACCESS(This);\r
     Instance = IP4_CONFIG2_INSTANCE_FROM_FORM_CALLBACK(Private);\r
 \r
   if (Action == EFI_BROWSER_ACTION_CHANGED) {\r
     Private = IP4_FORM_CALLBACK_INFO_FROM_CONFIG_ACCESS(This);\r
     Instance = IP4_CONFIG2_INSTANCE_FROM_FORM_CALLBACK(Private);\r

-    \r
+\r

     IfrFormNvData = AllocateZeroPool (sizeof (IP4_CONFIG2_IFR_NVDATA));\r
     if (IfrFormNvData == NULL) {\r
       return EFI_OUT_OF_RESOURCES;\r
     IfrFormNvData = AllocateZeroPool (sizeof (IP4_CONFIG2_IFR_NVDATA));\r
     if (IfrFormNvData == NULL) {\r
       return EFI_OUT_OF_RESOURCES;\r


@@ -1181,7 +1181,7 @@ Ip4FormCallback (
         Status = EFI_INVALID_PARAMETER;\r
       }\r
       break;\r
         Status = EFI_INVALID_PARAMETER;\r
       }\r
       break;\r

-    \r
+\r

     case KEY_DNS:\r
       Status = Ip4Config2StrToIpList (IfrFormNvData->DnsAddress, &DnsAddress, &DnsCount);\r
       if (!EFI_ERROR (Status) && DnsCount > 0) {\r
     case KEY_DNS:\r
       Status = Ip4Config2StrToIpList (IfrFormNvData->DnsAddress, &DnsAddress, &DnsCount);\r
       if (!EFI_ERROR (Status) && DnsCount > 0) {\r


@@ -1191,19 +1191,19 @@ Ip4FormCallback (
             CreatePopUp (EFI_LIGHTGRAY | EFI_BACKGROUND_BLUE, &Key, L"Invalid Dns Server!", NULL);\r
             Status = EFI_INVALID_PARAMETER;\r
             break;\r
             CreatePopUp (EFI_LIGHTGRAY | EFI_BACKGROUND_BLUE, &Key, L"Invalid Dns Server!", NULL);\r
             Status = EFI_INVALID_PARAMETER;\r
             break;\r

-          } \r
+          }\r

         }\r
       } else {\r
         if (EFI_ERROR (Status)) {\r
           CreatePopUp (EFI_LIGHTGRAY | EFI_BACKGROUND_BLUE, &Key, L"Invalid Dns Server!", NULL);\r
         }\r
       }\r
         }\r
       } else {\r
         if (EFI_ERROR (Status)) {\r
           CreatePopUp (EFI_LIGHTGRAY | EFI_BACKGROUND_BLUE, &Key, L"Invalid Dns Server!", NULL);\r
         }\r
       }\r

-      \r
-      if(DnsAddress != NULL) {  \r
+\r
+      if(DnsAddress != NULL) {\r

         FreePool(DnsAddress);\r
       }\r
       break;\r
         FreePool(DnsAddress);\r
       }\r
       break;\r

-      \r
+\r

     case KEY_SAVE_CHANGES:\r
       Status = Ip4Config2ConvertIfrNvDataToConfigNvData (IfrFormNvData, Instance);\r
       *ActionRequest = EFI_BROWSER_ACTION_REQUEST_SUBMIT;\r
     case KEY_SAVE_CHANGES:\r
       Status = Ip4Config2ConvertIfrNvDataToConfigNvData (IfrFormNvData, Instance);\r
       *ActionRequest = EFI_BROWSER_ACTION_REQUEST_SUBMIT;\r


@@ -1232,7 +1232,7 @@ Ip4FormCallback (
   @retval EFI_SUCCESS              The HII Config Access protocol is installed.\r
   @retval EFI_OUT_OF_RESOURCES     Failed to allocate memory.\r
   @retval Others                   Other errors as indicated.\r
   @retval EFI_SUCCESS              The HII Config Access protocol is installed.\r
   @retval EFI_OUT_OF_RESOURCES     Failed to allocate memory.\r
   @retval Others                   Other errors as indicated.\r

-  \r
+\r

 **/\r
 EFI_STATUS\r
 Ip4Config2FormInit (\r
 **/\r
 EFI_STATUS\r
 Ip4Config2FormInit (\r


@@ -1253,9 +1253,9 @@ Ip4Config2FormInit (
 \r
   IpSb = IP4_SERVICE_FROM_IP4_CONFIG2_INSTANCE (Instance);\r
   ASSERT (IpSb != NULL);\r
 \r
   IpSb = IP4_SERVICE_FROM_IP4_CONFIG2_INSTANCE (Instance);\r
   ASSERT (IpSb != NULL);\r

-  \r
+\r

   CallbackInfo = &Instance->CallbackInfo;\r
   CallbackInfo = &Instance->CallbackInfo;\r

-  \r
+\r

   CallbackInfo->Signature = IP4_FORM_CALLBACK_INFO_SIGNATURE;\r
 \r
   Status = gBS->HandleProtocol (\r
   CallbackInfo->Signature = IP4_FORM_CALLBACK_INFO_SIGNATURE;\r
 \r
   Status = gBS->HandleProtocol (\r


@@ -1344,26 +1344,26 @@ Ip4Config2FormInit (
   Status = NetLibGetMacString (IpSb->Controller, IpSb->Image, &MacString);\r
   if (!EFI_ERROR (Status)) {\r
     OldMenuString = HiiGetString (\r
   Status = NetLibGetMacString (IpSb->Controller, IpSb->Image, &MacString);\r
   if (!EFI_ERROR (Status)) {\r
     OldMenuString = HiiGetString (\r

-                      CallbackInfo->RegisteredHandle, \r
-                      STRING_TOKEN (STR_IP4_CONFIG2_FORM_HELP), \r
+                      CallbackInfo->RegisteredHandle,\r
+                      STRING_TOKEN (STR_IP4_CONFIG2_FORM_HELP),\r

                       NULL\r
                       );\r
     UnicodeSPrint (MenuString, 128, L"%s (MAC:%s)", OldMenuString, MacString);\r
     HiiSetString (\r
                       NULL\r
                       );\r
     UnicodeSPrint (MenuString, 128, L"%s (MAC:%s)", OldMenuString, MacString);\r
     HiiSetString (\r

-      CallbackInfo->RegisteredHandle, \r
-      STRING_TOKEN (STR_IP4_CONFIG2_FORM_HELP), \r
-      MenuString, \r
+      CallbackInfo->RegisteredHandle,\r
+      STRING_TOKEN (STR_IP4_CONFIG2_FORM_HELP),\r
+      MenuString,\r

       NULL\r
       );\r
 \r
     UnicodeSPrint (PortString, 128, L"MAC:%s", MacString);\r
     HiiSetString (\r
       NULL\r
       );\r
 \r
     UnicodeSPrint (PortString, 128, L"MAC:%s", MacString);\r
     HiiSetString (\r

-      CallbackInfo->RegisteredHandle,  \r
-      STRING_TOKEN (STR_IP4_DEVICE_FORM_HELP), \r
-      PortString, \r
+      CallbackInfo->RegisteredHandle,\r
+      STRING_TOKEN (STR_IP4_DEVICE_FORM_HELP),\r
+      PortString,\r

       NULL\r
       );\r
       NULL\r
       );\r

-    \r
+\r

     FreePool (MacString);\r
     FreePool (OldMenuString);\r
 \r
     FreePool (MacString);\r
     FreePool (OldMenuString);\r
 \r


@@ -1405,7 +1405,7 @@ Ip4Config2FormUnload (
            IpSb->Image,\r
            CallbackInfo->ChildHandle\r
            );\r
            IpSb->Image,\r
            CallbackInfo->ChildHandle\r
            );\r

-    \r
+\r

     //\r
     // Uninstall EFI_HII_CONFIG_ACCESS_PROTOCOL\r
     //\r
     //\r
     // Uninstall EFI_HII_CONFIG_ACCESS_PROTOCOL\r
     //\r

diff --git a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Config2Nv.h b/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Config2Nv.h
index 5a82e6d2296f48c5b66614c8ac13395ba9e073b7..884d01a0d590d582288c6b61063e07a59a2414fd 100644 (file)
--- a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Config2Nv.h
+++ b/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Config2Nv.h
@@ -1,7 +1,7 @@
 /** @file\r
   The header file of IP4Config2Nv.c\r
 \r
 /** @file\r
   The header file of IP4Config2Nv.c\r
 \r

-Copyright (c) 2015, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2015 - 2018, Intel Corporation. All rights reserved.<BR>\r

 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r


@@ -30,7 +30,7 @@ extern UINT8  Ip4DxeStrings[];
   @retval EFI_SUCCESS              The HII Config Access protocol is installed.\r
   @retval EFI_OUT_OF_RESOURCES     Failed to allocate memory.\r
   @retval Others                   Other errors as indicated.\r
   @retval EFI_SUCCESS              The HII Config Access protocol is installed.\r
   @retval EFI_OUT_OF_RESOURCES     Failed to allocate memory.\r
   @retval Others                   Other errors as indicated.\r

-  \r
+\r

 **/\r
 EFI_STATUS\r
 Ip4Config2FormInit (\r
 **/\r
 EFI_STATUS\r
 Ip4Config2FormInit (\r

diff --git a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Driver.c b/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Driver.c
index 552c4e190b40cde75a6b74e1e4ca9bcb5ecb572c..0f2558141459a59b1ad1fc7e617076fee95c0467 100644 (file)
--- a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Driver.c
+++ b/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Driver.c
@@ -258,7 +258,7 @@ Ip4CreateService (
   IpSb->ReconfigEvent = NULL;\r
 \r
   IpSb->Reconfig = FALSE;\r
   IpSb->ReconfigEvent = NULL;\r
 \r
   IpSb->Reconfig = FALSE;\r

-  \r
+\r

   IpSb->MediaPresent = TRUE;\r
 \r
   //\r
   IpSb->MediaPresent = TRUE;\r
 \r
   //\r


@@ -352,7 +352,7 @@ Ip4CreateService (
 \r
   IpSb->MacString = NULL;\r
   Status = NetLibGetMacString (IpSb->Controller, IpSb->Image, &IpSb->MacString);\r
 \r
   IpSb->MacString = NULL;\r
   Status = NetLibGetMacString (IpSb->Controller, IpSb->Image, &IpSb->MacString);\r

-  \r
+\r

   if (EFI_ERROR (Status)) {\r
     goto ON_ERROR;\r
   }\r
   if (EFI_ERROR (Status)) {\r
     goto ON_ERROR;\r
   }\r


@@ -367,7 +367,7 @@ Ip4CreateService (
   InsertHeadList (&IpSb->Interfaces, &IpSb->DefaultInterface->Link);\r
 \r
   ZeroMem (&IpSb->Ip4Config2Instance, sizeof (IP4_CONFIG2_INSTANCE));\r
   InsertHeadList (&IpSb->Interfaces, &IpSb->DefaultInterface->Link);\r
 \r
   ZeroMem (&IpSb->Ip4Config2Instance, sizeof (IP4_CONFIG2_INSTANCE));\r

-  \r
+\r

   Status = Ip4Config2InitInstance (&IpSb->Ip4Config2Instance);\r
 \r
   if (EFI_ERROR (Status)) {\r
   Status = Ip4Config2InitInstance (&IpSb->Ip4Config2Instance);\r
 \r
   if (EFI_ERROR (Status)) {\r


@@ -488,7 +488,7 @@ Ip4CleanService (
 \r
 /**\r
   Callback function which provided by user to remove one node in NetDestroyLinkList process.\r
 \r
 /**\r
   Callback function which provided by user to remove one node in NetDestroyLinkList process.\r

-  \r
+\r

   @param[in]    Entry           The entry to be removed.\r
   @param[in]    Context         Pointer to the callback context corresponds to the Context in NetDestroyLinkList.\r
 \r
   @param[in]    Entry           The entry to be removed.\r
   @param[in]    Context         Pointer to the callback context corresponds to the Context in NetDestroyLinkList.\r
 \r


@@ -549,7 +549,7 @@ Ip4DriverBindingStart (
   IN EFI_HANDLE                   ControllerHandle,\r
   IN EFI_DEVICE_PATH_PROTOCOL     *RemainingDevicePath OPTIONAL\r
   )\r
   IN EFI_HANDLE                   ControllerHandle,\r
   IN EFI_DEVICE_PATH_PROTOCOL     *RemainingDevicePath OPTIONAL\r
   )\r

-{ \r
+{\r

   EFI_STATUS                    Status;\r
   IP4_SERVICE                   *IpSb;\r
   EFI_IP4_CONFIG2_PROTOCOL      *Ip4Cfg2;\r
   EFI_STATUS                    Status;\r
   IP4_SERVICE                   *IpSb;\r
   EFI_IP4_CONFIG2_PROTOCOL      *Ip4Cfg2;\r


@@ -575,13 +575,13 @@ Ip4DriverBindingStart (
   if (Status == EFI_SUCCESS) {\r
     return EFI_ALREADY_STARTED;\r
   }\r
   if (Status == EFI_SUCCESS) {\r
     return EFI_ALREADY_STARTED;\r
   }\r

-  \r
+\r

   Status = Ip4CreateService (ControllerHandle, This->DriverBindingHandle, &IpSb);\r
   Status = Ip4CreateService (ControllerHandle, This->DriverBindingHandle, &IpSb);\r

-  \r
+\r

   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r

-  \r
+\r

   ASSERT (IpSb != NULL);\r
 \r
   Ip4Cfg2  = &IpSb->Ip4Config2Instance.Ip4Config2;\r
   ASSERT (IpSb != NULL);\r
 \r
   Ip4Cfg2  = &IpSb->Ip4Config2Instance.Ip4Config2;\r


@@ -603,16 +603,16 @@ Ip4DriverBindingStart (
   }\r
 \r
   //\r
   }\r
 \r
   //\r

-  // Read the config data from NV variable again. \r
+  // Read the config data from NV variable again.\r

   // The default data can be changed by other drivers.\r
   //\r
   Status = Ip4Config2ReadConfigData (IpSb->MacString, &IpSb->Ip4Config2Instance);\r
   if (EFI_ERROR (Status)) {\r
     goto UNINSTALL_PROTOCOL;\r
   }\r
   // The default data can be changed by other drivers.\r
   //\r
   Status = Ip4Config2ReadConfigData (IpSb->MacString, &IpSb->Ip4Config2Instance);\r
   if (EFI_ERROR (Status)) {\r
     goto UNINSTALL_PROTOCOL;\r
   }\r

-  \r
+\r

   //\r
   //\r

-  // Consume the installed EFI_IP4_CONFIG2_PROTOCOL to set the default data items. \r
+  // Consume the installed EFI_IP4_CONFIG2_PROTOCOL to set the default data items.\r

   //\r
   for (Index = Ip4Config2DataTypePolicy; Index < Ip4Config2DataTypeMaximum; Index++) {\r
     DataItem = &IpSb->Ip4Config2Instance.DataItem[Index];\r
   //\r
   for (Index = Ip4Config2DataTypePolicy; Index < Ip4Config2DataTypeMaximum; Index++) {\r
     DataItem = &IpSb->Ip4Config2Instance.DataItem[Index];\r


@@ -626,13 +626,13 @@ Ip4DriverBindingStart (
       if (EFI_ERROR(Status)) {\r
         goto UNINSTALL_PROTOCOL;\r
       }\r
       if (EFI_ERROR(Status)) {\r
         goto UNINSTALL_PROTOCOL;\r
       }\r

-      \r
+\r

       if (Index == Ip4Config2DataTypePolicy && (*(DataItem->Data.Policy) == Ip4Config2PolicyDhcp)) {\r
         break;\r
       if (Index == Ip4Config2DataTypePolicy && (*(DataItem->Data.Policy) == Ip4Config2PolicyDhcp)) {\r
         break;\r

-      } \r
+      }\r

     }\r
   }\r
     }\r
   }\r

- \r
+\r

   //\r
   // Ready to go: start the receiving and timer.\r
   // Ip4Config2SetPolicy maybe call Ip4ReceiveFrame() to set the default interface's RecvRequest first after\r
   //\r
   // Ready to go: start the receiving and timer.\r
   // Ip4Config2SetPolicy maybe call Ip4ReceiveFrame() to set the default interface's RecvRequest first after\r


@@ -705,9 +705,9 @@ Ip4DriverBindingStop (
   )\r
 {\r
   EFI_SERVICE_BINDING_PROTOCOL             *ServiceBinding;\r
   )\r
 {\r
   EFI_SERVICE_BINDING_PROTOCOL             *ServiceBinding;\r

-  IP4_SERVICE                              *IpSb; \r
+  IP4_SERVICE                              *IpSb;\r

   EFI_HANDLE                               NicHandle;\r
   EFI_HANDLE                               NicHandle;\r

-  EFI_STATUS                               Status; \r
+  EFI_STATUS                               Status;\r

   INTN                                     State;\r
   LIST_ENTRY                               *List;\r
   IP4_DESTROY_CHILD_IN_HANDLE_BUF_CONTEXT  Context;\r
   INTN                                     State;\r
   LIST_ENTRY                               *List;\r
   IP4_DESTROY_CHILD_IN_HANDLE_BUF_CONTEXT  Context;\r


@@ -717,20 +717,20 @@ Ip4DriverBindingStop (
   BOOLEAN                                  IsDhcp4;\r
 \r
   IsDhcp4   = FALSE;\r
   BOOLEAN                                  IsDhcp4;\r
 \r
   IsDhcp4   = FALSE;\r

-   \r
+\r

   NicHandle = NetLibGetNicHandle (ControllerHandle, &gEfiManagedNetworkProtocolGuid);\r
   if (NicHandle == NULL) {\r
     NicHandle = NetLibGetNicHandle (ControllerHandle, &gEfiArpProtocolGuid);\r
     if (NicHandle == NULL) {\r
       NicHandle = NetLibGetNicHandle (ControllerHandle, &gEfiDhcp4ProtocolGuid);\r
       if (NicHandle != NULL) {\r
   NicHandle = NetLibGetNicHandle (ControllerHandle, &gEfiManagedNetworkProtocolGuid);\r
   if (NicHandle == NULL) {\r
     NicHandle = NetLibGetNicHandle (ControllerHandle, &gEfiArpProtocolGuid);\r
     if (NicHandle == NULL) {\r
       NicHandle = NetLibGetNicHandle (ControllerHandle, &gEfiDhcp4ProtocolGuid);\r
       if (NicHandle != NULL) {\r

-        IsDhcp4 = TRUE;  \r
+        IsDhcp4 = TRUE;\r

       } else {\r
         return EFI_SUCCESS;\r
       }\r
     }\r
   }\r
       } else {\r
         return EFI_SUCCESS;\r
       }\r
     }\r
   }\r

-   \r
+\r

   Status = gBS->OpenProtocol (\r
                   NicHandle,\r
                   &gEfiIp4ServiceBindingProtocolGuid,\r
   Status = gBS->OpenProtocol (\r
                   NicHandle,\r
                   &gEfiIp4ServiceBindingProtocolGuid,\r


@@ -742,7 +742,7 @@ Ip4DriverBindingStop (
   if (EFI_ERROR (Status)) {\r
     return EFI_DEVICE_ERROR;\r
   }\r
   if (EFI_ERROR (Status)) {\r
     return EFI_DEVICE_ERROR;\r
   }\r

-  \r
+\r

   IpSb = IP4_SERVICE_FROM_PROTOCOL (ServiceBinding);\r
 \r
   if (IsDhcp4) {\r
   IpSb = IP4_SERVICE_FROM_PROTOCOL (ServiceBinding);\r
 \r
   if (IsDhcp4) {\r


@@ -761,7 +761,7 @@ Ip4DriverBindingStop (
                NULL\r
                );\r
   } else if (IpSb->DefaultInterface->ArpHandle == ControllerHandle) {\r
                NULL\r
                );\r
   } else if (IpSb->DefaultInterface->ArpHandle == ControllerHandle) {\r

-  \r
+\r

     //\r
     // The ARP protocol for the default interface is being uninstalled and all\r
     // its IP child handles should have been destroyed before. So, release the\r
     //\r
     // The ARP protocol for the default interface is being uninstalled and all\r
     // its IP child handles should have been destroyed before. So, release the\r


@@ -770,7 +770,7 @@ Ip4DriverBindingStop (
     Ip4CancelReceive (IpSb->DefaultInterface);\r
     Ip4FreeInterface (IpSb->DefaultInterface, NULL);\r
     Ip4FreeRouteTable (IpSb->DefaultRouteTable);\r
     Ip4CancelReceive (IpSb->DefaultInterface);\r
     Ip4FreeInterface (IpSb->DefaultInterface, NULL);\r
     Ip4FreeRouteTable (IpSb->DefaultRouteTable);\r

-    \r
+\r

     IpIf = Ip4CreateInterface (IpSb->Mnp, IpSb->Controller, IpSb->Image);\r
     if (IpIf == NULL) {\r
       goto ON_ERROR;\r
     IpIf = Ip4CreateInterface (IpSb->Mnp, IpSb->Controller, IpSb->Image);\r
     if (IpIf == NULL) {\r
       goto ON_ERROR;\r


@@ -780,7 +780,7 @@ Ip4DriverBindingStop (
       Ip4FreeInterface (IpIf, NULL);\r
       goto ON_ERROR;;\r
     }\r
       Ip4FreeInterface (IpIf, NULL);\r
       goto ON_ERROR;;\r
     }\r

-    \r
+\r

     IpSb->DefaultInterface  = IpIf;\r
     InsertHeadList (&IpSb->Interfaces, &IpIf->Link);\r
     IpSb->DefaultRouteTable = RouteTable;\r
     IpSb->DefaultInterface  = IpIf;\r
     InsertHeadList (&IpSb->Interfaces, &IpIf->Link);\r
     IpSb->DefaultRouteTable = RouteTable;\r


@@ -807,7 +807,7 @@ Ip4DriverBindingStop (
            &IpSb->Ip4Config2Instance.Ip4Config2,\r
            NULL\r
            );\r
            &IpSb->Ip4Config2Instance.Ip4Config2,\r
            NULL\r
            );\r

-    \r
+\r

     if (gIp4ControllerNameTable != NULL) {\r
       FreeUnicodeStringTable (gIp4ControllerNameTable);\r
       gIp4ControllerNameTable = NULL;\r
     if (gIp4ControllerNameTable != NULL) {\r
       FreeUnicodeStringTable (gIp4ControllerNameTable);\r
       gIp4ControllerNameTable = NULL;\r

diff --git a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Driver.h b/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Driver.h
index 8c5298b645ceb0ca983a784d70584f19a0d49c6b..0a278cd77556d6931499faa24fbe65c01ff7b557 100644 (file)
--- a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Driver.h
+++ b/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Driver.h
@@ -1,6 +1,6 @@
 /** @file\r
 \r
 /** @file\r
 \r

-Copyright (c) 2005 - 2016, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2005 - 2018, Intel Corporation. All rights reserved.<BR>\r

 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r


@@ -34,7 +34,7 @@ typedef struct {
   This is the declaration of an EFI image entry point. This entry point is\r
   the same for UEFI Applications, UEFI OS Loaders, and UEFI Drivers including\r
   both device drivers and bus drivers.\r
   This is the declaration of an EFI image entry point. This entry point is\r
   the same for UEFI Applications, UEFI OS Loaders, and UEFI Drivers including\r
   both device drivers and bus drivers.\r

-  \r
+\r

   The entry point for IP4 driver which install the driver\r
   binding and component name protocol on its image.\r
 \r
   The entry point for IP4 driver which install the driver\r
   binding and component name protocol on its image.\r
 \r


@@ -114,7 +114,7 @@ Ip4DriverBindingStart (
   restrictions for this service. DisconnectController()\r
   must follow these calling restrictions. If any other agent wishes\r
   to call Stop() it must also follow these calling restrictions.\r
   restrictions for this service. DisconnectController()\r
   must follow these calling restrictions. If any other agent wishes\r
   to call Stop() it must also follow these calling restrictions.\r

-  \r
+\r

   @param[in]  This              Protocol instance pointer.\r
   @param[in]  ControllerHandle  Handle of device to stop driver on\r
   @param[in]  NumberOfChildren  Number of Handles in ChildHandleBuffer. If number\r
   @param[in]  This              Protocol instance pointer.\r
   @param[in]  ControllerHandle  Handle of device to stop driver on\r
   @param[in]  NumberOfChildren  Number of Handles in ChildHandleBuffer. If number\r


@@ -139,14 +139,14 @@ Ip4DriverBindingStop (
 //\r
 /**\r
   Creates a child handle and installs a protocol.\r
 //\r
 /**\r
   Creates a child handle and installs a protocol.\r

-  \r
-  The CreateChild() function installs a protocol on ChildHandle. \r
-  If ChildHandle is a pointer to NULL, then a new handle is created and returned in ChildHandle. \r
+\r
+  The CreateChild() function installs a protocol on ChildHandle.\r
+  If ChildHandle is a pointer to NULL, then a new handle is created and returned in ChildHandle.\r

   If ChildHandle is not a pointer to NULL, then the protocol installs on the existing ChildHandle.\r
 \r
   @param  This        Pointer to the EFI_SERVICE_BINDING_PROTOCOL instance.\r
   @param  ChildHandle Pointer to the handle of the child to create. If it is NULL,\r
   If ChildHandle is not a pointer to NULL, then the protocol installs on the existing ChildHandle.\r
 \r
   @param  This        Pointer to the EFI_SERVICE_BINDING_PROTOCOL instance.\r
   @param  ChildHandle Pointer to the handle of the child to create. If it is NULL,\r

-                      then a new handle is created. If it is a pointer to an existing UEFI handle, \r
+                      then a new handle is created. If it is a pointer to an existing UEFI handle,\r

                       then the protocol is added to the existing UEFI handle.\r
 \r
   @retval EFI_SUCCES            The protocol was added to ChildHandle.\r
                       then the protocol is added to the existing UEFI handle.\r
 \r
   @retval EFI_SUCCES            The protocol was added to ChildHandle.\r


@@ -165,9 +165,9 @@ Ip4ServiceBindingCreateChild (
 \r
 /**\r
   Destroys a child handle with a protocol installed on it.\r
 \r
 /**\r
   Destroys a child handle with a protocol installed on it.\r

-  \r
-  The DestroyChild() function does the opposite of CreateChild(). It removes a protocol \r
-  that was installed by CreateChild() from ChildHandle. If the removed protocol is the \r
+\r
+  The DestroyChild() function does the opposite of CreateChild(). It removes a protocol\r
+  that was installed by CreateChild() from ChildHandle. If the removed protocol is the\r

   last protocol on ChildHandle, then ChildHandle is destroyed.\r
 \r
   @param  This        Pointer to the EFI_SERVICE_BINDING_PROTOCOL instance.\r
   last protocol on ChildHandle, then ChildHandle is destroyed.\r
 \r
   @param  This        Pointer to the EFI_SERVICE_BINDING_PROTOCOL instance.\r

diff --git a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.inf b/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.inf
index 313528783d7bb59d3d3fde214027188fbab349dd..b2b934a8c35d38bcd7bb6cbd7b96deb549ddf5db 100644 (file)
--- a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.inf
+++ b/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.inf
@@ -6,7 +6,7 @@
 #  subset of the Internet Control Message Protocol (ICMP) and may include support for\r
 #  the Internet Group Management Protocol (IGMP).\r
 #\r
 #  subset of the Internet Control Message Protocol (ICMP) and may include support for\r
 #  the Internet Group Management Protocol (IGMP).\r
 #\r

-#  Copyright (c) 2007 - 2016, Intel Corporation. All rights reserved.<BR>\r
+#  Copyright (c) 2007 - 2018, Intel Corporation. All rights reserved.<BR>\r

 #  This program and the accompanying materials\r
 #  are licensed and made available under the terms and conditions of the BSD License\r
 #  which accompanies this distribution. The full text of the license may be found at\r
 #  This program and the accompanying materials\r
 #  are licensed and made available under the terms and conditions of the BSD License\r
 #  which accompanies this distribution. The full text of the license may be found at\r


@@ -24,7 +24,7 @@
   MODULE_UNI_FILE                = Ip4Dxe.uni\r
   FILE_GUID                      = 9FB1A1F3-3B71-4324-B39A-745CBB015FFF\r
   MODULE_TYPE                    = UEFI_DRIVER\r
   MODULE_UNI_FILE                = Ip4Dxe.uni\r
   FILE_GUID                      = 9FB1A1F3-3B71-4324-B39A-745CBB015FFF\r
   MODULE_TYPE                    = UEFI_DRIVER\r

-  VERSION_STRING                 = 1.0 \r
+  VERSION_STRING                 = 1.0\r

   ENTRY_POINT                    = Ip4DriverEntryPoint\r
   UNLOAD_IMAGE                   = NetLibDefaultUnload\r
 \r
   ENTRY_POINT                    = Ip4DriverEntryPoint\r
   UNLOAD_IMAGE                   = NetLibDefaultUnload\r
 \r


@@ -33,7 +33,7 @@
 #\r
 #  VALID_ARCHITECTURES           = IA32 X64 IPF EBC\r
 #\r
 #\r
 #  VALID_ARCHITECTURES           = IA32 X64 IPF EBC\r
 #\r

-#  DRIVER_BINDING                =  gIp4DriverBinding                        \r
+#  DRIVER_BINDING                =  gIp4DriverBinding\r

 #  COMPONENT_NAME                =  gIp4ComponentName\r
 #  COMPONENT_NAME2               =  gIp4ComponentName2\r
 #\r
 #  COMPONENT_NAME                =  gIp4ComponentName\r
 #  COMPONENT_NAME2               =  gIp4ComponentName2\r
 #\r


@@ -102,7 +102,7 @@
   gEfiIpSec2ProtocolGuid                        ## SOMETIMES_CONSUMES\r
   gEfiHiiConfigAccessProtocolGuid               ## BY_START\r
   gEfiDevicePathProtocolGuid                    ## TO_START\r
   gEfiIpSec2ProtocolGuid                        ## SOMETIMES_CONSUMES\r
   gEfiHiiConfigAccessProtocolGuid               ## BY_START\r
   gEfiDevicePathProtocolGuid                    ## TO_START\r

-  \r
+\r

 [Guids]\r
   ## SOMETIMES_CONSUMES ## GUID # HiiIsConfigHdrMatch   EFI_NIC_IP4_CONFIG_VARIABLE\r
   ## SOMETIMES_PRODUCES ## GUID # HiiConstructConfigHdr EFI_NIC_IP4_CONFIG_VARIABLE\r
 [Guids]\r
   ## SOMETIMES_CONSUMES ## GUID # HiiIsConfigHdrMatch   EFI_NIC_IP4_CONFIG_VARIABLE\r
   ## SOMETIMES_PRODUCES ## GUID # HiiConstructConfigHdr EFI_NIC_IP4_CONFIG_VARIABLE\r

diff --git a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.uni b/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.uni
index e25b0242d6b903a5a745be661406d978fac8dabc..a0779b9c9c04d7e606f7aa544b725b200ff54f81 100644 (file)
--- a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.uni
+++ b/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.uni
@@ -6,13 +6,13 @@
 // subset of the Internet Control Message Protocol (ICMP) and may include support for\r
 // the Internet Group Management Protocol (IGMP).\r
 //\r
 // subset of the Internet Control Message Protocol (ICMP) and may include support for\r
 // the Internet Group Management Protocol (IGMP).\r
 //\r

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

 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r
 // which accompanies this distribution. The full text of the license may be found at\r
 // http://opensource.org/licenses/bsd-license.php\r
 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r
 // which accompanies this distribution. The full text of the license may be found at\r
 // http://opensource.org/licenses/bsd-license.php\r

-// \r
+//\r

 // THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 // WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 //\r
 // THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 // WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 //\r

diff --git a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4DxeExtra.uni b/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4DxeExtra.uni
index 9335e9cfa30db9293a3cdbdfe656b8f96bc0936e..15b0c9027dcadd17e15e457a0f8ec1e049054e90 100644 (file)
--- a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4DxeExtra.uni
+++ b/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4DxeExtra.uni
@@ -1,7 +1,7 @@
 // /** @file\r
 // Ip4Dxe Localized Strings and Content\r
 //\r
 // /** @file\r
 // Ip4Dxe Localized Strings and Content\r
 //\r

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

 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r
 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r


@@ -13,8 +13,8 @@
 //\r
 // **/\r
 \r
 //\r
 // **/\r
 \r

-#string STR_PROPERTIES_MODULE_NAME \r
-#language en-US \r
+#string STR_PROPERTIES_MODULE_NAME\r
+#language en-US\r

 "IP v4 DXE Driver"\r
 \r
 \r
 "IP v4 DXE Driver"\r
 \r
 \r

diff --git a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4DxeStrings.uni b/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4DxeStrings.uni
index 0546ceacb9fa8243640644685ec5cc62803e97c4..0b68c2f4699e0540fff672d99e760b4fda37b65d 100644 (file)
--- a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4DxeStrings.uni
+++ b/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4DxeStrings.uni
@@ -1,7 +1,7 @@
 // /** @file\r
 //   String definitions for Ip4Config2 formset\r
 \r
 // /** @file\r
 //   String definitions for Ip4Config2 formset\r
 \r

-// Copyright (c) 2015 - 2017, Intel Corporation. All rights reserved.<BR>\r
+// Copyright (c) 2015 - 2018, Intel Corporation. All rights reserved.<BR>\r

 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r
 // which accompanies this distribution.  The full text of the license may be found at\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r
 // which accompanies this distribution.  The full text of the license may be found at\r


@@ -30,7 +30,7 @@
 #string STR_IP4_MASK_HELP             #language en-US "Enter NetMask in dotted-decimal notation. Example: 255.255.255.0\r\n"\r
 #string STR_IP4_LOCAL_GATEWAY         #language en-US "Local Gateway"\r
 #string STR_IP4_GATEWAY_HELP          #language en-US "Enter Gateway in dotted-decimal notation. Example: 192.168.10.1\r\n"\r
 #string STR_IP4_MASK_HELP             #language en-US "Enter NetMask in dotted-decimal notation. Example: 255.255.255.0\r\n"\r
 #string STR_IP4_LOCAL_GATEWAY         #language en-US "Local Gateway"\r
 #string STR_IP4_GATEWAY_HELP          #language en-US "Enter Gateway in dotted-decimal notation. Example: 192.168.10.1\r\n"\r

-#string STR_IP4_LOCAL_DNS                #language en-US "Local DNS Servers"\r
+#string STR_IP4_LOCAL_DNS             #language en-US "Local DNS Servers"\r

 #string STR_IP4_DNS_HELP              #language en-US "Enter DNS Servers in dotted-decimal notation. Example: 192.168.10.8 192.168.10.9\r\n"\r
 #string STR_SAVE_CHANGES              #language en-US "Save Changes and Exit"\r
 #string STR_NULL                      #language en-US ""\r
 #string STR_IP4_DNS_HELP              #language en-US "Enter DNS Servers in dotted-decimal notation. Example: 192.168.10.8 192.168.10.9\r\n"\r
 #string STR_SAVE_CHANGES              #language en-US "Save Changes and Exit"\r
 #string STR_NULL                      #language en-US ""\r

diff --git a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Icmp.c b/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Icmp.c
index ed6bdbe466422406ad9e5999b588d504122880fb..511342e786d73d9cfbcecfa10ef0a58aa3830f99 100644 (file)
--- a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Icmp.c
+++ b/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Icmp.c
@@ -1,6 +1,6 @@
 /** @file\r
 \r
 /** @file\r
 \r

-Copyright (c) 2005 - 2015, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2005 - 2018, Intel Corporation. All rights reserved.<BR>\r

 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r


@@ -72,7 +72,7 @@ mIp4SupportedIcmp[23] = {
 /**\r
   Process the ICMP redirect. Find the instance then update\r
   its route cache.\r
 /**\r
   Process the ICMP redirect. Find the instance then update\r
   its route cache.\r

-  \r
+\r

   All kinds of redirect is treated as host redirect as\r
   specified by RFC1122 3.3.1.2:\r
   "Since the subnet mask appropriate to the destination\r
   All kinds of redirect is treated as host redirect as\r
   specified by RFC1122 3.3.1.2:\r
   "Since the subnet mask appropriate to the destination\r


@@ -80,7 +80,7 @@ mIp4SupportedIcmp[23] = {
   message SHOULD be treated identically to a Host Redirect\r
   message;"\r
 \r
   message SHOULD be treated identically to a Host Redirect\r
   message;"\r
 \r

-  @param[in]  IpSb               The IP4 service binding instance that received \r
+  @param[in]  IpSb               The IP4 service binding instance that received\r

                                  the packet.\r
   @param[in]  Head               The IP head of the received ICMPpacket.\r
   @param[in]  Packet             The content of the ICMP redirect packet with IP\r
                                  the packet.\r
   @param[in]  Head               The IP head of the received ICMPpacket.\r
   @param[in]  Packet             The content of the ICMP redirect packet with IP\r


@@ -166,7 +166,7 @@ Ip4ProcessIcmpRedirect (
   @retval EFI_SUCCESS            The ICMP error is processed successfully.\r
   @retval EFI_INVALID_PARAMETER  The packet is invalid\r
   @retval Others                 Failed to process the packet.\r
   @retval EFI_SUCCESS            The ICMP error is processed successfully.\r
   @retval EFI_INVALID_PARAMETER  The packet is invalid\r
   @retval Others                 Failed to process the packet.\r

-  \r
+\r

 **/\r
 EFI_STATUS\r
 Ip4ProcessIcmpError (\r
 **/\r
 EFI_STATUS\r
 Ip4ProcessIcmpError (\r

diff --git a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Icmp.h b/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Icmp.h
index 30199dced6ec66e142195145d31529394915ade7..a5183efb0a7861ab14842a8409a29338992a5f67 100644 (file)
--- a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Icmp.h
+++ b/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Icmp.h
@@ -1,7 +1,7 @@
 /** @file\r
   Header file for ICMP protocol.\r
 /** @file\r
   Header file for ICMP protocol.\r

-  \r
-Copyright (c) 2005 - 2015, Intel Corporation. All rights reserved.<BR>\r
+\r
+Copyright (c) 2005 - 2018, Intel Corporation. All rights reserved.<BR>\r

 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r

diff --git a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4If.c b/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4If.c
index d29d87372e3dfba93cd08cc957deea71d4847595..6e0e3290c75f6367c207cbd7a5ba932d84781df1 100644 (file)
--- a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4If.c
+++ b/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4If.c
@@ -1,7 +1,7 @@
 /** @file\r
   Implement IP4 pesudo interface.\r
 /** @file\r
   Implement IP4 pesudo interface.\r

-  \r
-Copyright (c) 2005 - 2017, Intel Corporation. All rights reserved.<BR>\r
+\r
+Copyright (c) 2005 - 2018, Intel Corporation. All rights reserved.<BR>\r

 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r


@@ -68,7 +68,7 @@ Ip4OnArpResolvedDpc (
   @param  Event             The Arp request event.\r
   @param  Context           The context of the callback, a point to the ARP\r
                             queue.\r
   @param  Event             The Arp request event.\r
   @param  Context           The context of the callback, a point to the ARP\r
                             queue.\r

-                                \r
+\r

 **/\r
 VOID\r
 EFIAPI\r
 **/\r
 VOID\r
 EFIAPI\r


@@ -139,7 +139,7 @@ Ip4CancelFrameArp (
                                 finished.\r
   @param[in]  Context           Opaque parameter to the call back.\r
 \r
                                 finished.\r
   @param[in]  Context           Opaque parameter to the call back.\r
 \r

-  @retval   Token               The wrapped token if succeed \r
+  @retval   Token               The wrapped token if succeed\r

   @retval   NULL                The wrapped token if NULL\r
 \r
 **/\r
   @retval   NULL                The wrapped token if NULL\r
 \r
 **/\r


@@ -587,10 +587,10 @@ Ip4SetAddress (
              Interface->Image,\r
              Interface->Controller\r
              );\r
              Interface->Image,\r
              Interface->Controller\r
              );\r

-      \r
+\r

       Interface->Arp = NULL;\r
     }\r
       Interface->Arp = NULL;\r
     }\r

-    \r
+\r

     NetLibDestroyServiceChild (\r
       Interface->Controller,\r
       Interface->Image,\r
     NetLibDestroyServiceChild (\r
       Interface->Controller,\r
       Interface->Image,\r


@@ -872,7 +872,7 @@ Ip4OnArpResolvedDpc (
   @param  Event             The Arp request event.\r
   @param  Context           The context of the callback, a point to the ARP\r
                             queue.\r
   @param  Event             The Arp request event.\r
   @param  Context           The context of the callback, a point to the ARP\r
                             queue.\r

-                                \r
+\r

 **/\r
 VOID\r
 EFIAPI\r
 **/\r
 VOID\r
 EFIAPI\r

diff --git a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4If.h b/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4If.h
index 577286360b1c7e411001ae198751e3c371d73fa5..909837131e93dbbd2161b2558eb6172b99b5773b 100644 (file)
--- a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4If.h
+++ b/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4If.h
@@ -1,7 +1,7 @@
 /** @file\r
   Definition for IP4 pesudo interface structure.\r
 /** @file\r
   Definition for IP4 pesudo interface structure.\r

-  \r
-Copyright (c) 2005 - 2016, Intel Corporation. All rights reserved.<BR>\r
+\r
+Copyright (c) 2005 - 2018, Intel Corporation. All rights reserved.<BR>\r

 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r

diff --git a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Igmp.c b/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Igmp.c
index e0edc93ff844f6291b35960df52a89d9ddfb153a..ee768bb39da65c7aeeb193aa7cf789882c2d801e 100644 (file)
--- a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Igmp.c
+++ b/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Igmp.c
@@ -1,7 +1,7 @@
 /** @file\r
   This file implements the RFC2236: IGMP v2.\r
 /** @file\r
   This file implements the RFC2236: IGMP v2.\r

-  \r
-Copyright (c) 2005 - 2015, Intel Corporation. All rights reserved.<BR>\r
+\r
+Copyright (c) 2005 - 2018, Intel Corporation. All rights reserved.<BR>\r

 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r

diff --git a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Impl.c b/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Impl.c
index 5a9d8287031ca3498cb4b7ac1f9c7713a8100119..fa84a9b1ca7b09b7782419b9adf4cf465a19251e 100644 (file)
--- a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Impl.c
+++ b/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Impl.c
@@ -682,7 +682,7 @@ Ip4ConfigProtocol (
     //\r
     if (IpSb->State == IP4_SERVICE_UNSTARTED) {\r
       //\r
     //\r
     if (IpSb->State == IP4_SERVICE_UNSTARTED) {\r
       //\r

-      // Trigger the EFI_IP4_CONFIG2_PROTOCOL to retrieve the \r
+      // Trigger the EFI_IP4_CONFIG2_PROTOCOL to retrieve the\r

       // default IPv4 address if it is not available yet.\r
       //\r
       Policy = IpSb->Ip4Config2Instance.Policy;\r
       // default IPv4 address if it is not available yet.\r
       //\r
       Policy = IpSb->Ip4Config2Instance.Policy;\r


@@ -1048,11 +1048,11 @@ Ip4Groups (
   // is decreamented each time an address is removed..\r
   //\r
   for (Index = IpInstance->GroupCount; Index > 0 ; Index--) {\r
   // is decreamented each time an address is removed..\r
   //\r
   for (Index = IpInstance->GroupCount; Index > 0 ; Index--) {\r

-    Group = 0;         \r
+    Group = 0;\r

     if(IpInstance->Groups != NULL) {\r
     if(IpInstance->Groups != NULL) {\r

-         Group = IpInstance->Groups[Index - 1];\r
-       }\r
-       \r
+      Group = IpInstance->Groups[Index - 1];\r
+    }\r
+\r

     if ((GroupAddress == NULL) || EFI_IP4_EQUAL (&Group, GroupAddress)) {\r
       if (EFI_ERROR (Ip4LeaveGroup (IpInstance, NTOHL (Group)))) {\r
         return EFI_DEVICE_ERROR;\r
     if ((GroupAddress == NULL) || EFI_IP4_EQUAL (&Group, GroupAddress)) {\r
       if (EFI_ERROR (Ip4LeaveGroup (IpInstance, NTOHL (Group)))) {\r
         return EFI_DEVICE_ERROR;\r


@@ -1663,7 +1663,7 @@ EfiIp4Transmit (
     }\r
 \r
     RawHdrLen = (UINT8) (RawHdrLen << 2);\r
     }\r
 \r
     RawHdrLen = (UINT8) (RawHdrLen << 2);\r

-    \r
+\r

     CopyMem (&Head, FirstFragment, IP4_MIN_HEADLEN);\r
 \r
     Ip4NtohHead (&Head);\r
     CopyMem (&Head, FirstFragment, IP4_MIN_HEADLEN);\r
 \r
     Ip4NtohHead (&Head);\r


@@ -2253,8 +2253,8 @@ Ip4SentPacketTicking (
 }\r
 \r
 /**\r
 }\r
 \r
 /**\r

-  This heart beat timer of IP4 service instance times out all of its IP4 children's \r
-  received-but-not-delivered and transmitted-but-not-recycle packets, and provides \r
+  This heart beat timer of IP4 service instance times out all of its IP4 children's\r
+  received-but-not-delivered and transmitted-but-not-recycle packets, and provides\r

   time input for its IGMP protocol.\r
 \r
   @param[in]  Event                  The IP4 service instance's heart beat timer.\r
   time input for its IGMP protocol.\r
 \r
   @param[in]  Event                  The IP4 service instance's heart beat timer.\r


@@ -2272,17 +2272,17 @@ Ip4TimerTicking (
 \r
   IpSb = (IP4_SERVICE *) Context;\r
   NET_CHECK_SIGNATURE (IpSb, IP4_SERVICE_SIGNATURE);\r
 \r
   IpSb = (IP4_SERVICE *) Context;\r
   NET_CHECK_SIGNATURE (IpSb, IP4_SERVICE_SIGNATURE);\r

-  \r
+\r

   Ip4PacketTimerTicking (IpSb);\r
   Ip4IgmpTicking (IpSb);\r
 }\r
 \r
 /**\r
   Ip4PacketTimerTicking (IpSb);\r
   Ip4IgmpTicking (IpSb);\r
 }\r
 \r
 /**\r

-  This dedicated timer is used to poll underlying network media status. In case \r
-  of cable swap or wireless network switch, a new round auto configuration will \r
-  be initiated. The timer will signal the IP4 to run DHCP configuration again. \r
-  IP4 driver will free old IP address related resource, such as route table and \r
-  Interface, then initiate a DHCP process to acquire new IP, eventually create \r
+  This dedicated timer is used to poll underlying network media status. In case\r
+  of cable swap or wireless network switch, a new round auto configuration will\r
+  be initiated. The timer will signal the IP4 to run DHCP configuration again.\r
+  IP4 driver will free old IP address related resource, such as route table and\r
+  Interface, then initiate a DHCP process to acquire new IP, eventually create\r

   route table for new IP address.\r
 \r
   @param[in]  Event                  The IP4 service instance's heart beat timer.\r
   route table for new IP address.\r
 \r
   @param[in]  Event                  The IP4 service instance's heart beat timer.\r


@@ -2303,12 +2303,12 @@ Ip4TimerReconfigChecking (
 \r
   IpSb = (IP4_SERVICE *) Context;\r
   NET_CHECK_SIGNATURE (IpSb, IP4_SERVICE_SIGNATURE);\r
 \r
   IpSb = (IP4_SERVICE *) Context;\r
   NET_CHECK_SIGNATURE (IpSb, IP4_SERVICE_SIGNATURE);\r

-  \r
+\r

   OldMediaPresent = IpSb->MediaPresent;\r
 \r
   //\r
   OldMediaPresent = IpSb->MediaPresent;\r
 \r
   //\r

-  // Get fresh mode data from MNP, since underlying media status may change. \r
-  // Here, it needs to mention that the MediaPresent can also be checked even if \r
+  // Get fresh mode data from MNP, since underlying media status may change.\r
+  // Here, it needs to mention that the MediaPresent can also be checked even if\r

   // EFI_NOT_STARTED returned while this MNP child driver instance isn't configured.\r
   //\r
   Status = IpSb->Mnp->GetModeData (IpSb->Mnp, NULL, &SnpModeData);\r
   // EFI_NOT_STARTED returned while this MNP child driver instance isn't configured.\r
   //\r
   Status = IpSb->Mnp->GetModeData (IpSb->Mnp, NULL, &SnpModeData);\r


@@ -2323,8 +2323,8 @@ Ip4TimerReconfigChecking (
   if (!OldMediaPresent && IpSb->MediaPresent && (IpSb->Ip4Config2Instance.Policy == Ip4Config2PolicyDhcp)) {\r
     //\r
     // Signal the IP4 to run the dhcp configuration again. IP4 driver will free\r
   if (!OldMediaPresent && IpSb->MediaPresent && (IpSb->Ip4Config2Instance.Policy == Ip4Config2PolicyDhcp)) {\r
     //\r
     // Signal the IP4 to run the dhcp configuration again. IP4 driver will free\r

-    // old IP address related resource, such as route table and Interface, then \r
-    // initiate a DHCP round to acquire new IP, eventually \r
+    // old IP address related resource, such as route table and Interface, then\r
+    // initiate a DHCP round to acquire new IP, eventually\r

     // create route table for new IP address.\r
     //\r
     if (IpSb->ReconfigEvent != NULL) {\r
     // create route table for new IP address.\r
     //\r
     if (IpSb->ReconfigEvent != NULL) {\r

diff --git a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Impl.h b/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Impl.h
index 8bdc39a3f10aa8ba333a2864f087c52f4df16e28..ddca6ce897f6ecdee0e46d1af6ec2b50893bf473 100644 (file)
--- a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Impl.h
+++ b/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Impl.h
@@ -1,6 +1,6 @@
 /** @file\r
   Ip4 internal functions and type defintions.\r
 /** @file\r
   Ip4 internal functions and type defintions.\r

-  \r
+\r

 Copyright (c) 2005 - 2018, Intel Corporation. All rights reserved.<BR>\r
 (C) Copyright 2015 Hewlett-Packard Development Company, L.P.<BR>\r
 \r
 Copyright (c) 2005 - 2018, Intel Corporation. All rights reserved.<BR>\r
 (C) Copyright 2015 Hewlett-Packard Development Company, L.P.<BR>\r
 \r


@@ -134,7 +134,7 @@ struct _IP4_PROTOCOL {
   EFI_HANDLE                Handle;\r
   INTN                      State;\r
 \r
   EFI_HANDLE                Handle;\r
   INTN                      State;\r
 \r

-  BOOLEAN                   InDestroy;                      \r
+  BOOLEAN                   InDestroy;\r

 \r
   IP4_SERVICE               *Service;\r
   LIST_ENTRY                Link;       // Link to all the IP protocol from the service\r
 \r
   IP4_SERVICE               *Service;\r
   LIST_ENTRY                Link;       // Link to all the IP protocol from the service\r


@@ -212,7 +212,7 @@ struct _IP4_SERVICE {
   BOOLEAN                         Reconfig;\r
 \r
   //\r
   BOOLEAN                         Reconfig;\r
 \r
   //\r

-  // Underlying media present status. \r
+  // Underlying media present status.\r

   //\r
   BOOLEAN                         MediaPresent;\r
 \r
   //\r
   BOOLEAN                         MediaPresent;\r
 \r


@@ -334,8 +334,8 @@ Ip4Groups (
   );\r
 \r
 /**\r
   );\r
 \r
 /**\r

-  This heart beat timer of IP4 service instance times out all of its IP4 children's \r
-  received-but-not-delivered and transmitted-but-not-recycle packets, and provides \r
+  This heart beat timer of IP4 service instance times out all of its IP4 children's\r
+  received-but-not-delivered and transmitted-but-not-recycle packets, and provides\r

   time input for its IGMP protocol.\r
 \r
   @param[in]  Event                  The IP4 service instance's heart beat timer.\r
   time input for its IGMP protocol.\r
 \r
   @param[in]  Event                  The IP4 service instance's heart beat timer.\r


@@ -350,11 +350,11 @@ Ip4TimerTicking (
   );\r
 \r
 /**\r
   );\r
 \r
 /**\r

-  This dedicated timer is used to poll underlying network media status. In case \r
-  of cable swap or wireless network switch, a new round auto configuration will \r
-  be initiated. The timer will signal the IP4 to run DHCP configuration again. \r
-  IP4 driver will free old IP address related resource, such as route table and \r
-  Interface, then initiate a DHCP process to acquire new IP, eventually create \r
+  This dedicated timer is used to poll underlying network media status. In case\r
+  of cable swap or wireless network switch, a new round auto configuration will\r
+  be initiated. The timer will signal the IP4 to run DHCP configuration again.\r
+  IP4 driver will free old IP address related resource, such as route table and\r
+  Interface, then initiate a DHCP process to acquire new IP, eventually create\r

   route table for new IP address.\r
 \r
   @param[in]  Event                  The IP4 service instance's heart beat timer.\r
   route table for new IP address.\r
 \r
   @param[in]  Event                  The IP4 service instance's heart beat timer.\r

diff --git a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Input.c b/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Input.c
index e6943230195cb6e056c132e214e483206817a6ba..f22a3c3199ed89e2a7f5836d60af228af8e1ae51 100644 (file)
--- a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Input.c
+++ b/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Input.c
@@ -1,7 +1,7 @@
 /** @file\r
   IP4 input process.\r
 /** @file\r
   IP4 input process.\r

-  \r
-Copyright (c) 2005 - 2017, Intel Corporation. All rights reserved.<BR>\r
+\r
+Copyright (c) 2005 - 2018, Intel Corporation. All rights reserved.<BR>\r

 (C) Copyright 2015 Hewlett-Packard Development Company, L.P.<BR>\r
 \r
 This program and the accompanying materials\r
 (C) Copyright 2015 Hewlett-Packard Development Company, L.P.<BR>\r
 \r
 This program and the accompanying materials\r


@@ -441,8 +441,8 @@ DROP:
 }\r
 \r
 /**\r
 }\r
 \r
 /**\r

-  The callback function for the net buffer which wraps the packet processed by \r
-  IPsec. It releases the wrap packet and also signals IPsec to free the resources. \r
+  The callback function for the net buffer which wraps the packet processed by\r
+  IPsec. It releases the wrap packet and also signals IPsec to free the resources.\r

 \r
   @param[in]  Arg       The wrap context\r
 \r
 \r
   @param[in]  Arg       The wrap context\r
 \r


@@ -469,25 +469,25 @@ Ip4IpSecFree (
 }\r
 \r
 /**\r
 }\r
 \r
 /**\r

-  The work function to locate IPsec protocol to process the inbound or \r
+  The work function to locate IPsec protocol to process the inbound or\r

   outbound IP packets. The process routine handls the packet with following\r
   outbound IP packets. The process routine handls the packet with following\r

-  actions: bypass the packet, discard the packet, or protect the packet.       \r
+  actions: bypass the packet, discard the packet, or protect the packet.\r

 \r
   @param[in]       IpSb          The IP4 service instance.\r
   @param[in, out]  Head          The The caller supplied IP4 header.\r
   @param[in, out]  Netbuf        The IP4 packet to be processed by IPsec.\r
   @param[in, out]  Options       The caller supplied options.\r
   @param[in, out]  OptionsLen    The length of the option.\r
 \r
   @param[in]       IpSb          The IP4 service instance.\r
   @param[in, out]  Head          The The caller supplied IP4 header.\r
   @param[in, out]  Netbuf        The IP4 packet to be processed by IPsec.\r
   @param[in, out]  Options       The caller supplied options.\r
   @param[in, out]  OptionsLen    The length of the option.\r

-  @param[in]       Direction     The directionality in an SPD entry, \r
+  @param[in]       Direction     The directionality in an SPD entry,\r

                                  EfiIPsecInBound or EfiIPsecOutBound.\r
   @param[in]       Context       The token's wrap.\r
 \r
   @retval EFI_SUCCESS            The IPsec protocol is not available or disabled.\r
   @retval EFI_SUCCESS            The packet was bypassed and all buffers remain the same.\r
   @retval EFI_SUCCESS            The packet was protected.\r
                                  EfiIPsecInBound or EfiIPsecOutBound.\r
   @param[in]       Context       The token's wrap.\r
 \r
   @retval EFI_SUCCESS            The IPsec protocol is not available or disabled.\r
   @retval EFI_SUCCESS            The packet was bypassed and all buffers remain the same.\r
   @retval EFI_SUCCESS            The packet was protected.\r

-  @retval EFI_ACCESS_DENIED      The packet was discarded.  \r
+  @retval EFI_ACCESS_DENIED      The packet was discarded.\r

   @retval EFI_OUT_OF_RESOURCES   There is no suffcient resource to complete the operation.\r
   @retval EFI_OUT_OF_RESOURCES   There is no suffcient resource to complete the operation.\r

-  @retval EFI_BUFFER_TOO_SMALL   The number of non-empty block is bigger than the \r
+  @retval EFI_BUFFER_TOO_SMALL   The number of non-empty block is bigger than the\r

                                  number of input data blocks when build a fragment table.\r
 \r
 **/\r
                                  number of input data blocks when build a fragment table.\r
 \r
 **/\r


@@ -519,12 +519,12 @@ Ip4IpSecProcessPacket (
     goto ON_EXIT;\r
   }\r
   ASSERT (mIpSec != NULL);\r
     goto ON_EXIT;\r
   }\r
   ASSERT (mIpSec != NULL);\r

-  \r
+\r

   Packet        = *Netbuf;\r
   RecycleEvent  = NULL;\r
   IpSecWrap     = NULL;\r
   FragmentTable = NULL;\r
   Packet        = *Netbuf;\r
   RecycleEvent  = NULL;\r
   IpSecWrap     = NULL;\r
   FragmentTable = NULL;\r

-  TxWrap        = (IP4_TXTOKEN_WRAP *) Context; \r
+  TxWrap        = (IP4_TXTOKEN_WRAP *) Context;\r

   FragmentCount = Packet->BlockOpNum;\r
 \r
   ZeroMem (&ZeroHead, sizeof (IP4_HEAD));\r
   FragmentCount = Packet->BlockOpNum;\r
 \r
   ZeroMem (&ZeroHead, sizeof (IP4_HEAD));\r


@@ -535,14 +535,14 @@ Ip4IpSecProcessPacket (
   if (mIpSec->DisabledFlag) {\r
     //\r
     // If IPsec is disabled, restore the original MTU\r
   if (mIpSec->DisabledFlag) {\r
     //\r
     // If IPsec is disabled, restore the original MTU\r

-    //   \r
+    //\r

     IpSb->MaxPacketSize = IpSb->OldMaxPacketSize;\r
     goto ON_EXIT;\r
   } else {\r
     //\r
     IpSb->MaxPacketSize = IpSb->OldMaxPacketSize;\r
     goto ON_EXIT;\r
   } else {\r
     //\r

-    // If IPsec is enabled, use the MTU which reduce the IPsec header length.  \r
+    // If IPsec is enabled, use the MTU which reduce the IPsec header length.\r

     //\r
     //\r

-    IpSb->MaxPacketSize = IpSb->OldMaxPacketSize - IP4_MAX_IPSEC_HEADLEN;   \r
+    IpSb->MaxPacketSize = IpSb->OldMaxPacketSize - IP4_MAX_IPSEC_HEADLEN;\r

   }\r
 \r
   //\r
   }\r
 \r
   //\r


@@ -554,9 +554,9 @@ Ip4IpSecProcessPacket (
     Status = EFI_OUT_OF_RESOURCES;\r
     goto ON_EXIT;\r
   }\r
     Status = EFI_OUT_OF_RESOURCES;\r
     goto ON_EXIT;\r
   }\r

- \r
+\r

   Status = NetbufBuildExt (Packet, FragmentTable, &FragmentCount);\r
   Status = NetbufBuildExt (Packet, FragmentTable, &FragmentCount);\r

-  \r
+\r

   //\r
   // Record the original FragmentTable and count.\r
   //\r
   //\r
   // Record the original FragmentTable and count.\r
   //\r


@@ -572,7 +572,7 @@ Ip4IpSecProcessPacket (
   // Convert host byte order to network byte order\r
   //\r
   Ip4NtohHead (*Head);\r
   // Convert host byte order to network byte order\r
   //\r
   Ip4NtohHead (*Head);\r

-  \r
+\r

   Status = mIpSec->ProcessExt (\r
                      mIpSec,\r
                      IpSb->Controller,\r
   Status = mIpSec->ProcessExt (\r
                      mIpSec,\r
                      IpSb->Controller,\r


@@ -590,7 +590,7 @@ Ip4IpSecProcessPacket (
   // Convert back to host byte order\r
   //\r
   Ip4NtohHead (*Head);\r
   // Convert back to host byte order\r
   //\r
   Ip4NtohHead (*Head);\r

-  \r
+\r

   if (EFI_ERROR (Status)) {\r
     FreePool (OriginalFragmentTable);\r
     goto ON_EXIT;\r
   if (EFI_ERROR (Status)) {\r
     FreePool (OriginalFragmentTable);\r
     goto ON_EXIT;\r


@@ -610,7 +610,7 @@ Ip4IpSecProcessPacket (
   }\r
 \r
   if (Direction == EfiIPsecOutBound && TxWrap != NULL) {\r
   }\r
 \r
   if (Direction == EfiIPsecOutBound && TxWrap != NULL) {\r

-  \r
+\r

     TxWrap->IpSecRecycleSignal = RecycleEvent;\r
     TxWrap->Packet             = NetbufFromExt (\r
                                    FragmentTable,\r
     TxWrap->IpSecRecycleSignal = RecycleEvent;\r
     TxWrap->Packet             = NetbufFromExt (\r
                                    FragmentTable,\r


@@ -635,28 +635,28 @@ Ip4IpSecProcessPacket (
     //\r
     NetIpSecNetbufFree (*Netbuf);\r
     *Netbuf = TxWrap->Packet;\r
     //\r
     NetIpSecNetbufFree (*Netbuf);\r
     *Netbuf = TxWrap->Packet;\r

-    \r
+\r

   } else {\r
   } else {\r

-  \r
+\r

     IpSecWrap = AllocateZeroPool (sizeof (IP4_IPSEC_WRAP));\r
     IpSecWrap = AllocateZeroPool (sizeof (IP4_IPSEC_WRAP));\r

-  \r
+\r

     if (IpSecWrap == NULL) {\r
       Status = EFI_OUT_OF_RESOURCES;\r
       gBS->SignalEvent (RecycleEvent);\r
       goto ON_EXIT;\r
     }\r
     if (IpSecWrap == NULL) {\r
       Status = EFI_OUT_OF_RESOURCES;\r
       gBS->SignalEvent (RecycleEvent);\r
       goto ON_EXIT;\r
     }\r

-    \r
+\r

     IpSecWrap->IpSecRecycleSignal = RecycleEvent;\r
     IpSecWrap->Packet             = Packet;\r
     Packet                        = NetbufFromExt (\r
     IpSecWrap->IpSecRecycleSignal = RecycleEvent;\r
     IpSecWrap->Packet             = Packet;\r
     Packet                        = NetbufFromExt (\r

-                                      FragmentTable, \r
-                                      FragmentCount, \r
-                                      IP4_MAX_HEADLEN, \r
-                                      0, \r
-                                      Ip4IpSecFree, \r
+                                      FragmentTable,\r
+                                      FragmentCount,\r
+                                      IP4_MAX_HEADLEN,\r
+                                      0,\r
+                                      Ip4IpSecFree,\r

                                       IpSecWrap\r
                                       );\r
                                       IpSecWrap\r
                                       );\r

-  \r
+\r

     if (Packet == NULL) {\r
       Packet = IpSecWrap->Packet;\r
       gBS->SignalEvent (RecycleEvent);\r
     if (Packet == NULL) {\r
       Packet = IpSecWrap->Packet;\r
       gBS->SignalEvent (RecycleEvent);\r


@@ -686,7 +686,7 @@ ON_EXIT:
 /**\r
   Pre-process the IPv4 packet. First validates the IPv4 packet, and\r
   then reassembles packet if it is necessary.\r
 /**\r
   Pre-process the IPv4 packet. First validates the IPv4 packet, and\r
   then reassembles packet if it is necessary.\r

-  \r
+\r

   @param[in]       IpSb            Pointer to IP4_SERVICE.\r
   @param[in, out]  Packet          Pointer to the Packet to be processed.\r
   @param[in]       Head            Pointer to the IP4_HEAD.\r
   @param[in]       IpSb            Pointer to IP4_SERVICE.\r
   @param[in, out]  Packet          Pointer to the Packet to be processed.\r
   @param[in]       Head            Pointer to the IP4_HEAD.\r


@@ -696,7 +696,7 @@ ON_EXIT:
                                    as multicast.\r
 \r
   @retval     EFI_SEUCCESS               The recieved packet is in well form.\r
                                    as multicast.\r
 \r
   @retval     EFI_SEUCCESS               The recieved packet is in well form.\r

-  @retval     EFI_INVAILD_PARAMETER      The recieved packet is malformed.  \r
+  @retval     EFI_INVAILD_PARAMETER      The recieved packet is malformed.\r

 \r
 **/\r
 EFI_STATUS\r
 \r
 **/\r
 EFI_STATUS\r


@@ -705,9 +705,9 @@ Ip4PreProcessPacket (
   IN OUT NET_BUF        **Packet,\r
   IN     IP4_HEAD       *Head,\r
   IN     UINT8          *Option,\r
   IN OUT NET_BUF        **Packet,\r
   IN     IP4_HEAD       *Head,\r
   IN     UINT8          *Option,\r

-  IN     UINT32         OptionLen, \r
+  IN     UINT32         OptionLen,\r

   IN     UINT32         Flag\r
   IN     UINT32         Flag\r

-  ) \r
+  )\r

 {\r
   IP4_CLIP_INFO             *Info;\r
   UINT32                    HeadLen;\r
 {\r
   IP4_CLIP_INFO             *Info;\r
   UINT32                    HeadLen;\r


@@ -720,7 +720,7 @@ Ip4PreProcessPacket (
   if ((*Packet)->TotalSize < IP4_MIN_HEADLEN) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
   if ((*Packet)->TotalSize < IP4_MIN_HEADLEN) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r

-  \r
+\r

   HeadLen  = (Head->HeadLen << 2);\r
   TotalLen = NTOHS (Head->TotalLen);\r
 \r
   HeadLen  = (Head->HeadLen << 2);\r
   TotalLen = NTOHS (Head->TotalLen);\r
 \r


@@ -769,7 +769,7 @@ Ip4PreProcessPacket (
   // Validate the options. Don't call the Ip4OptionIsValid if\r
   // there is no option to save some CPU process.\r
   //\r
   // Validate the options. Don't call the Ip4OptionIsValid if\r
   // there is no option to save some CPU process.\r
   //\r

-  \r
+\r

   if ((OptionLen > 0) && !Ip4OptionIsValid (Option, OptionLen, TRUE)) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
   if ((OptionLen > 0) && !Ip4OptionIsValid (Option, OptionLen, TRUE)) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r


@@ -810,7 +810,7 @@ Ip4PreProcessPacket (
       return EFI_INVALID_PARAMETER;\r
     }\r
   }\r
       return EFI_INVALID_PARAMETER;\r
     }\r
   }\r

-  \r
+\r

   return EFI_SUCCESS;\r
 }\r
 \r
   return EFI_SUCCESS;\r
 }\r
 \r


@@ -842,7 +842,7 @@ Ip4AccpetFrame (
   IP4_HEAD                  ZeroHead;\r
   UINT8                     *Option;\r
   UINT32                    OptionLen;\r
   IP4_HEAD                  ZeroHead;\r
   UINT8                     *Option;\r
   UINT32                    OptionLen;\r

-  \r
+\r

   IpSb   = (IP4_SERVICE *) Context;\r
   Option = NULL;\r
 \r
   IpSb   = (IP4_SERVICE *) Context;\r
   Option = NULL;\r
 \r


@@ -861,11 +861,11 @@ Ip4AccpetFrame (
   // Validate packet format and reassemble packet if it is necessary.\r
   //\r
   Status = Ip4PreProcessPacket (\r
   // Validate packet format and reassemble packet if it is necessary.\r
   //\r
   Status = Ip4PreProcessPacket (\r

-             IpSb, \r
-             &Packet, \r
-             Head, \r
+             IpSb,\r
+             &Packet,\r
+             Head,\r

              Option,\r
              Option,\r

-             OptionLen,  \r
+             OptionLen,\r

              Flag\r
              );\r
 \r
              Flag\r
              );\r
 \r


@@ -890,7 +890,7 @@ Ip4AccpetFrame (
   if (EFI_ERROR (Status)) {\r
     goto RESTART;\r
   }\r
   if (EFI_ERROR (Status)) {\r
     goto RESTART;\r
   }\r

-  \r
+\r

   //\r
   // If the packet is protected by tunnel mode, parse the inner Ip Packet.\r
   //\r
   //\r
   // If the packet is protected by tunnel mode, parse the inner Ip Packet.\r
   //\r


@@ -914,7 +914,7 @@ Ip4AccpetFrame (
       goto RESTART;\r
     }\r
   }\r
       goto RESTART;\r
     }\r
   }\r

-  \r
+\r

   ASSERT (Packet != NULL);\r
   Head  = Packet->Ip.Ip4;\r
   IP4_GET_CLIP_INFO (Packet)->Status = EFI_SUCCESS;\r
   ASSERT (Packet != NULL);\r
   Head  = Packet->Ip.Ip4;\r
   IP4_GET_CLIP_INFO (Packet)->Status = EFI_SUCCESS;\r


@@ -1298,7 +1298,7 @@ Ip4InstanceDeliverPacket (
         //\r
         Head = NetbufAllocSpace (Dup, IP4_MAX_HEADLEN, NET_BUF_HEAD);\r
         ASSERT (Head != NULL);\r
         //\r
         Head = NetbufAllocSpace (Dup, IP4_MAX_HEADLEN, NET_BUF_HEAD);\r
         ASSERT (Head != NULL);\r

-        \r
+\r

         Dup->Ip.Ip4 = (IP4_HEAD *) Head;\r
 \r
         CopyMem (Head, Packet->Ip.Ip4, Packet->Ip.Ip4->HeadLen << 2);\r
         Dup->Ip.Ip4 = (IP4_HEAD *) Head;\r
 \r
         CopyMem (Head, Packet->Ip.Ip4, Packet->Ip.Ip4->HeadLen << 2);\r


@@ -1345,7 +1345,7 @@ Ip4InstanceDeliverPacket (
   @param[in]  Head               The header of the received packet.\r
   @param[in]  Packet             The data of the received packet.\r
   @param[in]  Option             Point to the IP4 packet header options.\r
   @param[in]  Head               The header of the received packet.\r
   @param[in]  Packet             The data of the received packet.\r
   @param[in]  Option             Point to the IP4 packet header options.\r

-  @param[in]  OptionLen          Length of the IP4 packet header options.  \r
+  @param[in]  OptionLen          Length of the IP4 packet header options.\r

   @param[in]  IpIf               The interface to enqueue the packet to.\r
 \r
   @return The number of the IP4 children that accepts the packet\r
   @param[in]  IpIf               The interface to enqueue the packet to.\r
 \r
   @return The number of the IP4 children that accepts the packet\r

diff --git a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Input.h b/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Input.h
index 1c8e8b2a15edda44b823679cccb00f20fd763465..b24ca5aaa32f008513991ee7a19d08958e83c22a 100644 (file)
--- a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Input.h
+++ b/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Input.h
@@ -1,6 +1,6 @@
 /** @file\r
 \r
 /** @file\r
 \r

-Copyright (c) 2005 - 2012, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2005 - 2018, Intel Corporation. All rights reserved.<BR>\r

 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r


@@ -17,7 +17,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #define IP4_MIN_HEADLEN        20\r
 #define IP4_MAX_HEADLEN        60\r
 ///\r
 #define IP4_MIN_HEADLEN        20\r
 #define IP4_MAX_HEADLEN        60\r
 ///\r

-/// 8(ESP header) + 16(max IV) + 16(max padding) + 2(ESP tail) + 12(max ICV) = 54 \r
+/// 8(ESP header) + 16(max IV) + 16(max padding) + 2(ESP tail) + 12(max ICV) = 54\r

 ///\r
 #define IP4_MAX_IPSEC_HEADLEN  54\r
 \r
 ///\r
 #define IP4_MAX_IPSEC_HEADLEN  54\r
 \r


@@ -169,7 +169,7 @@ Ip4Demultiplex (
   @param[in]  Head               The header of the received packet.\r
   @param[in]  Packet             The data of the received packet.\r
   @param[in]  Option             Point to the IP4 packet header options.\r
   @param[in]  Head               The header of the received packet.\r
   @param[in]  Packet             The data of the received packet.\r
   @param[in]  Option             Point to the IP4 packet header options.\r

-  @param[in]  OptionLen          Length of the IP4 packet header options.  \r
+  @param[in]  OptionLen          Length of the IP4 packet header options.\r

   @param[in]  IpIf               The interface to enqueue the packet to.\r
 \r
   @return The number of the IP4 children that accepts the packet\r
   @param[in]  IpIf               The interface to enqueue the packet to.\r
 \r
   @return The number of the IP4 children that accepts the packet\r


@@ -216,25 +216,25 @@ Ip4PacketTimerTicking (
   );\r
 \r
 /**\r
   );\r
 \r
 /**\r

-  The work function to locate IPsec protocol to process the inbound or \r
+  The work function to locate IPsec protocol to process the inbound or\r

   outbound IP packets. The process routine handls the packet with following\r
   outbound IP packets. The process routine handls the packet with following\r

-  actions: bypass the packet, discard the packet, or protect the packet.       \r
+  actions: bypass the packet, discard the packet, or protect the packet.\r

 \r
   @param[in]       IpSb          The IP4 service instance.\r
   @param[in, out]  Head          The The caller supplied IP4 header.\r
   @param[in, out]  Netbuf        The IP4 packet to be processed by IPsec.\r
   @param[in, out]  Options       The caller supplied options.\r
   @param[in, out]  OptionsLen    The length of the option.\r
 \r
   @param[in]       IpSb          The IP4 service instance.\r
   @param[in, out]  Head          The The caller supplied IP4 header.\r
   @param[in, out]  Netbuf        The IP4 packet to be processed by IPsec.\r
   @param[in, out]  Options       The caller supplied options.\r
   @param[in, out]  OptionsLen    The length of the option.\r

-  @param[in]       Direction     The directionality in an SPD entry, \r
+  @param[in]       Direction     The directionality in an SPD entry,\r

                                  EfiIPsecInBound or EfiIPsecOutBound.\r
   @param[in]       Context       The token's wrap.\r
 \r
   @retval EFI_SUCCESS            The IPsec protocol is not available or disabled.\r
   @retval EFI_SUCCESS            The packet was bypassed and all buffers remain the same.\r
   @retval EFI_SUCCESS            The packet was protected.\r
                                  EfiIPsecInBound or EfiIPsecOutBound.\r
   @param[in]       Context       The token's wrap.\r
 \r
   @retval EFI_SUCCESS            The IPsec protocol is not available or disabled.\r
   @retval EFI_SUCCESS            The packet was bypassed and all buffers remain the same.\r
   @retval EFI_SUCCESS            The packet was protected.\r

-  @retval EFI_ACCESS_DENIED      The packet was discarded.  \r
+  @retval EFI_ACCESS_DENIED      The packet was discarded.\r

   @retval EFI_OUT_OF_RESOURCES   There is no suffcient resource to complete the operation.\r
   @retval EFI_OUT_OF_RESOURCES   There is no suffcient resource to complete the operation.\r

-  @retval EFI_BUFFER_TOO_SMALL   The number of non-empty block is bigger than the \r
+  @retval EFI_BUFFER_TOO_SMALL   The number of non-empty block is bigger than the\r

                                  number of input data blocks when build a fragment table.\r
 \r
 **/\r
                                  number of input data blocks when build a fragment table.\r
 \r
 **/\r

diff --git a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Option.c b/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Option.c
index 6a925732758cf66b76670e22faa1b16a4e099931..611887b71b3814f269f891f5b9bb784f29833bf6 100644 (file)
--- a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Option.c
+++ b/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Option.c
@@ -1,7 +1,7 @@
 /** @file\r
   IP4 option support functions.\r
 /** @file\r
   IP4 option support functions.\r

-  \r
-Copyright (c) 2005 - 2011, Intel Corporation. All rights reserved.<BR>\r
+\r
+Copyright (c) 2005 - 2018, Intel Corporation. All rights reserved.<BR>\r

 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r


@@ -109,7 +109,7 @@ Ip4OptionIsValid (
   @param[in]       Option            The original option to copy from\r
   @param[in]       OptionLen         The length of the original option\r
   @param[in]       FirstFragment     Whether it is the first fragment\r
   @param[in]       Option            The original option to copy from\r
   @param[in]       OptionLen         The length of the original option\r
   @param[in]       FirstFragment     Whether it is the first fragment\r

-  @param[in, out]  Buf               The buffer to copy options to. NULL \r
+  @param[in, out]  Buf               The buffer to copy options to. NULL\r

   @param[in, out]  BufLen            The length of the buffer\r
 \r
   @retval EFI_SUCCESS           The options are copied over\r
   @param[in, out]  BufLen            The length of the buffer\r
 \r
   @retval EFI_SUCCESS           The options are copied over\r

diff --git a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Option.h b/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Option.h
index f9c65d026d6b34344152060a7fb025fbfc2d5a44..e1c20973889e4190b7ac53b36b0505a6adc8be77 100644 (file)
--- a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Option.h
+++ b/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Option.h
@@ -1,7 +1,7 @@
 /** @file\r
   IP4 option support routines.\r
 /** @file\r
   IP4 option support routines.\r

-  \r
-Copyright (c) 2005 - 2009, Intel Corporation. All rights reserved.<BR>\r
+\r
+Copyright (c) 2005 - 2018, Intel Corporation. All rights reserved.<BR>\r

 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r


@@ -54,7 +54,7 @@ Ip4OptionIsValid (
   @param[in]       Option            The original option to copy from\r
   @param[in]       OptionLen         The length of the original option\r
   @param[in]       FirstFragment     Whether it is the first fragment\r
   @param[in]       Option            The original option to copy from\r
   @param[in]       OptionLen         The length of the original option\r
   @param[in]       FirstFragment     Whether it is the first fragment\r

-  @param[in, out]  Buf               The buffer to copy options to. NULL \r
+  @param[in, out]  Buf               The buffer to copy options to. NULL\r

   @param[in, out]  BufLen            The length of the buffer\r
 \r
   @retval EFI_SUCCESS           The options are copied over\r
   @param[in, out]  BufLen            The length of the buffer\r
 \r
   @retval EFI_SUCCESS           The options are copied over\r

diff --git a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Output.c b/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Output.c
index 68d1f0943ff504080d74eacc317d3554ceac102c..1716f43576f2a4c888b37d1546d9fa3ff2d45bfa 100644 (file)
--- a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Output.c
+++ b/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Output.c
@@ -1,7 +1,7 @@
 /** @file\r
   Transmit the IP4 packet.\r
 /** @file\r
   Transmit the IP4 packet.\r

-  \r
-Copyright (c) 2005 - 2015, Intel Corporation. All rights reserved.<BR>\r
+\r
+Copyright (c) 2005 - 2018, Intel Corporation. All rights reserved.<BR>\r

 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r


@@ -269,16 +269,16 @@ Ip4Output (
     Head->Ver      = 4;\r
     RawData        = FALSE;\r
   }\r
     Head->Ver      = 4;\r
     RawData        = FALSE;\r
   }\r

-  \r
+\r

   //\r
   // Call IPsec process.\r
   //\r
   Status = Ip4IpSecProcessPacket (\r
   //\r
   // Call IPsec process.\r
   //\r
   Status = Ip4IpSecProcessPacket (\r

-             IpSb, \r
-             &Head, \r
-             &Packet, \r
-             &Option, \r
-             &OptLen, \r
+             IpSb,\r
+             &Head,\r
+             &Packet,\r
+             &Option,\r
+             &OptLen,\r

              EfiIPsecOutBound,\r
              Context\r
              );\r
              EfiIPsecOutBound,\r
              Context\r
              );\r


@@ -286,7 +286,7 @@ Ip4Output (
   if (EFI_ERROR(Status)) {\r
     return Status;\r
   }\r
   if (EFI_ERROR(Status)) {\r
     return Status;\r
   }\r

-  \r
+\r

   Dest = Head->Dst;\r
   if (IP4_IS_BROADCAST (Ip4GetNetCast (Dest, IpIf)) || (Dest == IP4_ALLONE_ADDRESS)) {\r
     //\r
   Dest = Head->Dst;\r
   if (IP4_IS_BROADCAST (Ip4GetNetCast (Dest, IpIf)) || (Dest == IP4_ALLONE_ADDRESS)) {\r
     //\r


@@ -333,7 +333,7 @@ Ip4Output (
   // OK, selected the source and route, fragment the packet then send\r
   // them. Tag each fragment other than the first one as spawn from it.\r
   //\r
   // OK, selected the source and route, fragment the packet then send\r
   // them. Tag each fragment other than the first one as spawn from it.\r
   //\r

-  Mtu = IpSb->MaxPacketSize + sizeof (IP4_HEAD);  \r
+  Mtu = IpSb->MaxPacketSize + sizeof (IP4_HEAD);\r

 \r
   if (Packet->TotalSize + HeadLen > Mtu) {\r
     //\r
 \r
   if (Packet->TotalSize + HeadLen > Mtu) {\r
     //\r


@@ -342,7 +342,7 @@ Ip4Output (
     if (RawData) {\r
       return EFI_BAD_BUFFER_SIZE;\r
     }\r
     if (RawData) {\r
       return EFI_BAD_BUFFER_SIZE;\r
     }\r

-    \r
+\r

     //\r
     // Packet is fragmented from the tail to the head, that is, the\r
     // first frame sent is the last fragment of the packet. The first\r
     //\r
     // Packet is fragmented from the tail to the head, that is, the\r
     // first frame sent is the last fragment of the packet. The first\r

diff --git a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Route.h b/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Route.h
index 778c97dc8b30904904d4713db7d373738a1c05e8..6269f4ceda4a60789786324f8156bd4e8f976e88 100644 (file)
--- a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Route.h
+++ b/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Route.h
@@ -1,7 +1,7 @@
 /** @file\r
   EFI IP4 route table and route cache table defintions.\r
 /** @file\r
   EFI IP4 route table and route cache table defintions.\r

-  \r
-Copyright (c) 2005 - 2009, Intel Corporation. All rights reserved.<BR>\r
+\r
+Copyright (c) 2005 - 2018, Intel Corporation. All rights reserved.<BR>\r

 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r

diff --git a/MdeModulePkg/Universal/Network/MnpDxe/ComponentName.c b/MdeModulePkg/Universal/Network/MnpDxe/ComponentName.c
index b6f96087ede91dc2b3603d5e0b35774aebd8f5f1..e92be98d9bb4e5aefaeec95692bb038de48be6a3 100644 (file)
--- a/MdeModulePkg/Universal/Network/MnpDxe/ComponentName.c
+++ b/MdeModulePkg/Universal/Network/MnpDxe/ComponentName.c
@@ -1,7 +1,7 @@
 /** @file\r
   UEFI Component Name(2) protocol implementation for MnpDxe driver.\r
 \r
 /** @file\r
   UEFI Component Name(2) protocol implementation for MnpDxe driver.\r
 \r

-Copyright (c) 2005 - 2014, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2005 - 2018, Intel Corporation. All rights reserved.<BR>\r

 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions\r
 of the BSD License which accompanies this distribution.  The full\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions\r
 of the BSD License which accompanies this distribution.  The full\r


@@ -107,10 +107,10 @@ MnpComponentNameGetDriverName (
 \r
   @param  Mnp[in]                 A pointer to the EFI_MANAGED_NETWORK_PROTOCOL.\r
 \r
 \r
   @param  Mnp[in]                 A pointer to the EFI_MANAGED_NETWORK_PROTOCOL.\r
 \r

-  \r
+\r

   @retval EFI_SUCCESS             Update the ControllerNameTable of this instance successfully.\r
   @retval EFI_INVALID_PARAMETER   The input parameter is invalid.\r
   @retval EFI_SUCCESS             Update the ControllerNameTable of this instance successfully.\r
   @retval EFI_INVALID_PARAMETER   The input parameter is invalid.\r

-  \r
+\r

 **/\r
 EFI_STATUS\r
 UpdateName (\r
 **/\r
 EFI_STATUS\r
 UpdateName (\r


@@ -157,7 +157,7 @@ UpdateName (
     //\r
     // Remove the last '-'\r
     //\r
     //\r
     // Remove the last '-'\r
     //\r

-    OffSet--;  \r
+    OffSet--;\r

     //\r
     // Print the ProtocolType and VLAN ID for this instance.\r
     //\r
     //\r
     // Print the ProtocolType and VLAN ID for this instance.\r
     //\r


@@ -177,12 +177,12 @@ UpdateName (
   } else {\r
     return Status;\r
   }\r
   } else {\r
     return Status;\r
   }\r

-  \r
+\r

   if (gMnpControllerNameTable != NULL) {\r
     FreeUnicodeStringTable (gMnpControllerNameTable);\r
     gMnpControllerNameTable = NULL;\r
   }\r
   if (gMnpControllerNameTable != NULL) {\r
     FreeUnicodeStringTable (gMnpControllerNameTable);\r
     gMnpControllerNameTable = NULL;\r
   }\r

-  \r
+\r

   Status = AddUnicodeString2 (\r
              "eng",\r
              gMnpComponentName.SupportedLanguages,\r
   Status = AddUnicodeString2 (\r
              "eng",\r
              gMnpComponentName.SupportedLanguages,\r


@@ -193,7 +193,7 @@ UpdateName (
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r

-  \r
+\r

   return AddUnicodeString2 (\r
            "en",\r
            gMnpComponentName2.SupportedLanguages,\r
   return AddUnicodeString2 (\r
            "en",\r
            gMnpComponentName2.SupportedLanguages,\r


@@ -290,22 +290,22 @@ MnpComponentNameGetControllerName (
   if (ChildHandle == NULL) {\r
     return EFI_UNSUPPORTED;\r
   }\r
   if (ChildHandle == NULL) {\r
     return EFI_UNSUPPORTED;\r
   }\r

- \r
-  // \r
-  // Make sure this driver is currently managing ControllerHandle  \r
-  // \r
+\r
+  //\r
+  // Make sure this driver is currently managing ControllerHandle\r
+  //\r

   Status = EfiTestManagedDevice (\r
              ControllerHandle,\r
              gMnpDriverBinding.DriverBindingHandle,\r
              &gEfiSimpleNetworkProtocolGuid\r
              );\r
   Status = EfiTestManagedDevice (\r
              ControllerHandle,\r
              gMnpDriverBinding.DriverBindingHandle,\r
              &gEfiSimpleNetworkProtocolGuid\r
              );\r

-  if (EFI_ERROR (Status)) { \r
+  if (EFI_ERROR (Status)) {\r

     return Status;\r
   }\r
     return Status;\r
   }\r

-  \r
-  // \r
-  // Make sure this driver produced ChildHandle \r
-  // \r
+\r
+  //\r
+  // Make sure this driver produced ChildHandle\r
+  //\r

   Status = EfiTestChildHandle (\r
              ControllerHandle,\r
              ChildHandle,\r
   Status = EfiTestChildHandle (\r
              ControllerHandle,\r
              ChildHandle,\r


@@ -315,9 +315,9 @@ MnpComponentNameGetControllerName (
     return Status;\r
   }\r
 \r
     return Status;\r
   }\r
 \r

-  // \r
-  // Retrieve an instance of a produced protocol from ChildHandle  \r
-  // \r
+  //\r
+  // Retrieve an instance of a produced protocol from ChildHandle\r
+  //\r

   Status = gBS->OpenProtocol (\r
                   ChildHandle,\r
                   &gEfiManagedNetworkProtocolGuid,\r
   Status = gBS->OpenProtocol (\r
                   ChildHandle,\r
                   &gEfiManagedNetworkProtocolGuid,\r

diff --git a/MdeModulePkg/Universal/Network/MnpDxe/MnpConfig.c b/MdeModulePkg/Universal/Network/MnpDxe/MnpConfig.c
index e24cb758cd7f9bc3179ac1fb74f863e011225615..a801eed01f72c2248196dcaf454e3403636639a1 100644 (file)
--- a/MdeModulePkg/Universal/Network/MnpDxe/MnpConfig.c
+++ b/MdeModulePkg/Universal/Network/MnpDxe/MnpConfig.c
@@ -1,7 +1,7 @@
 /** @file\r
   Implementation of Managed Network Protocol private services.\r
 \r
 /** @file\r
   Implementation of Managed Network Protocol private services.\r
 \r

-Copyright (c) 2005 - 2017, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2005 - 2018, Intel Corporation. All rights reserved.<BR>\r

 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions\r
 of the BSD License which accompanies this distribution.  The full\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions\r
 of the BSD License which accompanies this distribution.  The full\r


@@ -255,7 +255,7 @@ MnpAddFreeTxBuf (
 \r
 /**\r
   Allocate a free TX buffer from MnpDeviceData->FreeTxBufList. If there is none\r
 \r
 /**\r
   Allocate a free TX buffer from MnpDeviceData->FreeTxBufList. If there is none\r

-  in the queue, first try to recycle some from SNP, then try to allocate some and add \r
+  in the queue, first try to recycle some from SNP, then try to allocate some and add\r

   them into the queue, then fetch the NET_BUF from the updated FreeTxBufList.\r
 \r
   @param[in, out]  MnpDeviceData        Pointer to the MNP_DEVICE_DATA.\r
   them into the queue, then fetch the NET_BUF from the updated FreeTxBufList.\r
 \r
   @param[in, out]  MnpDeviceData        Pointer to the MNP_DEVICE_DATA.\r


@@ -274,7 +274,7 @@ MnpAllocTxBuf (
   EFI_STATUS        Status;\r
   LIST_ENTRY        *Entry;\r
   MNP_TX_BUF_WRAP   *TxBufWrap;\r
   EFI_STATUS        Status;\r
   LIST_ENTRY        *Entry;\r
   MNP_TX_BUF_WRAP   *TxBufWrap;\r

-  \r
+\r

   NET_CHECK_SIGNATURE (MnpDeviceData, MNP_DEVICE_DATA_SIGNATURE);\r
 \r
   OldTpl = gBS->RaiseTPL (TPL_CALLBACK);\r
   NET_CHECK_SIGNATURE (MnpDeviceData, MNP_DEVICE_DATA_SIGNATURE);\r
 \r
   OldTpl = gBS->RaiseTPL (TPL_CALLBACK);\r


@@ -369,7 +369,7 @@ MnpFreeTxBuf (
       );\r
     return;\r
   }\r
       );\r
     return;\r
   }\r

-  \r
+\r

   OldTpl = gBS->RaiseTPL (TPL_CALLBACK);\r
   InsertTailList (&MnpDeviceData->FreeTxBufList, &TxBufWrap->WrapEntry);\r
   TxBufWrap->InUse = FALSE;\r
   OldTpl = gBS->RaiseTPL (TPL_CALLBACK);\r
   InsertTailList (&MnpDeviceData->FreeTxBufList, &TxBufWrap->WrapEntry);\r
   TxBufWrap->InUse = FALSE;\r


@@ -877,7 +877,7 @@ MnpDestroyServiceData (
 \r
 /**\r
   Callback function which provided by user to remove one node in NetDestroyLinkList process.\r
 \r
 /**\r
   Callback function which provided by user to remove one node in NetDestroyLinkList process.\r

-  \r
+\r

   @param[in]    Entry           The entry to be removed.\r
   @param[in]    Context         Pointer to the callback context corresponds to the Context in NetDestroyLinkList.\r
 \r
   @param[in]    Entry           The entry to be removed.\r
   @param[in]    Context         Pointer to the callback context corresponds to the Context in NetDestroyLinkList.\r
 \r


@@ -917,9 +917,9 @@ MnpDestroyServiceChild (
   LIST_ENTRY                         *List;\r
   EFI_STATUS                         Status;\r
   UINTN                              ListLength;\r
   LIST_ENTRY                         *List;\r
   EFI_STATUS                         Status;\r
   UINTN                              ListLength;\r

-  \r
+\r

   List = &MnpServiceData->ChildrenList;\r
   List = &MnpServiceData->ChildrenList;\r

-  \r
+\r

   Status = NetDestroyLinkList (\r
              List,\r
              MnpDestoryChildEntry,\r
   Status = NetDestroyLinkList (\r
              List,\r
              MnpDestoryChildEntry,\r


@@ -1160,7 +1160,7 @@ MnpStopSnp (
 {\r
   EFI_STATUS  Status;\r
   EFI_SIMPLE_NETWORK_PROTOCOL     *Snp;\r
 {\r
   EFI_STATUS  Status;\r
   EFI_SIMPLE_NETWORK_PROTOCOL     *Snp;\r

-  \r
+\r

   Snp = MnpDeviceData->Snp;\r
   ASSERT (Snp != NULL);\r
 \r
   Snp = MnpDeviceData->Snp;\r
   ASSERT (Snp != NULL);\r
 \r

diff --git a/MdeModulePkg/Universal/Network/MnpDxe/MnpDriver.c b/MdeModulePkg/Universal/Network/MnpDxe/MnpDriver.c
index 5718e4df249941c6985d95bf38c0d2cf953e4181..3b19ce8a6aed176322edf7ba746bfb8d6a9f9dbf 100644 (file)
--- a/MdeModulePkg/Universal/Network/MnpDxe/MnpDriver.c
+++ b/MdeModulePkg/Universal/Network/MnpDxe/MnpDriver.c
@@ -1,7 +1,7 @@
 /** @file\r
   Implementation of driver entry point and driver binding protocol.\r
 \r
 /** @file\r
   Implementation of driver entry point and driver binding protocol.\r
 \r

-Copyright (c) 2005 - 2016, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2005 - 2018, Intel Corporation. All rights reserved.<BR>\r

 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions\r
 of the BSD License which accompanies this distribution.  The full\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions\r
 of the BSD License which accompanies this distribution.  The full\r


@@ -28,7 +28,7 @@ EFI_DRIVER_BINDING_PROTOCOL gMnpDriverBinding = {
 \r
 /**\r
   Callback function which provided by user to remove one node in NetDestroyLinkList process.\r
 \r
 /**\r
   Callback function which provided by user to remove one node in NetDestroyLinkList process.\r

-  \r
+\r

   @param[in]    Entry           The entry to be removed.\r
   @param[in]    Context         Pointer to the callback context corresponds to the Context in NetDestroyLinkList.\r
 \r
   @param[in]    Entry           The entry to be removed.\r
   @param[in]    Context         Pointer to the callback context corresponds to the Context in NetDestroyLinkList.\r
 \r


@@ -44,14 +44,14 @@ MnpDestroyServiceDataEntry (
   )\r
 {\r
   MNP_SERVICE_DATA              *MnpServiceData;\r
   )\r
 {\r
   MNP_SERVICE_DATA              *MnpServiceData;\r

-  \r
+\r

   MnpServiceData = MNP_SERVICE_DATA_FROM_LINK (Entry);\r
   return MnpDestroyServiceData (MnpServiceData);\r
 }\r
 \r
 /**\r
   Callback function which provided by user to remove one node in NetDestroyLinkList process.\r
   MnpServiceData = MNP_SERVICE_DATA_FROM_LINK (Entry);\r
   return MnpDestroyServiceData (MnpServiceData);\r
 }\r
 \r
 /**\r
   Callback function which provided by user to remove one node in NetDestroyLinkList process.\r

-  \r
+\r

   @param[in]    Entry           The entry to be removed.\r
   @param[in]    Context         Pointer to the callback context corresponds to the Context in NetDestroyLinkList.\r
 \r
   @param[in]    Entry           The entry to be removed.\r
   @param[in]    Context         Pointer to the callback context corresponds to the Context in NetDestroyLinkList.\r
 \r

diff --git a/MdeModulePkg/Universal/Network/MnpDxe/MnpDxe.inf b/MdeModulePkg/Universal/Network/MnpDxe/MnpDxe.inf
index 07e62f5ba2384121c03ab2360fdc261737171ac3..090ab732b9b5bc6ce9142bada3c256ad31fca767 100644 (file)
--- a/MdeModulePkg/Universal/Network/MnpDxe/MnpDxe.inf
+++ b/MdeModulePkg/Universal/Network/MnpDxe/MnpDxe.inf
@@ -3,9 +3,9 @@
 #\r
 #  This module produces EFI Managed Network Protocol upon EFI Simple Network Protocol,\r
 #  to provide raw asynchronous network I/O services. It also produces EFI VLAN Protocol\r
 #\r
 #  This module produces EFI Managed Network Protocol upon EFI Simple Network Protocol,\r
 #  to provide raw asynchronous network I/O services. It also produces EFI VLAN Protocol\r

-#  to provide manageability interface for VLAN configuration. \r
+#  to provide manageability interface for VLAN configuration.\r

 #\r
 #\r

-#  Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.<BR>\r
+#  Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r

 #  This program and the accompanying materials\r
 #  are licensed and made available under the terms and conditions of the BSD License\r
 #  which accompanies this distribution. The full text of the license may be found at\r
 #  This program and the accompanying materials\r
 #  are licensed and made available under the terms and conditions of the BSD License\r
 #  which accompanies this distribution. The full text of the license may be found at\r

diff --git a/MdeModulePkg/Universal/Network/MnpDxe/MnpDxe.uni b/MdeModulePkg/Universal/Network/MnpDxe/MnpDxe.uni
index 645cc1bf368d4f874be23269586eecb0711f13a2..6ca8ac1fd630ebfc3e95194d51ec5f8fe7d3811c 100644 (file)
--- a/MdeModulePkg/Universal/Network/MnpDxe/MnpDxe.uni
+++ b/MdeModulePkg/Universal/Network/MnpDxe/MnpDxe.uni
@@ -5,13 +5,13 @@
 // to provide raw asynchronous network I/O services. It also produces EFI VLAN Protocol\r
 // to provide manageability interface for VLAN configuration.\r
 //\r
 // to provide raw asynchronous network I/O services. It also produces EFI VLAN Protocol\r
 // to provide manageability interface for VLAN configuration.\r
 //\r

-// Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.<BR>\r
+// Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r

 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r
 // which accompanies this distribution. The full text of the license may be found at\r
 // http://opensource.org/licenses/bsd-license.php\r
 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r
 // which accompanies this distribution. The full text of the license may be found at\r
 // http://opensource.org/licenses/bsd-license.php\r

-// \r
+//\r

 // THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 // WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 //\r
 // THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 // WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 //\r

diff --git a/MdeModulePkg/Universal/Network/MnpDxe/MnpDxeExtra.uni b/MdeModulePkg/Universal/Network/MnpDxe/MnpDxeExtra.uni
index 4cecf1f868320e1d69f65ca2e9a1277a648fa17f..3d6363b6b0b123a808d11349ba9d32af048ac2a9 100644 (file)
--- a/MdeModulePkg/Universal/Network/MnpDxe/MnpDxeExtra.uni
+++ b/MdeModulePkg/Universal/Network/MnpDxe/MnpDxeExtra.uni
@@ -1,7 +1,7 @@
 // /** @file\r
 // MnpDxe Localized Strings and Content\r
 //\r
 // /** @file\r
 // MnpDxe Localized Strings and Content\r
 //\r

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

 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r
 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r


@@ -14,7 +14,7 @@
 // **/\r
 \r
 #string STR_PROPERTIES_MODULE_NAME\r
 // **/\r
 \r
 #string STR_PROPERTIES_MODULE_NAME\r

-#language en-US \r
+#language en-US\r

 "MNP DXE Driver"\r
 \r
 \r
 "MNP DXE Driver"\r
 \r
 \r

diff --git a/MdeModulePkg/Universal/Network/MnpDxe/MnpImpl.h b/MdeModulePkg/Universal/Network/MnpDxe/MnpImpl.h
index 51391afe2685ea587ae64989d3c650972af49056..4ee54c18ce9675db0dafeb161ff3d3c4a9c12e4e 100644 (file)
--- a/MdeModulePkg/Universal/Network/MnpDxe/MnpImpl.h
+++ b/MdeModulePkg/Universal/Network/MnpDxe/MnpImpl.h
@@ -1,7 +1,7 @@
 /** @file\r
   Declaration of structures and functions of MnpDxe driver.\r
 \r
 /** @file\r
   Declaration of structures and functions of MnpDxe driver.\r
 \r

-Copyright (c) 2005 - 2016, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2005 - 2018, Intel Corporation. All rights reserved.<BR>\r

 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions\r
 of the BSD License which accompanies this distribution.  The full\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions\r
 of the BSD License which accompanies this distribution.  The full\r


@@ -366,7 +366,7 @@ MnpBuildTxPacket (
   );\r
 \r
 /**\r
   );\r
 \r
 /**\r

-  Synchronously send out the packet. \r
+  Synchronously send out the packet.\r

 \r
   This functon places the packet buffer to SNP driver's tansmit queue. The packet\r
   can be considered successfully sent out once SNP acccetp the packet, while the\r
 \r
   This functon places the packet buffer to SNP driver's tansmit queue. The packet\r
   can be considered successfully sent out once SNP acccetp the packet, while the\r


@@ -468,7 +468,7 @@ MnpFreeNbuf (
 \r
 /**\r
   Allocate a free TX buffer from MnpDeviceData->FreeTxBufList. If there is none\r
 \r
 /**\r
   Allocate a free TX buffer from MnpDeviceData->FreeTxBufList. If there is none\r

-  in the queue, first try to recycle some from SNP, then try to allocate some and add \r
+  in the queue, first try to recycle some from SNP, then try to allocate some and add\r

   them into the queue, then fetch the NET_BUF from the updated FreeTxBufList.\r
 \r
   @param[in, out]  MnpDeviceData        Pointer to the MNP_DEVICE_DATA.\r
   them into the queue, then fetch the NET_BUF from the updated FreeTxBufList.\r
 \r
   @param[in, out]  MnpDeviceData        Pointer to the MNP_DEVICE_DATA.\r

diff --git a/MdeModulePkg/Universal/Network/MnpDxe/MnpIo.c b/MdeModulePkg/Universal/Network/MnpDxe/MnpIo.c
index ba0f36e710db712a2fc902ccea6d92949009609d..5c9eaf1a08c51dbf7628952893f06c0f4c972f95 100644 (file)
--- a/MdeModulePkg/Universal/Network/MnpDxe/MnpIo.c
+++ b/MdeModulePkg/Universal/Network/MnpDxe/MnpIo.c
@@ -1,7 +1,7 @@
 /** @file\r
   Implementation of Managed Network Protocol I/O functions.\r
 \r
 /** @file\r
   Implementation of Managed Network Protocol I/O functions.\r
 \r

-Copyright (c) 2005 - 2016, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2005 - 2018, Intel Corporation. All rights reserved.<BR>\r

 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions\r
 of the BSD License which accompanies this distribution.  The full\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions\r
 of the BSD License which accompanies this distribution.  The full\r


@@ -129,14 +129,14 @@ MnpBuildTxPacket (
   UINT16                  Index;\r
   MNP_DEVICE_DATA         *MnpDeviceData;\r
   UINT8                   *TxBuf;\r
   UINT16                  Index;\r
   MNP_DEVICE_DATA         *MnpDeviceData;\r
   UINT8                   *TxBuf;\r

-  \r
+\r

   MnpDeviceData = MnpServiceData->MnpDeviceData;\r
   MnpDeviceData = MnpServiceData->MnpDeviceData;\r

-  \r
+\r

   TxBuf = MnpAllocTxBuf (MnpDeviceData);\r
   if (TxBuf == NULL) {\r
     return EFI_OUT_OF_RESOURCES;\r
   }\r
   TxBuf = MnpAllocTxBuf (MnpDeviceData);\r
   if (TxBuf == NULL) {\r
     return EFI_OUT_OF_RESOURCES;\r
   }\r

-  \r
+\r

   //\r
   // Reserve space for vlan tag if needed.\r
   //\r
   //\r
   // Reserve space for vlan tag if needed.\r
   //\r


@@ -145,14 +145,14 @@ MnpBuildTxPacket (
   } else {\r
     *PktBuf = TxBuf;\r
   }\r
   } else {\r
     *PktBuf = TxBuf;\r
   }\r

-  \r
+\r

   if ((TxData->DestinationAddress == NULL) && (TxData->FragmentCount == 1)) {\r
     CopyMem (\r
         *PktBuf,\r
         TxData->FragmentTable[0].FragmentBuffer,\r
         TxData->FragmentTable[0].FragmentLength\r
         );\r
   if ((TxData->DestinationAddress == NULL) && (TxData->FragmentCount == 1)) {\r
     CopyMem (\r
         *PktBuf,\r
         TxData->FragmentTable[0].FragmentBuffer,\r
         TxData->FragmentTable[0].FragmentLength\r
         );\r

-    \r
+\r

     *PktLen = TxData->FragmentTable[0].FragmentLength;\r
   } else {\r
     //\r
     *PktLen = TxData->FragmentTable[0].FragmentLength;\r
   } else {\r
     //\r


@@ -160,7 +160,7 @@ MnpBuildTxPacket (
     // one fragment, copy the data into the packet buffer. Reserve the\r
     // media header space if necessary.\r
     //\r
     // one fragment, copy the data into the packet buffer. Reserve the\r
     // media header space if necessary.\r
     //\r

-    SnpMode = MnpDeviceData->Snp->Mode; \r
+    SnpMode = MnpDeviceData->Snp->Mode;\r

     DstPos  = *PktBuf;\r
     *PktLen = 0;\r
     if (TxData->DestinationAddress != NULL) {\r
     DstPos  = *PktBuf;\r
     *PktLen = 0;\r
     if (TxData->DestinationAddress != NULL) {\r


@@ -195,7 +195,7 @@ MnpBuildTxPacket (
 \r
 \r
 /**\r
 \r
 \r
 /**\r

-  Synchronously send out the packet. \r
+  Synchronously send out the packet.\r

 \r
   This functon places the packet buffer to SNP driver's tansmit queue. The packet\r
   can be considered successfully sent out once SNP acccetp the packet, while the\r
 \r
   This functon places the packet buffer to SNP driver's tansmit queue. The packet\r
   can be considered successfully sent out once SNP acccetp the packet, while the\r


@@ -245,7 +245,7 @@ MnpSyncSendPacket (
     goto SIGNAL_TOKEN;\r
   }\r
 \r
     goto SIGNAL_TOKEN;\r
   }\r
 \r

-  \r
+\r

   if (MnpServiceData->VlanId != 0) {\r
     //\r
     // Insert VLAN tag\r
   if (MnpServiceData->VlanId != 0) {\r
     //\r
     // Insert VLAN tag\r


@@ -282,9 +282,9 @@ MnpSyncSendPacket (
                     TxData->SourceAddress,\r
                     TxData->DestinationAddress,\r
                     &ProtocolType\r
                     TxData->SourceAddress,\r
                     TxData->DestinationAddress,\r
                     &ProtocolType\r

-                    ); \r
+                    );\r

   }\r
   }\r

-  \r
+\r

   if (EFI_ERROR (Status)) {\r
     Token->Status = EFI_DEVICE_ERROR;\r
   }\r
   if (EFI_ERROR (Status)) {\r
     Token->Status = EFI_DEVICE_ERROR;\r
   }\r

diff --git a/MdeModulePkg/Universal/Network/MnpDxe/MnpVlan.c b/MdeModulePkg/Universal/Network/MnpDxe/MnpVlan.c
index 98cbc2e35da85c906f15c8d1ec29429b72f7063f..c81bd07c651ba3024c117071e858367c3ace04dd 100644 (file)
--- a/MdeModulePkg/Universal/Network/MnpDxe/MnpVlan.c
+++ b/MdeModulePkg/Universal/Network/MnpDxe/MnpVlan.c
@@ -1,7 +1,7 @@
 /** @file\r
   VLAN Config Protocol implementation and VLAN packet process routine.\r
 \r
 /** @file\r
   VLAN Config Protocol implementation and VLAN packet process routine.\r
 \r

-Copyright (c) 2009 - 2016, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2009 - 2018, Intel Corporation. All rights reserved.<BR>\r

 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions\r
 of the BSD License which accompanies this distribution.  The full\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions\r
 of the BSD License which accompanies this distribution.  The full\r


@@ -237,7 +237,7 @@ MnpInsertVlanTag (
   @param[in]      Buffer             Pointer to the buffer contains the array of VLAN_TCI.\r
   @param[in]      NumberOfVlan       Pointer to number of VLAN.\r
   @param[out]     NewNumberOfVlan    Pointer to number of unique VLAN.\r
   @param[in]      Buffer             Pointer to the buffer contains the array of VLAN_TCI.\r
   @param[in]      NumberOfVlan       Pointer to number of VLAN.\r
   @param[out]     NewNumberOfVlan    Pointer to number of unique VLAN.\r

-  \r
+\r

   @retval EFI_SUCCESS            The VLAN variable is successfully checked.\r
   @retval EFI_OUT_OF_RESOURCES   There is not enough resource to set the configuration.\r
 \r
   @retval EFI_SUCCESS            The VLAN variable is successfully checked.\r
   @retval EFI_OUT_OF_RESOURCES   There is not enough resource to set the configuration.\r
 \r


@@ -259,7 +259,7 @@ MnpCheckVlanVariable (
   Count = 0;\r
   FoundDuplicateItem  = FALSE;\r
   Status = EFI_SUCCESS;\r
   Count = 0;\r
   FoundDuplicateItem  = FALSE;\r
   Status = EFI_SUCCESS;\r

-  \r
+\r

   for (Index = 0; Index < NumberOfVlan; Index++) {\r
    for (Index2 = Index + 1; Index2 < NumberOfVlan; Index2++) {\r
      if (Buffer[Index].Bits.Vid == Buffer[Index2].Bits.Vid) {\r
   for (Index = 0; Index < NumberOfVlan; Index++) {\r
    for (Index2 = Index + 1; Index2 < NumberOfVlan; Index2++) {\r
      if (Buffer[Index].Bits.Vid == Buffer[Index2].Bits.Vid) {\r


@@ -280,7 +280,7 @@ MnpCheckVlanVariable (
   if (Count != 0) {\r
     Status = MnpSetVlanVariable (MnpDeviceData, *NewNumberOfVlan, Buffer);\r
   }\r
   if (Count != 0) {\r
     Status = MnpSetVlanVariable (MnpDeviceData, *NewNumberOfVlan, Buffer);\r
   }\r

-  \r
+\r

   return Status;\r
 }\r
 \r
   return Status;\r
 }\r
 \r

diff --git a/MdeModulePkg/Universal/Network/Mtftp4Dxe/ComponentName.c b/MdeModulePkg/Universal/Network/Mtftp4Dxe/ComponentName.c
index 901c2df06414e96adebc4b4db6fd03cc7b5d16b3..111c54e2effe9967dc57df545289b10588f5048a 100644 (file)
--- a/MdeModulePkg/Universal/Network/Mtftp4Dxe/ComponentName.c
+++ b/MdeModulePkg/Universal/Network/Mtftp4Dxe/ComponentName.c
@@ -1,7 +1,7 @@
 /** @file\r
   UEFI Component Name(2) protocol implementation for Mtftp4Dxe driver.\r
 /** @file\r
   UEFI Component Name(2) protocol implementation for Mtftp4Dxe driver.\r

-  \r
-Copyright (c) 2006 - 2012, Intel Corporation. All rights reserved.<BR>\r
+\r
+Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r

 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r


@@ -237,10 +237,10 @@ Mtftp4ComponentNameGetDriverName (
 \r
   @param  Mtftp4[in]                A pointer to the EFI_MTFTP4_PROTOCOL.\r
 \r
 \r
   @param  Mtftp4[in]                A pointer to the EFI_MTFTP4_PROTOCOL.\r
 \r

-  \r
+\r

   @retval EFI_SUCCESS               Update the ControllerNameTable of this instance successfully.\r
   @retval EFI_INVALID_PARAMETER     The input parameter is invalid.\r
   @retval EFI_SUCCESS               Update the ControllerNameTable of this instance successfully.\r
   @retval EFI_INVALID_PARAMETER     The input parameter is invalid.\r

-  \r
+\r

 **/\r
 EFI_STATUS\r
 UpdateName (\r
 **/\r
 EFI_STATUS\r
 UpdateName (\r


@@ -277,7 +277,7 @@ UpdateName (
     FreeUnicodeStringTable (gMtftp4ControllerNameTable);\r
     gMtftp4ControllerNameTable = NULL;\r
   }\r
     FreeUnicodeStringTable (gMtftp4ControllerNameTable);\r
     gMtftp4ControllerNameTable = NULL;\r
   }\r

-  \r
+\r

   Status = AddUnicodeString2 (\r
              "eng",\r
              gMtftp4ComponentName.SupportedLanguages,\r
   Status = AddUnicodeString2 (\r
              "eng",\r
              gMtftp4ComponentName.SupportedLanguages,\r


@@ -288,7 +288,7 @@ UpdateName (
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r

-  \r
+\r

   return AddUnicodeString2 (\r
            "en",\r
            gMtftp4ComponentName2.SupportedLanguages,\r
   return AddUnicodeString2 (\r
            "en",\r
            gMtftp4ComponentName2.SupportedLanguages,\r


@@ -385,10 +385,10 @@ Mtftp4ComponentNameGetControllerName (
   if (ChildHandle == NULL) {\r
     return EFI_UNSUPPORTED;\r
   }\r
   if (ChildHandle == NULL) {\r
     return EFI_UNSUPPORTED;\r
   }\r

-  \r
-  // \r
-  // Make sure this driver produced ChildHandle \r
-  // \r
+\r
+  //\r
+  // Make sure this driver produced ChildHandle\r
+  //\r

   Status = EfiTestChildHandle (\r
              ControllerHandle,\r
              ChildHandle,\r
   Status = EfiTestChildHandle (\r
              ControllerHandle,\r
              ChildHandle,\r


@@ -398,9 +398,9 @@ Mtftp4ComponentNameGetControllerName (
     return Status;\r
   }\r
 \r
     return Status;\r
   }\r
 \r

-  // \r
+  //\r

   // Retrieve an instance of a produced protocol from ChildHandle\r
   // Retrieve an instance of a produced protocol from ChildHandle\r

-  // \r
+  //\r

   Status = gBS->OpenProtocol (\r
                   ChildHandle,\r
                   &gEfiMtftp4ProtocolGuid,\r
   Status = gBS->OpenProtocol (\r
                   ChildHandle,\r
                   &gEfiMtftp4ProtocolGuid,\r

diff --git a/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Driver.c b/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Driver.c
index 713cc66dd17325a1a7b208280bcd6cab9a2e9cb9..e6f101d5e9a0e6da3ef3b4700633b58a217598bd 100644 (file)
--- a/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Driver.c
+++ b/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Driver.c
@@ -315,7 +315,7 @@ Mtftp4DriverBindingStart (
   if (EFI_ERROR (Status)) {\r
     goto ON_ERROR;\r
   }\r
   if (EFI_ERROR (Status)) {\r
     goto ON_ERROR;\r
   }\r

-  \r
+\r

   //\r
   // Install the Mtftp4ServiceBinding Protocol onto Controller\r
   //\r
   //\r
   // Install the Mtftp4ServiceBinding Protocol onto Controller\r
   //\r


@@ -341,7 +341,7 @@ ON_ERROR:
 \r
 /**\r
   Callback function which provided by user to remove one node in NetDestroyLinkList process.\r
 \r
 /**\r
   Callback function which provided by user to remove one node in NetDestroyLinkList process.\r

-  \r
+\r

   @param[in]    Entry           The entry to be removed.\r
   @param[in]    Context         Pointer to the callback context corresponds to the Context in NetDestroyLinkList.\r
 \r
   @param[in]    Entry           The entry to be removed.\r
   @param[in]    Context         Pointer to the callback context corresponds to the Context in NetDestroyLinkList.\r
 \r


@@ -713,7 +713,7 @@ Mtftp4ServiceBindingDestroyChild (
            &gEfiUdp4ProtocolGuid,\r
            gMtftp4DriverBinding.DriverBindingHandle,\r
            ChildHandle\r
            &gEfiUdp4ProtocolGuid,\r
            gMtftp4DriverBinding.DriverBindingHandle,\r
            ChildHandle\r

-           );  \r
+           );\r

   }\r
 \r
   //\r
   }\r
 \r
   //\r

diff --git a/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Driver.h b/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Driver.h
index 936eab1ba16bb0880bd4756a5d5c2c629e9cae61..cd7675ec8196056bac10e15c9cacdc6d664ca525 100644 (file)
--- a/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Driver.h
+++ b/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Driver.h
@@ -1,7 +1,7 @@
 /** @file\r
   Mtftp drivers function header.\r
 /** @file\r
   Mtftp drivers function header.\r

-  \r
-Copyright (c) 2006 - 2012, Intel Corporation. All rights reserved.<BR>\r
+\r
+Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r

 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r


@@ -49,8 +49,8 @@ Mtftp4DriverBindingSupported (
   );\r
 \r
 /**\r
   );\r
 \r
 /**\r

-  Start the MTFTP driver on this controller. \r
-  \r
+  Start the MTFTP driver on this controller.\r
+\r

   MTFTP driver will install a MTFTP SERVICE BINDING protocol on the supported\r
   controller, which can be used to create/destroy MTFTP children.\r
 \r
   MTFTP driver will install a MTFTP SERVICE BINDING protocol on the supported\r
   controller, which can be used to create/destroy MTFTP children.\r
 \r

diff --git a/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.inf b/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.inf
index 3d7c8c00e021eb0848a0c1986d967c732d86c67e..ad9e7abce6971bf05e6fe36dacdc300b2803c190 100644 (file)
--- a/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.inf
+++ b/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.inf
@@ -4,7 +4,7 @@
 #  This module produces EFI MTFTPv4 Protocol upon EFI UDPv4 Protocol, to provide\r
 #  basic services for client-side unicast and/or multicase TFTP operations.\r
 #\r
 #  This module produces EFI MTFTPv4 Protocol upon EFI UDPv4 Protocol, to provide\r
 #  basic services for client-side unicast and/or multicase TFTP operations.\r
 #\r

-#  Copyright (c) 2007 - 2014, Intel Corporation. All rights reserved.<BR>\r
+#  Copyright (c) 2007 - 2018, Intel Corporation. All rights reserved.<BR>\r

 #  This program and the accompanying materials\r
 #  are licensed and made available under the terms and conditions of the BSD License\r
 #  which accompanies this distribution. The full text of the license may be found at\r
 #  This program and the accompanying materials\r
 #  are licensed and made available under the terms and conditions of the BSD License\r
 #  which accompanies this distribution. The full text of the license may be found at\r


@@ -30,7 +30,7 @@
 #\r
 #  VALID_ARCHITECTURES           = IA32 X64 IPF EBC\r
 #\r
 #\r
 #  VALID_ARCHITECTURES           = IA32 X64 IPF EBC\r
 #\r

-#  DRIVER_BINDING                =  gMtftp4DriverBinding                        \r
+#  DRIVER_BINDING                =  gMtftp4DriverBinding\r

 #  COMPONENT_NAME                =  gMtftp4ComponentName\r
 #  COMPONENT_NAME2               =  gMtftp4ComponentName2\r
 #\r
 #  COMPONENT_NAME                =  gMtftp4ComponentName\r
 #  COMPONENT_NAME2               =  gMtftp4ComponentName2\r
 #\r

diff --git a/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.uni b/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.uni
index 74f7ff7fed0e3d6f271c3f85a761ff3680bb6d40..5d67d224e0986970c1910a25df1b7143cacff8cb 100644 (file)
--- a/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.uni
+++ b/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.uni
@@ -4,13 +4,13 @@
 // This module produces EFI MTFTPv4 Protocol upon EFI UDPv4 Protocol, to provide\r
 // basic services for client-side unicast and/or multicase TFTP operations.\r
 //\r
 // This module produces EFI MTFTPv4 Protocol upon EFI UDPv4 Protocol, to provide\r
 // basic services for client-side unicast and/or multicase TFTP operations.\r
 //\r

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

 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r
 // which accompanies this distribution. The full text of the license may be found at\r
 // http://opensource.org/licenses/bsd-license.php\r
 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r
 // which accompanies this distribution. The full text of the license may be found at\r
 // http://opensource.org/licenses/bsd-license.php\r

-// \r
+//\r

 // THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 // WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 //\r
 // THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 // WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 //\r

diff --git a/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4DxeExtra.uni b/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4DxeExtra.uni
index 6d69022e705092580d620edff739bf4020698e92..fe83f15de6324da09bc58153bc4146ff38549463 100644 (file)
--- a/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4DxeExtra.uni
+++ b/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4DxeExtra.uni
@@ -1,7 +1,7 @@
 // /** @file\r
 // Mtftp4Dxe Localized Strings and Content\r
 //\r
 // /** @file\r
 // Mtftp4Dxe Localized Strings and Content\r
 //\r

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

 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r
 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r


@@ -13,8 +13,8 @@
 //\r
 // **/\r
 \r
 //\r
 // **/\r
 \r

-#string STR_PROPERTIES_MODULE_NAME \r
-#language en-US \r
+#string STR_PROPERTIES_MODULE_NAME\r
+#language en-US\r

 "MTFTP v4 DXE Driver"\r
 \r
 \r
 "MTFTP v4 DXE Driver"\r
 \r
 \r

diff --git a/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Impl.c b/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Impl.c
index 065528c9371bbae27fd23c4503fe30c05959681c..d5a1a8c303e00c801344abe18e876181ed0d3ce8 100644 (file)
--- a/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Impl.c
+++ b/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Impl.c
@@ -1,6 +1,6 @@
 /** @file\r
   Interface routine for Mtftp4.\r
 /** @file\r
   Interface routine for Mtftp4.\r

-  \r
+\r

 (C) Copyright 2014 Hewlett-Packard Development Company, L.P.<BR>\r
 Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r
 This program and the accompanying materials\r
 (C) Copyright 2014 Hewlett-Packard Development Company, L.P.<BR>\r
 Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r
 This program and the accompanying materials\r


@@ -96,9 +96,9 @@ Mtftp4CleanOperation (
 \r
 \r
 /**\r
 \r
 \r
 /**\r

-  Check packet for GetInfo. \r
-  \r
-  GetInfo is implemented with EfiMtftp4ReadFile. It use Mtftp4GetInfoCheckPacket \r
+  Check packet for GetInfo.\r
+\r
+  GetInfo is implemented with EfiMtftp4ReadFile. It use Mtftp4GetInfoCheckPacket\r

   to inspect the first packet from server, then abort the session.\r
 \r
   @param  This                   The MTFTP4 protocol instance\r
   to inspect the first packet from server, then abort the session.\r
 \r
   @param  This                   The MTFTP4 protocol instance\r


@@ -167,10 +167,10 @@ Mtftp4GetInfoCheckPacket (
 \r
 \r
 /**\r
 \r
 \r
 /**\r

-  Check whether the override data is valid. \r
-  \r
+  Check whether the override data is valid.\r
+\r

   It will first validate whether the server is a valid unicast. If a gateway\r
   It will first validate whether the server is a valid unicast. If a gateway\r

-  is provided in the Override, it also check that it is a unicast on the \r
+  is provided in the Override, it also check that it is a unicast on the\r

   connected network.\r
 \r
   @param  Instance               The MTFTP instance\r
   connected network.\r
 \r
   @param  Instance               The MTFTP instance\r


@@ -178,7 +178,7 @@ Mtftp4GetInfoCheckPacket (
 \r
   @retval TRUE                   The override data is valid\r
   @retval FALSE                  The override data is invalid\r
 \r
   @retval TRUE                   The override data is valid\r
   @retval FALSE                  The override data is invalid\r

-  \r
+\r

 **/\r
 BOOLEAN\r
 Mtftp4OverrideValid (\r
 **/\r
 BOOLEAN\r
 Mtftp4OverrideValid (\r


@@ -219,9 +219,9 @@ Mtftp4OverrideValid (
 \r
 /**\r
   Poll the UDP to get the IP4 default address, which may be retrieved\r
 \r
 /**\r
   Poll the UDP to get the IP4 default address, which may be retrieved\r

-  by DHCP. \r
-  \r
-  The default time out value is 5 seconds. If IP has retrieved the default address, \r
+  by DHCP.\r
+\r
+  The default time out value is 5 seconds. If IP has retrieved the default address,\r

   the UDP is reconfigured.\r
 \r
   @param  Instance               The Mtftp instance\r
   the UDP is reconfigured.\r
 \r
   @param  Instance               The Mtftp instance\r


@@ -396,7 +396,7 @@ Mtftp4Start (
 \r
   Status      = EFI_SUCCESS;\r
   TokenStatus = EFI_SUCCESS;\r
 \r
   Status      = EFI_SUCCESS;\r
   TokenStatus = EFI_SUCCESS;\r

-  \r
+\r

   OldTpl = gBS->RaiseTPL (TPL_CALLBACK);\r
 \r
   if (Instance->State != MTFTP4_STATE_CONFIGED) {\r
   OldTpl = gBS->RaiseTPL (TPL_CALLBACK);\r
 \r
   if (Instance->State != MTFTP4_STATE_CONFIGED) {\r


@@ -536,17 +536,17 @@ ON_ERROR:
 /**\r
   Reads the current operational settings.\r
 \r
 /**\r
   Reads the current operational settings.\r
 \r

-  The GetModeData()function reads the current operational settings of this \r
+  The GetModeData()function reads the current operational settings of this\r

   EFI MTFTPv4 Protocol driver instance.\r
 \r
   @param  This                   Pointer to the EFI_MTFTP4_PROTOCOL instance.\r
   @param  ModeData               Pointer to storage for the EFI MTFTPv4 Protocol\r
   EFI MTFTPv4 Protocol driver instance.\r
 \r
   @param  This                   Pointer to the EFI_MTFTP4_PROTOCOL instance.\r
   @param  ModeData               Pointer to storage for the EFI MTFTPv4 Protocol\r

-                                 driver mode data. \r
+                                 driver mode data.\r

 \r
   @retval EFI_SUCCESS            The configuration data was successfully returned.\r
   @retval EFI_OUT_OF_RESOURCES   The required mode data could not be allocated.\r
   @retval EFI_INVALID_PARAMETER  This is NULL or ModeData is NULL.\r
 \r
   @retval EFI_SUCCESS            The configuration data was successfully returned.\r
   @retval EFI_OUT_OF_RESOURCES   The required mode data could not be allocated.\r
   @retval EFI_INVALID_PARAMETER  This is NULL or ModeData is NULL.\r

-  \r
+\r

 **/\r
 EFI_STATUS\r
 EFIAPI\r
 **/\r
 EFI_STATUS\r
 EFIAPI\r


@@ -579,49 +579,49 @@ EfiMtftp4GetModeData (
 \r
 \r
 /**\r
 \r
 \r
 /**\r

-  Initializes, changes, or resets the default operational setting for this \r
+  Initializes, changes, or resets the default operational setting for this\r

   EFI MTFTPv4 Protocol driver instance.\r
   EFI MTFTPv4 Protocol driver instance.\r

-  \r
-  The Configure() function is used to set and change the configuration data for \r
-  this EFI MTFTPv4 Protocol driver instance. The configuration data can be reset \r
-  to startup defaults by calling Configure() with MtftpConfigData set to NULL. \r
-  Whenever the instance is reset, any pending operation is aborted. By changing \r
-  the EFI MTFTPv4 Protocol driver instance configuration data, the client can \r
-  connect to different MTFTPv4 servers. The configuration parameters in \r
-  MtftpConfigData are used as the default parameters in later MTFTPv4 operations \r
+\r
+  The Configure() function is used to set and change the configuration data for\r
+  this EFI MTFTPv4 Protocol driver instance. The configuration data can be reset\r
+  to startup defaults by calling Configure() with MtftpConfigData set to NULL.\r
+  Whenever the instance is reset, any pending operation is aborted. By changing\r
+  the EFI MTFTPv4 Protocol driver instance configuration data, the client can\r
+  connect to different MTFTPv4 servers. The configuration parameters in\r
+  MtftpConfigData are used as the default parameters in later MTFTPv4 operations\r

   and can be overridden in later operations.\r
   and can be overridden in later operations.\r

-  \r
+\r

   @param  This                   Pointer to the EFI_MTFTP4_PROTOCOL instance\r
   @param  This                   Pointer to the EFI_MTFTP4_PROTOCOL instance\r

-  @param  ConfigData             MtftpConfigDataPointer to the configuration data \r
+  @param  ConfigData             MtftpConfigDataPointer to the configuration data\r

                                  structure\r
 \r
                                  structure\r
 \r

-  @retval EFI_SUCCESS            The EFI MTFTPv4 Protocol driver was configured \r
+  @retval EFI_SUCCESS            The EFI MTFTPv4 Protocol driver was configured\r

                                  successfully.\r
   @retval EFI_INVALID_PARAMETER  One or more following conditions are TRUE:\r
                                  1.This is NULL.\r
                                  successfully.\r
   @retval EFI_INVALID_PARAMETER  One or more following conditions are TRUE:\r
                                  1.This is NULL.\r

-                                 2.MtftpConfigData.UseDefaultSetting is FALSE and \r
-                                   MtftpConfigData.StationIp is not a valid IPv4 \r
+                                 2.MtftpConfigData.UseDefaultSetting is FALSE and\r
+                                   MtftpConfigData.StationIp is not a valid IPv4\r

                                    unicast address.\r
                                    unicast address.\r

-                                 3.MtftpCofigData.UseDefaultSetting is FALSE and \r
+                                 3.MtftpCofigData.UseDefaultSetting is FALSE and\r

                                    MtftpConfigData.SubnetMask is invalid.\r
                                    MtftpConfigData.SubnetMask is invalid.\r

-                                 4.MtftpCofigData.ServerIp is not a valid IPv4 \r
+                                 4.MtftpCofigData.ServerIp is not a valid IPv4\r

                                    unicast address.\r
                                    unicast address.\r

-                                 5.MtftpConfigData.UseDefaultSetting is FALSE and \r
-                                   MtftpConfigData.GatewayIp is not a valid IPv4 \r
-                                   unicast address or is not in the same subnet \r
+                                 5.MtftpConfigData.UseDefaultSetting is FALSE and\r
+                                   MtftpConfigData.GatewayIp is not a valid IPv4\r
+                                   unicast address or is not in the same subnet\r

                                    with station address.\r
                                    with station address.\r

-  @retval EFI_ACCESS_DENIED      The EFI configuration could not be changed at this \r
-                                 time because there is one MTFTP background operation \r
+  @retval EFI_ACCESS_DENIED      The EFI configuration could not be changed at this\r
+                                 time because there is one MTFTP background operation\r

                                  in progress.\r
                                  in progress.\r

-  @retval EFI_NO_MAPPING         When using a default address, configuration \r
+  @retval EFI_NO_MAPPING         When using a default address, configuration\r

                                  (DHCP, BOOTP, RARP, etc.) has not finished yet.\r
                                  (DHCP, BOOTP, RARP, etc.) has not finished yet.\r

-  @retval EFI_UNSUPPORTED        A configuration protocol (DHCP, BOOTP, RARP, etc.) \r
-                                 could not be located when clients choose to use \r
+  @retval EFI_UNSUPPORTED        A configuration protocol (DHCP, BOOTP, RARP, etc.)\r
+                                 could not be located when clients choose to use\r

                                  the default address settings.\r
                                  the default address settings.\r

-  @retval EFI_OUT_OF_RESOURCES   The EFI MTFTPv4 Protocol driver instance data could \r
+  @retval EFI_OUT_OF_RESOURCES   The EFI MTFTPv4 Protocol driver instance data could\r

                                  not be allocated.\r
                                  not be allocated.\r

-  @retval EFI_DEVICE_ERROR       An unexpected system or network error occurred. \r
-                                 The EFI MTFTPv4 Protocol driver instance is not \r
+  @retval EFI_DEVICE_ERROR       An unexpected system or network error occurred.\r
+                                 The EFI MTFTPv4 Protocol driver instance is not\r

                                  configured.\r
 \r
 **/\r
                                  configured.\r
 \r
 **/\r


@@ -681,7 +681,7 @@ EfiMtftp4Configure (
       return EFI_INVALID_PARAMETER;\r
     }\r
 \r
       return EFI_INVALID_PARAMETER;\r
     }\r
 \r

-    if ((Gateway != 0) && \r
+    if ((Gateway != 0) &&\r

         (!IP4_NET_EQUAL (Gateway, Ip, Netmask) || (Netmask != 0 && !NetIp4IsUnicast (Gateway, Netmask)))) {\r
 \r
       return EFI_INVALID_PARAMETER;\r
         (!IP4_NET_EQUAL (Gateway, Ip, Netmask) || (Netmask != 0 && !NetIp4IsUnicast (Gateway, Netmask)))) {\r
 \r
       return EFI_INVALID_PARAMETER;\r


@@ -707,21 +707,21 @@ EfiMtftp4Configure (
 \r
 /**\r
   Parses the options in an MTFTPv4 OACK packet.\r
 \r
 /**\r
   Parses the options in an MTFTPv4 OACK packet.\r

-  \r
-  The ParseOptions() function parses the option fields in an MTFTPv4 OACK packet \r
-  and returns the number of options that were found and optionally a list of \r
+\r
+  The ParseOptions() function parses the option fields in an MTFTPv4 OACK packet\r
+  and returns the number of options that were found and optionally a list of\r

   pointers to the options in the packet.\r
   pointers to the options in the packet.\r

-  If one or more of the option fields are not valid, then EFI_PROTOCOL_ERROR is \r
+  If one or more of the option fields are not valid, then EFI_PROTOCOL_ERROR is\r

   returned and *OptionCount and *OptionList stop at the last valid option.\r
   The OptionList is allocated by this function, and caller should free it when used.\r
 \r
   @param  This                   Pointer to the EFI_MTFTP4_PROTOCOL instance.\r
   @param  PacketLen              Length of the OACK packet to be parsed.\r
   returned and *OptionCount and *OptionList stop at the last valid option.\r
   The OptionList is allocated by this function, and caller should free it when used.\r
 \r
   @param  This                   Pointer to the EFI_MTFTP4_PROTOCOL instance.\r
   @param  PacketLen              Length of the OACK packet to be parsed.\r

-  @param  Packet                 Pointer to the OACK packet to be parsed. \r
+  @param  Packet                 Pointer to the OACK packet to be parsed.\r

   @param  OptionCount            Pointer to the number of options in following OptionList.\r
   @param  OptionCount            Pointer to the number of options in following OptionList.\r

-  @param  OptionList             Pointer to EFI_MTFTP4_OPTION storage. Call the \r
+  @param  OptionList             Pointer to EFI_MTFTP4_OPTION storage. Call the\r

                                  EFI Boot Service FreePool() to release theOptionList\r
                                  EFI Boot Service FreePool() to release theOptionList\r

-                                 if the options in this OptionList are not needed \r
+                                 if the options in this OptionList are not needed\r

                                  any more\r
 \r
   @retval EFI_SUCCESS            The OACK packet was valid and the OptionCount and\r
                                  any more\r
 \r
   @retval EFI_SUCCESS            The OACK packet was valid and the OptionCount and\r


@@ -769,25 +769,25 @@ EfiMtftp4ParseOptions (
 \r
 /**\r
   Downloads a file from an MTFTPv4 server.\r
 \r
 /**\r
   Downloads a file from an MTFTPv4 server.\r

-  \r
-  The ReadFile() function is used to initialize and start an MTFTPv4 download \r
-  process and optionally wait for completion. When the download operation completes, \r
-  whether successfully or not, the Token.Status field is updated by the EFI MTFTPv4 \r
+\r
+  The ReadFile() function is used to initialize and start an MTFTPv4 download\r
+  process and optionally wait for completion. When the download operation completes,\r
+  whether successfully or not, the Token.Status field is updated by the EFI MTFTPv4\r

   Protocol driver and then Token.Event is signaled (if it is not NULL).\r
   Data can be downloaded from the MTFTPv4 server into either of the following locations:\r
   1.A fixed buffer that is pointed to by Token.Buffer\r
   2.A download service function that is pointed to by Token.CheckPacket\r
   Protocol driver and then Token.Event is signaled (if it is not NULL).\r
   Data can be downloaded from the MTFTPv4 server into either of the following locations:\r
   1.A fixed buffer that is pointed to by Token.Buffer\r
   2.A download service function that is pointed to by Token.CheckPacket\r

-  If both Token.Buffer and Token.CheckPacket are used, then Token.CheckPacket \r
-  will be called first. If the call is successful, the packet will be stored in \r
+  If both Token.Buffer and Token.CheckPacket are used, then Token.CheckPacket\r
+  will be called first. If the call is successful, the packet will be stored in\r

   Token.Buffer.\r
 \r
   @param  This                  Pointer to the EFI_MTFTP4_PROTOCOL instance\r
   Token.Buffer.\r
 \r
   @param  This                  Pointer to the EFI_MTFTP4_PROTOCOL instance\r

-  @param  Token                 Pointer to the token structure to provide the \r
+  @param  Token                 Pointer to the token structure to provide the\r

                                 parameters that are used in this operation.\r
 \r
   @retval EFI_SUCCESS           The data file has been transferred successfully.\r
   @retval EFI_OUT_OF_RESOURCES  Required system resources could not be allocated.\r
                                 parameters that are used in this operation.\r
 \r
   @retval EFI_SUCCESS           The data file has been transferred successfully.\r
   @retval EFI_OUT_OF_RESOURCES  Required system resources could not be allocated.\r

-  @retval EFI_BUFFER_TOO_SMALL  BufferSize is not large enough to hold the downloaded \r
+  @retval EFI_BUFFER_TOO_SMALL  BufferSize is not large enough to hold the downloaded\r

                                 data in downloading process.\r
   @retval EFI_ABORTED           Current operation is aborted by user.\r
   @retval EFI_ICMP_ERROR        An ICMP ERROR packet was received.\r
                                 data in downloading process.\r
   @retval EFI_ABORTED           Current operation is aborted by user.\r
   @retval EFI_ICMP_ERROR        An ICMP ERROR packet was received.\r


@@ -811,24 +811,24 @@ EfiMtftp4ReadFile (
 /**\r
   Sends a data file to an MTFTPv4 server. May be unsupported in some EFI implementations\r
 \r
 /**\r
   Sends a data file to an MTFTPv4 server. May be unsupported in some EFI implementations\r
 \r

-  The WriteFile() function is used to initialize an uploading operation with the \r
-  given option list and optionally wait for completion. If one or more of the \r
-  options is not supported by the server, the unsupported options are ignored and \r
-  a standard TFTP process starts instead. When the upload process completes, \r
-  whether successfully or not, Token.Event is signaled, and the EFI MTFTPv4 Protocol \r
+  The WriteFile() function is used to initialize an uploading operation with the\r
+  given option list and optionally wait for completion. If one or more of the\r
+  options is not supported by the server, the unsupported options are ignored and\r
+  a standard TFTP process starts instead. When the upload process completes,\r
+  whether successfully or not, Token.Event is signaled, and the EFI MTFTPv4 Protocol\r

   driver updates Token.Status.\r
   The caller can supply the data to be uploaded in the following two modes:\r
   1.Through the user-provided buffer\r
   2.Through a callback function\r
   With the user-provided buffer, the Token.BufferSize field indicates the length\r
   driver updates Token.Status.\r
   The caller can supply the data to be uploaded in the following two modes:\r
   1.Through the user-provided buffer\r
   2.Through a callback function\r
   With the user-provided buffer, the Token.BufferSize field indicates the length\r

-  of the buffer, and the driver will upload the data in the buffer. With an \r
-  EFI_MTFTP4_PACKET_NEEDED callback function, the driver will call this callback \r
-  function to get more data from the user to upload. See the definition of \r
-  EFI_MTFTP4_PACKET_NEEDED for more information. These two modes cannot be used at \r
+  of the buffer, and the driver will upload the data in the buffer. With an\r
+  EFI_MTFTP4_PACKET_NEEDED callback function, the driver will call this callback\r
+  function to get more data from the user to upload. See the definition of\r
+  EFI_MTFTP4_PACKET_NEEDED for more information. These two modes cannot be used at\r

   the same time. The callback function will be ignored if the user provides the buffer.\r
 \r
   @param  This                   Pointer to the EFI_MTFTP4_PROTOCOL instance.\r
   the same time. The callback function will be ignored if the user provides the buffer.\r
 \r
   @param  This                   Pointer to the EFI_MTFTP4_PROTOCOL instance.\r

-  @param  Token                  Pointer to the token structure to provide the \r
+  @param  Token                  Pointer to the token structure to provide the\r

                                  parameters that are used in this function\r
 \r
   @retval EFI_SUCCESS            The upload session has started.\r
                                  parameters that are used in this function\r
 \r
   @retval EFI_SUCCESS            The upload session has started.\r


@@ -843,15 +843,15 @@ EfiMtftp4ReadFile (
                                     format.\r
                                  6. Token.Buffer and Token.PacketNeeded are both\r
                                     NULL.\r
                                     format.\r
                                  6. Token.Buffer and Token.PacketNeeded are both\r
                                     NULL.\r

-                                 7. One or more IPv4 addresses in Token.OverrideData \r
-                                    are not valid unicast IPv4 addresses if \r
+                                 7. One or more IPv4 addresses in Token.OverrideData\r
+                                    are not valid unicast IPv4 addresses if\r

                                     Token.OverrideData is not NULL.\r
   @retval EFI_UNSUPPORTED        One or more options in the Token.OptionList are in the\r
                                  unsupported list of structure EFI_MTFTP4_MODE_DATA.\r
   @retval EFI_NOT_STARTED        The EFI MTFTPv4 Protocol driver has not been started.\r
                                     Token.OverrideData is not NULL.\r
   @retval EFI_UNSUPPORTED        One or more options in the Token.OptionList are in the\r
                                  unsupported list of structure EFI_MTFTP4_MODE_DATA.\r
   @retval EFI_NOT_STARTED        The EFI MTFTPv4 Protocol driver has not been started.\r

-  @retval EFI_NO_MAPPING         When using a default address, configuration (DHCP, \r
+  @retval EFI_NO_MAPPING         When using a default address, configuration (DHCP,\r

                                  BOOTP, RARP, etc.) is not finished yet.\r
                                  BOOTP, RARP, etc.) is not finished yet.\r

-  @retval EFI_ALREADY_STARTED    This Token is already being used in another MTFTPv4 \r
+  @retval EFI_ALREADY_STARTED    This Token is already being used in another MTFTPv4\r

                                  session.\r
   @retval EFI_OUT_OF_RESOURCES   Required system resources could not be allocated.\r
   @retval EFI_ACCESS_DENIED      The previous operation has not completed yet.\r
                                  session.\r
   @retval EFI_OUT_OF_RESOURCES   Required system resources could not be allocated.\r
   @retval EFI_ACCESS_DENIED      The previous operation has not completed yet.\r


@@ -870,35 +870,35 @@ EfiMtftp4WriteFile (
 \r
 \r
 /**\r
 \r
 \r
 /**\r

-  Downloads a data file "directory" from an MTFTPv4 server. \r
+  Downloads a data file "directory" from an MTFTPv4 server.\r

   May be unsupported in some EFI implementations\r
   May be unsupported in some EFI implementations\r

-  \r
-  The ReadDirectory() function is used to return a list of files on the MTFTPv4 \r
-  server that are logically (or operationally) related to Token.Filename. The \r
-  directory request packet that is sent to the server is built with the option \r
+\r
+  The ReadDirectory() function is used to return a list of files on the MTFTPv4\r
+  server that are logically (or operationally) related to Token.Filename. The\r
+  directory request packet that is sent to the server is built with the option\r

   list that was provided by caller, if present.\r
   list that was provided by caller, if present.\r

-  The file information that the server returns is put into either of the following \r
+  The file information that the server returns is put into either of the following\r

   locations:\r
   1.A fixed buffer that is pointed to by Token.Buffer\r
   2.A download service function that is pointed to by Token.CheckPacket\r
   locations:\r
   1.A fixed buffer that is pointed to by Token.Buffer\r
   2.A download service function that is pointed to by Token.CheckPacket\r

-  If both Token.Buffer and Token.CheckPacket are used, then Token.CheckPacket will \r
+  If both Token.Buffer and Token.CheckPacket are used, then Token.CheckPacket will\r

   be called first. If the call is successful, the packet will be stored in Token.Buffer.\r
   be called first. If the call is successful, the packet will be stored in Token.Buffer.\r

-  The returned directory listing in the Token.Buffer or EFI_MTFTP4_PACKET consists \r
-  of a list of two or three variable-length ASCII strings, each terminated by a \r
-  null character, for each file in the directory. If the multicast option is involved, \r
-  the first field of each directory entry is the static multicast IP address and \r
-  UDP port number that is associated with the file name. The format of the field \r
-  is ip:ip:ip:ip:port. If the multicast option is not involved, this field and its \r
+  The returned directory listing in the Token.Buffer or EFI_MTFTP4_PACKET consists\r
+  of a list of two or three variable-length ASCII strings, each terminated by a\r
+  null character, for each file in the directory. If the multicast option is involved,\r
+  the first field of each directory entry is the static multicast IP address and\r
+  UDP port number that is associated with the file name. The format of the field\r
+  is ip:ip:ip:ip:port. If the multicast option is not involved, this field and its\r

   terminating null character are not present.\r
   terminating null character are not present.\r

-  The next field of each directory entry is the file name and the last field is \r
-  the file information string. The information string contains the file size and \r
-  the create/modify timestamp. The format of the information string is filesize \r
-  yyyy-mm-dd hh:mm:ss:ffff. The timestamp is Coordinated Universal Time \r
+  The next field of each directory entry is the file name and the last field is\r
+  the file information string. The information string contains the file size and\r
+  the create/modify timestamp. The format of the information string is filesize\r
+  yyyy-mm-dd hh:mm:ss:ffff. The timestamp is Coordinated Universal Time\r

   (UTC; also known as Greenwich Mean Time [GMT]).\r
   The only difference between ReadFile and ReadDirectory is the opcode used.\r
 \r
   @param  This                   Pointer to the EFI_MTFTP4_PROTOCOL instance\r
   (UTC; also known as Greenwich Mean Time [GMT]).\r
   The only difference between ReadFile and ReadDirectory is the opcode used.\r
 \r
   @param  This                   Pointer to the EFI_MTFTP4_PROTOCOL instance\r

-  @param  Token                  Pointer to the token structure to provide the \r
+  @param  Token                  Pointer to the token structure to provide the\r

                                  parameters that are used in this function\r
 \r
   @retval EFI_SUCCESS            The MTFTPv4 related file "directory" has been downloaded.\r
                                  parameters that are used in this function\r
 \r
   @retval EFI_SUCCESS            The MTFTPv4 related file "directory" has been downloaded.\r


@@ -913,15 +913,15 @@ EfiMtftp4WriteFile (
                                     format.\r
                                  6. Token.Buffer and Token.PacketNeeded are both\r
                                     NULL.\r
                                     format.\r
                                  6. Token.Buffer and Token.PacketNeeded are both\r
                                     NULL.\r

-                                 7. One or more IPv4 addresses in Token.OverrideData \r
-                                    are not valid unicast IPv4 addresses if \r
+                                 7. One or more IPv4 addresses in Token.OverrideData\r
+                                    are not valid unicast IPv4 addresses if\r

                                     Token.OverrideData is not NULL.\r
   @retval EFI_UNSUPPORTED        One or more options in the Token.OptionList are in the\r
                                  unsupported list of structure EFI_MTFTP4_MODE_DATA.\r
   @retval EFI_NOT_STARTED        The EFI MTFTPv4 Protocol driver has not been started.\r
                                     Token.OverrideData is not NULL.\r
   @retval EFI_UNSUPPORTED        One or more options in the Token.OptionList are in the\r
                                  unsupported list of structure EFI_MTFTP4_MODE_DATA.\r
   @retval EFI_NOT_STARTED        The EFI MTFTPv4 Protocol driver has not been started.\r

-  @retval EFI_NO_MAPPING         When using a default address, configuration (DHCP, \r
+  @retval EFI_NO_MAPPING         When using a default address, configuration (DHCP,\r

                                  BOOTP, RARP, etc.) is not finished yet.\r
                                  BOOTP, RARP, etc.) is not finished yet.\r

-  @retval EFI_ALREADY_STARTED    This Token is already being used in another MTFTPv4 \r
+  @retval EFI_ALREADY_STARTED    This Token is already being used in another MTFTPv4\r

                                  session.\r
   @retval EFI_OUT_OF_RESOURCES   Required system resources could not be allocated.\r
   @retval EFI_ACCESS_DENIED      The previous operation has not completed yet.\r
                                  session.\r
   @retval EFI_OUT_OF_RESOURCES   Required system resources could not be allocated.\r
   @retval EFI_ACCESS_DENIED      The previous operation has not completed yet.\r


@@ -940,31 +940,31 @@ EfiMtftp4ReadDirectory (
 \r
 \r
 /**\r
 \r
 \r
 /**\r

-  Gets information about a file from an MTFTPv4 server. \r
-  \r
-  The GetInfo() function assembles an MTFTPv4 request packet with options; \r
-  sends it to the MTFTPv4 server; and may return an MTFTPv4 OACK, MTFTPv4 ERROR, \r
-  or ICMP ERROR packet. Retries occur only if no response packets are received \r
+  Gets information about a file from an MTFTPv4 server.\r
+\r
+  The GetInfo() function assembles an MTFTPv4 request packet with options;\r
+  sends it to the MTFTPv4 server; and may return an MTFTPv4 OACK, MTFTPv4 ERROR,\r
+  or ICMP ERROR packet. Retries occur only if no response packets are received\r

   from the MTFTPv4 server before the timeout expires.\r
   from the MTFTPv4 server before the timeout expires.\r

-  It is implemented with EfiMtftp4ReadFile: build a token, then pass it to \r
+  It is implemented with EfiMtftp4ReadFile: build a token, then pass it to\r

   EfiMtftp4ReadFile. In its check packet callback abort the opertions.\r
 \r
   @param  This                   Pointer to the EFI_MTFTP4_PROTOCOL instance\r
   EfiMtftp4ReadFile. In its check packet callback abort the opertions.\r
 \r
   @param  This                   Pointer to the EFI_MTFTP4_PROTOCOL instance\r

-  @param  OverrideData           Data that is used to override the existing \r
-                                 parameters. If NULL, the default parameters that \r
-                                 were set in the EFI_MTFTP4_PROTOCOL.Configure() \r
+  @param  OverrideData           Data that is used to override the existing\r
+                                 parameters. If NULL, the default parameters that\r
+                                 were set in the EFI_MTFTP4_PROTOCOL.Configure()\r

                                  function are used\r
   @param  Filename               Pointer to null-terminated ASCII file name string\r
                                  function are used\r
   @param  Filename               Pointer to null-terminated ASCII file name string\r

-  @param  ModeStr                Pointer to null-terminated ASCII mode string. If NULL, "octet" \r
+  @param  ModeStr                Pointer to null-terminated ASCII mode string. If NULL, "octet"\r

                                  will be used\r
   @param  OptionCount            Number of option/value string pairs in OptionList\r
                                  will be used\r
   @param  OptionCount            Number of option/value string pairs in OptionList\r

-  @param  OptionList             Pointer to array of option/value string pairs. \r
+  @param  OptionList             Pointer to array of option/value string pairs.\r

                                  Ignored if OptionCount is zero\r
   @param  PacketLength           The number of bytes in the returned packet\r
                                  Ignored if OptionCount is zero\r
   @param  PacketLength           The number of bytes in the returned packet\r

-  @param  Packet                 PacketThe pointer to the received packet. This \r
+  @param  Packet                 PacketThe pointer to the received packet. This\r

                                  buffer must be freed by the caller.\r
 \r
                                  buffer must be freed by the caller.\r
 \r

-  @retval EFI_SUCCESS            An MTFTPv4 OACK packet was received and is in \r
+  @retval EFI_SUCCESS            An MTFTPv4 OACK packet was received and is in\r

                                  the Buffer.\r
   @retval EFI_INVALID_PARAMETER  One or more of the following conditions is TRUE:\r
                                  1.This is NULL.\r
                                  the Buffer.\r
   @retval EFI_INVALID_PARAMETER  One or more of the following conditions is TRUE:\r
                                  1.This is NULL.\r


@@ -972,21 +972,21 @@ EfiMtftp4ReadDirectory (
                                  3.OptionCount is not zero and OptionList is NULL.\r
                                  4.One or more options in OptionList have wrong format.\r
                                  5.PacketLength is NULL.\r
                                  3.OptionCount is not zero and OptionList is NULL.\r
                                  4.One or more options in OptionList have wrong format.\r
                                  5.PacketLength is NULL.\r

-                                 6.One or more IPv4 addresses in OverrideData are \r
-                                   not valid unicast IPv4 addresses if OverrideData \r
+                                 6.One or more IPv4 addresses in OverrideData are\r
+                                   not valid unicast IPv4 addresses if OverrideData\r

                                    is not NULL.\r
   @retval EFI_UNSUPPORTED        One or more options in the OptionList are in the\r
                                  unsupported list of structure EFI_MTFTP4_MODE_DATA\r
   @retval EFI_NOT_STARTED        The EFI MTFTPv4 Protocol driver has not been started.\r
                                    is not NULL.\r
   @retval EFI_UNSUPPORTED        One or more options in the OptionList are in the\r
                                  unsupported list of structure EFI_MTFTP4_MODE_DATA\r
   @retval EFI_NOT_STARTED        The EFI MTFTPv4 Protocol driver has not been started.\r

-  @retval EFI_NO_MAPPING         When using a default address, configuration (DHCP, \r
+  @retval EFI_NO_MAPPING         When using a default address, configuration (DHCP,\r

                                  BOOTP, RARP, etc.) has not finished yet.\r
   @retval EFI_ACCESS_DENIED      The previous operation has not completed yet.\r
   @retval EFI_OUT_OF_RESOURCES   Required system resources could not be allocated.\r
                                  BOOTP, RARP, etc.) has not finished yet.\r
   @retval EFI_ACCESS_DENIED      The previous operation has not completed yet.\r
   @retval EFI_OUT_OF_RESOURCES   Required system resources could not be allocated.\r

-  @retval EFI_TFTP_ERROR         An MTFTPv4 ERROR packet was received and is in \r
+  @retval EFI_TFTP_ERROR         An MTFTPv4 ERROR packet was received and is in\r

                                  the Buffer.\r
                                  the Buffer.\r

-  @retval EFI_ICMP_ERROR         An ICMP ERROR packet was received and the Packet \r
+  @retval EFI_ICMP_ERROR         An ICMP ERROR packet was received and the Packet\r

                                  is set to NULL.\r
                                  is set to NULL.\r

-  @retval EFI_PROTOCOL_ERROR     An unexpected MTFTPv4 packet was received and is \r
+  @retval EFI_PROTOCOL_ERROR     An unexpected MTFTPv4 packet was received and is\r

                                  in the Buffer.\r
   @retval EFI_TIMEOUT            No responses were received from the MTFTPv4 server.\r
   @retval EFI_DEVICE_ERROR       An unexpected network error or system error occurred.\r
                                  in the Buffer.\r
   @retval EFI_TIMEOUT            No responses were received from the MTFTPv4 server.\r
   @retval EFI_DEVICE_ERROR       An unexpected network error or system error occurred.\r


@@ -1053,15 +1053,15 @@ EfiMtftp4GetInfo (
 /**\r
   Polls for incoming data packets and processes outgoing data packets.\r
 \r
 /**\r
   Polls for incoming data packets and processes outgoing data packets.\r
 \r

-  The Poll() function can be used by network drivers and applications to increase \r
-  the rate that data packets are moved between the communications device and the \r
+  The Poll() function can be used by network drivers and applications to increase\r
+  the rate that data packets are moved between the communications device and the\r

   transmit and receive queues.\r
   transmit and receive queues.\r

-  In some systems, the periodic timer event in the managed network driver may not \r
-  poll the underlying communications device fast enough to transmit and/or receive \r
-  all data packets without missing incoming packets or dropping outgoing packets. \r
-  Drivers and applications that are experiencing packet loss should try calling \r
+  In some systems, the periodic timer event in the managed network driver may not\r
+  poll the underlying communications device fast enough to transmit and/or receive\r
+  all data packets without missing incoming packets or dropping outgoing packets.\r
+  Drivers and applications that are experiencing packet loss should try calling\r

   the Poll() function more often.\r
   the Poll() function more often.\r

-  \r
+\r

   @param  This                   Pointer to the EFI_MTFTP4_PROTOCOL instance\r
 \r
   @retval EFI_SUCCESS            Incoming or outgoing data was processed.\r
   @param  This                   Pointer to the EFI_MTFTP4_PROTOCOL instance\r
 \r
   @retval EFI_SUCCESS            Incoming or outgoing data was processed.\r


@@ -1070,7 +1070,7 @@ EfiMtftp4GetInfo (
                                  BOOTP, RARP, etc.) is not finished yet.\r
   @retval EFI_INVALID_PARAMETER  This is NULL.\r
   @retval EFI_DEVICE_ERROR       An unexpected system or network error occurred.\r
                                  BOOTP, RARP, etc.) is not finished yet.\r
   @retval EFI_INVALID_PARAMETER  This is NULL.\r
   @retval EFI_DEVICE_ERROR       An unexpected system or network error occurred.\r

-  @retval EFI_TIMEOUT            Data was dropped out of the transmit and/or receive \r
+  @retval EFI_TIMEOUT            Data was dropped out of the transmit and/or receive\r

                                  queue. Consider increasing the polling rate.\r
 \r
 **/\r
                                  queue. Consider increasing the polling rate.\r
 \r
 **/\r

diff --git a/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Impl.h b/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Impl.h
index 851b595eee037ad451ff5ee2e33820f7699cd141..e24890cce82cfeeb8a77353496276df12d252e15 100644 (file)
--- a/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Impl.h
+++ b/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Impl.h
@@ -1,14 +1,14 @@
 /** @file\r
 /** @file\r

-  \r
+\r

   Mtftp4 Implementation.\r
   Mtftp4 Implementation.\r

-  \r
+\r

   Mtftp4 Implementation, it supports the following RFCs:\r
   RFC1350 - THE TFTP PROTOCOL (REVISION 2)\r
   RFC2090 - TFTP Multicast Option\r
   RFC2347 - TFTP Option Extension\r
   RFC2348 - TFTP Blocksize Option\r
   RFC2349 - TFTP Timeout Interval and Transfer Size Options\r
   Mtftp4 Implementation, it supports the following RFCs:\r
   RFC1350 - THE TFTP PROTOCOL (REVISION 2)\r
   RFC2090 - TFTP Multicast Option\r
   RFC2347 - TFTP Option Extension\r
   RFC2348 - TFTP Blocksize Option\r
   RFC2349 - TFTP Timeout Interval and Transfer Size Options\r

-  \r
+\r

 Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r


@@ -171,8 +171,8 @@ Mtftp4CleanOperation (
 \r
 /**\r
   Start the MTFTP session for upload.\r
 \r
 /**\r
   Start the MTFTP session for upload.\r

-  \r
-  It will first init some states, then send the WRQ request packet, \r
+\r
+  It will first init some states, then send the WRQ request packet,\r

   and start receiving the packet.\r
 \r
   @param  Instance              The MTFTP session\r
   and start receiving the packet.\r
 \r
   @param  Instance              The MTFTP session\r


@@ -190,9 +190,9 @@ Mtftp4WrqStart (
   );\r
 \r
 /**\r
   );\r
 \r
 /**\r

-  Start the MTFTP session to download. \r
-  \r
-  It will first initialize some of the internal states then build and send a RRQ \r
+  Start the MTFTP session to download.\r
+\r
+  It will first initialize some of the internal states then build and send a RRQ\r

   reqeuest packet, at last, it will start receive for the downloading.\r
 \r
   @param  Instance              The Mtftp session\r
   reqeuest packet, at last, it will start receive for the downloading.\r
 \r
   @param  Instance              The Mtftp session\r

diff --git a/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Option.h b/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Option.h
index b7fdbf23e1fbbfdc28ac9dd193edf1d1b11169d1..a3fdc4dca26da1d1fedd3a87d88e5ba7b5378b6d 100644 (file)
--- a/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Option.h
+++ b/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Option.h
@@ -1,7 +1,7 @@
 /** @file\r
   Routines to process MTFTP4 options.\r
 /** @file\r
   Routines to process MTFTP4 options.\r

-  \r
-Copyright (c) 2006 - 2009, Intel Corporation. All rights reserved.<BR>\r
+\r
+Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r

 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r


@@ -38,8 +38,8 @@ typedef struct {
 } MTFTP4_OPTION;\r
 \r
 /**\r
 } MTFTP4_OPTION;\r
 \r
 /**\r

-  Allocate and fill in a array of Mtftp options from the Packet. \r
-  \r
+  Allocate and fill in a array of Mtftp options from the Packet.\r
+\r

   It first calls Mtftp4FillOption to get the option number, then allocate\r
   the array, at last, call Mtftp4FillOption again to save the options.\r
 \r
   It first calls Mtftp4FillOption to get the option number, then allocate\r
   the array, at last, call Mtftp4FillOption again to save the options.\r
 \r

diff --git a/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Rrq.c b/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Rrq.c
index e983d7979192b453b726be4da6c8c96aa268bc51..63115ba5195866f0220c3a869d2984ac79190548 100644 (file)
--- a/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Rrq.c
+++ b/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Rrq.c
@@ -1,8 +1,8 @@
 /** @file\r
   Routines to process Rrq (download).\r
 /** @file\r
   Routines to process Rrq (download).\r

-  \r
+\r

 (C) Copyright 2014 Hewlett-Packard Development Company, L.P.<BR>\r
 (C) Copyright 2014 Hewlett-Packard Development Company, L.P.<BR>\r

-Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r

 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r


@@ -37,9 +37,9 @@ Mtftp4RrqInput (
 \r
 \r
 /**\r
 \r
 \r
 /**\r

-  Start the MTFTP session to download. \r
-  \r
-  It will first initialize some of the internal states then build and send a RRQ \r
+  Start the MTFTP session to download.\r
+\r
+  It will first initialize some of the internal states then build and send a RRQ\r

   reqeuest packet, at last, it will start receive for the downloading.\r
 \r
   @param  Instance              The Mtftp session\r
   reqeuest packet, at last, it will start receive for the downloading.\r
 \r
   @param  Instance              The Mtftp session\r


@@ -158,7 +158,7 @@ Mtftp4RrqSaveBlock (
   // This is the last block, save the block no\r
   //\r
   if (DataLen < Instance->BlkSize) {\r
   // This is the last block, save the block no\r
   //\r
   if (DataLen < Instance->BlkSize) {\r

-       Completed = TRUE;\r
+  Completed = TRUE;\r

     Instance->LastBlock = Block;\r
     Mtftp4SetLastBlockNum (&Instance->Blocks, Block);\r
   }\r
     Instance->LastBlock = Block;\r
     Mtftp4SetLastBlockNum (&Instance->Blocks, Block);\r
   }\r


@@ -167,7 +167,7 @@ Mtftp4RrqSaveBlock (
   // Remove this block number from the file hole. If Mtftp4RemoveBlockNum\r
   // returns EFI_NOT_FOUND, the block has been saved, don't save it again.\r
   // Note that : For bigger files, allowing the block counter to roll over\r
   // Remove this block number from the file hole. If Mtftp4RemoveBlockNum\r
   // returns EFI_NOT_FOUND, the block has been saved, don't save it again.\r
   // Note that : For bigger files, allowing the block counter to roll over\r

-  // to accept transfers of unlimited size. So TotalBlock is memorised as \r
+  // to accept transfers of unlimited size. So TotalBlock is memorised as\r

   // continuous block counter.\r
   //\r
   Status = Mtftp4RemoveBlockNum (&Instance->Blocks, Block, Completed, &TotalBlock);\r
   // continuous block counter.\r
   //\r
   Status = Mtftp4RemoveBlockNum (&Instance->Blocks, Block, Completed, &TotalBlock);\r


@@ -228,8 +228,8 @@ Mtftp4RrqSaveBlock (
 \r
 \r
 /**\r
 \r
 \r
 /**\r

-  Function to process the received data packets. \r
-  \r
+  Function to process the received data packets.\r
+\r

   It will save the block then send back an ACK if it is active.\r
 \r
   @param  Instance              The downloading MTFTP session\r
   It will save the block then send back an ACK if it is active.\r
 \r
   @param  Instance              The downloading MTFTP session\r


@@ -318,7 +318,7 @@ Mtftp4RrqHandleData (
 \r
 /**\r
   Validate whether the options received in the server's OACK packet is valid.\r
 \r
 /**\r
   Validate whether the options received in the server's OACK packet is valid.\r

-  \r
+\r

   The options are valid only if:\r
   1. The server doesn't include options not requested by us\r
   2. The server can only use smaller blksize than that is requested\r
   The options are valid only if:\r
   1. The server doesn't include options not requested by us\r
   2. The server can only use smaller blksize than that is requested\r


@@ -428,20 +428,20 @@ Mtftp4RrqConfigMcastPort (
     return Status;\r
   }\r
 \r
     return Status;\r
   }\r
 \r

-  if (!Config->UseDefaultSetting && \r
+  if (!Config->UseDefaultSetting &&\r

       !EFI_IP4_EQUAL (&mZeroIp4Addr, &Config->GatewayIp)) {\r
     //\r
     // The station IP address is manually configured and the Gateway IP is not 0.\r
     // Add the default route for this UDP instance.\r
     //\r
     Status = McastIo->Protocol.Udp4->Routes (\r
       !EFI_IP4_EQUAL (&mZeroIp4Addr, &Config->GatewayIp)) {\r
     //\r
     // The station IP address is manually configured and the Gateway IP is not 0.\r
     // Add the default route for this UDP instance.\r
     //\r
     Status = McastIo->Protocol.Udp4->Routes (\r

-                                       McastIo->Protocol.Udp4, \r
+                                       McastIo->Protocol.Udp4,\r

                                        FALSE,\r
                                        &mZeroIp4Addr,\r
                                        &mZeroIp4Addr,\r
                                        &Config->GatewayIp\r
                                        );\r
                                        FALSE,\r
                                        &mZeroIp4Addr,\r
                                        &mZeroIp4Addr,\r
                                        &Config->GatewayIp\r
                                        );\r

-                             \r
+\r

     if (EFI_ERROR (Status)) {\r
       McastIo->Protocol.Udp4->Configure (McastIo->Protocol.Udp4, NULL);\r
       return Status;\r
     if (EFI_ERROR (Status)) {\r
       McastIo->Protocol.Udp4->Configure (McastIo->Protocol.Udp4, NULL);\r
       return Status;\r


@@ -459,8 +459,8 @@ Mtftp4RrqConfigMcastPort (
 \r
 \r
 /**\r
 \r
 \r
 /**\r

-  Function to process the OACK. \r
-  \r
+  Function to process the OACK.\r
+\r

   It will first validate the OACK packet, then update the various negotiated parameters.\r
 \r
   @param  Instance              The download MTFTP session\r
   It will first validate the OACK packet, then update the various negotiated parameters.\r
 \r
   @param  Instance              The download MTFTP session\r


@@ -591,22 +591,22 @@ Mtftp4RrqHandleOack (
 \r
         return Status;\r
       }\r
 \r
         return Status;\r
       }\r

-    \r
+\r

       //\r
       // Update the parameters used.\r
       //\r
       if (Reply.BlkSize != 0) {\r
         Instance->BlkSize = Reply.BlkSize;\r
       }\r
       //\r
       // Update the parameters used.\r
       //\r
       if (Reply.BlkSize != 0) {\r
         Instance->BlkSize = Reply.BlkSize;\r
       }\r

-      \r
+\r

       if (Reply.Timeout != 0) {\r
         Instance->Timeout = Reply.Timeout;\r
       if (Reply.Timeout != 0) {\r
         Instance->Timeout = Reply.Timeout;\r

-      }  \r
-    }    \r
-    \r
+      }\r
+    }\r
+\r

   } else {\r
     Instance->Master = TRUE;\r
   } else {\r
     Instance->Master = TRUE;\r

-    \r
+\r

     if (Reply.BlkSize != 0) {\r
       Instance->BlkSize = Reply.BlkSize;\r
     }\r
     if (Reply.BlkSize != 0) {\r
       Instance->BlkSize = Reply.BlkSize;\r
     }\r


@@ -615,7 +615,7 @@ Mtftp4RrqHandleOack (
       Instance->Timeout = Reply.Timeout;\r
     }\r
   }\r
       Instance->Timeout = Reply.Timeout;\r
     }\r
   }\r

-  \r
+\r

   //\r
   // Send an ACK to (Expected - 1) which is 0 for unicast download,\r
   // or tell the server we want to receive the Expected block.\r
   //\r
   // Send an ACK to (Expected - 1) which is 0 for unicast download,\r
   // or tell the server we want to receive the Expected block.\r


@@ -762,7 +762,7 @@ Mtftp4RrqInput (
   case EFI_MTFTP4_OPCODE_ERROR:\r
     Status = EFI_TFTP_ERROR;\r
     break;\r
   case EFI_MTFTP4_OPCODE_ERROR:\r
     Status = EFI_TFTP_ERROR;\r
     break;\r

-    \r
+\r

   default:\r
     break;\r
   }\r
   default:\r
     break;\r
   }\r

diff --git a/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Support.c b/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Support.c
index e4366b6ddb83bda1dfd2ecdefd65fb7a859595b4..71c679ed13e8ad67c3298ea1c2dd1ce767e58977 100644 (file)
--- a/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Support.c
+++ b/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Support.c
@@ -1,6 +1,6 @@
 /** @file\r
   Support routines for Mtftp.\r
 /** @file\r
   Support routines for Mtftp.\r

-  \r
+\r

 Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r


@@ -48,16 +48,16 @@ Mtftp4AllocateRange (
 \r
 \r
 /**\r
 \r
 \r
 /**\r

-  Initialize the block range for either RRQ or WRQ. \r
-  \r
-  RRQ and WRQ have different requirements for Start and End. \r
-  For example, during start up, WRQ initializes its whole valid block range \r
-  to [0, 0xffff]. This is bacause the server will send us a ACK0 to inform us \r
-  to start the upload. When the client received ACK0, it will remove 0 from the \r
+  Initialize the block range for either RRQ or WRQ.\r
+\r
+  RRQ and WRQ have different requirements for Start and End.\r
+  For example, during start up, WRQ initializes its whole valid block range\r
+  to [0, 0xffff]. This is bacause the server will send us a ACK0 to inform us\r
+  to start the upload. When the client received ACK0, it will remove 0 from the\r

   range, get the next block number, which is 1, then upload the BLOCK1. For RRQ\r
   range, get the next block number, which is 1, then upload the BLOCK1. For RRQ\r

-  without option negotiation, the server will directly send us the BLOCK1 in \r
-  response to the client's RRQ. When received BLOCK1, the client will remove \r
-  it from the block range and send an ACK. It also works if there is option \r
+  without option negotiation, the server will directly send us the BLOCK1 in\r
+  response to the client's RRQ. When received BLOCK1, the client will remove\r
+  it from the block range and send an ACK. It also works if there is option\r

   negotiation.\r
 \r
   @param  Head                  The block range head to initialize\r
   negotiation.\r
 \r
   @param  Head                  The block range head to initialize\r


@@ -93,7 +93,7 @@ Mtftp4InitBlockRange (
 \r
   @param  Head                  The block range head\r
 \r
 \r
   @param  Head                  The block range head\r
 \r

-  @return The first valid block number, -1 if the block range is empty. \r
+  @return The first valid block number, -1 if the block range is empty.\r

 \r
 **/\r
 INTN\r
 \r
 **/\r
 INTN\r


@@ -113,10 +113,10 @@ Mtftp4GetNextBlockNum (
 \r
 \r
 /**\r
 \r
 \r
 /**\r

-  Set the last block number of the block range list. \r
-  \r
+  Set the last block number of the block range list.\r
+\r

   It will remove all the blocks after the Last. MTFTP initialize the block range\r
   It will remove all the blocks after the Last. MTFTP initialize the block range\r

-  to the maximum possible range, such as [0, 0xffff] for WRQ. When it gets the \r
+  to the maximum possible range, such as [0, 0xffff] for WRQ. When it gets the\r

   last block number, it will call this function to set the last block number.\r
 \r
   @param  Head                  The block range list\r
   last block number, it will call this function to set the last block number.\r
 \r
   @param  Head                  The block range list\r


@@ -159,7 +159,7 @@ Mtftp4SetLastBlockNum (
   @param  Head                  The block range list to remove from\r
   @param  Num                   The block number to remove\r
   @param  Completed             Whether Num is the last block number\r
   @param  Head                  The block range list to remove from\r
   @param  Num                   The block number to remove\r
   @param  Completed             Whether Num is the last block number\r

-  @param  TotalBlock            The continuous block number in all \r
+  @param  TotalBlock            The continuous block number in all\r

 \r
   @retval EFI_NOT_FOUND         The block number isn't in the block range list\r
   @retval EFI_SUCCESS           The block number has been removed from the list\r
 \r
   @retval EFI_NOT_FOUND         The block number isn't in the block range list\r
   @retval EFI_SUCCESS           The block number has been removed from the list\r


@@ -213,22 +213,22 @@ Mtftp4RemoveBlockNum (
       Range->Start++;\r
 \r
       //\r
       Range->Start++;\r
 \r
       //\r

-      // Note that: RFC 1350 does not mention block counter roll-over, \r
-      // but several TFTP hosts implement the roll-over be able to accept \r
-      // transfers of unlimited size. There is no consensus, however, whether \r
-      // the counter should wrap around to zero or to one. Many implementations \r
-      // wrap to zero, because this is the simplest to implement. Here we choose \r
+      // Note that: RFC 1350 does not mention block counter roll-over,\r
+      // but several TFTP hosts implement the roll-over be able to accept\r
+      // transfers of unlimited size. There is no consensus, however, whether\r
+      // the counter should wrap around to zero or to one. Many implementations\r
+      // wrap to zero, because this is the simplest to implement. Here we choose\r

       // this solution.\r
       //\r
       // this solution.\r
       //\r

-         *TotalBlock  = Num;\r
-         \r
+    *TotalBlock  = Num;\r
+\r

       if (Range->Round > 0) {\r
       if (Range->Round > 0) {\r

-           *TotalBlock += Range->Bound +  MultU64x32 ((UINTN) (Range->Round -1), (UINT32) (Range->Bound + 1)) + 1;\r
-         }\r
+      *TotalBlock += Range->Bound +  MultU64x32 ((UINTN) (Range->Round -1), (UINT32) (Range->Bound + 1)) + 1;\r
+    }\r

 \r
       if (Range->Start > Range->Bound) {\r
 \r
       if (Range->Start > Range->Bound) {\r

-                 Range->Start = 0;\r
-                 Range->Round ++;\r
+        Range->Start = 0;\r
+      Range->Round ++;\r

       }\r
 \r
       if ((Range->Start > Range->End) || Completed) {\r
       }\r
 \r
       if ((Range->Start > Range->End) || Completed) {\r


@@ -321,7 +321,7 @@ Mtftp4SendRequest (
 \r
   Packet->OpCode = HTONS (Instance->Operation);\r
   BufferLength  -= sizeof (Packet->OpCode);\r
 \r
   Packet->OpCode = HTONS (Instance->Operation);\r
   BufferLength  -= sizeof (Packet->OpCode);\r

-  \r
+\r

   Cur            = Packet->Rrq.Filename;\r
   Status         = AsciiStrCpyS ((CHAR8 *) Cur, BufferLength, (CHAR8 *) Token->Filename);\r
   ASSERT_EFI_ERROR (Status);\r
   Cur            = Packet->Rrq.Filename;\r
   Status         = AsciiStrCpyS ((CHAR8 *) Cur, BufferLength, (CHAR8 *) Token->Filename);\r
   ASSERT_EFI_ERROR (Status);\r


@@ -335,17 +335,17 @@ Mtftp4SendRequest (
   for (Index = 0; Index < Token->OptionCount; ++Index) {\r
     OptionStrLength = AsciiStrLen ((CHAR8 *) Options[Index].OptionStr);\r
     ValueStrLength  = AsciiStrLen ((CHAR8 *) Options[Index].ValueStr);\r
   for (Index = 0; Index < Token->OptionCount; ++Index) {\r
     OptionStrLength = AsciiStrLen ((CHAR8 *) Options[Index].OptionStr);\r
     ValueStrLength  = AsciiStrLen ((CHAR8 *) Options[Index].ValueStr);\r

-    \r
+\r

     Status          = AsciiStrCpyS ((CHAR8 *) Cur, BufferLength, (CHAR8 *) Options[Index].OptionStr);\r
     ASSERT_EFI_ERROR (Status);\r
     BufferLength   -= (UINT32) (OptionStrLength + 1);\r
     Cur            += OptionStrLength + 1;\r
     Status          = AsciiStrCpyS ((CHAR8 *) Cur, BufferLength, (CHAR8 *) Options[Index].OptionStr);\r
     ASSERT_EFI_ERROR (Status);\r
     BufferLength   -= (UINT32) (OptionStrLength + 1);\r
     Cur            += OptionStrLength + 1;\r

-    \r
+\r

     Status          = AsciiStrCpyS ((CHAR8 *) Cur, BufferLength, (CHAR8 *) Options[Index].ValueStr);\r
     ASSERT_EFI_ERROR (Status);\r
     BufferLength   -= (UINT32) (ValueStrLength + 1);\r
     Cur            += ValueStrLength + 1;\r
     Status          = AsciiStrCpyS ((CHAR8 *) Cur, BufferLength, (CHAR8 *) Options[Index].ValueStr);\r
     ASSERT_EFI_ERROR (Status);\r
     BufferLength   -= (UINT32) (ValueStrLength + 1);\r
     Cur            += ValueStrLength + 1;\r

-    \r
+\r

   }\r
 \r
   return Mtftp4SendPacket (Instance, Nbuf);\r
   }\r
 \r
   return Mtftp4SendPacket (Instance, Nbuf);\r


@@ -356,7 +356,7 @@ Mtftp4SendRequest (
   Build then send an error message.\r
 \r
   @param  Instance              The MTFTP session\r
   Build then send an error message.\r
 \r
   @param  Instance              The MTFTP session\r

-  @param  ErrCode               The error code  \r
+  @param  ErrCode               The error code\r

   @param  ErrInfo               The error message\r
 \r
   @retval EFI_OUT_OF_RESOURCES  Failed to allocate memory for the error packet\r
   @param  ErrInfo               The error message\r
 \r
   @retval EFI_OUT_OF_RESOURCES  Failed to allocate memory for the error packet\r


@@ -395,7 +395,7 @@ Mtftp4SendError (
 \r
 /**\r
   The callback function called when the packet is transmitted.\r
 \r
 /**\r
   The callback function called when the packet is transmitted.\r

-  \r
+\r

   It simply frees the packet.\r
 \r
   @param  Packet                The transmitted (or failed to) packet\r
   It simply frees the packet.\r
 \r
   @param  Packet                The transmitted (or failed to) packet\r


@@ -437,10 +437,10 @@ Mtftp4SetTimeout (
 \r
 \r
 /**\r
 \r
 \r
 /**\r

-  Send the packet for the instance. \r
-  \r
-  It will first save a reference to the packet for later retransmission. \r
-  Then determine the destination port, listen port for requests, and connected \r
+  Send the packet for the instance.\r
+\r
+  It will first save a reference to the packet for later retransmission.\r
+  Then determine the destination port, listen port for requests, and connected\r

   port for others. At last, send the packet out.\r
 \r
   @param  Instance              The Mtftp instance\r
   port for others. At last, send the packet out.\r
 \r
   @param  Instance              The Mtftp instance\r


@@ -484,7 +484,7 @@ Mtftp4SendPacket (
   ASSERT (Buffer != NULL);\r
   OpCode = NTOHS (*(UINT16 *)Buffer);\r
 \r
   ASSERT (Buffer != NULL);\r
   OpCode = NTOHS (*(UINT16 *)Buffer);\r
 \r

-  if ((OpCode == EFI_MTFTP4_OPCODE_RRQ) || \r
+  if ((OpCode == EFI_MTFTP4_OPCODE_RRQ) ||\r

       (OpCode == EFI_MTFTP4_OPCODE_DIR) ||\r
       (OpCode == EFI_MTFTP4_OPCODE_WRQ)) {\r
     UdpPoint.RemotePort = Instance->ListeningPort;\r
       (OpCode == EFI_MTFTP4_OPCODE_DIR) ||\r
       (OpCode == EFI_MTFTP4_OPCODE_WRQ)) {\r
     UdpPoint.RemotePort = Instance->ListeningPort;\r


@@ -634,7 +634,7 @@ Mtftp4OnTimerTick (
     if (!Instance->HasTimeout) {\r
       continue;\r
     }\r
     if (!Instance->HasTimeout) {\r
       continue;\r
     }\r

-    \r
+\r

     Instance->HasTimeout = FALSE;\r
 \r
     //\r
     Instance->HasTimeout = FALSE;\r
 \r
     //\r

diff --git a/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Support.h b/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Support.h
index fd8703a925cf12d459c99a877ff958bf223a60d1..df18440a9ef5d1a7f9307549e077a5405db1880d 100644 (file)
--- a/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Support.h
+++ b/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Support.h
@@ -1,6 +1,6 @@
 /** @file\r
   Support routines for MTFTP.\r
 /** @file\r
   Support routines for MTFTP.\r

-  \r
+\r

 Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r


@@ -30,16 +30,16 @@ typedef struct {
 \r
 \r
 /**\r
 \r
 \r
 /**\r

-  Initialize the block range for either RRQ or WRQ. \r
-  \r
-  RRQ and WRQ have different requirements for Start and End. \r
-  For example, during start up, WRQ initializes its whole valid block range \r
-  to [0, 0xffff]. This is bacause the server will send us a ACK0 to inform us \r
-  to start the upload. When the client received ACK0, it will remove 0 from the \r
+  Initialize the block range for either RRQ or WRQ.\r
+\r
+  RRQ and WRQ have different requirements for Start and End.\r
+  For example, during start up, WRQ initializes its whole valid block range\r
+  to [0, 0xffff]. This is bacause the server will send us a ACK0 to inform us\r
+  to start the upload. When the client received ACK0, it will remove 0 from the\r

   range, get the next block number, which is 1, then upload the BLOCK1. For RRQ\r
   range, get the next block number, which is 1, then upload the BLOCK1. For RRQ\r

-  without option negotiation, the server will directly send us the BLOCK1 in \r
-  response to the client's RRQ. When received BLOCK1, the client will remove \r
-  it from the block range and send an ACK. It also works if there is option \r
+  without option negotiation, the server will directly send us the BLOCK1 in\r
+  response to the client's RRQ. When received BLOCK1, the client will remove\r
+  it from the block range and send an ACK. It also works if there is option\r

   negotiation.\r
 \r
   @param  Head                  The block range head to initialize\r
   negotiation.\r
 \r
   @param  Head                  The block range head to initialize\r


@@ -62,7 +62,7 @@ Mtftp4InitBlockRange (
 \r
   @param  Head                  The block range head\r
 \r
 \r
   @param  Head                  The block range head\r
 \r

-  @return The first valid block number, -1 if the block range is empty. \r
+  @return The first valid block number, -1 if the block range is empty.\r

 \r
 **/\r
 INTN\r
 \r
 **/\r
 INTN\r


@@ -71,10 +71,10 @@ Mtftp4GetNextBlockNum (
   );\r
 \r
 /**\r
   );\r
 \r
 /**\r

-  Set the last block number of the block range list. \r
-  \r
+  Set the last block number of the block range list.\r
+\r

   It will remove all the blocks after the Last. MTFTP initialize the block range\r
   It will remove all the blocks after the Last. MTFTP initialize the block range\r

-  to the maximum possible range, such as [0, 0xffff] for WRQ. When it gets the \r
+  to the maximum possible range, such as [0, 0xffff] for WRQ. When it gets the\r

   last block number, it will call this function to set the last block number.\r
 \r
   @param  Head                  The block range list\r
   last block number, it will call this function to set the last block number.\r
 \r
   @param  Head                  The block range list\r


@@ -93,7 +93,7 @@ Mtftp4SetLastBlockNum (
   @param  Head                  The block range list to remove from\r
   @param  Num                   The block number to remove\r
   @param  Completed             Wether Num is the last block number\r
   @param  Head                  The block range list to remove from\r
   @param  Num                   The block number to remove\r
   @param  Completed             Wether Num is the last block number\r

-  @param  TotalBlock            The continuous block number in all \r
+  @param  TotalBlock            The continuous block number in all\r

 \r
   @retval EFI_NOT_FOUND         The block number isn't in the block range list\r
   @retval EFI_SUCCESS           The block number has been removed from the list\r
 \r
   @retval EFI_NOT_FOUND         The block number isn't in the block range list\r
   @retval EFI_SUCCESS           The block number has been removed from the list\r


@@ -120,10 +120,10 @@ Mtftp4SetTimeout (
   );\r
 \r
 /**\r
   );\r
 \r
 /**\r

-  Send the packet for the instance. \r
-  \r
-  It will first save a reference to the packet for later retransmission. \r
-  Then determine the destination port, listen port for requests, and connected \r
+  Send the packet for the instance.\r
+\r
+  It will first save a reference to the packet for later retransmission.\r
+  Then determine the destination port, listen port for requests, and connected\r

   port for others. At last, send the packet out.\r
 \r
   @param  Instance              The Mtftp instance\r
   port for others. At last, send the packet out.\r
 \r
   @param  Instance              The Mtftp instance\r


@@ -158,7 +158,7 @@ Mtftp4SendRequest (
   Build then send an error message.\r
 \r
   @param  Instance              The MTFTP session\r
   Build then send an error message.\r
 \r
   @param  Instance              The MTFTP session\r

-  @param  ErrCode               The error code  \r
+  @param  ErrCode               The error code\r

   @param  ErrInfo               The error message\r
 \r
   @retval EFI_OUT_OF_RESOURCES  Failed to allocate memory for the error packet\r
   @param  ErrInfo               The error message\r
 \r
   @retval EFI_OUT_OF_RESOURCES  Failed to allocate memory for the error packet\r

diff --git a/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Wrq.c b/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Wrq.c
index 438659a76e762965bfc271be6f2b0fb3dbfc6d39..cf1d50fe4056020c87078496960260d358069e3d 100644 (file)
--- a/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Wrq.c
+++ b/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Wrq.c
@@ -1,6 +1,6 @@
 /** @file\r
   Routines to process Wrq (upload).\r
 /** @file\r
   Routines to process Wrq (upload).\r

-  \r
+\r

 Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r


@@ -124,9 +124,9 @@ Mtftp4WrqSendBlock (
 \r
 \r
 /**\r
 \r
 \r
 /**\r

-  Function to handle received ACK packet. \r
-  \r
-  If the ACK number matches the expected block number, and there are more \r
+  Function to handle received ACK packet.\r
+\r
+  If the ACK number matches the expected block number, and there are more\r

   data pending, send the next block. Otherwise tell the caller that we are done.\r
 \r
   @param  Instance              The MTFTP upload session\r
   data pending, send the next block. Otherwise tell the caller that we are done.\r
 \r
   @param  Instance              The MTFTP upload session\r


@@ -150,7 +150,7 @@ Mtftp4WrqHandleAck (
   UINT16                    AckNum;\r
   INTN                      Expected;\r
   UINT64                    TotalBlock;\r
   UINT16                    AckNum;\r
   INTN                      Expected;\r
   UINT64                    TotalBlock;\r

- \r
+\r

   *Completed  = FALSE;\r
   AckNum      = NTOHS (Packet->Ack.Block[0]);\r
   Expected    = Mtftp4GetNextBlockNum (&Instance->Blocks);\r
   *Completed  = FALSE;\r
   AckNum      = NTOHS (Packet->Ack.Block[0]);\r
   Expected    = Mtftp4GetNextBlockNum (&Instance->Blocks);\r


@@ -175,7 +175,7 @@ Mtftp4WrqHandleAck (
   Expected = Mtftp4GetNextBlockNum (&Instance->Blocks);\r
 \r
   if (Expected < 0) {\r
   Expected = Mtftp4GetNextBlockNum (&Instance->Blocks);\r
 \r
   if (Expected < 0) {\r

-  \r
+\r

     //\r
     // The block range is empty. It may either because the the last\r
     // block has been ACKed, or the sequence number just looped back,\r
     //\r
     // The block range is empty. It may either because the the last\r
     // block has been ACKed, or the sequence number just looped back,\r


@@ -202,8 +202,8 @@ Mtftp4WrqHandleAck (
 \r
 \r
 /**\r
 \r
 \r
 /**\r

-  Check whether the received OACK is valid. \r
-  \r
+  Check whether the received OACK is valid.\r
+\r

   The OACK is valid only if:\r
   1. It only include options requested by us\r
   2. It can only include a smaller block size\r
   The OACK is valid only if:\r
   1. It only include options requested by us\r
   2. It can only include a smaller block size\r


@@ -244,8 +244,8 @@ Mtftp4WrqOackValid (
 \r
 \r
 /**\r
 \r
 \r
 /**\r

-  Function to handle the MTFTP OACK packet. \r
-  \r
+  Function to handle the MTFTP OACK packet.\r
+\r

   It parses the packet's options, and update the internal states of the session.\r
 \r
   @param  Instance              The MTFTP session\r
   It parses the packet's options, and update the internal states of the session.\r
 \r
   @param  Instance              The MTFTP session\r


@@ -458,7 +458,7 @@ Mtftp4WrqInput (
   case EFI_MTFTP4_OPCODE_ERROR:\r
     Status = EFI_TFTP_ERROR;\r
     break;\r
   case EFI_MTFTP4_OPCODE_ERROR:\r
     Status = EFI_TFTP_ERROR;\r
     break;\r

-    \r
+\r

   default:\r
     break;\r
   }\r
   default:\r
     break;\r
   }\r


@@ -492,8 +492,8 @@ ON_EXIT:
 \r
 /**\r
   Start the MTFTP session for upload.\r
 \r
 /**\r
   Start the MTFTP session for upload.\r

-  \r
-  It will first init some states, then send the WRQ request packet, \r
+\r
+  It will first init some states, then send the WRQ request packet,\r

   and start receiving the packet.\r
 \r
   @param  Instance              The MTFTP session\r
   and start receiving the packet.\r
 \r
   @param  Instance              The MTFTP session\r

diff --git a/MdeModulePkg/Universal/Network/SnpDxe/ComponentName.c b/MdeModulePkg/Universal/Network/SnpDxe/ComponentName.c
index d8b818401888d54186bdffc99f73ce3ab8dc7fe3..a3665745990b80a980ebac52854b981e617268e1 100644 (file)
--- a/MdeModulePkg/Universal/Network/SnpDxe/ComponentName.c
+++ b/MdeModulePkg/Universal/Network/SnpDxe/ComponentName.c
@@ -1,11 +1,11 @@
 /** @file\r
     UEFI Component Name(2) protocol implementation for SnpDxe driver.\r
 \r
 /** @file\r
     UEFI Component Name(2) protocol implementation for SnpDxe driver.\r
 \r

-Copyright (c) 2004 - 2014, Intel Corporation. All rights reserved.<BR>\r
-This program and the accompanying materials are licensed \r
-and made available under the terms and conditions of the BSD License which \r
-accompanies this distribution. The full text of the license may be found at \r
-http://opensource.org/licenses/bsd-license.php \r
+Copyright (c) 2004 - 2018, Intel Corporation. All rights reserved.<BR>\r
+This program and the accompanying materials are licensed\r
+and made available under the terms and conditions of the BSD License which\r
+accompanies this distribution. The full text of the license may be found at\r
+http://opensource.org/licenses/bsd-license.php\r

 \r
 THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 \r
 THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r


@@ -238,10 +238,10 @@ SimpleNetworkComponentNameGetDriverName (
 \r
   @param  Snp[in]                   A pointer to the EFI_SIMPLE_NETWORK_PROTOCOL.\r
 \r
 \r
   @param  Snp[in]                   A pointer to the EFI_SIMPLE_NETWORK_PROTOCOL.\r
 \r

-  \r
+\r

   @retval EFI_SUCCESS               Update the ControllerNameTable of this instance successfully.\r
   @retval EFI_INVALID_PARAMETER     The input parameter is invalid.\r
   @retval EFI_SUCCESS               Update the ControllerNameTable of this instance successfully.\r
   @retval EFI_INVALID_PARAMETER     The input parameter is invalid.\r

-  \r
+\r

 **/\r
 EFI_STATUS\r
 UpdateName (\r
 **/\r
 EFI_STATUS\r
 UpdateName (\r


@@ -285,7 +285,7 @@ UpdateName (
     FreeUnicodeStringTable (gSimpleNetworkControllerNameTable);\r
     gSimpleNetworkControllerNameTable = NULL;\r
   }\r
     FreeUnicodeStringTable (gSimpleNetworkControllerNameTable);\r
     gSimpleNetworkControllerNameTable = NULL;\r
   }\r

-  \r
+\r

   Status = AddUnicodeString2 (\r
              "eng",\r
              gSimpleNetworkComponentName.SupportedLanguages,\r
   Status = AddUnicodeString2 (\r
              "eng",\r
              gSimpleNetworkComponentName.SupportedLanguages,\r


@@ -296,7 +296,7 @@ UpdateName (
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r

-  \r
+\r

   return AddUnicodeString2 (\r
            "en",\r
            gSimpleNetworkComponentName2.SupportedLanguages,\r
   return AddUnicodeString2 (\r
            "en",\r
            gSimpleNetworkComponentName2.SupportedLanguages,\r


@@ -317,8 +317,8 @@ UpdateName (
   and EFI_SUCCESS is returned.  If the driver specified by This is not currently\r
   managing the controller specified by ControllerHandle and ChildHandle,\r
   then EFI_UNSUPPORTED is returned.  If the driver specified by This does not\r
   and EFI_SUCCESS is returned.  If the driver specified by This is not currently\r
   managing the controller specified by ControllerHandle and ChildHandle,\r
   then EFI_UNSUPPORTED is returned.  If the driver specified by This does not\r

-  support the language specified by Language, then EFI_UNSUPPORTED is returned. \r
-  Currently not implemented. \r
+  support the language specified by Language, then EFI_UNSUPPORTED is returned.\r
+  Currently not implemented.\r

 \r
   @param  This[in]              A pointer to the EFI_COMPONENT_NAME2_PROTOCOL or\r
                                 EFI_COMPONENT_NAME_PROTOCOL instance.\r
 \r
   @param  This[in]              A pointer to the EFI_COMPONENT_NAME2_PROTOCOL or\r
                                 EFI_COMPONENT_NAME_PROTOCOL instance.\r


@@ -387,7 +387,7 @@ SimpleNetworkComponentNameGetControllerName (
 {\r
   EFI_STATUS                    Status;\r
   EFI_SIMPLE_NETWORK_PROTOCOL   *Snp;\r
 {\r
   EFI_STATUS                    Status;\r
   EFI_SIMPLE_NETWORK_PROTOCOL   *Snp;\r

-  \r
+\r

   if (ChildHandle != NULL) {\r
     return EFI_UNSUPPORTED;\r
   }\r
   if (ChildHandle != NULL) {\r
     return EFI_UNSUPPORTED;\r
   }\r


@@ -404,9 +404,9 @@ SimpleNetworkComponentNameGetControllerName (
     return Status;\r
   }\r
 \r
     return Status;\r
   }\r
 \r

-  // \r
+  //\r

   // Retrieve an instance of a produced protocol from ControllerHandle\r
   // Retrieve an instance of a produced protocol from ControllerHandle\r

-  // \r
+  //\r

   Status = gBS->OpenProtocol (\r
                   ControllerHandle,\r
                   &gEfiSimpleNetworkProtocolGuid,\r
   Status = gBS->OpenProtocol (\r
                   ControllerHandle,\r
                   &gEfiSimpleNetworkProtocolGuid,\r

diff --git a/MdeModulePkg/Universal/Network/SnpDxe/Initialize.c b/MdeModulePkg/Universal/Network/SnpDxe/Initialize.c
index 63bdf92f5593a008d292755b2045a63bb130bf00..a97891341b39d3c7a9d32b6013a7bb302d5bb2f7 100644 (file)
--- a/MdeModulePkg/Universal/Network/SnpDxe/Initialize.c
+++ b/MdeModulePkg/Universal/Network/SnpDxe/Initialize.c
@@ -1,11 +1,11 @@
 /** @file\r
 /** @file\r

-               Implementation of initializing a network adapter.\r
+     Implementation of initializing a network adapter.\r

 \r
 \r

-Copyright (c) 2004 - 2016, Intel Corporation. All rights reserved.<BR>\r
-This program and the accompanying materials are licensed \r
-and made available under the terms and conditions of the BSD License which \r
-accompanies this distribution. The full text of the license may be found at \r
-http://opensource.org/licenses/bsd-license.php \r
+Copyright (c) 2004 - 2018, Intel Corporation. All rights reserved.<BR>\r
+This program and the accompanying materials are licensed\r
+and made available under the terms and conditions of the BSD License which\r
+accompanies this distribution. The full text of the license may be found at\r
+http://opensource.org/licenses/bsd-license.php\r

 \r
 THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 \r
 THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r


@@ -19,9 +19,9 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   Call UNDI to initialize the interface.\r
 \r
   @param  Snp                   Pointer to snp driver structure.\r
   Call UNDI to initialize the interface.\r
 \r
   @param  Snp                   Pointer to snp driver structure.\r

-  @param  CableDetectFlag       Do/don't detect the cable (depending on what \r
+  @param  CableDetectFlag       Do/don't detect the cable (depending on what\r

                                 undi supports).\r
                                 undi supports).\r

-  \r
+\r

   @retval EFI_SUCCESS           UNDI is initialized successfully.\r
   @retval EFI_DEVICE_ERROR      UNDI could not be initialized.\r
   @retval Other                 Other errors as indicated.\r
   @retval EFI_SUCCESS           UNDI is initialized successfully.\r
   @retval EFI_DEVICE_ERROR      UNDI could not be initialized.\r
   @retval Other                 Other errors as indicated.\r


@@ -103,17 +103,17 @@ PxeInit (
 \r
   //\r
   // There are two fields need to be checked here:\r
 \r
   //\r
   // There are two fields need to be checked here:\r

-  // First is the upper two bits (14 & 15) in the CDB.StatFlags field. Until these bits change to report \r
+  // First is the upper two bits (14 & 15) in the CDB.StatFlags field. Until these bits change to report\r

   // PXE_STATFLAGS_COMMAND_COMPLETE or PXE_STATFLAGS_COMMAND_FAILED, the command has not been executed by the UNDI.\r
   // PXE_STATFLAGS_COMMAND_COMPLETE or PXE_STATFLAGS_COMMAND_FAILED, the command has not been executed by the UNDI.\r

-  // Second is the CDB.StatCode field. After command execution completes, either successfully or not, \r
+  // Second is the CDB.StatCode field. After command execution completes, either successfully or not,\r

   // the CDB.StatCode field contains the result of the command execution.\r
   //\r
   if ((((Snp->Cdb.StatFlags) & PXE_STATFLAGS_STATUS_MASK) == PXE_STATFLAGS_COMMAND_COMPLETE) &&\r
       (Snp->Cdb.StatCode == PXE_STATCODE_SUCCESS)) {\r
     //\r
   // the CDB.StatCode field contains the result of the command execution.\r
   //\r
   if ((((Snp->Cdb.StatFlags) & PXE_STATFLAGS_STATUS_MASK) == PXE_STATFLAGS_COMMAND_COMPLETE) &&\r
       (Snp->Cdb.StatCode == PXE_STATCODE_SUCCESS)) {\r
     //\r

-    // If cable detect feature is enabled in CDB.OpFlags, check the CDB.StatFlags to see if there is an \r
-    // active connection to this network device. If the no media StatFlag is set, the UNDI and network \r
-    // device are still initialized.    \r
+    // If cable detect feature is enabled in CDB.OpFlags, check the CDB.StatFlags to see if there is an\r
+    // active connection to this network device. If the no media StatFlag is set, the UNDI and network\r
+    // device are still initialized.\r

     //\r
     if (CableDetectFlag == PXE_OPFLAGS_INITIALIZE_DETECT_CABLE) {\r
       if(((Snp->Cdb.StatFlags) & PXE_STATFLAGS_INITIALIZED_NO_MEDIA) != PXE_STATFLAGS_INITIALIZED_NO_MEDIA) {\r
     //\r
     if (CableDetectFlag == PXE_OPFLAGS_INITIALIZE_DETECT_CABLE) {\r
       if(((Snp->Cdb.StatFlags) & PXE_STATFLAGS_INITIALIZED_NO_MEDIA) != PXE_STATFLAGS_INITIALIZED_NO_MEDIA) {\r


@@ -122,7 +122,7 @@ PxeInit (
         Snp->Mode.MediaPresent = FALSE;\r
       }\r
     }\r
         Snp->Mode.MediaPresent = FALSE;\r
       }\r
     }\r

-    \r
+\r

     Snp->Mode.State   = EfiSimpleNetworkInitialized;\r
     Status            = EFI_SUCCESS;\r
   } else {\r
     Snp->Mode.State   = EfiSimpleNetworkInitialized;\r
     Status            = EFI_SUCCESS;\r
   } else {\r


@@ -151,8 +151,8 @@ PxeInit (
 \r
 \r
 /**\r
 \r
 \r
 /**\r

-  Resets a network adapter and allocates the transmit and receive buffers \r
-  required by the network interface; optionally, also requests allocation of \r
+  Resets a network adapter and allocates the transmit and receive buffers\r
+  required by the network interface; optionally, also requests allocation of\r

   additional transmit and receive buffers.\r
 \r
   This function allocates the transmit and receive buffers required by the network\r
   additional transmit and receive buffers.\r
 \r
   This function allocates the transmit and receive buffers required by the network\r


@@ -164,8 +164,8 @@ PxeInit (
 \r
   @param ExtraRxBufferSize  The size, in bytes, of the extra receive buffer space\r
                             that the driver should allocate for the network interface.\r
 \r
   @param ExtraRxBufferSize  The size, in bytes, of the extra receive buffer space\r
                             that the driver should allocate for the network interface.\r

-                            Some network interfaces will not be able to use the \r
-                            extra buffer, and the caller will not know if it is \r
+                            Some network interfaces will not be able to use the\r
+                            extra buffer, and the caller will not know if it is\r

                             actually being used.\r
   @param ExtraTxBufferSize  The size, in bytes, of the extra transmit buffer space\r
                             that the driver should allocate for the network interface.\r
                             actually being used.\r
   @param ExtraTxBufferSize  The size, in bytes, of the extra transmit buffer space\r
                             that the driver should allocate for the network interface.\r

diff --git a/MdeModulePkg/Universal/Network/SnpDxe/Mcast_ip_to_mac.c b/MdeModulePkg/Universal/Network/SnpDxe/Mcast_ip_to_mac.c
index 23dba901942ae54c9cc4ae6731576e8e4325892c..8b2ede2c9bacfc26fe732a5566a0ff7de2014f6a 100644 (file)
--- a/MdeModulePkg/Universal/Network/SnpDxe/Mcast_ip_to_mac.c
+++ b/MdeModulePkg/Universal/Network/SnpDxe/Mcast_ip_to_mac.c
@@ -1,12 +1,12 @@
 /** @file\r
 /** @file\r

-               Implementation of converting an multicast IP address to multicast HW MAC\r
-               address.\r
- \r
-Copyright (c) 2004 - 2007, Intel Corporation. All rights reserved.<BR>\r
-This program and the accompanying materials are licensed \r
-and made available under the terms and conditions of the BSD License which \r
-accompanies this distribution. The full text of the license may be found at \r
-http://opensource.org/licenses/bsd-license.php \r
+     Implementation of converting an multicast IP address to multicast HW MAC\r
+     address.\r
+\r
+Copyright (c) 2004 - 2018, Intel Corporation. All rights reserved.<BR>\r
+This program and the accompanying materials are licensed\r
+and made available under the terms and conditions of the BSD License which\r
+accompanies this distribution. The full text of the license may be found at\r
+http://opensource.org/licenses/bsd-license.php\r

 \r
 THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 \r
 THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r


@@ -23,11 +23,11 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   @param  IP    Multicast IP address.\r
   @param  MAC   Pointer to hold the return MAC address.\r
 \r
   @param  IP    Multicast IP address.\r
   @param  MAC   Pointer to hold the return MAC address.\r
 \r

-  @retval EFI_SUCCESS           The multicast IP address was mapped to the \r
+  @retval EFI_SUCCESS           The multicast IP address was mapped to the\r

                                 multicast HW MAC address.\r
                                 multicast HW MAC address.\r

-  @retval EFI_INVALID_PARAMETER Invalid UNDI command. \r
-  @retval EFI_UNSUPPORTED       Command is not supported by UNDI. \r
-  @retval EFI_DEVICE_ERROR      Fail to execute UNDI command. \r
+  @retval EFI_INVALID_PARAMETER Invalid UNDI command.\r
+  @retval EFI_UNSUPPORTED       Command is not supported by UNDI.\r
+  @retval EFI_DEVICE_ERROR      Fail to execute UNDI command.\r

 \r
 **/\r
 EFI_STATUS\r
 \r
 **/\r
 EFI_STATUS\r


@@ -103,29 +103,29 @@ PxeIp2Mac (
 \r
 /**\r
   Converts a multicast IP address to a multicast HW MAC address.\r
 \r
 /**\r
   Converts a multicast IP address to a multicast HW MAC address.\r

-  \r
-  This function converts a multicast IP address to a multicast HW MAC address \r
+\r
+  This function converts a multicast IP address to a multicast HW MAC address\r

   for all packet transactions. If the mapping is accepted, then EFI_SUCCESS will\r
   be returned.\r
 \r
   @param This A pointer to the EFI_SIMPLE_NETWORK_PROTOCOL instance.\r
   @param IPv6 Set to TRUE if the multicast IP address is IPv6 [RFC 2460].\r
   for all packet transactions. If the mapping is accepted, then EFI_SUCCESS will\r
   be returned.\r
 \r
   @param This A pointer to the EFI_SIMPLE_NETWORK_PROTOCOL instance.\r
   @param IPv6 Set to TRUE if the multicast IP address is IPv6 [RFC 2460].\r

-              Set to FALSE if the multicast IP address is IPv4 [RFC 791]. \r
-  @param IP   The multicast IP address that is to be converted to a multicast \r
+              Set to FALSE if the multicast IP address is IPv4 [RFC 791].\r
+  @param IP   The multicast IP address that is to be converted to a multicast\r

               HW MAC address.\r
   @param MAC  The multicast HW MAC address that is to be generated from IP.\r
 \r
   @retval EFI_SUCCESS           The multicast IP address was mapped to the\r
                                 multicast HW MAC address.\r
               HW MAC address.\r
   @param MAC  The multicast HW MAC address that is to be generated from IP.\r
 \r
   @retval EFI_SUCCESS           The multicast IP address was mapped to the\r
                                 multicast HW MAC address.\r

-  @retval EFI_NOT_STARTED       The Simple Network Protocol interface has not \r
+  @retval EFI_NOT_STARTED       The Simple Network Protocol interface has not\r

                                 been started by calling Start().\r
   @retval EFI_INVALID_PARAMETER IP is NULL.\r
   @retval EFI_INVALID_PARAMETER MAC is NULL.\r
                                 been started by calling Start().\r
   @retval EFI_INVALID_PARAMETER IP is NULL.\r
   @retval EFI_INVALID_PARAMETER MAC is NULL.\r

-  @retval EFI_INVALID_PARAMETER IP does not point to a valid IPv4 or IPv6 \r
+  @retval EFI_INVALID_PARAMETER IP does not point to a valid IPv4 or IPv6\r

                                 multicast address.\r
                                 multicast address.\r

-  @retval EFI_DEVICE_ERROR      The Simple Network Protocol interface has not \r
+  @retval EFI_DEVICE_ERROR      The Simple Network Protocol interface has not\r

                                 been initialized by calling Initialize().\r
                                 been initialized by calling Initialize().\r

-  @retval EFI_UNSUPPORTED       IPv6 is TRUE and the implementation does not \r
+  @retval EFI_UNSUPPORTED       IPv6 is TRUE and the implementation does not\r

                                 support IPv6 multicast to MAC address conversion.\r
 \r
 **/\r
                                 support IPv6 multicast to MAC address conversion.\r
 \r
 **/\r

diff --git a/MdeModulePkg/Universal/Network/SnpDxe/Nvdata.c b/MdeModulePkg/Universal/Network/SnpDxe/Nvdata.c
index 443979087e59c56ea87b7ae34df1c7d6a4b7c279..721b34a22a9e62965b3662109050a14a69f1d100 100644 (file)
--- a/MdeModulePkg/Universal/Network/SnpDxe/Nvdata.c
+++ b/MdeModulePkg/Universal/Network/SnpDxe/Nvdata.c
@@ -1,12 +1,12 @@
 /** @file\r
 /** @file\r

-       Implementation of reading and writing operations on the NVRAM device\r
-       attached to a network interface.\r
- \r
-Copyright (c) 2004 - 2009, Intel Corporation. All rights reserved.<BR>\r
-This program and the accompanying materials are licensed \r
-and made available under the terms and conditions of the BSD License which \r
-accompanies this distribution. The full text of the license may be found at \r
-http://opensource.org/licenses/bsd-license.php \r
+   Implementation of reading and writing operations on the NVRAM device\r
+   attached to a network interface.\r
+\r
+Copyright (c) 2004 - 2018, Intel Corporation. All rights reserved.<BR>\r
+This program and the accompanying materials are licensed\r
+and made available under the terms and conditions of the BSD License which\r
+accompanies this distribution. The full text of the license may be found at\r
+http://opensource.org/licenses/bsd-license.php\r

 \r
 THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 \r
 THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r


@@ -97,51 +97,51 @@ PxeNvDataRead (
 \r
 \r
 /**\r
 \r
 \r
 /**\r

-  Performs read and write operations on the NVRAM device attached to a network \r
+  Performs read and write operations on the NVRAM device attached to a network\r

   interface.\r
   interface.\r

-  \r
-  This function performs read and write operations on the NVRAM device attached \r
+\r
+  This function performs read and write operations on the NVRAM device attached\r

   to a network interface. If ReadWrite is TRUE, a read operation is performed.\r
   to a network interface. If ReadWrite is TRUE, a read operation is performed.\r

-  If ReadWrite is FALSE, a write operation is performed. Offset specifies the \r
-  byte offset at which to start either operation. Offset must be a multiple of \r
-  NvRamAccessSize , and it must have a value between zero and NvRamSize. \r
+  If ReadWrite is FALSE, a write operation is performed. Offset specifies the\r
+  byte offset at which to start either operation. Offset must be a multiple of\r
+  NvRamAccessSize , and it must have a value between zero and NvRamSize.\r

   BufferSize specifies the length of the read or write operation. BufferSize must\r
   also be a multiple of NvRamAccessSize, and Offset + BufferSize must not exceed\r
   BufferSize specifies the length of the read or write operation. BufferSize must\r
   also be a multiple of NvRamAccessSize, and Offset + BufferSize must not exceed\r

-  NvRamSize. \r
-  If any of the above conditions is not met, then EFI_INVALID_PARAMETER will be \r
-  returned. \r
-  If all the conditions are met and the operation is "read," the NVRAM device \r
-  attached to the network interface will be read into Buffer and EFI_SUCCESS \r
+  NvRamSize.\r
+  If any of the above conditions is not met, then EFI_INVALID_PARAMETER will be\r
+  returned.\r
+  If all the conditions are met and the operation is "read," the NVRAM device\r
+  attached to the network interface will be read into Buffer and EFI_SUCCESS\r

   will be returned. If this is a write operation, the contents of Buffer will be\r
   will be returned. If this is a write operation, the contents of Buffer will be\r

-  used to update the contents of the NVRAM device attached to the network \r
+  used to update the contents of the NVRAM device attached to the network\r

   interface and EFI_SUCCESS will be returned.\r
   interface and EFI_SUCCESS will be returned.\r

-  \r
+\r

   It does the basic checking on the input parameters and retrieves snp structure\r
   and then calls the read_nvdata() call which does the actual reading\r
 \r
   @param This       A pointer to the EFI_SIMPLE_NETWORK_PROTOCOL instance.\r
   @param ReadWrite  TRUE for read operations, FALSE for write operations.\r
   It does the basic checking on the input parameters and retrieves snp structure\r
   and then calls the read_nvdata() call which does the actual reading\r
 \r
   @param This       A pointer to the EFI_SIMPLE_NETWORK_PROTOCOL instance.\r
   @param ReadWrite  TRUE for read operations, FALSE for write operations.\r

-  @param Offset     Byte offset in the NVRAM device at which to start the read or \r
-                    write operation. This must be a multiple of NvRamAccessSize \r
-                    and less than NvRamSize. (See EFI_SIMPLE_NETWORK_MODE)  \r
-  @param BufferSize The number of bytes to read or write from the NVRAM device. \r
+  @param Offset     Byte offset in the NVRAM device at which to start the read or\r
+                    write operation. This must be a multiple of NvRamAccessSize\r
+                    and less than NvRamSize. (See EFI_SIMPLE_NETWORK_MODE)\r
+  @param BufferSize The number of bytes to read or write from the NVRAM device.\r

                     This must also be a multiple of NvramAccessSize.\r
   @param Buffer     A pointer to the data buffer.\r
 \r
   @retval EFI_SUCCESS           The NVRAM access was performed.\r
   @retval EFI_NOT_STARTED       The network interface has not been started.\r
   @retval EFI_INVALID_PARAMETER One or more of the following conditions is TRUE:\r
                     This must also be a multiple of NvramAccessSize.\r
   @param Buffer     A pointer to the data buffer.\r
 \r
   @retval EFI_SUCCESS           The NVRAM access was performed.\r
   @retval EFI_NOT_STARTED       The network interface has not been started.\r
   @retval EFI_INVALID_PARAMETER One or more of the following conditions is TRUE:\r

-                                * The This parameter is NULL \r
-                                * The This parameter does not point to a valid \r
+                                * The This parameter is NULL\r
+                                * The This parameter does not point to a valid\r

                                   EFI_SIMPLE_NETWORK_PROTOCOL  structure\r
                                   EFI_SIMPLE_NETWORK_PROTOCOL  structure\r

-                                * The Offset parameter is not a multiple of \r
+                                * The Offset parameter is not a multiple of\r

                                   EFI_SIMPLE_NETWORK_MODE.NvRamAccessSize\r
                                   EFI_SIMPLE_NETWORK_MODE.NvRamAccessSize\r

-                                * The Offset parameter is not less than \r
+                                * The Offset parameter is not less than\r

                                   EFI_SIMPLE_NETWORK_MODE.NvRamSize\r
                                   EFI_SIMPLE_NETWORK_MODE.NvRamSize\r

-                                * The BufferSize parameter is not a multiple of \r
+                                * The BufferSize parameter is not a multiple of\r

                                   EFI_SIMPLE_NETWORK_MODE.NvRamAccessSize\r
                                 * The Buffer parameter is NULL\r
                                   EFI_SIMPLE_NETWORK_MODE.NvRamAccessSize\r
                                 * The Buffer parameter is NULL\r

-  @retval EFI_DEVICE_ERROR      The command could not be sent to the network \r
+  @retval EFI_DEVICE_ERROR      The command could not be sent to the network\r

                                 interface.\r
   @retval EFI_UNSUPPORTED       This function is not supported by the network\r
                                 interface.\r
                                 interface.\r
   @retval EFI_UNSUPPORTED       This function is not supported by the network\r
                                 interface.\r

diff --git a/MdeModulePkg/Universal/Network/SnpDxe/Receive_filters.c b/MdeModulePkg/Universal/Network/SnpDxe/Receive_filters.c
index c37018c8263fb55094e445e1a5765e41f8171c63..3b2c27d4425c1126e9118b1f22b304c2a18733e7 100644 (file)
--- a/MdeModulePkg/Universal/Network/SnpDxe/Receive_filters.c
+++ b/MdeModulePkg/Universal/Network/SnpDxe/Receive_filters.c
@@ -2,11 +2,11 @@
     Implementation of managing the multicast receive filters of a network\r
     interface.\r
 \r
     Implementation of managing the multicast receive filters of a network\r
     interface.\r
 \r

-Copyright (c) 2004 - 2016, Intel Corporation. All rights reserved.<BR>\r
-This program and the accompanying materials are licensed and made available under the \r
-terms and conditions of the BSD License which accompanies this distribution. The \r
-full text of the license may be found at \r
-http://opensource.org/licenses/bsd-license.php \r
+Copyright (c) 2004 - 2018, Intel Corporation. All rights reserved.<BR>\r
+This program and the accompanying materials are licensed and made available under the\r
+terms and conditions of the BSD License which accompanies this distribution. The\r
+full text of the license may be found at\r
+http://opensource.org/licenses/bsd-license.php\r

 \r
 THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 \r
 THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r


@@ -24,8 +24,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   @param  EnableFlags        Bit mask for enabling the receive filters.\r
   @param  MCastAddressCount  Multicast address count for a new multicast address\r
                              list.\r
   @param  EnableFlags        Bit mask for enabling the receive filters.\r
   @param  MCastAddressCount  Multicast address count for a new multicast address\r
                              list.\r

-  @param  MCastAddressList   List of new multicast addresses. \r
-   \r
+  @param  MCastAddressList   List of new multicast addresses.\r
+\r

   @retval EFI_SUCCESS           The multicast receive filter list was updated.\r
   @retval EFI_INVALID_PARAMETER Invalid UNDI command.\r
   @retval EFI_UNSUPPORTED       Command is not supported by UNDI.\r
   @retval EFI_SUCCESS           The multicast receive filter list was updated.\r
   @retval EFI_INVALID_PARAMETER Invalid UNDI command.\r
   @retval EFI_UNSUPPORTED       Command is not supported by UNDI.\r


@@ -115,13 +115,13 @@ PxeRecvFilterEnable (
 \r
   @param  Snp             Pointer to snp driver structure\r
   @param  DisableFlags    Bit mask for disabling the receive filters\r
 \r
   @param  Snp             Pointer to snp driver structure\r
   @param  DisableFlags    Bit mask for disabling the receive filters\r

-  @param  ResetMCastList  Boolean flag to reset/delete the multicast filter \r
+  @param  ResetMCastList  Boolean flag to reset/delete the multicast filter\r

                           list.\r
 \r
   @retval EFI_SUCCESS           The multicast receive filter list was updated.\r
   @retval EFI_DEVICE_ERROR      Fail to execute UNDI command.\r
                           list.\r
 \r
   @retval EFI_SUCCESS           The multicast receive filter list was updated.\r
   @retval EFI_DEVICE_ERROR      Fail to execute UNDI command.\r

-   \r
-**/ \r
+\r
+**/\r

 EFI_STATUS\r
 PxeRecvFilterDisable (\r
   SNP_DRIVER *Snp,\r
 EFI_STATUS\r
 PxeRecvFilterDisable (\r
   SNP_DRIVER *Snp,\r


@@ -194,8 +194,8 @@ PxeRecvFilterDisable (
   @param  Snp                Pointer to snp driver structure.\r
 \r
   @retval EFI_SUCCESS           The receive filter was read.\r
   @param  Snp                Pointer to snp driver structure.\r
 \r
   @retval EFI_SUCCESS           The receive filter was read.\r

-  @retval EFI_DEVICE_ERROR      Fail to execute UNDI command. \r
-   \r
+  @retval EFI_DEVICE_ERROR      Fail to execute UNDI command.\r
+\r

 **/\r
 EFI_STATUS\r
 PxeRecvFilterRead (\r
 **/\r
 EFI_STATUS\r
 PxeRecvFilterRead (\r


@@ -291,70 +291,70 @@ PxeRecvFilterRead (
 \r
 /**\r
   Manages the multicast receive filters of a network interface.\r
 \r
 /**\r
   Manages the multicast receive filters of a network interface.\r

-  \r
-  This function is used enable and disable the hardware and software receive \r
+\r
+  This function is used enable and disable the hardware and software receive\r

   filters for the underlying network device.\r
   filters for the underlying network device.\r

-  The receive filter change is broken down into three steps: \r
-  * The filter mask bits that are set (ON) in the Enable parameter are added to \r
-    the current receive filter settings. \r
+  The receive filter change is broken down into three steps:\r
+  * The filter mask bits that are set (ON) in the Enable parameter are added to\r
+    the current receive filter settings.\r

   * The filter mask bits that are set (ON) in the Disable parameter are subtracted\r
     from the updated receive filter settings.\r
   * If the resulting receive filter setting is not supported by the hardware a\r
     more liberal setting is selected.\r
   * The filter mask bits that are set (ON) in the Disable parameter are subtracted\r
     from the updated receive filter settings.\r
   * If the resulting receive filter setting is not supported by the hardware a\r
     more liberal setting is selected.\r

-  If the same bits are set in the Enable and Disable parameters, then the bits \r
+  If the same bits are set in the Enable and Disable parameters, then the bits\r

   in the Disable parameter takes precedence.\r
   in the Disable parameter takes precedence.\r

-  If the ResetMCastFilter parameter is TRUE, then the multicast address list \r
-  filter is disabled (irregardless of what other multicast bits are set in the \r
-  Enable and Disable parameters). The SNP->Mode->MCastFilterCount field is set \r
+  If the ResetMCastFilter parameter is TRUE, then the multicast address list\r
+  filter is disabled (irregardless of what other multicast bits are set in the\r
+  Enable and Disable parameters). The SNP->Mode->MCastFilterCount field is set\r

   to zero. The Snp->Mode->MCastFilter contents are undefined.\r
   to zero. The Snp->Mode->MCastFilter contents are undefined.\r

-  After enabling or disabling receive filter settings, software should verify \r
-  the new settings by checking the Snp->Mode->ReceiveFilterSettings, \r
+  After enabling or disabling receive filter settings, software should verify\r
+  the new settings by checking the Snp->Mode->ReceiveFilterSettings,\r

   Snp->Mode->MCastFilterCount and Snp->Mode->MCastFilter fields.\r
   Snp->Mode->MCastFilterCount and Snp->Mode->MCastFilter fields.\r

-  Note: Some network drivers and/or devices will automatically promote receive \r
+  Note: Some network drivers and/or devices will automatically promote receive\r

     filter settings if the requested setting can not be honored. For example, if\r
     filter settings if the requested setting can not be honored. For example, if\r

-    a request for four multicast addresses is made and the underlying hardware \r
-    only supports two multicast addresses the driver might set the promiscuous \r
+    a request for four multicast addresses is made and the underlying hardware\r
+    only supports two multicast addresses the driver might set the promiscuous\r

     or promiscuous multicast receive filters instead. The receiving software is\r
     or promiscuous multicast receive filters instead. The receiving software is\r

-    responsible for discarding any extra packets that get through the hardware \r
+    responsible for discarding any extra packets that get through the hardware\r

     receive filters.\r
     receive filters.\r

-    Note: Note: To disable all receive filter hardware, the network driver must \r
+    Note: Note: To disable all receive filter hardware, the network driver must\r

       be Shutdown() and Stopped(). Calling ReceiveFilters() with Disable set to\r
       be Shutdown() and Stopped(). Calling ReceiveFilters() with Disable set to\r

-      Snp->Mode->ReceiveFilterSettings will make it so no more packets are \r
-      returned by the Receive() function, but the receive hardware may still be \r
+      Snp->Mode->ReceiveFilterSettings will make it so no more packets are\r
+      returned by the Receive() function, but the receive hardware may still be\r

       moving packets into system memory before inspecting and discarding them.\r
       moving packets into system memory before inspecting and discarding them.\r

-      Unexpected system errors, reboots and hangs can occur if an OS is loaded \r
+      Unexpected system errors, reboots and hangs can occur if an OS is loaded\r

       and the network devices are not Shutdown() and Stopped().\r
       and the network devices are not Shutdown() and Stopped().\r

-  If ResetMCastFilter is TRUE, then the multicast receive filter list on the \r
+  If ResetMCastFilter is TRUE, then the multicast receive filter list on the\r

   network interface will be reset to the default multicast receive filter list.\r
   network interface will be reset to the default multicast receive filter list.\r

-  If ResetMCastFilter is FALSE, and this network interface allows the multicast \r
-  receive filter list to be modified, then the MCastFilterCnt and MCastFilter \r
-  are used to update the current multicast receive filter list. The modified \r
-  receive filter list settings can be found in the MCastFilter field of \r
+  If ResetMCastFilter is FALSE, and this network interface allows the multicast\r
+  receive filter list to be modified, then the MCastFilterCnt and MCastFilter\r
+  are used to update the current multicast receive filter list. The modified\r
+  receive filter list settings can be found in the MCastFilter field of\r

   EFI_SIMPLE_NETWORK_MODE. If the network interface does not allow the multicast\r
   receive filter list to be modified, then EFI_INVALID_PARAMETER will be returned.\r
   If the driver has not been initialized, EFI_DEVICE_ERROR will be returned.\r
   EFI_SIMPLE_NETWORK_MODE. If the network interface does not allow the multicast\r
   receive filter list to be modified, then EFI_INVALID_PARAMETER will be returned.\r
   If the driver has not been initialized, EFI_DEVICE_ERROR will be returned.\r

-  If the receive filter mask and multicast receive filter list have been \r
+  If the receive filter mask and multicast receive filter list have been\r

   successfully updated on the network interface, EFI_SUCCESS will be returned.\r
 \r
   @param This             A pointer to the EFI_SIMPLE_NETWORK_PROTOCOL instance.\r
   @param Enable           A bit mask of receive filters to enable on the network\r
                           interface.\r
   @param Disable          A bit mask of receive filters to disable on the network\r
   successfully updated on the network interface, EFI_SUCCESS will be returned.\r
 \r
   @param This             A pointer to the EFI_SIMPLE_NETWORK_PROTOCOL instance.\r
   @param Enable           A bit mask of receive filters to enable on the network\r
                           interface.\r
   @param Disable          A bit mask of receive filters to disable on the network\r

-                          interface. For backward compatibility with EFI 1.1 \r
+                          interface. For backward compatibility with EFI 1.1\r

                           platforms, the EFI_SIMPLE_NETWORK_RECEIVE_MULTICAST bit\r
                           must be set when the ResetMCastFilter parameter is TRUE.\r
                           platforms, the EFI_SIMPLE_NETWORK_RECEIVE_MULTICAST bit\r
                           must be set when the ResetMCastFilter parameter is TRUE.\r

-  @param ResetMCastFilter Set to TRUE to reset the contents of the multicast \r
-                          receive filters on the network interface to their \r
-                          default values. \r
+  @param ResetMCastFilter Set to TRUE to reset the contents of the multicast\r
+                          receive filters on the network interface to their\r
+                          default values.\r

   @param MCastFilterCnt   Number of multicast HW MAC addresses in the new MCastFilter\r
   @param MCastFilterCnt   Number of multicast HW MAC addresses in the new MCastFilter\r

-                          list. This value must be less than or equal to the \r
-                          MCastFilterCnt field of EFI_SIMPLE_NETWORK_MODE. \r
+                          list. This value must be less than or equal to the\r
+                          MCastFilterCnt field of EFI_SIMPLE_NETWORK_MODE.\r

                           This field is optional if ResetMCastFilter is TRUE.\r
   @param MCastFilter      A pointer to a list of new multicast receive filter HW\r
                           This field is optional if ResetMCastFilter is TRUE.\r
   @param MCastFilter      A pointer to a list of new multicast receive filter HW\r

-                          MAC addresses. This list will replace any existing \r
-                          multicast HW MAC address list. This field is optional \r
+                          MAC addresses. This list will replace any existing\r
+                          multicast HW MAC address list. This field is optional\r

                           if ResetMCastFilter is TRUE.\r
                           if ResetMCastFilter is TRUE.\r

-   \r
+\r

   @retval EFI_SUCCESS            The multicast receive filter list was updated.\r
   @retval EFI_NOT_STARTED        The network interface has not been started.\r
   @retval EFI_INVALID_PARAMETER  One or more of the following conditions is TRUE:\r
   @retval EFI_SUCCESS            The multicast receive filter list was updated.\r
   @retval EFI_NOT_STARTED        The network interface has not been started.\r
   @retval EFI_INVALID_PARAMETER  One or more of the following conditions is TRUE:\r


@@ -363,9 +363,9 @@ PxeRecvFilterRead (
                                    in Snp->Mode->ReceiveFilterMask\r
                                  * There are bits set in Disable that are not set\r
                                    in Snp->Mode->ReceiveFilterMask\r
                                    in Snp->Mode->ReceiveFilterMask\r
                                  * There are bits set in Disable that are not set\r
                                    in Snp->Mode->ReceiveFilterMask\r

-                                 * Multicast is being enabled (the \r
-                                   EFI_SIMPLE_NETWORK_RECEIVE_MULTICAST bit is \r
-                                   set in Enable, it is not set in Disable, and \r
+                                 * Multicast is being enabled (the\r
+                                   EFI_SIMPLE_NETWORK_RECEIVE_MULTICAST bit is\r
+                                   set in Enable, it is not set in Disable, and\r

                                    ResetMCastFilter is FALSE) and MCastFilterCount\r
                                    is zero\r
                                  * Multicast is being enabled and MCastFilterCount\r
                                    ResetMCastFilter is FALSE) and MCastFilterCount\r
                                    is zero\r
                                  * Multicast is being enabled and MCastFilterCount\r


@@ -377,7 +377,7 @@ PxeRecvFilterRead (
   @retval EFI_DEVICE_ERROR       One or more of the following conditions is TRUE:\r
                                  * The network interface has been started but has\r
                                    not been initialized\r
   @retval EFI_DEVICE_ERROR       One or more of the following conditions is TRUE:\r
                                  * The network interface has been started but has\r
                                    not been initialized\r

-                                 * An unexpected error was returned by the \r
+                                 * An unexpected error was returned by the\r

                                    underlying network driver or device\r
   @retval EFI_UNSUPPORTED        This function is not supported by the network\r
                                  interface.\r
                                    underlying network driver or device\r
   @retval EFI_UNSUPPORTED        This function is not supported by the network\r
                                  interface.\r

diff --git a/MdeModulePkg/Universal/Network/SnpDxe/Reset.c b/MdeModulePkg/Universal/Network/SnpDxe/Reset.c
index 2381264c11afa2c830e7935ba792986432a95373..498d706fd4c823960caae6eaa32bd190aee38f6c 100644 (file)
--- a/MdeModulePkg/Universal/Network/SnpDxe/Reset.c
+++ b/MdeModulePkg/Universal/Network/SnpDxe/Reset.c
@@ -1,11 +1,11 @@
 /** @file\r
     Implementation of resetting a network adapter.\r
 /** @file\r
     Implementation of resetting a network adapter.\r

- \r
-Copyright (c) 2004 - 2007, Intel Corporation. All rights reserved.<BR>\r
-This program and the accompanying materials are licensed and made available under the \r
-terms and conditions of the BSD License which accompanies this distribution. The \r
-full text of the license may be found at \r
-http://opensource.org/licenses/bsd-license.php \r
+\r
+Copyright (c) 2004 - 2018, Intel Corporation. All rights reserved.<BR>\r
+This program and the accompanying materials are licensed and made available under the\r
+terms and conditions of the BSD License which accompanies this distribution. The\r
+full text of the license may be found at\r
+http://opensource.org/licenses/bsd-license.php\r

 \r
 THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 \r
 THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r


@@ -70,16 +70,16 @@ PxeReset (
   provided in the previous call to Initialize().\r
 \r
   This function resets a network adapter and reinitializes it with the parameters\r
   provided in the previous call to Initialize().\r
 \r
   This function resets a network adapter and reinitializes it with the parameters\r

-  that were provided in the previous call to Initialize(). The transmit and \r
+  that were provided in the previous call to Initialize(). The transmit and\r

   receive queues are emptied and all pending interrupts are cleared.\r
   receive queues are emptied and all pending interrupts are cleared.\r

-  Receive filters, the station address, the statistics, and the multicast-IP-to-HW \r
-  MAC addresses are not reset by this call. If the network interface was \r
-  successfully reset, then EFI_SUCCESS will be returned. If the driver has not \r
+  Receive filters, the station address, the statistics, and the multicast-IP-to-HW\r
+  MAC addresses are not reset by this call. If the network interface was\r
+  successfully reset, then EFI_SUCCESS will be returned. If the driver has not\r

   been initialized, EFI_DEVICE_ERROR will be returned.\r
 \r
   @param This                 A pointer to the EFI_SIMPLE_NETWORK_PROTOCOL instance.\r
   been initialized, EFI_DEVICE_ERROR will be returned.\r
 \r
   @param This                 A pointer to the EFI_SIMPLE_NETWORK_PROTOCOL instance.\r

-  @param ExtendedVerification Indicates that the driver may perform a more \r
-                              exhaustive verification operation of the device \r
+  @param ExtendedVerification Indicates that the driver may perform a more\r
+                              exhaustive verification operation of the device\r

                               during reset.\r
 \r
   @retval EFI_SUCCESS           The network interface was reset.\r
                               during reset.\r
 \r
   @retval EFI_SUCCESS           The network interface was reset.\r

diff --git a/MdeModulePkg/Universal/Network/SnpDxe/Shutdown.c b/MdeModulePkg/Universal/Network/SnpDxe/Shutdown.c
index 1f5199277849ac23c0b5c9cbb90bc1292f33a56b..670e93b037c4a4ca78060853593f5b4d14f368b3 100644 (file)
--- a/MdeModulePkg/Universal/Network/SnpDxe/Shutdown.c
+++ b/MdeModulePkg/Universal/Network/SnpDxe/Shutdown.c
@@ -1,11 +1,11 @@
 /** @file\r
     Implementation of shuting down a network adapter.\r
 /** @file\r
     Implementation of shuting down a network adapter.\r

- \r
-Copyright (c) 2004 - 2007, Intel Corporation. All rights reserved.<BR>\r
-This program and the accompanying materials are licensed \r
-and made available under the terms and conditions of the BSD License which \r
-accompanies this distribution. The full text of the license may be found at \r
-http://opensource.org/licenses/bsd-license.php \r
+\r
+Copyright (c) 2004 - 2018, Intel Corporation. All rights reserved.<BR>\r
+This program and the accompanying materials are licensed\r
+and made available under the terms and conditions of the BSD License which\r
+accompanies this distribution. The full text of the license may be found at\r
+http://opensource.org/licenses/bsd-license.php\r

 \r
 THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 \r
 THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r


@@ -74,12 +74,12 @@ PxeShutdown (
 \r
 \r
 /**\r
 \r
 \r
 /**\r

-  Resets a network adapter and leaves it in a state that is safe for another \r
-  driver to initialize. \r
-  \r
+  Resets a network adapter and leaves it in a state that is safe for another\r
+  driver to initialize.\r
+\r

   This function releases the memory buffers assigned in the Initialize() call.\r
   Pending transmits and receives are lost, and interrupts are cleared and disabled.\r
   This function releases the memory buffers assigned in the Initialize() call.\r
   Pending transmits and receives are lost, and interrupts are cleared and disabled.\r

-  After this call, only the Initialize() and Stop() calls may be used. If the \r
+  After this call, only the Initialize() and Stop() calls may be used. If the\r

   network interface was successfully shutdown, then EFI_SUCCESS will be returned.\r
   If the driver has not been initialized, EFI_DEVICE_ERROR will be returned.\r
 \r
   network interface was successfully shutdown, then EFI_SUCCESS will be returned.\r
   If the driver has not been initialized, EFI_DEVICE_ERROR will be returned.\r
 \r


@@ -87,7 +87,7 @@ PxeShutdown (
 \r
   @retval EFI_SUCCESS           The network interface was shutdown.\r
   @retval EFI_NOT_STARTED       The network interface has not been started.\r
 \r
   @retval EFI_SUCCESS           The network interface was shutdown.\r
   @retval EFI_NOT_STARTED       The network interface has not been started.\r

-  @retval EFI_INVALID_PARAMETER This parameter was NULL or did not point to a valid \r
+  @retval EFI_INVALID_PARAMETER This parameter was NULL or did not point to a valid\r

                                 EFI_SIMPLE_NETWORK_PROTOCOL structure.\r
   @retval EFI_DEVICE_ERROR      The command could not be sent to the network interface.\r
 \r
                                 EFI_SIMPLE_NETWORK_PROTOCOL structure.\r
   @retval EFI_DEVICE_ERROR      The command could not be sent to the network interface.\r
 \r


@@ -128,7 +128,7 @@ SnpUndi32Shutdown (
     Status = EFI_DEVICE_ERROR;\r
     goto ON_EXIT;\r
   }\r
     Status = EFI_DEVICE_ERROR;\r
     goto ON_EXIT;\r
   }\r

-  \r
+\r

   Status                          = PxeShutdown (Snp);\r
 \r
   Snp->Mode.State                 = EfiSimpleNetworkStarted;\r
   Status                          = PxeShutdown (Snp);\r
 \r
   Snp->Mode.State                 = EfiSimpleNetworkStarted;\r

diff --git a/MdeModulePkg/Universal/Network/SnpDxe/Snp.c b/MdeModulePkg/Universal/Network/SnpDxe/Snp.c
index 9f61aee05773a8eb57b8f3776f410c727162e105..43cb21b8c35c7eb7a094c739de762ba89fb503fb 100644 (file)
--- a/MdeModulePkg/Universal/Network/SnpDxe/Snp.c
+++ b/MdeModulePkg/Universal/Network/SnpDxe/Snp.c
@@ -1,7 +1,7 @@
 /** @file\r
   Implementation of driver entry point and driver binding protocol.\r
 \r
 /** @file\r
   Implementation of driver entry point and driver binding protocol.\r
 \r

-Copyright (c) 2004 - 2016, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2004 - 2018, Intel Corporation. All rights reserved.<BR>\r

 This program and the accompanying materials are licensed\r
 and made available under the terms and conditions of the BSD License which\r
 accompanies this distribution. The full text of the license may be found at\r
 This program and the accompanying materials are licensed\r
 and made available under the terms and conditions of the BSD License which\r
 accompanies this distribution. The full text of the license may be found at\r


@@ -275,7 +275,7 @@ SimpleNetworkDriverStart (
   EFI_ACPI_ADDRESS_SPACE_DESCRIPTOR         *BarDesc;\r
   BOOLEAN                                   FoundIoBar;\r
   BOOLEAN                                   FoundMemoryBar;\r
   EFI_ACPI_ADDRESS_SPACE_DESCRIPTOR         *BarDesc;\r
   BOOLEAN                                   FoundIoBar;\r
   BOOLEAN                                   FoundMemoryBar;\r

-  \r
+\r

   DEBUG ((EFI_D_NET, "\nSnpNotifyNetworkInterfaceIdentifier()  "));\r
 \r
   Status = gBS->OpenProtocol (\r
   DEBUG ((EFI_D_NET, "\nSnpNotifyNetworkInterfaceIdentifier()  "));\r
 \r
   Status = gBS->OpenProtocol (\r


@@ -411,7 +411,7 @@ SimpleNetworkDriverStart (
   }\r
   Snp->MaxRecycledTxBuf    = SNP_TX_BUFFER_INCREASEMENT;\r
   Snp->RecycledTxBufCount  = 0;\r
   }\r
   Snp->MaxRecycledTxBuf    = SNP_TX_BUFFER_INCREASEMENT;\r
   Snp->RecycledTxBufCount  = 0;\r

- \r
+\r

   if (Nii->Revision >= EFI_NETWORK_INTERFACE_IDENTIFIER_PROTOCOL_REVISION) {\r
     Snp->IfNum = Nii->IfNum;\r
 \r
   if (Nii->Revision >= EFI_NETWORK_INTERFACE_IDENTIFIER_PROTOCOL_REVISION) {\r
     Snp->IfNum = Nii->IfNum;\r
 \r

diff --git a/MdeModulePkg/Universal/Network/SnpDxe/SnpDxe.inf b/MdeModulePkg/Universal/Network/SnpDxe/SnpDxe.inf
index 90fd8d54752aaf5cf410214b2d8b7f55be7e1bcc..021d45d44d09dc444c2b7cfbc40d133f1ade846e 100644 (file)
--- a/MdeModulePkg/Universal/Network/SnpDxe/SnpDxe.inf
+++ b/MdeModulePkg/Universal/Network/SnpDxe/SnpDxe.inf
@@ -1,14 +1,14 @@
 ## @file\r
 #  This module produces EFI SNP Protocol.\r
 #\r
 ## @file\r
 #  This module produces EFI SNP Protocol.\r
 #\r

-#  This module produces Simple Network Protocol upon EFI Network Interface \r
+#  This module produces Simple Network Protocol upon EFI Network Interface\r

 #  Identifier Protocol, to provide a packet level interface to a network adapter.\r
 #\r
 #  Identifier Protocol, to provide a packet level interface to a network adapter.\r
 #\r

-#  Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.<BR>\r
-#  This program and the accompanying materials are licensed \r
-#  and made available under the terms and conditions of the BSD License which \r
-#  accompanies this distribution. The full text of the license may be found at \r
-#  http://opensource.org/licenses/bsd-license.php \r
+#  Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r
+#  This program and the accompanying materials are licensed\r
+#  and made available under the terms and conditions of the BSD License which\r
+#  accompanies this distribution. The full text of the license may be found at\r
+#  http://opensource.org/licenses/bsd-license.php\r

 #\r
 #  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 #  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 #\r
 #  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 #  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r


@@ -30,7 +30,7 @@
 #\r
 #  VALID_ARCHITECTURES           = IA32 X64 IPF EBC\r
 #\r
 #\r
 #  VALID_ARCHITECTURES           = IA32 X64 IPF EBC\r
 #\r

-#  DRIVER_BINDING                =  mSimpleNetworkDriverBinding                        \r
+#  DRIVER_BINDING                =  mSimpleNetworkDriverBinding\r

 #  COMPONENT_NAME                =  gSimpleNetworkComponentName\r
 #  COMPONENT_NAME2               =  gSimpleNetworkComponentName2\r
 #\r
 #  COMPONENT_NAME                =  gSimpleNetworkComponentName\r
 #  COMPONENT_NAME2               =  gSimpleNetworkComponentName2\r
 #\r

diff --git a/MdeModulePkg/Universal/Network/SnpDxe/SnpDxe.uni b/MdeModulePkg/Universal/Network/SnpDxe/SnpDxe.uni
index cd1e9ba521f036ef0c6758425543294649dc3e6a..55e8adf5ef79a662cffd1249aa5a29a26a91629f 100644 (file)
--- a/MdeModulePkg/Universal/Network/SnpDxe/SnpDxe.uni
+++ b/MdeModulePkg/Universal/Network/SnpDxe/SnpDxe.uni
@@ -4,13 +4,13 @@
 // This module produces Simple Network Protocol upon EFI Network Interface\r
 // Identifier Protocol, to provide a packet level interface to a network adapter.\r
 //\r
 // This module produces Simple Network Protocol upon EFI Network Interface\r
 // Identifier Protocol, to provide a packet level interface to a network adapter.\r
 //\r

-// Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.<BR>\r
+// Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r

 //\r
 // This program and the accompanying materials are licensed\r
 // and made available under the terms and conditions of the BSD License which\r
 // accompanies this distribution. The full text of the license may be found at\r
 // http://opensource.org/licenses/bsd-license.php\r
 //\r
 // This program and the accompanying materials are licensed\r
 // and made available under the terms and conditions of the BSD License which\r
 // accompanies this distribution. The full text of the license may be found at\r
 // http://opensource.org/licenses/bsd-license.php\r

-// \r
+//\r

 // THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 // WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 //\r
 // THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 // WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 //\r

diff --git a/MdeModulePkg/Universal/Network/SnpDxe/SnpDxeExtra.uni b/MdeModulePkg/Universal/Network/SnpDxe/SnpDxeExtra.uni
index 5476a45f4e461daf95a858b830bac4b0926de215..7c220651dae26e0d1dd22b5f1ad97c463ec717dc 100644 (file)
--- a/MdeModulePkg/Universal/Network/SnpDxe/SnpDxeExtra.uni
+++ b/MdeModulePkg/Universal/Network/SnpDxe/SnpDxeExtra.uni
@@ -1,7 +1,7 @@
 // /** @file\r
 // SnpDxe Localized Strings and Content\r
 //\r
 // /** @file\r
 // SnpDxe Localized Strings and Content\r
 //\r

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

 //\r
 // This program and the accompanying materials are licensed\r
 // and made available under the terms and conditions of the BSD License which\r
 //\r
 // This program and the accompanying materials are licensed\r
 // and made available under the terms and conditions of the BSD License which\r


@@ -13,8 +13,8 @@
 //\r
 // **/\r
 \r
 //\r
 // **/\r
 \r

-#string STR_PROPERTIES_MODULE_NAME \r
-#language en-US \r
+#string STR_PROPERTIES_MODULE_NAME\r
+#language en-US\r

 "SNP DXE Driver"\r
 \r
 \r
 "SNP DXE Driver"\r
 \r
 \r

diff --git a/MdeModulePkg/Universal/Network/SnpDxe/Start.c b/MdeModulePkg/Universal/Network/SnpDxe/Start.c
index 210f08107872489ce223c173e31e2e7dd91f609b..82d49c8b14a8ace54b24fc5fb41e60c5dbcea728 100644 (file)
--- a/MdeModulePkg/Universal/Network/SnpDxe/Start.c
+++ b/MdeModulePkg/Universal/Network/SnpDxe/Start.c
@@ -1,11 +1,11 @@
 /** @file\r
     Implementation of starting a network adapter.\r
 /** @file\r
     Implementation of starting a network adapter.\r

- \r
-Copyright (c) 2004 - 2007, Intel Corporation. All rights reserved.<BR>\r
-This program and the accompanying materials are licensed \r
-and made available under the terms and conditions of the BSD License which \r
-accompanies this distribution. The full text of the license may be found at \r
-http://opensource.org/licenses/bsd-license.php \r
+\r
+Copyright (c) 2004 - 2018, Intel Corporation. All rights reserved.<BR>\r
+This program and the accompanying materials are licensed\r
+and made available under the terms and conditions of the BSD License which\r
+accompanies this distribution. The full text of the license may be found at\r
+http://opensource.org/licenses/bsd-license.php\r

 \r
 THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 \r
 THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r


@@ -22,7 +22,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 \r
   @retval EFI_SUCCESS            UNDI is started successfully.\r
   @retval EFI_DEVICE_ERROR       UNDI could not be started.\r
 \r
   @retval EFI_SUCCESS            UNDI is started successfully.\r
   @retval EFI_DEVICE_ERROR       UNDI could not be started.\r

-  \r
+\r

 **/\r
 EFI_STATUS\r
 PxeStart (\r
 **/\r
 EFI_STATUS\r
 PxeStart (\r


@@ -100,7 +100,7 @@ PxeStart (
 \r
 /**\r
   Change the state of a network interface from "stopped" to "started."\r
 \r
 /**\r
   Change the state of a network interface from "stopped" to "started."\r

-  \r
+\r

   This function starts a network interface. If the network interface successfully\r
   starts, then EFI_SUCCESS will be returned.\r
 \r
   This function starts a network interface. If the network interface successfully\r
   starts, then EFI_SUCCESS will be returned.\r
 \r


@@ -108,7 +108,7 @@ PxeStart (
 \r
   @retval EFI_SUCCESS            The network interface was started.\r
   @retval EFI_ALREADY_STARTED    The network interface is already in the started state.\r
 \r
   @retval EFI_SUCCESS            The network interface was started.\r
   @retval EFI_ALREADY_STARTED    The network interface is already in the started state.\r

-  @retval EFI_INVALID_PARAMETER  This parameter was NULL or did not point to a valid \r
+  @retval EFI_INVALID_PARAMETER  This parameter was NULL or did not point to a valid\r

                                  EFI_SIMPLE_NETWORK_PROTOCOL structure.\r
   @retval EFI_DEVICE_ERROR       The command could not be sent to the network interface.\r
   @retval EFI_UNSUPPORTED        This function is not supported by the network interface.\r
                                  EFI_SIMPLE_NETWORK_PROTOCOL structure.\r
   @retval EFI_DEVICE_ERROR       The command could not be sent to the network interface.\r
   @retval EFI_UNSUPPORTED        This function is not supported by the network interface.\r

diff --git a/MdeModulePkg/Universal/Network/SnpDxe/Station_address.c b/MdeModulePkg/Universal/Network/SnpDxe/Station_address.c
index 0917baf6743b74822314fa87b4adbab643eaed7a..ce70fcdf36e25cddb965afd150959848a6a3a918 100644 (file)
--- a/MdeModulePkg/Universal/Network/SnpDxe/Station_address.c
+++ b/MdeModulePkg/Universal/Network/SnpDxe/Station_address.c
@@ -1,11 +1,11 @@
 /** @file\r
     Implementation of reading the MAC address of a network adapter.\r
 /** @file\r
     Implementation of reading the MAC address of a network adapter.\r

- \r
-Copyright (c) 2004 - 2014, Intel Corporation. All rights reserved.<BR>\r
-This program and the accompanying materials are licensed \r
-and made available under the terms and conditions of the BSD License which \r
-accompanies this distribution. The full text of the license may be found at \r
-http://opensource.org/licenses/bsd-license.php \r
+\r
+Copyright (c) 2004 - 2018, Intel Corporation. All rights reserved.<BR>\r
+This program and the accompanying materials are licensed\r
+and made available under the terms and conditions of the BSD License which\r
+accompanies this distribution. The full text of the license may be found at\r
+http://opensource.org/licenses/bsd-license.php\r

 \r
 THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 \r
 THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r


@@ -16,11 +16,11 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 \r
 \r
 /**\r
 \r
 \r
 /**\r

-  Call UNDI to read the MAC address of the NIC and update the mode structure \r
-  with the address. \r
+  Call UNDI to read the MAC address of the NIC and update the mode structure\r
+  with the address.\r

 \r
   @param  Snp         Pointer to snp driver structure.\r
 \r
   @param  Snp         Pointer to snp driver structure.\r

-   \r
+\r

   @retval EFI_SUCCESS       The MAC address of the NIC is read successfully.\r
   @retval EFI_DEVICE_ERROR  Failed to read the MAC address of the NIC.\r
 \r
   @retval EFI_SUCCESS       The MAC address of the NIC is read successfully.\r
   @retval EFI_DEVICE_ERROR  Failed to read the MAC address of the NIC.\r
 \r


@@ -166,33 +166,33 @@ PxeSetStnAddr (
 \r
 /**\r
   Modifies or resets the current station address, if supported.\r
 \r
 /**\r
   Modifies or resets the current station address, if supported.\r

-  \r
-  This function modifies or resets the current station address of a network \r
+\r
+  This function modifies or resets the current station address of a network\r

   interface, if supported. If Reset is TRUE, then the current station address is\r
   interface, if supported. If Reset is TRUE, then the current station address is\r

-  set to the network interface's permanent address. If Reset is FALSE, and the \r
-  network interface allows its station address to be modified, then the current \r
-  station address is changed to the address specified by New. If the network \r
-  interface does not allow its station address to be modified, then \r
+  set to the network interface's permanent address. If Reset is FALSE, and the\r
+  network interface allows its station address to be modified, then the current\r
+  station address is changed to the address specified by New. If the network\r
+  interface does not allow its station address to be modified, then\r

   EFI_INVALID_PARAMETER will be returned. If the station address is successfully\r
   updated on the network interface, EFI_SUCCESS will be returned. If the driver\r
   has not been initialized, EFI_DEVICE_ERROR will be returned.\r
 \r
   @param This  A pointer to the EFI_SIMPLE_NETWORK_PROTOCOL instance.\r
   EFI_INVALID_PARAMETER will be returned. If the station address is successfully\r
   updated on the network interface, EFI_SUCCESS will be returned. If the driver\r
   has not been initialized, EFI_DEVICE_ERROR will be returned.\r
 \r
   @param This  A pointer to the EFI_SIMPLE_NETWORK_PROTOCOL instance.\r

-  @param Reset Flag used to reset the station address to the network interface's \r
+  @param Reset Flag used to reset the station address to the network interface's\r

                permanent address.\r
   @param New   New station address to be used for the network interface.\r
 \r
 \r
   @retval EFI_SUCCESS           The network interface's station address was updated.\r
                permanent address.\r
   @param New   New station address to be used for the network interface.\r
 \r
 \r
   @retval EFI_SUCCESS           The network interface's station address was updated.\r

-  @retval EFI_NOT_STARTED       The Simple Network Protocol interface has not been \r
+  @retval EFI_NOT_STARTED       The Simple Network Protocol interface has not been\r

                                 started by calling Start().\r
   @retval EFI_INVALID_PARAMETER The New station address was not accepted by the NIC.\r
   @retval EFI_INVALID_PARAMETER Reset is FALSE and New is NULL.\r
                                 started by calling Start().\r
   @retval EFI_INVALID_PARAMETER The New station address was not accepted by the NIC.\r
   @retval EFI_INVALID_PARAMETER Reset is FALSE and New is NULL.\r

-  @retval EFI_DEVICE_ERROR      The Simple Network Protocol interface has not \r
+  @retval EFI_DEVICE_ERROR      The Simple Network Protocol interface has not\r

                                 been initialized by calling Initialize().\r
                                 been initialized by calling Initialize().\r

-  @retval EFI_DEVICE_ERROR      An error occurred attempting to set the new \r
+  @retval EFI_DEVICE_ERROR      An error occurred attempting to set the new\r

                                 station address.\r
                                 station address.\r

-  @retval EFI_UNSUPPORTED       The NIC does not support changing the network \r
+  @retval EFI_UNSUPPORTED       The NIC does not support changing the network\r

                                 interface's station address.\r
 \r
 **/\r
                                 interface's station address.\r
 \r
 **/\r

diff --git a/MdeModulePkg/Universal/Network/SnpDxe/Stop.c b/MdeModulePkg/Universal/Network/SnpDxe/Stop.c
index a52d3b116390dc8cd3a22c8b84d5607878a71b68..46032f3ed38b18f3b2b15c7fe4ac3147800c36d1 100644 (file)
--- a/MdeModulePkg/Universal/Network/SnpDxe/Stop.c
+++ b/MdeModulePkg/Universal/Network/SnpDxe/Stop.c
@@ -1,11 +1,11 @@
 /** @file\r
     Implementation of stopping a network interface.\r
 /** @file\r
     Implementation of stopping a network interface.\r

- \r
-Copyright (c) 2004 - 2016, Intel Corporation. All rights reserved.<BR>\r
-This program and the accompanying materials are licensed \r
-and made available under the terms and conditions of the BSD License which \r
-accompanies this distribution. The full text of the license may be found at \r
-http://opensource.org/licenses/bsd-license.php \r
+\r
+Copyright (c) 2004 - 2018, Intel Corporation. All rights reserved.<BR>\r
+This program and the accompanying materials are licensed\r
+and made available under the terms and conditions of the BSD License which\r
+accompanies this distribution. The full text of the license may be found at\r
+http://opensource.org/licenses/bsd-license.php\r

 \r
 THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 \r
 THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r


@@ -19,7 +19,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   Call UNDI to stop the interface and changes the snp state.\r
 \r
   @param  Snp   Pointer to snp driver structure\r
   Call UNDI to stop the interface and changes the snp state.\r
 \r
   @param  Snp   Pointer to snp driver structure\r

-   \r
+\r

   @retval EFI_SUCCESS            The network interface was stopped.\r
   @retval EFI_DEVICE_ERROR       SNP is not initialized.\r
 \r
   @retval EFI_SUCCESS            The network interface was stopped.\r
   @retval EFI_DEVICE_ERROR       SNP is not initialized.\r
 \r


@@ -67,22 +67,22 @@ PxeStop (
 \r
 /**\r
   Changes the state of a network interface from "started" to "stopped."\r
 \r
 /**\r
   Changes the state of a network interface from "started" to "stopped."\r

-  \r
+\r

   This function stops a network interface. This call is only valid if the network\r
   interface is in the started state. If the network interface was successfully\r
   stopped, then EFI_SUCCESS will be returned.\r
   This function stops a network interface. This call is only valid if the network\r
   interface is in the started state. If the network interface was successfully\r
   stopped, then EFI_SUCCESS will be returned.\r

-  \r
-  @param  This                    A pointer to the EFI_SIMPLE_NETWORK_PROTOCOL \r
+\r
+  @param  This                    A pointer to the EFI_SIMPLE_NETWORK_PROTOCOL\r

                                   instance.\r
                                   instance.\r

-  \r
-  \r
+\r
+\r

   @retval EFI_SUCCESS             The network interface was stopped.\r
   @retval EFI_NOT_STARTED         The network interface has not been started.\r
   @retval EFI_SUCCESS             The network interface was stopped.\r
   @retval EFI_NOT_STARTED         The network interface has not been started.\r

-  @retval EFI_INVALID_PARAMETER   This parameter was NULL or did not point to a \r
+  @retval EFI_INVALID_PARAMETER   This parameter was NULL or did not point to a\r

                                   valid EFI_SIMPLE_NETWORK_PROTOCOL structure.\r
                                   valid EFI_SIMPLE_NETWORK_PROTOCOL structure.\r

-  @retval EFI_DEVICE_ERROR        The command could not be sent to the network \r
+  @retval EFI_DEVICE_ERROR        The command could not be sent to the network\r

                                   interface.\r
                                   interface.\r

-  @retval EFI_UNSUPPORTED         This function is not supported by the network \r
+  @retval EFI_UNSUPPORTED         This function is not supported by the network\r

                                   interface.\r
 \r
 **/\r
                                   interface.\r
 \r
 **/\r

diff --git a/MdeModulePkg/Universal/Network/SnpDxe/Transmit.c b/MdeModulePkg/Universal/Network/SnpDxe/Transmit.c
index 2c7083eb1bc1db79a412ed2b29f937bb3dea4f05..aff4e8410f5f9b321ed5d547794a96fc55d6f25a 100644 (file)
--- a/MdeModulePkg/Universal/Network/SnpDxe/Transmit.c
+++ b/MdeModulePkg/Universal/Network/SnpDxe/Transmit.c
@@ -1,11 +1,11 @@
 /** @file\r
     Implementation of transmitting a packet.\r
 /** @file\r
     Implementation of transmitting a packet.\r

- \r
-Copyright (c) 2004 - 2017, Intel Corporation. All rights reserved.<BR>\r
-This program and the accompanying materials are licensed \r
-and made available under the terms and conditions of the BSD License which \r
-accompanies this distribution. The full text of the license may be found at \r
-http://opensource.org/licenses/bsd-license.php \r
+\r
+Copyright (c) 2004 - 2018, Intel Corporation. All rights reserved.<BR>\r
+This program and the accompanying materials are licensed\r
+and made available under the terms and conditions of the BSD License which\r
+accompanies this distribution. The full text of the license may be found at\r
+http://opensource.org/licenses/bsd-license.php\r

 \r
 THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 \r
 THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r


@@ -221,45 +221,45 @@ PxeTransmit (
 \r
 /**\r
   Places a packet in the transmit queue of a network interface.\r
 \r
 /**\r
   Places a packet in the transmit queue of a network interface.\r

-  \r
+\r

   This function places the packet specified by Header and Buffer on the transmit\r
   This function places the packet specified by Header and Buffer on the transmit\r

-  queue. If HeaderSize is nonzero and HeaderSize is not equal to \r
-  This->Mode->MediaHeaderSize, then EFI_INVALID_PARAMETER will be returned. If \r
+  queue. If HeaderSize is nonzero and HeaderSize is not equal to\r
+  This->Mode->MediaHeaderSize, then EFI_INVALID_PARAMETER will be returned. If\r

   BufferSize is less than This->Mode->MediaHeaderSize, then EFI_BUFFER_TOO_SMALL\r
   BufferSize is less than This->Mode->MediaHeaderSize, then EFI_BUFFER_TOO_SMALL\r

-  will be returned. If Buffer is NULL, then EFI_INVALID_PARAMETER will be \r
+  will be returned. If Buffer is NULL, then EFI_INVALID_PARAMETER will be\r

   returned. If HeaderSize is nonzero and DestAddr or Protocol is NULL, then\r
   EFI_INVALID_PARAMETER will be returned. If the transmit engine of the network\r
   returned. If HeaderSize is nonzero and DestAddr or Protocol is NULL, then\r
   EFI_INVALID_PARAMETER will be returned. If the transmit engine of the network\r

-  interface is busy, then EFI_NOT_READY will be returned. If this packet can be \r
-  accepted by the transmit engine of the network interface, the packet contents \r
-  specified by Buffer will be placed on the transmit queue of the network \r
-  interface, and EFI_SUCCESS will be returned. GetStatus() can be used to \r
-  determine when the packet has actually been transmitted. The contents of the \r
-  Buffer must not be modified until the packet has actually been transmitted. \r
+  interface is busy, then EFI_NOT_READY will be returned. If this packet can be\r
+  accepted by the transmit engine of the network interface, the packet contents\r
+  specified by Buffer will be placed on the transmit queue of the network\r
+  interface, and EFI_SUCCESS will be returned. GetStatus() can be used to\r
+  determine when the packet has actually been transmitted. The contents of the\r
+  Buffer must not be modified until the packet has actually been transmitted.\r

   The Transmit() function performs nonblocking I/O. A caller who wants to perform\r
   The Transmit() function performs nonblocking I/O. A caller who wants to perform\r

-  blocking I/O, should call Transmit(), and then GetStatus() until the \r
+  blocking I/O, should call Transmit(), and then GetStatus() until the\r

   transmitted buffer shows up in the recycled transmit buffer.\r
   If the driver has not been initialized, EFI_DEVICE_ERROR will be returned.\r
 \r
   @param This       A pointer to the EFI_SIMPLE_NETWORK_PROTOCOL instance.\r
   transmitted buffer shows up in the recycled transmit buffer.\r
   If the driver has not been initialized, EFI_DEVICE_ERROR will be returned.\r
 \r
   @param This       A pointer to the EFI_SIMPLE_NETWORK_PROTOCOL instance.\r

-  @param HeaderSize The size, in bytes, of the media header to be filled in by the \r
+  @param HeaderSize The size, in bytes, of the media header to be filled in by the\r

                     Transmit() function. If HeaderSize is nonzero, then it must\r
                     be equal to This->Mode->MediaHeaderSize and the DestAddr and\r
                     Protocol parameters must not be NULL.\r
   @param BufferSize The size, in bytes, of the entire packet (media header and\r
                     data) to be transmitted through the network interface.\r
                     Transmit() function. If HeaderSize is nonzero, then it must\r
                     be equal to This->Mode->MediaHeaderSize and the DestAddr and\r
                     Protocol parameters must not be NULL.\r
   @param BufferSize The size, in bytes, of the entire packet (media header and\r
                     data) to be transmitted through the network interface.\r

-  @param Buffer     A pointer to the packet (media header followed by data) to be \r
-                    transmitted. This parameter cannot be NULL. If HeaderSize is \r
+  @param Buffer     A pointer to the packet (media header followed by data) to be\r
+                    transmitted. This parameter cannot be NULL. If HeaderSize is\r

                     zero, then the media header in Buffer must already be filled\r
                     zero, then the media header in Buffer must already be filled\r

-                    in by the caller. If HeaderSize is nonzero, then the media \r
+                    in by the caller. If HeaderSize is nonzero, then the media\r

                     header will be filled in by the Transmit() function.\r
                     header will be filled in by the Transmit() function.\r

-  @param SrcAddr    The source HW MAC address. If HeaderSize is zero, then this \r
-                    parameter is ignored. If HeaderSize is nonzero and SrcAddr \r
-                    is NULL, then This->Mode->CurrentAddress is used for the \r
+  @param SrcAddr    The source HW MAC address. If HeaderSize is zero, then this\r
+                    parameter is ignored. If HeaderSize is nonzero and SrcAddr\r
+                    is NULL, then This->Mode->CurrentAddress is used for the\r

                     source HW MAC address.\r
                     source HW MAC address.\r

-  @param DestAddr   The destination HW MAC address. If HeaderSize is zero, then \r
+  @param DestAddr   The destination HW MAC address. If HeaderSize is zero, then\r

                     this parameter is ignored.\r
                     this parameter is ignored.\r

-  @param Protocol   The type of header to build. If HeaderSize is zero, then this \r
-                    parameter is ignored. See RFC 1700, section "Ether Types," \r
+  @param Protocol   The type of header to build. If HeaderSize is zero, then this\r
+                    parameter is ignored. See RFC 1700, section "Ether Types,"\r

                     for examples.\r
 \r
   @retval EFI_SUCCESS           The packet was placed on the transmit queue.\r
                     for examples.\r
 \r
   @retval EFI_SUCCESS           The packet was placed on the transmit queue.\r

diff --git a/MdeModulePkg/Universal/Network/SnpDxe/WaitForPacket.c b/MdeModulePkg/Universal/Network/SnpDxe/WaitForPacket.c
index 23d7455fd197e29c51db56153d1b754cb7ad20bb..137f9ed94d149d75b7c29ebcb7176affb305cb8a 100644 (file)
--- a/MdeModulePkg/Universal/Network/SnpDxe/WaitForPacket.c
+++ b/MdeModulePkg/Universal/Network/SnpDxe/WaitForPacket.c
@@ -1,11 +1,11 @@
 /** @file\r
     Event handler to check for available packet.\r
 \r
 /** @file\r
     Event handler to check for available packet.\r
 \r

-Copyright (c) 2004 - 2008, Intel Corporation. All rights reserved.<BR>\r
-This program and the accompanying materials are licensed \r
-and made available under the terms and conditions of the BSD License which \r
-accompanies this distribution. The full text of the license may be found at \r
-http://opensource.org/licenses/bsd-license.php \r
+Copyright (c) 2004 - 2018, Intel Corporation. All rights reserved.<BR>\r
+This program and the accompanying materials are licensed\r
+and made available under the terms and conditions of the BSD License which\r
+accompanies this distribution. The full text of the license may be found at\r
+http://opensource.org/licenses/bsd-license.php\r

 \r
 THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 \r
 THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r

diff --git a/MdeModulePkg/Universal/Network/Tcp4Dxe/ComponentName.c b/MdeModulePkg/Universal/Network/Tcp4Dxe/ComponentName.c
index bb3a39c5b1cdf03941c55a3d8d7ef47613b21062..f1227691ec2155faa1fa55e3bb9ecbd57ad6feab 100644 (file)
--- a/MdeModulePkg/Universal/Network/Tcp4Dxe/ComponentName.c
+++ b/MdeModulePkg/Universal/Network/Tcp4Dxe/ComponentName.c
@@ -1,7 +1,7 @@
 /** @file\r
   UEFI Component Name(2) protocol implementation for Tcp4Dxe driver.\r
 \r
 /** @file\r
   UEFI Component Name(2) protocol implementation for Tcp4Dxe driver.\r
 \r

-Copyright (c) 2005 - 2015, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2005 - 2018, Intel Corporation. All rights reserved.<BR>\r

 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r


@@ -234,10 +234,10 @@ TcpComponentNameGetDriverName (
 \r
   @param  Tcp4[in]                   A pointer to the EFI_TCP4_PROTOCOL.\r
 \r
 \r
   @param  Tcp4[in]                   A pointer to the EFI_TCP4_PROTOCOL.\r
 \r

-  \r
+\r

   @retval EFI_SUCCESS                Update the ControllerNameTable of this instance successfully.\r
   @retval EFI_INVALID_PARAMETER      The input parameter is invalid.\r
   @retval EFI_SUCCESS                Update the ControllerNameTable of this instance successfully.\r
   @retval EFI_INVALID_PARAMETER      The input parameter is invalid.\r

-  \r
+\r

 **/\r
 EFI_STATUS\r
 UpdateName (\r
 **/\r
 EFI_STATUS\r
 UpdateName (\r


@@ -279,7 +279,7 @@ UpdateName (
     FreeUnicodeStringTable (gTcpControllerNameTable);\r
     gTcpControllerNameTable = NULL;\r
   }\r
     FreeUnicodeStringTable (gTcpControllerNameTable);\r
     gTcpControllerNameTable = NULL;\r
   }\r

-  \r
+\r

   Status = AddUnicodeString2 (\r
              "eng",\r
              gTcp4ComponentName.SupportedLanguages,\r
   Status = AddUnicodeString2 (\r
              "eng",\r
              gTcp4ComponentName.SupportedLanguages,\r


@@ -290,7 +290,7 @@ UpdateName (
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r

-  \r
+\r

   return AddUnicodeString2 (\r
            "en",\r
            gTcp4ComponentName2.SupportedLanguages,\r
   return AddUnicodeString2 (\r
            "en",\r
            gTcp4ComponentName2.SupportedLanguages,\r


@@ -387,10 +387,10 @@ TcpComponentNameGetControllerName (
   if (ChildHandle == NULL) {\r
     return EFI_UNSUPPORTED;\r
   }\r
   if (ChildHandle == NULL) {\r
     return EFI_UNSUPPORTED;\r
   }\r

-  \r
-  // \r
-  // Make sure this driver produced ChildHandle \r
-  // \r
+\r
+  //\r
+  // Make sure this driver produced ChildHandle\r
+  //\r

   Status = EfiTestChildHandle (\r
              ControllerHandle,\r
              ChildHandle,\r
   Status = EfiTestChildHandle (\r
              ControllerHandle,\r
              ChildHandle,\r


@@ -400,9 +400,9 @@ TcpComponentNameGetControllerName (
     return Status;\r
   }\r
 \r
     return Status;\r
   }\r
 \r

-  // \r
+  //\r

   // Retrieve an instance of a produced protocol from ChildHandle\r
   // Retrieve an instance of a produced protocol from ChildHandle\r

-  // \r
+  //\r

   Status = gBS->OpenProtocol (\r
                   ChildHandle,\r
                   &gEfiTcp4ProtocolGuid,\r
   Status = gBS->OpenProtocol (\r
                   ChildHandle,\r
                   &gEfiTcp4ProtocolGuid,\r

diff --git a/MdeModulePkg/Universal/Network/Tcp4Dxe/SockImpl.h b/MdeModulePkg/Universal/Network/Tcp4Dxe/SockImpl.h
index bfd750a8ceee090921d9d562e02c2767ac56379d..bea7479eb222b8b6a3c6038d9fadd53868a34a40 100644 (file)
--- a/MdeModulePkg/Universal/Network/Tcp4Dxe/SockImpl.h
+++ b/MdeModulePkg/Universal/Network/Tcp4Dxe/SockImpl.h
@@ -1,7 +1,7 @@
 /** @file\r
   Socket implementation header file.\r
 \r
 /** @file\r
   Socket implementation header file.\r
 \r

-Copyright (c) 2005 - 2017, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2005 - 2018, Intel Corporation. All rights reserved.<BR>\r

 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r


@@ -20,10 +20,10 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 \r
 /**\r
   Signal a event with the given status.\r
 \r
 /**\r
   Signal a event with the given status.\r

-  \r
+\r

   @param Token        The token's event is to be signaled.\r
   @param TokenStatus  The status to be sent with the event.\r
   @param Token        The token's event is to be signaled.\r
   @param TokenStatus  The status to be sent with the event.\r

-  \r
+\r

 **/\r
 #define SIGNAL_TOKEN(Token, TokenStatus) \\r
   do { \\r
 **/\r
 #define SIGNAL_TOKEN(Token, TokenStatus) \\r
   do { \\r


@@ -36,7 +36,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   Supporting function for both SockImpl and SockInterface.\r
 \r
   @param Event  The Event this notify function registered to, ignored.\r
   Supporting function for both SockImpl and SockInterface.\r
 \r
   @param Event  The Event this notify function registered to, ignored.\r

-  \r
+\r

 **/\r
 VOID\r
 EFIAPI\r
 **/\r
 VOID\r
 EFIAPI\r

diff --git a/MdeModulePkg/Universal/Network/Tcp4Dxe/SockInterface.c b/MdeModulePkg/Universal/Network/Tcp4Dxe/SockInterface.c
index bca4b02009df8da0ba7a2d995e3e63881abd7db9..6dbabc4e51cf1329765e106cf5370b3b96071a52 100644 (file)
--- a/MdeModulePkg/Universal/Network/Tcp4Dxe/SockInterface.c
+++ b/MdeModulePkg/Universal/Network/Tcp4Dxe/SockInterface.c
@@ -1,7 +1,7 @@
 /** @file\r
   Interface function of the Socket.\r
 \r
 /** @file\r
   Interface function of the Socket.\r
 \r

-Copyright (c) 2005 - 2017, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2005 - 2018, Intel Corporation. All rights reserved.<BR>\r

 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r


@@ -22,7 +22,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   @param  List                 Pointer to the token list to be searched.\r
   @param  Event                The event to be checked.\r
 \r
   @param  List                 Pointer to the token list to be searched.\r
   @param  Event                The event to be checked.\r
 \r

-  @retval  TRUE                The specific Event exists in the List. \r
+  @retval  TRUE                The specific Event exists in the List.\r

   @retval  FALSE               The specific Event is not in the List.\r
 \r
 **/\r
   @retval  FALSE               The specific Event is not in the List.\r
 \r
 **/\r


@@ -58,7 +58,7 @@ SockTokenExistedInList (
   @param  Sock                 Pointer to the instance's socket.\r
   @param  Event                The event to be checked.\r
 \r
   @param  Sock                 Pointer to the instance's socket.\r
   @param  Event                The event to be checked.\r
 \r

-  @retval  TRUE                The Event exists in related socket's lists. \r
+  @retval  TRUE                The Event exists in related socket's lists.\r

   @retval  FALSE               The Event is not in related socket's lists.\r
 \r
 **/\r
   @retval  FALSE               The Event is not in related socket's lists.\r
 \r
 **/\r


@@ -250,7 +250,7 @@ SockDestroyChild (
   data ProtoData.\r
 \r
   @param  SockInitData         Inital data to setting the socket.\r
   data ProtoData.\r
 \r
   @param  SockInitData         Inital data to setting the socket.\r

-  \r
+\r

   @return Pointer to the newly created socket. If NULL, error condition occured.\r
 \r
 **/\r
   @return Pointer to the newly created socket. If NULL, error condition occured.\r
 \r
 **/\r

diff --git a/MdeModulePkg/Universal/Network/Tcp4Dxe/Socket.h b/MdeModulePkg/Universal/Network/Tcp4Dxe/Socket.h
index 9c2e6d0b65a9f7debaf106842cbd2a69f10b5458..7ff2fc565edd7a6bb4267f8f5ecd3111d3d2dc81 100644 (file)
--- a/MdeModulePkg/Universal/Network/Tcp4Dxe/Socket.h
+++ b/MdeModulePkg/Universal/Network/Tcp4Dxe/Socket.h
@@ -1,7 +1,7 @@
 /** @file\r
   Socket header file.\r
 \r
 /** @file\r
   Socket header file.\r
 \r

-Copyright (c) 2005 - 2012, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2005 - 2018, Intel Corporation. All rights reserved.<BR>\r

 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r


@@ -85,31 +85,31 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 \r
 /**\r
   Set socket SO_NO_MORE_DATA flag.\r
 \r
 /**\r
   Set socket SO_NO_MORE_DATA flag.\r

-  \r
+\r

   @param Sock               Pointer to the socket\r
   @param Sock               Pointer to the socket\r

-  \r
+\r

 **/\r
 #define SOCK_NO_MORE_DATA(Sock)     ((Sock)->Flag |= SO_NO_MORE_DATA)\r
 \r
 /**\r
   Check whether the socket is unconfigured.\r
 **/\r
 #define SOCK_NO_MORE_DATA(Sock)     ((Sock)->Flag |= SO_NO_MORE_DATA)\r
 \r
 /**\r
   Check whether the socket is unconfigured.\r

-  \r
+\r

   @param  Sock               Pointer to the socket\r
   @param  Sock               Pointer to the socket\r

-  \r
+\r

   @retval True               The socket is unconfigued\r
   @retval False              The socket is not unconfigued\r
   @retval True               The socket is unconfigued\r
   @retval False              The socket is not unconfigued\r

-  \r
+\r

 **/\r
 #define SOCK_IS_UNCONFIGURED(Sock)  ((Sock)->ConfigureState == SO_UNCONFIGURED)\r
 \r
 /**\r
   Check whether the socket is configured.\r
 **/\r
 #define SOCK_IS_UNCONFIGURED(Sock)  ((Sock)->ConfigureState == SO_UNCONFIGURED)\r
 \r
 /**\r
   Check whether the socket is configured.\r

-  \r
+\r

   @param  Sock               Pointer to the socket\r
   @param  Sock               Pointer to the socket\r

-  \r
+\r

   @retval True               The socket is configued\r
   @retval False              The socket is not configued\r
   @retval True               The socket is configued\r
   @retval False              The socket is not configued\r

-  \r
+\r

 **/\r
 #define SOCK_IS_CONFIGURED(Sock) \\r
     (((Sock)->ConfigureState == SO_CONFIGURED_ACTIVE) || \\r
 **/\r
 #define SOCK_IS_CONFIGURED(Sock) \\r
     (((Sock)->ConfigureState == SO_CONFIGURED_ACTIVE) || \\r


@@ -117,109 +117,109 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 \r
 /**\r
   Check whether the socket is configured to active mode.\r
 \r
 /**\r
   Check whether the socket is configured to active mode.\r

-  \r
+\r

   @param  Sock               Pointer to the socket\r
   @param  Sock               Pointer to the socket\r

-  \r
+\r

   @retval True               The socket is configued to active mode\r
   @retval False              The socket is not configued to active mode\r
   @retval True               The socket is configued to active mode\r
   @retval False              The socket is not configued to active mode\r

-  \r
+\r

 **/\r
 #define SOCK_IS_CONFIGURED_ACTIVE(Sock) \\r
   ((Sock)->ConfigureState == SO_CONFIGURED_ACTIVE)\r
 \r
 /**\r
   Check whether the socket is configured to passive mode.\r
 **/\r
 #define SOCK_IS_CONFIGURED_ACTIVE(Sock) \\r
   ((Sock)->ConfigureState == SO_CONFIGURED_ACTIVE)\r
 \r
 /**\r
   Check whether the socket is configured to passive mode.\r

-  \r
+\r

   @param  Sock               Pointer to the socket\r
   @param  Sock               Pointer to the socket\r

-  \r
+\r

   @retval True               The socket is configued to passive mode\r
   @retval False              The socket is not configued to passive mode\r
   @retval True               The socket is configued to passive mode\r
   @retval False              The socket is not configued to passive mode\r

-  \r
+\r

 **/\r
 #define SOCK_IS_CONNECTED_PASSIVE(Sock) \\r
   ((Sock)->ConfigureState == SO_CONFIGURED_PASSIVE)\r
 \r
 /**\r
   Check whether the socket is mapped.\r
 **/\r
 #define SOCK_IS_CONNECTED_PASSIVE(Sock) \\r
   ((Sock)->ConfigureState == SO_CONFIGURED_PASSIVE)\r
 \r
 /**\r
   Check whether the socket is mapped.\r

-  \r
+\r

   @param  Sock               Pointer to the socket\r
   @param  Sock               Pointer to the socket\r

-  \r
+\r

   @retval True               The socket is no mapping\r
   @retval False              The socket is mapped\r
   @retval True               The socket is no mapping\r
   @retval False              The socket is mapped\r

-  \r
+\r

 **/\r
 #define SOCK_IS_NO_MAPPING(Sock) \\r
   ((Sock)->ConfigureState == SO_NO_MAPPING)\r
 \r
 /**\r
   Check whether the socket is closed.\r
 **/\r
 #define SOCK_IS_NO_MAPPING(Sock) \\r
   ((Sock)->ConfigureState == SO_NO_MAPPING)\r
 \r
 /**\r
   Check whether the socket is closed.\r

-  \r
+\r

   @param  Sock               Pointer to the socket\r
   @param  Sock               Pointer to the socket\r

-  \r
+\r

   @retval True               The socket is closed\r
   @retval False              The socket is not closed\r
   @retval True               The socket is closed\r
   @retval False              The socket is not closed\r

-  \r
+\r

 **/\r
 #define SOCK_IS_CLOSED(Sock)          ((Sock)->State == SO_CLOSED)\r
 \r
 /**\r
   Check whether the socket is listening.\r
 **/\r
 #define SOCK_IS_CLOSED(Sock)          ((Sock)->State == SO_CLOSED)\r
 \r
 /**\r
   Check whether the socket is listening.\r

-  \r
+\r

   @param  Sock               Pointer to the socket\r
   @param  Sock               Pointer to the socket\r

-  \r
+\r

   @retval True               The socket is listening\r
   @retval False              The socket is not listening\r
   @retval True               The socket is listening\r
   @retval False              The socket is not listening\r

-  \r
+\r

 **/\r
 #define SOCK_IS_LISTENING(Sock)       ((Sock)->State == SO_LISTENING)\r
 \r
 /**\r
   Check whether the socket is connecting.\r
 **/\r
 #define SOCK_IS_LISTENING(Sock)       ((Sock)->State == SO_LISTENING)\r
 \r
 /**\r
   Check whether the socket is connecting.\r

-  \r
+\r

   @param  Sock               Pointer to the socket\r
   @param  Sock               Pointer to the socket\r

-  \r
+\r

   @retval True               The socket is connecting\r
   @retval False              The socket is not connecting\r
   @retval True               The socket is connecting\r
   @retval False              The socket is not connecting\r

-  \r
+\r

 **/\r
 #define SOCK_IS_CONNECTING(Sock)      ((Sock)->State == SO_CONNECTING)\r
 \r
 /**\r
   Check whether the socket has connected.\r
 **/\r
 #define SOCK_IS_CONNECTING(Sock)      ((Sock)->State == SO_CONNECTING)\r
 \r
 /**\r
   Check whether the socket has connected.\r

-  \r
+\r

   @param  Sock               Pointer to the socket\r
   @param  Sock               Pointer to the socket\r

-  \r
+\r

   @retval True               The socket has connected\r
   @retval False              The socket has not connected\r
   @retval True               The socket has connected\r
   @retval False              The socket has not connected\r

-  \r
+\r

 **/\r
 #define SOCK_IS_CONNECTED(Sock)       ((Sock)->State == SO_CONNECTED)\r
 \r
 /**\r
   Check whether the socket is disconnecting.\r
 **/\r
 #define SOCK_IS_CONNECTED(Sock)       ((Sock)->State == SO_CONNECTED)\r
 \r
 /**\r
   Check whether the socket is disconnecting.\r

-  \r
+\r

   @param  Sock               Pointer to the socket\r
   @param  Sock               Pointer to the socket\r

-  \r
+\r

   @retval True               The socket is disconnecting\r
   @retval False              The socket is not disconnecting\r
   @retval True               The socket is disconnecting\r
   @retval False              The socket is not disconnecting\r

-  \r
+\r

 **/\r
 #define SOCK_IS_DISCONNECTING(Sock)   ((Sock)->State == SO_DISCONNECTING)\r
 \r
 /**\r
   Check whether the socket is no more data.\r
 **/\r
 #define SOCK_IS_DISCONNECTING(Sock)   ((Sock)->State == SO_DISCONNECTING)\r
 \r
 /**\r
   Check whether the socket is no more data.\r

-  \r
+\r

   @param  Sock               Pointer to the socket\r
   @param  Sock               Pointer to the socket\r

-  \r
+\r

   @retval True               The socket is no more data\r
   @retval False              The socket still has data\r
   @retval True               The socket is no more data\r
   @retval False              The socket still has data\r

-  \r
+\r

 **/\r
 #define SOCK_IS_NO_MORE_DATA(Sock)    (0 != ((Sock)->Flag & SO_NO_MORE_DATA))\r
 \r
 /**\r
   Set the size of the receive buffer.\r
 **/\r
 #define SOCK_IS_NO_MORE_DATA(Sock)    (0 != ((Sock)->Flag & SO_NO_MORE_DATA))\r
 \r
 /**\r
   Set the size of the receive buffer.\r

-  \r
+\r

   @param  Sock               Pointer to the socket\r
   @param  Size               The size to set\r
 \r
   @param  Sock               Pointer to the socket\r
   @param  Size               The size to set\r
 \r


@@ -228,9 +228,9 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 \r
 /**\r
   Get the size of the receive buffer.\r
 \r
 /**\r
   Get the size of the receive buffer.\r

-  \r
+\r

   @param  Sock               Pointer to the socket\r
   @param  Sock               Pointer to the socket\r

-  \r
+\r

   @return The receive buffer size\r
 \r
 **/\r
   @return The receive buffer size\r
 \r
 **/\r


@@ -238,9 +238,9 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 \r
 /**\r
   Get the size of the receive data.\r
 \r
 /**\r
   Get the size of the receive data.\r

-  \r
+\r

   @param  Sock               Pointer to the socket\r
   @param  Sock               Pointer to the socket\r

-  \r
+\r

   @return The received data size\r
 \r
 **/\r
   @return The received data size\r
 \r
 **/\r


@@ -248,7 +248,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 \r
 /**\r
   Set the size of the send buffer.\r
 \r
 /**\r
   Set the size of the send buffer.\r

-  \r
+\r

   @param  Sock               Pointer to the socket\r
   @param  Size               The size to set\r
 \r
   @param  Sock               Pointer to the socket\r
   @param  Size               The size to set\r
 \r


@@ -257,9 +257,9 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 \r
 /**\r
   Get the size of the send buffer.\r
 \r
 /**\r
   Get the size of the send buffer.\r

-  \r
+\r

   @param  Sock               Pointer to the socket\r
   @param  Sock               Pointer to the socket\r

-  \r
+\r

   @return The send buffer size\r
 \r
 **/\r
   @return The send buffer size\r
 \r
 **/\r


@@ -267,9 +267,9 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 \r
 /**\r
   Get the size of the send data.\r
 \r
 /**\r
   Get the size of the send data.\r

-  \r
+\r

   @param  Sock               Pointer to the socket\r
   @param  Sock               Pointer to the socket\r

-  \r
+\r

   @return The send data size\r
 \r
 **/\r
   @return The send data size\r
 \r
 **/\r


@@ -277,7 +277,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 \r
 /**\r
   Set the backlog value of the socket.\r
 \r
 /**\r
   Set the backlog value of the socket.\r

-  \r
+\r

   @param  Sock               Pointer to the socket\r
   @param  Value              The value to set\r
 \r
   @param  Sock               Pointer to the socket\r
   @param  Value              The value to set\r
 \r


@@ -286,9 +286,9 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 \r
 /**\r
   Get the backlog value of the socket.\r
 \r
 /**\r
   Get the backlog value of the socket.\r

-  \r
+\r

   @param  Sock               Pointer to the socket\r
   @param  Sock               Pointer to the socket\r

-  \r
+\r

   @return The backlog value\r
 \r
 **/\r
   @return The backlog value\r
 \r
 **/\r


@@ -296,7 +296,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 \r
 /**\r
   Set the socket with error state.\r
 \r
 /**\r
   Set the socket with error state.\r

-  \r
+\r

   @param  Sock               Pointer to the socket\r
   @param  Error              The error state\r
 \r
   @param  Sock               Pointer to the socket\r
   @param  Error              The error state\r
 \r


@@ -342,7 +342,7 @@ typedef struct _SOCK_IO_TOKEN {
 } SOCK_IO_TOKEN;\r
 \r
 ///\r
 } SOCK_IO_TOKEN;\r
 \r
 ///\r

-///  The request issued from socket layer to protocol layer.  \r
+///  The request issued from socket layer to protocol layer.\r

 ///\r
 #define SOCK_ATTACH     0    ///< Attach current socket to a new PCB\r
 #define SOCK_DETACH     1    ///< Detach current socket from the PCB\r
 ///\r
 #define SOCK_ATTACH     0    ///< Attach current socket to a new PCB\r
 #define SOCK_DETACH     1    ///< Detach current socket from the PCB\r


@@ -379,15 +379,15 @@ typedef struct _SOCK_BUFFER {
 \r
 /**\r
   The handler of protocol for request from socket.\r
 \r
 /**\r
   The handler of protocol for request from socket.\r

-  \r
+\r

   @param Socket              The socket issuing the request to protocol\r
   @param Request             The request issued by socket\r
   @param RequestData         The request related data\r
   @param Socket              The socket issuing the request to protocol\r
   @param Request             The request issued by socket\r
   @param RequestData         The request related data\r

-  \r
+\r

   @retval EFI_SUCCESS        The socket request is completed successfully.\r
   @retval other              The error status returned by the corresponding TCP\r
                              layer function.\r
   @retval EFI_SUCCESS        The socket request is completed successfully.\r
   @retval other              The error status returned by the corresponding TCP\r
                              layer function.\r

-                             \r
+\r

 **/\r
 typedef\r
 EFI_STATUS\r
 **/\r
 typedef\r
 EFI_STATUS\r


@@ -396,8 +396,8 @@ EFI_STATUS
   IN UINT8        Request,\r
   IN VOID         *RequestData\r
   );\r
   IN UINT8        Request,\r
   IN VOID         *RequestData\r
   );\r

-  \r
-  \r
+\r
+\r

 //\r
 // Socket provided oprerations for low layer protocol\r
 //\r
 //\r
 // Socket provided oprerations for low layer protocol\r
 //\r


@@ -420,15 +420,15 @@ SockSetState (
   );\r
 \r
 /**\r
   );\r
 \r
 /**\r

-  Called by the low layer protocol to indicate the socket a connection is \r
-  established. \r
-  \r
-  This function just changes the socket's state to SO_CONNECTED \r
+  Called by the low layer protocol to indicate the socket a connection is\r
+  established.\r
+\r
+  This function just changes the socket's state to SO_CONNECTED\r

   and signals the token used for connection establishment.\r
 \r
   @param  Sock                  Pointer to the socket associated with the\r
                                 established connection.\r
   and signals the token used for connection establishment.\r
 \r
   @param  Sock                  Pointer to the socket associated with the\r
                                 established connection.\r

-                                \r
+\r

 **/\r
 VOID\r
 SockConnEstablished (\r
 **/\r
 VOID\r
 SockConnEstablished (\r


@@ -437,13 +437,13 @@ SockConnEstablished (
 \r
 /**\r
   Called by the low layer protocol to indicate the connection is closed.\r
 \r
 /**\r
   Called by the low layer protocol to indicate the connection is closed.\r

-  \r
-  This function flushes the socket, sets the state to SO_CLOSED and signals \r
+\r
+  This function flushes the socket, sets the state to SO_CLOSED and signals\r

   the close token.\r
 \r
   @param  Sock                  Pointer to the socket associated with the closed\r
                                 connection.\r
   the close token.\r
 \r
   @param  Sock                  Pointer to the socket associated with the closed\r
                                 connection.\r

-                                \r
+\r

 **/\r
 VOID\r
 SockConnClosed (\r
 **/\r
 VOID\r
 SockConnClosed (\r


@@ -452,8 +452,8 @@ SockConnClosed (
 \r
 /**\r
   Called by low layer protocol to indicate that some data is sent or processed.\r
 \r
 /**\r
   Called by low layer protocol to indicate that some data is sent or processed.\r

-   \r
-  This function trims the sent data in the socket send buffer, signals the data \r
+\r
+  This function trims the sent data in the socket send buffer, signals the data\r

   token if proper.\r
 \r
   @param  Sock                  Pointer to the socket.\r
   token if proper.\r
 \r
   @param  Sock                  Pointer to the socket.\r


@@ -490,7 +490,7 @@ SockGetDataToSend (
 /**\r
   Called by the low layer protocol to indicate that there\r
   will be no more data from the communication peer.\r
 /**\r
   Called by the low layer protocol to indicate that there\r
   will be no more data from the communication peer.\r

-  \r
+\r

   This function set the socket's state to SO_NO_MORE_DATA and\r
   signal all queued IO tokens with the error status EFI_CONNECTION_FIN.\r
 \r
   This function set the socket's state to SO_NO_MORE_DATA and\r
   signal all queued IO tokens with the error status EFI_CONNECTION_FIN.\r
 \r


@@ -504,8 +504,8 @@ SockNoMoreData (
 \r
 /**\r
   Called by the low layer protocol to deliver received data to socket layer.\r
 \r
 /**\r
   Called by the low layer protocol to deliver received data to socket layer.\r

-  \r
-  This function will append the data to the socket receive buffer, set ther \r
+\r
+  This function will append the data to the socket receive buffer, set ther\r

   urgent data length and then check if any receive token can be signaled.\r
 \r
   @param  Sock                  Pointer to the socket.\r
   urgent data length and then check if any receive token can be signaled.\r
 \r
   @param  Sock                  Pointer to the socket.\r


@@ -573,9 +573,9 @@ EFI_STATUS
   IN SOCKET  *This,\r
   IN VOID    *Context\r
   );\r
   IN SOCKET  *This,\r
   IN VOID    *Context\r
   );\r

-  \r
+\r

 ///\r
 ///\r

-/// Proto type of the destroy callback \r
+/// Proto type of the destroy callback\r

 ///\r
 typedef\r
 VOID\r
 ///\r
 typedef\r
 VOID\r


@@ -618,7 +618,7 @@ typedef struct _SOCK_INIT_DATA {
 \r
 ///\r
 ///  The union type of TCP and UDP protocol.\r
 \r
 ///\r
 ///  The union type of TCP and UDP protocol.\r

-///  \r
+///\r

 typedef union _NET_PROTOCOL {\r
   EFI_TCP4_PROTOCOL TcpProtocol;   ///< Tcp protocol\r
   EFI_UDP4_PROTOCOL UdpProtocol;   ///< Udp protocol\r
 typedef union _NET_PROTOCOL {\r
   EFI_TCP4_PROTOCOL TcpProtocol;   ///< Tcp protocol\r
   EFI_UDP4_PROTOCOL UdpProtocol;   ///< Udp protocol\r


@@ -637,7 +637,7 @@ struct _SOCKET {
   EFI_HANDLE            DriverBinding;  ///< Socket's driver binding protocol\r
   EFI_DEVICE_PATH_PROTOCOL  *ParentDevicePath;\r
   EFI_DEVICE_PATH_PROTOCOL  *DevicePath;\r
   EFI_HANDLE            DriverBinding;  ///< Socket's driver binding protocol\r
   EFI_DEVICE_PATH_PROTOCOL  *ParentDevicePath;\r
   EFI_DEVICE_PATH_PROTOCOL  *DevicePath;\r

-  LIST_ENTRY                Link;  \r
+  LIST_ENTRY                Link;\r

   UINT8                 ConfigureState;\r
   SOCK_TYPE             Type;\r
   UINT8                 State;\r
   UINT8                 ConfigureState;\r
   SOCK_TYPE             Type;\r
   UINT8                 State;\r


@@ -655,7 +655,7 @@ struct _SOCKET {
   UINT32          ConnCnt;        ///< the current count of connections to it\r
   SOCKET          *Parent;        ///< listening parent that accept the connection\r
   LIST_ENTRY      ConnectionList; ///< the connections maintained by this socket\r
   UINT32          ConnCnt;        ///< the current count of connections to it\r
   SOCKET          *Parent;        ///< listening parent that accept the connection\r
   LIST_ENTRY      ConnectionList; ///< the connections maintained by this socket\r

-  \r
+\r

   //\r
   // The queue to buffer application's asynchronous token\r
   //\r
   //\r
   // The queue to buffer application's asynchronous token\r
   //\r


@@ -714,7 +714,7 @@ typedef struct _TCP_RSV_DATA {
   data ProtoData.\r
 \r
   @param  SockInitData         Inital data to setting the socket.\r
   data ProtoData.\r
 \r
   @param  SockInitData         Inital data to setting the socket.\r

-  \r
+\r

   @return Pointer to the newly created socket. If NULL, error condition occured.\r
 \r
 **/\r
   @return Pointer to the newly created socket. If NULL, error condition occured.\r
 \r
 **/\r


@@ -973,7 +973,7 @@ SockBufFirst (
   @param  SockEntry             Pointer to the buffer block prior to the required\r
                                 one.\r
 \r
   @param  SockEntry             Pointer to the buffer block prior to the required\r
                                 one.\r
 \r

-  @return Pointer to the buffer block next to SockEntry. NULL if SockEntry is \r
+  @return Pointer to the buffer block next to SockEntry. NULL if SockEntry is\r

           the tail or head entry.\r
 \r
 **/\r
           the tail or head entry.\r
 \r
 **/\r

diff --git a/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dispatcher.c b/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dispatcher.c
index 702cae8d6586b89abf8c6ec6684f0c5d57cd97cd..a0f97d603171d65f6acce2fd1649bceaf4227dfe 100644 (file)
--- a/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dispatcher.c
+++ b/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dispatcher.c
@@ -2,7 +2,7 @@
   Tcp request dispatcher implementation.\r
 \r
 (C) Copyright 2014 Hewlett-Packard Development Company, L.P.<BR>\r
   Tcp request dispatcher implementation.\r
 \r
 (C) Copyright 2014 Hewlett-Packard Development Company, L.P.<BR>\r

-Copyright (c) 2005 - 2017, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2005 - 2018, Intel Corporation. All rights reserved.<BR>\r

 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r


@@ -332,7 +332,7 @@ Tcp4DetachPcb (
   ASSERT (Tcb != NULL);\r
 \r
   Tcp4FlushPcb (Tcb);\r
   ASSERT (Tcb != NULL);\r
 \r
   Tcp4FlushPcb (Tcb);\r

-  \r
+\r

   IpIoRemoveIp (ProtoData->TcpService->IpIo, Tcb->IpInfo);\r
 \r
   FreePool (Tcb);\r
   IpIoRemoveIp (ProtoData->TcpService->IpIo, Tcb->IpInfo);\r
 \r
   FreePool (Tcb);\r

diff --git a/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Driver.c b/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Driver.c
index 7d84767f5e95f2909e4607c23ba80b11827b8139..2ff8eee8693b6a6ed68c5789b853c9943c1b3996 100644 (file)
--- a/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Driver.c
+++ b/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Driver.c
@@ -1,7 +1,7 @@
 /** @file\r
   Tcp driver function.\r
 \r
 /** @file\r
   Tcp driver function.\r
 \r

-Copyright (c) 2005 - 2016, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2005 - 2018, Intel Corporation. All rights reserved.<BR>\r

 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r


@@ -116,7 +116,7 @@ Tcp4CreateTimer (
 \r
 /**\r
   Stop and destroy the heartbeat timer for TCP driver.\r
 \r
 /**\r
   Stop and destroy the heartbeat timer for TCP driver.\r

-  \r
+\r

 **/\r
 VOID\r
 Tcp4DestroyTimer (\r
 **/\r
 VOID\r
 Tcp4DestroyTimer (\r


@@ -138,7 +138,7 @@ Tcp4DestroyTimer (
 \r
 /**\r
   Callback function which provided by user to remove one node in NetDestroyLinkList process.\r
 \r
 /**\r
   Callback function which provided by user to remove one node in NetDestroyLinkList process.\r

-  \r
+\r

   @param[in]    Entry           The entry to be removed.\r
   @param[in]    Context         Pointer to the callback context corresponds to the Context in NetDestroyLinkList.\r
 \r
   @param[in]    Entry           The entry to be removed.\r
   @param[in]    Context         Pointer to the callback context corresponds to the Context in NetDestroyLinkList.\r
 \r


@@ -221,32 +221,32 @@ Tcp4DriverEntryPoint (
 \r
 /**\r
   Tests to see if this driver supports a given controller.\r
 \r
 /**\r
   Tests to see if this driver supports a given controller.\r

-  \r
-  If a child device is provided, it further tests to see if this driver supports \r
+\r
+  If a child device is provided, it further tests to see if this driver supports\r

   creating a handle for the specified child device.\r
 \r
   @param  This                 A pointer to the EFI_DRIVER_BINDING_PROTOCOL instance.\r
   creating a handle for the specified child device.\r
 \r
   @param  This                 A pointer to the EFI_DRIVER_BINDING_PROTOCOL instance.\r

-  @param  ControllerHandle     The handle of the controller to test. This handle \r
-                               must support a protocol interface that supplies \r
+  @param  ControllerHandle     The handle of the controller to test. This handle\r
+                               must support a protocol interface that supplies\r

                                an I/O abstraction to the driver.\r
                                an I/O abstraction to the driver.\r

-  @param  RemainingDevicePath  A pointer to the remaining portion of a device path. \r
+  @param  RemainingDevicePath  A pointer to the remaining portion of a device path.\r

                                This parameter is ignored by device drivers, and is optional for bus drivers.\r
 \r
 \r
   @retval EFI_SUCCESS          The device specified by ControllerHandle and\r
                                This parameter is ignored by device drivers, and is optional for bus drivers.\r
 \r
 \r
   @retval EFI_SUCCESS          The device specified by ControllerHandle and\r

-                               RemainingDevicePath is supported by the driver \r
+                               RemainingDevicePath is supported by the driver\r

                                specified by This.\r
   @retval EFI_ALREADY_STARTED  The device specified by ControllerHandle and\r
                                specified by This.\r
   @retval EFI_ALREADY_STARTED  The device specified by ControllerHandle and\r

-                               RemainingDevicePath is already being managed by \r
+                               RemainingDevicePath is already being managed by\r

                                the driver specified by This.\r
   @retval EFI_ACCESS_DENIED    The device specified by ControllerHandle and\r
                                the driver specified by This.\r
   @retval EFI_ACCESS_DENIED    The device specified by ControllerHandle and\r

-                               RemainingDevicePath is already being managed by a \r
-                               different driver or an application that requires \r
+                               RemainingDevicePath is already being managed by a\r
+                               different driver or an application that requires\r

                                exclusive access.\r
   @retval EFI_UNSUPPORTED      The device specified by ControllerHandle and\r
                                exclusive access.\r
   @retval EFI_UNSUPPORTED      The device specified by ControllerHandle and\r

-                               RemainingDevicePath is not supported by the driver \r
+                               RemainingDevicePath is not supported by the driver\r

                                specified by This.\r
                                specified by This.\r

-                               \r
+\r

 **/\r
 EFI_STATUS\r
 EFIAPI\r
 **/\r
 EFI_STATUS\r
 EFIAPI\r


@@ -290,31 +290,31 @@ Tcp4DriverBindingSupported (
 \r
 \r
 /**\r
 \r
 \r
 /**\r

-  Start this driver on ControllerHandle. \r
-  \r
-  The Start() function is designed to be invoked from the EFI boot service \r
-  ConnectController(). As a result, much of the error checking on the parameters \r
-  to Start() has been moved into this common boot service. It is legal to call \r
-  Start() from other locations, but the following calling restrictions must be \r
+  Start this driver on ControllerHandle.\r
+\r
+  The Start() function is designed to be invoked from the EFI boot service\r
+  ConnectController(). As a result, much of the error checking on the parameters\r
+  to Start() has been moved into this common boot service. It is legal to call\r
+  Start() from other locations, but the following calling restrictions must be\r

   followed or the system behavior will not be deterministic.\r
   1. ControllerHandle must be a valid EFI_HANDLE.\r
   followed or the system behavior will not be deterministic.\r
   1. ControllerHandle must be a valid EFI_HANDLE.\r

-  2. If RemainingDevicePath is not NULL, then it must be a pointer to a naturally \r
+  2. If RemainingDevicePath is not NULL, then it must be a pointer to a naturally\r

      aligned EFI_DEVICE_PATH_PROTOCOL.\r
      aligned EFI_DEVICE_PATH_PROTOCOL.\r

-  3. Prior to calling Start(), the Supported() function for the driver specified \r
-     by This must have been called with the same calling parameters, and Supported() \r
+  3. Prior to calling Start(), the Supported() function for the driver specified\r
+     by This must have been called with the same calling parameters, and Supported()\r

      must have returned EFI_SUCCESS.\r
 \r
   @param  This                 A pointer to the EFI_DRIVER_BINDING_PROTOCOL instance.\r
      must have returned EFI_SUCCESS.\r
 \r
   @param  This                 A pointer to the EFI_DRIVER_BINDING_PROTOCOL instance.\r

-  @param  ControllerHandle     The handle of the controller to start. This handle \r
-                               must support a protocol interface that supplies \r
+  @param  ControllerHandle     The handle of the controller to start. This handle\r
+                               must support a protocol interface that supplies\r

                                an I/O abstraction to the driver.\r
                                an I/O abstraction to the driver.\r

-  @param  RemainingDevicePath  A pointer to the remaining portion of a device path. \r
-                               This parameter is ignored by device drivers, and is \r
+  @param  RemainingDevicePath  A pointer to the remaining portion of a device path.\r
+                               This parameter is ignored by device drivers, and is\r

                                optional for bus drivers.\r
 \r
   @retval EFI_SUCCESS          The device was started.\r
   @retval EFI_ALREADY_STARTED  The device could not be started due to a device error.\r
                                optional for bus drivers.\r
 \r
   @retval EFI_SUCCESS          The device was started.\r
   @retval EFI_ALREADY_STARTED  The device could not be started due to a device error.\r

-  @retval EFI_OUT_OF_RESOURCES The request could not be completed due to a lack \r
+  @retval EFI_OUT_OF_RESOURCES The request could not be completed due to a lack\r

                                of resources.\r
 \r
 **/\r
                                of resources.\r
 \r
 **/\r


@@ -435,25 +435,25 @@ ON_ERROR:
 \r
 /**\r
   Stop this driver on ControllerHandle.\r
 \r
 /**\r
   Stop this driver on ControllerHandle.\r

-  \r
-  The Stop() function is designed to be invoked from the EFI boot service \r
-  DisconnectController(). As a result, much of the error checking on the parameters \r
-  to Stop() has been moved into this common boot service. It is legal to call Stop() \r
-  from other locations, but the following calling restrictions must be followed \r
+\r
+  The Stop() function is designed to be invoked from the EFI boot service\r
+  DisconnectController(). As a result, much of the error checking on the parameters\r
+  to Stop() has been moved into this common boot service. It is legal to call Stop()\r
+  from other locations, but the following calling restrictions must be followed\r

   or the system behavior will not be deterministic.\r
   or the system behavior will not be deterministic.\r

-  1. ControllerHandle must be a valid EFI_HANDLE that was used on a previous call \r
+  1. ControllerHandle must be a valid EFI_HANDLE that was used on a previous call\r

      to this same driver's Start() function.\r
   2. The first NumberOfChildren handles of ChildHandleBuffer must all be a valid\r
      to this same driver's Start() function.\r
   2. The first NumberOfChildren handles of ChildHandleBuffer must all be a valid\r

-     EFI_HANDLE. In addition, all of these handles must have been created in this \r
-     driver's Start() function, and the Start() function must have called OpenProtocol() \r
+     EFI_HANDLE. In addition, all of these handles must have been created in this\r
+     driver's Start() function, and the Start() function must have called OpenProtocol()\r

      on ControllerHandle with an Attribute of EFI_OPEN_PROTOCOL_BY_CHILD_CONTROLLER.\r
      on ControllerHandle with an Attribute of EFI_OPEN_PROTOCOL_BY_CHILD_CONTROLLER.\r

-  \r
+\r

   @param  This              A pointer to the EFI_DRIVER_BINDING_PROTOCOL instance.\r
   @param  This              A pointer to the EFI_DRIVER_BINDING_PROTOCOL instance.\r

-  @param  ControllerHandle  A handle to the device being stopped. The handle must \r
-                            support a bus specific I/O protocol for the driver \r
+  @param  ControllerHandle  A handle to the device being stopped. The handle must\r
+                            support a bus specific I/O protocol for the driver\r

                             to use to stop the device.\r
   @param  NumberOfChildren  The number of child device handles in ChildHandleBuffer.\r
                             to use to stop the device.\r
   @param  NumberOfChildren  The number of child device handles in ChildHandleBuffer.\r

-  @param  ChildHandleBuffer An array of child handles to be freed. May be NULL if \r
+  @param  ChildHandleBuffer An array of child handles to be freed. May be NULL if\r

                             NumberOfChildren is 0.\r
 \r
   @retval EFI_SUCCESS       The device was stopped.\r
                             NumberOfChildren is 0.\r
 \r
   @retval EFI_SUCCESS       The device was stopped.\r


@@ -505,7 +505,7 @@ Tcp4DriverBindingStop (
   TcpServiceData = TCP4_FROM_THIS (ServiceBinding);\r
 \r
   if (NumberOfChildren != 0) {\r
   TcpServiceData = TCP4_FROM_THIS (ServiceBinding);\r
 \r
   if (NumberOfChildren != 0) {\r

-    List = &TcpServiceData->SocketList; \r
+    List = &TcpServiceData->SocketList;\r

     Context.ServiceBinding = ServiceBinding;\r
     Context.NumberOfChildren = NumberOfChildren;\r
     Context.ChildHandleBuffer = ChildHandleBuffer;\r
     Context.ServiceBinding = ServiceBinding;\r
     Context.NumberOfChildren = NumberOfChildren;\r
     Context.ChildHandleBuffer = ChildHandleBuffer;\r


@@ -541,7 +541,7 @@ Tcp4DriverBindingStop (
       FreeUnicodeStringTable (gTcpControllerNameTable);\r
       gTcpControllerNameTable = NULL;\r
     }\r
       FreeUnicodeStringTable (gTcpControllerNameTable);\r
       gTcpControllerNameTable = NULL;\r
     }\r

-    \r
+\r

     //\r
     // Release the TCP service data\r
     //\r
     //\r
     // Release the TCP service data\r
     //\r


@@ -554,15 +554,15 @@ Tcp4DriverBindingStop (
 }\r
 \r
 /**\r
 }\r
 \r
 /**\r

-  Open Ip4 and device path protocols for a created socket, and insert it in \r
+  Open Ip4 and device path protocols for a created socket, and insert it in\r

   socket list.\r
   socket list.\r

-  \r
+\r

   @param  This                Pointer to the socket just created\r
   @param  Context             Context of the socket\r
   @param  This                Pointer to the socket just created\r
   @param  Context             Context of the socket\r

-  \r
+\r

   @retval EFI_SUCCESS         This protocol is installed successfully.\r
   @retval other               Some error occured.\r
   @retval EFI_SUCCESS         This protocol is installed successfully.\r
   @retval other               Some error occured.\r

-  \r
+\r

 **/\r
 EFI_STATUS\r
 Tcp4CreateSocketCallback (\r
 **/\r
 EFI_STATUS\r
 Tcp4CreateSocketCallback (\r


@@ -620,11 +620,11 @@ Tcp4CreateSocketCallback (
 }\r
 \r
 /**\r
 }\r
 \r
 /**\r

-  Close Ip4 and device path protocols for a socket, and remove it from socket list. \r
-    \r
+  Close Ip4 and device path protocols for a socket, and remove it from socket list.\r
+\r

   @param  This                Pointer to the socket to be removed\r
   @param  Context             Context of the socket\r
   @param  This                Pointer to the socket to be removed\r
   @param  Context             Context of the socket\r

-  \r
+\r

 **/\r
 VOID\r
 Tcp4DestroySocketCallback (\r
 **/\r
 VOID\r
 Tcp4DestroySocketCallback (\r


@@ -654,15 +654,15 @@ Tcp4DestroySocketCallback (
 \r
 /**\r
   Creates a child handle and installs a protocol.\r
 \r
 /**\r
   Creates a child handle and installs a protocol.\r

-  \r
-  The CreateChild() function installs a protocol on ChildHandle. If ChildHandle \r
-  is a pointer to NULL, then a new handle is created and returned in ChildHandle. \r
-  If ChildHandle is not a pointer to NULL, then the protocol installs on the existing \r
+\r
+  The CreateChild() function installs a protocol on ChildHandle. If ChildHandle\r
+  is a pointer to NULL, then a new handle is created and returned in ChildHandle.\r
+  If ChildHandle is not a pointer to NULL, then the protocol installs on the existing\r

   ChildHandle.\r
 \r
   @param  This        Pointer to the EFI_SERVICE_BINDING_PROTOCOL instance.\r
   ChildHandle.\r
 \r
   @param  This        Pointer to the EFI_SERVICE_BINDING_PROTOCOL instance.\r

-  @param  ChildHandle Pointer to the handle of the child to create. If it is NULL, then \r
-                      a new handle is created. If it is a pointer to an existing UEFI \r
+  @param  ChildHandle Pointer to the handle of the child to create. If it is NULL, then\r
+                      a new handle is created. If it is a pointer to an existing UEFI\r

                       handle, then the protocol is added to the existing UEFI handle.\r
 \r
   @retval EFI_SUCCES            The protocol was added to ChildHandle.\r
                       handle, then the protocol is added to the existing UEFI handle.\r
 \r
   @retval EFI_SUCCES            The protocol was added to ChildHandle.\r


@@ -722,22 +722,22 @@ Tcp4ServiceBindingCreateChild (
 \r
 /**\r
   Destroys a child handle with a protocol installed on it.\r
 \r
 /**\r
   Destroys a child handle with a protocol installed on it.\r

-  \r
-  The DestroyChild() function does the opposite of CreateChild(). It removes a protocol \r
-  that was installed by CreateChild() from ChildHandle. If the removed protocol is the \r
+\r
+  The DestroyChild() function does the opposite of CreateChild(). It removes a protocol\r
+  that was installed by CreateChild() from ChildHandle. If the removed protocol is the\r

   last protocol on ChildHandle, then ChildHandle is destroyed.\r
 \r
   @param  This         Pointer to the EFI_SERVICE_BINDING_PROTOCOL instance.\r
   @param  ChildHandle  Handle of the child to destroy\r
 \r
   @retval EFI_SUCCES            The protocol was removed from ChildHandle.\r
   last protocol on ChildHandle, then ChildHandle is destroyed.\r
 \r
   @param  This         Pointer to the EFI_SERVICE_BINDING_PROTOCOL instance.\r
   @param  ChildHandle  Handle of the child to destroy\r
 \r
   @retval EFI_SUCCES            The protocol was removed from ChildHandle.\r

-  @retval EFI_UNSUPPORTED       ChildHandle does not support the protocol that is \r
+  @retval EFI_UNSUPPORTED       ChildHandle does not support the protocol that is\r

                                 being removed.\r
   @retval EFI_INVALID_PARAMETER Child handle is NULL.\r
   @retval EFI_ACCESS_DENIED     The protocol could not be removed from the ChildHandle\r
                                 because its services are being used.\r
   @retval other                 The child handle was not destroyed.\r
                                 being removed.\r
   @retval EFI_INVALID_PARAMETER Child handle is NULL.\r
   @retval EFI_ACCESS_DENIED     The protocol could not be removed from the ChildHandle\r
                                 because its services are being used.\r
   @retval other                 The child handle was not destroyed.\r

-  \r
+\r

 **/\r
 EFI_STATUS\r
 EFIAPI\r
 **/\r
 EFI_STATUS\r
 EFIAPI\r

diff --git a/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Driver.h b/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Driver.h
index edaa1a4a81cf2509d55ee6fb715e60361f180027..368f49c4ddb1b600f076f72ce5dcfb81e54d5da7 100644 (file)
--- a/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Driver.h
+++ b/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Driver.h
@@ -1,7 +1,7 @@
 /** @file\r
   Tcp driver function header.\r
 \r
 /** @file\r
   Tcp driver function header.\r
 \r

-Copyright (c) 2005 - 2016, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2005 - 2018, Intel Corporation. All rights reserved.<BR>\r

 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r


@@ -30,7 +30,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   Tcp4ServiceBinding, \\r
   TCP4_DRIVER_SIGNATURE \\r
   )\r
   Tcp4ServiceBinding, \\r
   TCP4_DRIVER_SIGNATURE \\r
   )\r

-  \r
+\r

 ///\r
 /// TCP heartbeat tick timer.\r
 ///\r
 ///\r
 /// TCP heartbeat tick timer.\r
 ///\r


@@ -148,32 +148,32 @@ Tcp4DriverEntryPoint (
 \r
 /**\r
   Tests to see if this driver supports a given controller.\r
 \r
 /**\r
   Tests to see if this driver supports a given controller.\r

-  \r
-  If a child device is provided, it further tests to see if this driver supports \r
+\r
+  If a child device is provided, it further tests to see if this driver supports\r

   creating a handle for the specified child device.\r
 \r
   @param  This                 A pointer to the EFI_DRIVER_BINDING_PROTOCOL instance.\r
   creating a handle for the specified child device.\r
 \r
   @param  This                 A pointer to the EFI_DRIVER_BINDING_PROTOCOL instance.\r

-  @param  ControllerHandle     The handle of the controller to test. This handle \r
-                               must support a protocol interface that supplies \r
+  @param  ControllerHandle     The handle of the controller to test. This handle\r
+                               must support a protocol interface that supplies\r

                                an I/O abstraction to the driver.\r
                                an I/O abstraction to the driver.\r

-  @param  RemainingDevicePath  A pointer to the remaining portion of a device path. \r
+  @param  RemainingDevicePath  A pointer to the remaining portion of a device path.\r

                                This parameter is ignored by device drivers, and is optional for bus drivers.\r
 \r
 \r
   @retval EFI_SUCCESS          The device specified by ControllerHandle and\r
                                This parameter is ignored by device drivers, and is optional for bus drivers.\r
 \r
 \r
   @retval EFI_SUCCESS          The device specified by ControllerHandle and\r

-                               RemainingDevicePath is supported by the driver \r
+                               RemainingDevicePath is supported by the driver\r

                                specified by This.\r
   @retval EFI_ALREADY_STARTED  The device specified by ControllerHandle and\r
                                specified by This.\r
   @retval EFI_ALREADY_STARTED  The device specified by ControllerHandle and\r

-                               RemainingDevicePath is already being managed by \r
+                               RemainingDevicePath is already being managed by\r

                                the driver specified by This.\r
   @retval EFI_ACCESS_DENIED    The device specified by ControllerHandle and\r
                                the driver specified by This.\r
   @retval EFI_ACCESS_DENIED    The device specified by ControllerHandle and\r

-                               RemainingDevicePath is already being managed by a \r
-                               different driver or an application that requires \r
+                               RemainingDevicePath is already being managed by a\r
+                               different driver or an application that requires\r

                                exclusive access.\r
   @retval EFI_UNSUPPORTED      The device specified by ControllerHandle and\r
                                exclusive access.\r
   @retval EFI_UNSUPPORTED      The device specified by ControllerHandle and\r

-                               RemainingDevicePath is not supported by the driver \r
+                               RemainingDevicePath is not supported by the driver\r

                                specified by This.\r
                                specified by This.\r

-                               \r
+\r

 **/\r
 EFI_STATUS\r
 EFIAPI\r
 **/\r
 EFI_STATUS\r
 EFIAPI\r


@@ -184,31 +184,31 @@ Tcp4DriverBindingSupported (
   );\r
 \r
 /**\r
   );\r
 \r
 /**\r

-  Start this driver on ControllerHandle. \r
-  \r
-  The Start() function is designed to be invoked from the EFI boot service \r
-  ConnectController(). As a result, much of the error checking on the parameters \r
-  to Start() has been moved into this common boot service. It is legal to call \r
-  Start() from other locations, but the following calling restrictions must be \r
+  Start this driver on ControllerHandle.\r
+\r
+  The Start() function is designed to be invoked from the EFI boot service\r
+  ConnectController(). As a result, much of the error checking on the parameters\r
+  to Start() has been moved into this common boot service. It is legal to call\r
+  Start() from other locations, but the following calling restrictions must be\r

   followed or the system behavior will not be deterministic.\r
   1. ControllerHandle must be a valid EFI_HANDLE.\r
   followed or the system behavior will not be deterministic.\r
   1. ControllerHandle must be a valid EFI_HANDLE.\r

-  2. If RemainingDevicePath is not NULL, then it must be a pointer to a naturally \r
+  2. If RemainingDevicePath is not NULL, then it must be a pointer to a naturally\r

      aligned EFI_DEVICE_PATH_PROTOCOL.\r
      aligned EFI_DEVICE_PATH_PROTOCOL.\r

-  3. Prior to calling Start(), the Supported() function for the driver specified \r
-     by This must have been called with the same calling parameters, and Supported() \r
+  3. Prior to calling Start(), the Supported() function for the driver specified\r
+     by This must have been called with the same calling parameters, and Supported()\r

      must have returned EFI_SUCCESS.\r
 \r
   @param  This                 A pointer to the EFI_DRIVER_BINDING_PROTOCOL instance.\r
      must have returned EFI_SUCCESS.\r
 \r
   @param  This                 A pointer to the EFI_DRIVER_BINDING_PROTOCOL instance.\r

-  @param  ControllerHandle     The handle of the controller to start. This handle \r
-                               must support a protocol interface that supplies \r
+  @param  ControllerHandle     The handle of the controller to start. This handle\r
+                               must support a protocol interface that supplies\r

                                an I/O abstraction to the driver.\r
                                an I/O abstraction to the driver.\r

-  @param  RemainingDevicePath  A pointer to the remaining portion of a device path. \r
-                               This parameter is ignored by device drivers, and is \r
+  @param  RemainingDevicePath  A pointer to the remaining portion of a device path.\r
+                               This parameter is ignored by device drivers, and is\r

                                optional for bus drivers.\r
 \r
   @retval EFI_SUCCESS          The device was started.\r
   @retval EFI_ALREADY_STARTED  The device could not be started due to a device error.\r
                                optional for bus drivers.\r
 \r
   @retval EFI_SUCCESS          The device was started.\r
   @retval EFI_ALREADY_STARTED  The device could not be started due to a device error.\r

-  @retval EFI_OUT_OF_RESOURCES The request could not be completed due to a lack \r
+  @retval EFI_OUT_OF_RESOURCES The request could not be completed due to a lack\r

                                of resources.\r
 \r
 **/\r
                                of resources.\r
 \r
 **/\r


@@ -222,25 +222,25 @@ Tcp4DriverBindingStart (
 \r
 /**\r
   Stop this driver on ControllerHandle.\r
 \r
 /**\r
   Stop this driver on ControllerHandle.\r

-  \r
-  The Stop() function is designed to be invoked from the EFI boot service \r
-  DisconnectController(). As a result, much of the error checking on the parameters \r
-  to Stop() has been moved into this common boot service. It is legal to call Stop() \r
-  from other locations, but the following calling restrictions must be followed \r
+\r
+  The Stop() function is designed to be invoked from the EFI boot service\r
+  DisconnectController(). As a result, much of the error checking on the parameters\r
+  to Stop() has been moved into this common boot service. It is legal to call Stop()\r
+  from other locations, but the following calling restrictions must be followed\r

   or the system behavior will not be deterministic.\r
   or the system behavior will not be deterministic.\r

-  1. ControllerHandle must be a valid EFI_HANDLE that was used on a previous call \r
+  1. ControllerHandle must be a valid EFI_HANDLE that was used on a previous call\r

      to this same driver's Start() function.\r
   2. The first NumberOfChildren handles of ChildHandleBuffer must all be a valid\r
      to this same driver's Start() function.\r
   2. The first NumberOfChildren handles of ChildHandleBuffer must all be a valid\r

-     EFI_HANDLE. In addition, all of these handles must have been created in this \r
-     driver's Start() function, and the Start() function must have called OpenProtocol() \r
+     EFI_HANDLE. In addition, all of these handles must have been created in this\r
+     driver's Start() function, and the Start() function must have called OpenProtocol()\r

      on ControllerHandle with an Attribute of EFI_OPEN_PROTOCOL_BY_CHILD_CONTROLLER.\r
      on ControllerHandle with an Attribute of EFI_OPEN_PROTOCOL_BY_CHILD_CONTROLLER.\r

-  \r
+\r

   @param  This              A pointer to the EFI_DRIVER_BINDING_PROTOCOL instance.\r
   @param  This              A pointer to the EFI_DRIVER_BINDING_PROTOCOL instance.\r

-  @param  ControllerHandle  A handle to the device being stopped. The handle must \r
-                            support a bus specific I/O protocol for the driver \r
+  @param  ControllerHandle  A handle to the device being stopped. The handle must\r
+                            support a bus specific I/O protocol for the driver\r

                             to use to stop the device.\r
   @param  NumberOfChildren  The number of child device handles in ChildHandleBuffer.\r
                             to use to stop the device.\r
   @param  NumberOfChildren  The number of child device handles in ChildHandleBuffer.\r

-  @param  ChildHandleBuffer An array of child handles to be freed. May be NULL if \r
+  @param  ChildHandleBuffer An array of child handles to be freed. May be NULL if\r

                             NumberOfChildren is 0.\r
 \r
   @retval EFI_SUCCESS       The device was stopped.\r
                             NumberOfChildren is 0.\r
 \r
   @retval EFI_SUCCESS       The device was stopped.\r


@@ -257,15 +257,15 @@ Tcp4DriverBindingStop (
   );\r
 \r
 /**\r
   );\r
 \r
 /**\r

-  Open Ip4 and device path protocols for a created socket, and insert it in \r
+  Open Ip4 and device path protocols for a created socket, and insert it in\r

   socket list.\r
   socket list.\r

-  \r
+\r

   @param  This                Pointer to the socket just created\r
   @param  Context             Context of the socket\r
   @param  This                Pointer to the socket just created\r
   @param  Context             Context of the socket\r

-  \r
+\r

   @retval EFI_SUCCESS         This protocol is installed successfully.\r
   @retval other               Some error occured.\r
   @retval EFI_SUCCESS         This protocol is installed successfully.\r
   @retval other               Some error occured.\r

-  \r
+\r

 **/\r
 EFI_STATUS\r
 Tcp4CreateSocketCallback (\r
 **/\r
 EFI_STATUS\r
 Tcp4CreateSocketCallback (\r


@@ -274,11 +274,11 @@ Tcp4CreateSocketCallback (
   );\r
 \r
 /**\r
   );\r
 \r
 /**\r

-  Close Ip4 and device path protocols for a socket, and remove it from socket list. \r
-    \r
+  Close Ip4 and device path protocols for a socket, and remove it from socket list.\r
+\r

   @param  This                Pointer to the socket to be removed\r
   @param  Context             Context of the socket\r
   @param  This                Pointer to the socket to be removed\r
   @param  Context             Context of the socket\r

-  \r
+\r

 **/\r
 VOID\r
 Tcp4DestroySocketCallback (\r
 **/\r
 VOID\r
 Tcp4DestroySocketCallback (\r


@@ -288,15 +288,15 @@ Tcp4DestroySocketCallback (
 \r
 /**\r
   Creates a child handle and installs a protocol.\r
 \r
 /**\r
   Creates a child handle and installs a protocol.\r

-  \r
-  The CreateChild() function installs a protocol on ChildHandle. If ChildHandle \r
-  is a pointer to NULL, then a new handle is created and returned in ChildHandle. \r
-  If ChildHandle is not a pointer to NULL, then the protocol installs on the existing \r
+\r
+  The CreateChild() function installs a protocol on ChildHandle. If ChildHandle\r
+  is a pointer to NULL, then a new handle is created and returned in ChildHandle.\r
+  If ChildHandle is not a pointer to NULL, then the protocol installs on the existing\r

   ChildHandle.\r
 \r
   @param  This        Pointer to the EFI_SERVICE_BINDING_PROTOCOL instance.\r
   ChildHandle.\r
 \r
   @param  This        Pointer to the EFI_SERVICE_BINDING_PROTOCOL instance.\r

-  @param  ChildHandle Pointer to the handle of the child to create. If it is NULL, then \r
-                      a new handle is created. If it is a pointer to an existing UEFI \r
+  @param  ChildHandle Pointer to the handle of the child to create. If it is NULL, then\r
+                      a new handle is created. If it is a pointer to an existing UEFI\r

                       handle, then the protocol is added to the existing UEFI handle.\r
 \r
   @retval EFI_SUCCES            The protocol was added to ChildHandle.\r
                       handle, then the protocol is added to the existing UEFI handle.\r
 \r
   @retval EFI_SUCCES            The protocol was added to ChildHandle.\r


@@ -315,22 +315,22 @@ Tcp4ServiceBindingCreateChild (
 \r
 /**\r
   Destroys a child handle with a protocol installed on it.\r
 \r
 /**\r
   Destroys a child handle with a protocol installed on it.\r

-  \r
-  The DestroyChild() function does the opposite of CreateChild(). It removes a protocol \r
-  that was installed by CreateChild() from ChildHandle. If the removed protocol is the \r
+\r
+  The DestroyChild() function does the opposite of CreateChild(). It removes a protocol\r
+  that was installed by CreateChild() from ChildHandle. If the removed protocol is the\r

   last protocol on ChildHandle, then ChildHandle is destroyed.\r
 \r
   @param  This         Pointer to the EFI_SERVICE_BINDING_PROTOCOL instance.\r
   @param  ChildHandle  Handle of the child to destroy\r
 \r
   @retval EFI_SUCCES            The protocol was removed from ChildHandle.\r
   last protocol on ChildHandle, then ChildHandle is destroyed.\r
 \r
   @param  This         Pointer to the EFI_SERVICE_BINDING_PROTOCOL instance.\r
   @param  ChildHandle  Handle of the child to destroy\r
 \r
   @retval EFI_SUCCES            The protocol was removed from ChildHandle.\r

-  @retval EFI_UNSUPPORTED       ChildHandle does not support the protocol that is \r
+  @retval EFI_UNSUPPORTED       ChildHandle does not support the protocol that is\r

                                 being removed.\r
   @retval EFI_INVALID_PARAMETER Child handle is NULL.\r
   @retval EFI_ACCESS_DENIED     The protocol could not be removed from the ChildHandle\r
                                 because its services are being used.\r
   @retval other                 The child handle was not destroyed.\r
                                 being removed.\r
   @retval EFI_INVALID_PARAMETER Child handle is NULL.\r
   @retval EFI_ACCESS_DENIED     The protocol could not be removed from the ChildHandle\r
                                 because its services are being used.\r
   @retval other                 The child handle was not destroyed.\r

-  \r
+\r

 **/\r
 EFI_STATUS\r
 EFIAPI\r
 **/\r
 EFI_STATUS\r
 EFIAPI\r

diff --git a/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dxe.inf b/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dxe.inf
index ba3c377b5ff8787fafc567c3f8d890f2310da9e9..5021cbc4b8ee857e1b901e6d56a67c3c3e4ac5f4 100644 (file)
--- a/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dxe.inf
+++ b/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dxe.inf
@@ -4,7 +4,7 @@
 #  This module produces EFI TCPv4(Transmission Control Protocol version 4) Protocol\r
 #  upon EFI IPv4 Protocol, to provide basic TCPv4 I/O services.\r
 #\r
 #  This module produces EFI TCPv4(Transmission Control Protocol version 4) Protocol\r
 #  upon EFI IPv4 Protocol, to provide basic TCPv4 I/O services.\r
 #\r

-#  Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.<BR>\r
+#  Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r

 #  This program and the accompanying materials\r
 #  are licensed and made available under the terms and conditions of the BSD License\r
 #  which accompanies this distribution. The full text of the license may be found at\r
 #  This program and the accompanying materials\r
 #  are licensed and made available under the terms and conditions of the BSD License\r
 #  which accompanies this distribution. The full text of the license may be found at\r


@@ -30,7 +30,7 @@
 #\r
 #  VALID_ARCHITECTURES           = IA32 X64 IPF EBC\r
 #\r
 #\r
 #  VALID_ARCHITECTURES           = IA32 X64 IPF EBC\r
 #\r

-#  DRIVER_BINDING                =  mTcp4DriverBinding                        \r
+#  DRIVER_BINDING                =  mTcp4DriverBinding\r

 #  COMPONENT_NAME                =  gTcp4ComponentName\r
 #  COMPONENT_NAME2               =  gTcp4ComponentName2\r
 #\r
 #  COMPONENT_NAME                =  gTcp4ComponentName\r
 #  COMPONENT_NAME2               =  gTcp4ComponentName2\r
 #\r

diff --git a/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dxe.uni b/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dxe.uni
index b6d30d985142fd80e5bf8a13db1993dcdd8e7fef..1514a391776653b830e1c37dedbf763ffce981c5 100644 (file)
--- a/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dxe.uni
+++ b/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dxe.uni
@@ -4,13 +4,13 @@
 // This module produces EFI TCPv4(Transmission Control Protocol version 4) Protocol\r
 // upon EFI IPv4 Protocol, to provide basic TCPv4 I/O services.\r
 //\r
 // This module produces EFI TCPv4(Transmission Control Protocol version 4) Protocol\r
 // upon EFI IPv4 Protocol, to provide basic TCPv4 I/O services.\r
 //\r

-// Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.<BR>\r
+// Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r

 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r
 // which accompanies this distribution. The full text of the license may be found at\r
 // http://opensource.org/licenses/bsd-license.php\r
 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r
 // which accompanies this distribution. The full text of the license may be found at\r
 // http://opensource.org/licenses/bsd-license.php\r

-// \r
+//\r

 // THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 // WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 //\r
 // THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 // WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 //\r

diff --git a/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4DxeExtra.uni b/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4DxeExtra.uni
index a3e36b362c85225f4de225e1ad7a357bbc2d63f2..0e6d2f2896f35904c8bbd6ef728091cf4c16bc3d 100644 (file)
--- a/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4DxeExtra.uni
+++ b/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4DxeExtra.uni
@@ -1,7 +1,7 @@
 // /** @file\r
 // Tcp4Dxe Localized Strings and Content\r
 //\r
 // /** @file\r
 // Tcp4Dxe Localized Strings and Content\r
 //\r

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

 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r
 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r


@@ -13,8 +13,8 @@
 //\r
 // **/\r
 \r
 //\r
 // **/\r
 \r

-#string STR_PROPERTIES_MODULE_NAME \r
-#language en-US \r
+#string STR_PROPERTIES_MODULE_NAME\r
+#language en-US\r

 "TCP v4 DXE Driver"\r
 \r
 \r
 "TCP v4 DXE Driver"\r
 \r
 \r

diff --git a/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Input.c b/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Input.c
index 72955c6c5e488159981deb71269243d728283e5c..f48efdac7cd8423ccc6e9db6b1f03e8dda33fc3a 100644 (file)
--- a/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Input.c
+++ b/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Input.c
@@ -1,7 +1,7 @@
 /** @file\r
   TCP input process routines.\r
 \r
 /** @file\r
   TCP input process routines.\r
 \r

-Copyright (c) 2005 - 2017, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2005 - 2018, Intel Corporation. All rights reserved.<BR>\r

 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r


@@ -704,7 +704,7 @@ TcpInput (
   TCP_SEQNO   Right;\r
   TCP_SEQNO   Urg;\r
   INT32       Usable;\r
   TCP_SEQNO   Right;\r
   TCP_SEQNO   Urg;\r
   INT32       Usable;\r

-  \r
+\r

   NET_CHECK_SIGNATURE (Nbuf, NET_BUF_SIGNATURE);\r
 \r
   Parent  = NULL;\r
   NET_CHECK_SIGNATURE (Nbuf, NET_BUF_SIGNATURE);\r
 \r
   Parent  = NULL;\r


@@ -717,7 +717,7 @@ TcpInput (
     DEBUG ((EFI_D_NET, "TcpInput: received a malformed packet\n"));\r
     goto DISCARD;\r
   }\r
     DEBUG ((EFI_D_NET, "TcpInput: received a malformed packet\n"));\r
     goto DISCARD;\r
   }\r

-  \r
+\r

   Len     = Nbuf->TotalSize - (Head->HeadLen << 2);\r
 \r
   if ((Head->HeadLen < 5) || (Len < 0) ||\r
   Len     = Nbuf->TotalSize - (Head->HeadLen << 2);\r
 \r
   if ((Head->HeadLen < 5) || (Len < 0) ||\r


@@ -1315,7 +1315,7 @@ StepSix:
   TcpSetKeepaliveTimer (Tcb);\r
 \r
   if (TCP_FLG_ON (Seg->Flag, TCP_FLG_URG) &&\r
   TcpSetKeepaliveTimer (Tcb);\r
 \r
   if (TCP_FLG_ON (Seg->Flag, TCP_FLG_URG) &&\r

-      !TCP_FIN_RCVD (Tcb->State)) \r
+      !TCP_FIN_RCVD (Tcb->State))\r

   {\r
 \r
     DEBUG ((EFI_D_NET, "TcpInput: received urgent data "\r
   {\r
 \r
     DEBUG ((EFI_D_NET, "TcpInput: received urgent data "\r

diff --git a/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Main.c b/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Main.c
index 2679f1b8a01a5f7551427f61e1b0229a2fbda681..d8fc68c0a97d2e189ad1c7ac2f6f921152630bd4 100644 (file)
--- a/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Main.c
+++ b/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Main.c
@@ -1,7 +1,7 @@
 /** @file\r
   Implementation of TCP4 protocol services.\r
 \r
 /** @file\r
   Implementation of TCP4 protocol services.\r
 \r

-Copyright (c) 2005 - 2017, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2005 - 2018, Intel Corporation. All rights reserved.<BR>\r

 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r


@@ -53,10 +53,10 @@ Tcp4ChkDataBuf (
 \r
 /**\r
   Get the current operational status.\r
 \r
 /**\r
   Get the current operational status.\r

-  \r
-  The GetModeData() function copies the current operational settings of this \r
-  EFI TCPv4 Protocol instance into user-supplied buffers. This function can \r
-  also be used to retrieve the operational setting of underlying drivers \r
+\r
+  The GetModeData() function copies the current operational settings of this\r
+  EFI TCPv4 Protocol instance into user-supplied buffers. This function can\r
+  also be used to retrieve the operational setting of underlying drivers\r

   such as IPv4, MNP, or SNP.\r
 \r
   @param  This                     Pointer to the EFI_TCP4_PROTOCOL instance.\r
   such as IPv4, MNP, or SNP.\r
 \r
   @param  This                     Pointer to the EFI_TCP4_PROTOCOL instance.\r


@@ -64,7 +64,7 @@ Tcp4ChkDataBuf (
                                    state.\r
   @param  Tcp4ConfigData           Pointer to the buffer to receive the current TCP\r
                                    configuration.\r
                                    state.\r
   @param  Tcp4ConfigData           Pointer to the buffer to receive the current TCP\r
                                    configuration.\r

-  @param  Ip4ModeData              Pointer to the buffer to receive the current IPv4 \r
+  @param  Ip4ModeData              Pointer to the buffer to receive the current IPv4\r

                                    configuration data used by the TCPv4 instance.\r
   @param  MnpConfigData            Pointer to the buffer to receive the current MNP\r
                                    configuration data indirectly used by the TCPv4\r
                                    configuration data used by the TCPv4 instance.\r
   @param  MnpConfigData            Pointer to the buffer to receive the current MNP\r
                                    configuration data indirectly used by the TCPv4\r


@@ -112,21 +112,21 @@ Tcp4GetModeData (
 /**\r
   Initialize or brutally reset the operational parameters for\r
   this EFI TCPv4 instance.\r
 /**\r
   Initialize or brutally reset the operational parameters for\r
   this EFI TCPv4 instance.\r

-  \r
+\r

   The Configure() function does the following:\r
   The Configure() function does the following:\r

-  * Initialize this EFI TCPv4 instance, i.e., initialize the communication end \r
+  * Initialize this EFI TCPv4 instance, i.e., initialize the communication end\r

   setting, specify active open or passive open for an instance.\r
   setting, specify active open or passive open for an instance.\r

-  * Reset this TCPv4 instance brutally, i.e., cancel all pending asynchronous \r
-  tokens, flush transmission and receiving buffer directly without informing \r
+  * Reset this TCPv4 instance brutally, i.e., cancel all pending asynchronous\r
+  tokens, flush transmission and receiving buffer directly without informing\r

   the communication peer.\r
   the communication peer.\r

-  No other TCPv4 Protocol operation can be executed by this instance \r
-  until it is configured properly. For an active TCP4 instance, after a proper \r
-  configuration it may call Connect() to initiates the three-way handshake. \r
-  For a passive TCP4 instance, its state will transit to Tcp4StateListen after \r
-  configuration, and Accept() may be called to listen the incoming TCP connection \r
-  request. If TcpConfigData is set to NULL, the instance is reset. Resetting \r
-  process will be done brutally, the state machine will be set to Tcp4StateClosed \r
-  directly, the receive queue and transmit queue will be flushed, and no traffic is \r
+  No other TCPv4 Protocol operation can be executed by this instance\r
+  until it is configured properly. For an active TCP4 instance, after a proper\r
+  configuration it may call Connect() to initiates the three-way handshake.\r
+  For a passive TCP4 instance, its state will transit to Tcp4StateListen after\r
+  configuration, and Accept() may be called to listen the incoming TCP connection\r
+  request. If TcpConfigData is set to NULL, the instance is reset. Resetting\r
+  process will be done brutally, the state machine will be set to Tcp4StateClosed\r
+  directly, the receive queue and transmit queue will be flushed, and no traffic is\r

   allowed through this instance.\r
 \r
   @param  This                     Pointer to the EFI_TCP4_PROTOCOL instance.\r
   allowed through this instance.\r
 \r
   @param  This                     Pointer to the EFI_TCP4_PROTOCOL instance.\r


@@ -183,7 +183,7 @@ Tcp4Configure (
 \r
       CopyMem (&Ip, &TcpConfigData->AccessPoint.StationAddress, sizeof (IP4_ADDR));\r
       CopyMem (&SubnetMask, &TcpConfigData->AccessPoint.SubnetMask, sizeof (IP4_ADDR));\r
 \r
       CopyMem (&Ip, &TcpConfigData->AccessPoint.StationAddress, sizeof (IP4_ADDR));\r
       CopyMem (&SubnetMask, &TcpConfigData->AccessPoint.SubnetMask, sizeof (IP4_ADDR));\r

-      if (!IP4_IS_VALID_NETMASK (NTOHL (SubnetMask)) || \r
+      if (!IP4_IS_VALID_NETMASK (NTOHL (SubnetMask)) ||\r

           (SubnetMask != 0 && !NetIp4IsUnicast (NTOHL (Ip), NTOHL (SubnetMask)))) {\r
         return EFI_INVALID_PARAMETER;\r
       }\r
           (SubnetMask != 0 && !NetIp4IsUnicast (NTOHL (Ip), NTOHL (SubnetMask)))) {\r
         return EFI_INVALID_PARAMETER;\r
       }\r


@@ -214,35 +214,35 @@ Tcp4Configure (
 \r
 /**\r
   Add or delete routing entries.\r
 \r
 /**\r
   Add or delete routing entries.\r

-  \r
+\r

   The Routes() function adds or deletes a route from the instance's routing table.\r
   The Routes() function adds or deletes a route from the instance's routing table.\r

-  The most specific route is selected by comparing the SubnetAddress with the \r
+  The most specific route is selected by comparing the SubnetAddress with the\r

   destination IP address's arithmetical AND to the SubnetMask.\r
   destination IP address's arithmetical AND to the SubnetMask.\r

-  The default route is added with both SubnetAddress and SubnetMask set to 0.0.0.0. \r
+  The default route is added with both SubnetAddress and SubnetMask set to 0.0.0.0.\r

   The default route matches all destination IP addresses if there is no more specific route.\r
   The default route matches all destination IP addresses if there is no more specific route.\r

-  Direct route is added with GatewayAddress set to 0.0.0.0. Packets are sent to \r
-  the destination host if its address can be found in the Address Resolution Protocol (ARP) \r
-  cache or it is on the local subnet. If the instance is configured to use default \r
+  Direct route is added with GatewayAddress set to 0.0.0.0. Packets are sent to\r
+  the destination host if its address can be found in the Address Resolution Protocol (ARP)\r
+  cache or it is on the local subnet. If the instance is configured to use default\r

   address, a direct route to the local network will be added automatically.\r
   address, a direct route to the local network will be added automatically.\r

-  Each TCP instance has its own independent routing table. Instance that uses the \r
-  default IP address will have a copy of the EFI_IP4_CONFIG_PROTOCOL's routing table. \r
-  The copy will be updated automatically whenever the IP driver reconfigures its \r
-  instance. As a result, the previous modification to the instance's local copy \r
-  will be lost. The priority of checking the route table is specific with IP \r
+  Each TCP instance has its own independent routing table. Instance that uses the\r
+  default IP address will have a copy of the EFI_IP4_CONFIG_PROTOCOL's routing table.\r
+  The copy will be updated automatically whenever the IP driver reconfigures its\r
+  instance. As a result, the previous modification to the instance's local copy\r
+  will be lost. The priority of checking the route table is specific with IP\r

   implementation and every IP implementation must comply with RFC 1122.\r
 \r
   @param  This                     Pointer to the EFI_TCP4_PROTOCOL instance.\r
   @param  DeleteRoute              If TRUE, delete the specified route from routing\r
                                    table; if FALSE, add the specified route to\r
                                    routing table.\r
   implementation and every IP implementation must comply with RFC 1122.\r
 \r
   @param  This                     Pointer to the EFI_TCP4_PROTOCOL instance.\r
   @param  DeleteRoute              If TRUE, delete the specified route from routing\r
                                    table; if FALSE, add the specified route to\r
                                    routing table.\r

-                                   DestinationAddress and SubnetMask are used as \r
+                                   DestinationAddress and SubnetMask are used as\r

                                    the keywords to search route entry.\r
   @param  SubnetAddress            The destination network.\r
   @param  SubnetMask               The subnet mask for the destination network.\r
                                    the keywords to search route entry.\r
   @param  SubnetAddress            The destination network.\r
   @param  SubnetMask               The subnet mask for the destination network.\r

-  @param  GatewayAddress           The gateway address for this route. \r
-                                   It must be on the same subnet with the station \r
+  @param  GatewayAddress           The gateway address for this route.\r
+                                   It must be on the same subnet with the station\r

                                    address unless a direct route is specified.\r
                                    address unless a direct route is specified.\r

-                                   \r
+\r

   @retval EFI_SUCCESS              The operation completed successfully.\r
   @retval EFI_NOT_STARTED          The EFI_TCP4_PROTOCOL instance has not been\r
                                    configured.\r
   @retval EFI_SUCCESS              The operation completed successfully.\r
   @retval EFI_NOT_STARTED          The EFI_TCP4_PROTOCOL instance has not been\r
                                    configured.\r


@@ -288,21 +288,21 @@ Tcp4Routes (
 /**\r
   Initiate a nonblocking TCP connection request for an active TCP instance.\r
 \r
 /**\r
   Initiate a nonblocking TCP connection request for an active TCP instance.\r
 \r

-  The Connect() function will initiate an active open to the remote peer configured \r
-  in current TCP instance if it is configured active. If the connection succeeds \r
-  or fails due to any error, the ConnectionToken->CompletionToken.Event will be \r
-  signaled and ConnectionToken->CompletionToken.Status will be updated accordingly. \r
-  This function can only be called for the TCP instance in Tcp4StateClosed state. \r
-  The instance will transfer into Tcp4StateSynSent if the function returns EFI_SUCCESS. \r
-  If TCP three way handshake succeeds, its state will become Tcp4StateEstablished, \r
+  The Connect() function will initiate an active open to the remote peer configured\r
+  in current TCP instance if it is configured active. If the connection succeeds\r
+  or fails due to any error, the ConnectionToken->CompletionToken.Event will be\r
+  signaled and ConnectionToken->CompletionToken.Status will be updated accordingly.\r
+  This function can only be called for the TCP instance in Tcp4StateClosed state.\r
+  The instance will transfer into Tcp4StateSynSent if the function returns EFI_SUCCESS.\r
+  If TCP three way handshake succeeds, its state will become Tcp4StateEstablished,\r

   otherwise, the state will return to Tcp4StateClosed.\r
   otherwise, the state will return to Tcp4StateClosed.\r

-  \r
+\r

   @param  This                     Pointer to the EFI_TCP4_PROTOCOL instance\r
   @param  ConnectionToken          Pointer to the connection token to return when\r
                                    the TCP three way handshake finishes.\r
 \r
   @param  This                     Pointer to the EFI_TCP4_PROTOCOL instance\r
   @param  ConnectionToken          Pointer to the connection token to return when\r
                                    the TCP three way handshake finishes.\r
 \r

-  @retval EFI_SUCCESS              The connection request is successfully initiated \r
-                                   and the state of this TCPv4 instance has \r
+  @retval EFI_SUCCESS              The connection request is successfully initiated\r
+                                   and the state of this TCPv4 instance has\r

                                    been changed to Tcp4StateSynSent.\r
   @retval EFI_NOT_STARTED          This EFI_TCP4_PROTOCOL instance hasn't been\r
                                    configured.\r
                                    been changed to Tcp4StateSynSent.\r
   @retval EFI_NOT_STARTED          This EFI_TCP4_PROTOCOL instance hasn't been\r
                                    configured.\r


@@ -338,14 +338,14 @@ Tcp4Connect (
 /**\r
   Listen on the passive instance to accept an incoming connection request.\r
 \r
 /**\r
   Listen on the passive instance to accept an incoming connection request.\r
 \r

-  The Accept() function initiates an asynchronous accept request to wait for an \r
-  incoming connection on the passive TCP instance. If a remote peer successfully \r
-  establishes a connection with this instance, a new TCP instance will be created \r
-  and its handle will be returned in ListenToken->NewChildHandle. The newly created \r
-  instance is configured by inheriting the passive instance's configuration and is \r
+  The Accept() function initiates an asynchronous accept request to wait for an\r
+  incoming connection on the passive TCP instance. If a remote peer successfully\r
+  establishes a connection with this instance, a new TCP instance will be created\r
+  and its handle will be returned in ListenToken->NewChildHandle. The newly created\r
+  instance is configured by inheriting the passive instance's configuration and is\r

   ready for use upon return. The instance is in the Tcp4StateEstablished state.\r
   ready for use upon return. The instance is in the Tcp4StateEstablished state.\r

-  The ListenToken->CompletionToken.Event will be signaled when a new connection \r
-  is accepted, user aborts the listen or connection is reset. This function only \r
+  The ListenToken->CompletionToken.Event will be signaled when a new connection\r
+  is accepted, user aborts the listen or connection is reset. This function only\r

   can be called when current TCP instance is in Tcp4StateListen state.\r
 \r
   @param  This                     Pointer to the EFI_TCP4_PROTOCOL instance\r
   can be called when current TCP instance is in Tcp4StateListen state.\r
 \r
   @param  This                     Pointer to the EFI_TCP4_PROTOCOL instance\r


@@ -389,8 +389,8 @@ Tcp4Accept (
 /**\r
   Queues outgoing data into the transmit queue.\r
 \r
 /**\r
   Queues outgoing data into the transmit queue.\r
 \r

-  The Transmit() function queues a sending request to this TCPv4 instance along \r
-  with the user data. The status of the token is updated and the event in the token \r
+  The Transmit() function queues a sending request to this TCPv4 instance along\r
+  with the user data. The status of the token is updated and the event in the token\r

   will be signaled once the data is sent out or some error occurs.\r
 \r
   @param  This                     Pointer to the EFI_TCP4_PROTOCOL instance\r
   will be signaled once the data is sent out or some error occurs.\r
 \r
   @param  This                     Pointer to the EFI_TCP4_PROTOCOL instance\r


@@ -406,11 +406,11 @@ Tcp4Accept (
   @retval EFI_ACCESS_DENIED        One or more of the following conditions is TRUE:\r
                                    * A transmit completion token with the same\r
                                      Token-> CompletionToken.Event was already in the\r
   @retval EFI_ACCESS_DENIED        One or more of the following conditions is TRUE:\r
                                    * A transmit completion token with the same\r
                                      Token-> CompletionToken.Event was already in the\r

-                                     transmission queue. \r
-                                   * The current instance is in Tcp4StateClosed state \r
-                                   * The current instance is a passive one and \r
-                                     it is in Tcp4StateListen state. \r
-                                   * User has called Close() to disconnect this \r
+                                     transmission queue.\r
+                                   * The current instance is in Tcp4StateClosed state\r
+                                   * The current instance is a passive one and\r
+                                     it is in Tcp4StateListen state.\r
+                                   * User has called Close() to disconnect this\r

                                      connection.\r
   @retval EFI_NOT_READY            The completion token could not be queued because\r
                                    the transmit queue is full.\r
                                      connection.\r
   @retval EFI_NOT_READY            The completion token could not be queued because\r
                                    the transmit queue is full.\r


@@ -459,16 +459,16 @@ Tcp4Transmit (
 /**\r
   Place an asynchronous receive request into the receiving queue.\r
 \r
 /**\r
   Place an asynchronous receive request into the receiving queue.\r
 \r

-  The Receive() function places a completion token into the receive packet queue. \r
-  This function is always asynchronous. The caller must allocate the \r
-  Token->CompletionToken.Event and the FragmentBuffer used to receive data. He also \r
-  must fill the DataLength which represents the whole length of all FragmentBuffer. \r
-  When the receive operation completes, the EFI TCPv4 Protocol driver updates the \r
-  Token->CompletionToken.Status and Token->Packet.RxData fields and the \r
-  Token->CompletionToken.Event is signaled. If got data the data and its length \r
-  will be copy into the FragmentTable, in the same time the full length of received \r
-  data will be recorded in the DataLength fields. Providing a proper notification \r
-  function and context for the event will enable the user to receive the notification \r
+  The Receive() function places a completion token into the receive packet queue.\r
+  This function is always asynchronous. The caller must allocate the\r
+  Token->CompletionToken.Event and the FragmentBuffer used to receive data. He also\r
+  must fill the DataLength which represents the whole length of all FragmentBuffer.\r
+  When the receive operation completes, the EFI TCPv4 Protocol driver updates the\r
+  Token->CompletionToken.Status and Token->Packet.RxData fields and the\r
+  Token->CompletionToken.Event is signaled. If got data the data and its length\r
+  will be copy into the FragmentTable, in the same time the full length of received\r
+  data will be recorded in the DataLength fields. Providing a proper notification\r
+  function and context for the event will enable the user to receive the notification\r

   and receiving status. That notification function is guaranteed to not be re-entered.\r
 \r
   @param  This                     Pointer to the EFI_TCP4_PROTOCOL instance.\r
   and receiving status. That notification function is guaranteed to not be re-entered.\r
 \r
   @param  This                     Pointer to the EFI_TCP4_PROTOCOL instance.\r


@@ -484,16 +484,16 @@ Tcp4Transmit (
   @retval EFI_OUT_OF_RESOURCES     The receive completion token could not be queued\r
                                    due to a lack of system resources.\r
   @retval EFI_DEVICE_ERROR         An unexpected system or network error occurred.\r
   @retval EFI_OUT_OF_RESOURCES     The receive completion token could not be queued\r
                                    due to a lack of system resources.\r
   @retval EFI_DEVICE_ERROR         An unexpected system or network error occurred.\r

-                                   The EFI TCPv4 Protocol instance has been reset \r
+                                   The EFI TCPv4 Protocol instance has been reset\r

                                    to startup defaults.\r
   @retval EFI_ACCESS_DENIED        One or more of the following conditions is TRUE:\r
                                    * A receive completion token with the same\r
                                    to startup defaults.\r
   @retval EFI_ACCESS_DENIED        One or more of the following conditions is TRUE:\r
                                    * A receive completion token with the same\r

-                                     Token->CompletionToken.Event was already in \r
-                                     the receive queue. \r
-                                   * The current instance is in Tcp4StateClosed state. \r
-                                   * The current instance is a passive one and it \r
-                                     is in Tcp4StateListen state. \r
-                                   * User has called Close() to disconnect this \r
+                                     Token->CompletionToken.Event was already in\r
+                                     the receive queue.\r
+                                   * The current instance is in Tcp4StateClosed state.\r
+                                   * The current instance is a passive one and it\r
+                                     is in Tcp4StateListen state.\r
+                                   * User has called Close() to disconnect this\r

                                      connection.\r
   @retval EFI_CONNECTION_FIN       The communication peer has closed the connection\r
                                    and there is no any buffered data in the receive\r
                                      connection.\r
   @retval EFI_CONNECTION_FIN       The communication peer has closed the connection\r
                                    and there is no any buffered data in the receive\r


@@ -541,13 +541,13 @@ Tcp4Receive (
 /**\r
   Disconnecting a TCP connection gracefully or reset a TCP connection.\r
 \r
 /**\r
   Disconnecting a TCP connection gracefully or reset a TCP connection.\r
 \r

-  Initiate an asynchronous close token to TCP driver. After Close() is called, \r
-  any buffered transmission data will be sent by TCP driver and the current \r
-  instance will have a graceful close working flow described as RFC 793 if \r
-  AbortOnClose is set to FALSE, otherwise, a rest packet will be sent by TCP \r
-  driver to fast disconnect this connection. When the close operation completes \r
-  successfully the TCP instance is in Tcp4StateClosed state, all pending \r
-  asynchronous operation is signaled and any buffers used for TCP network traffic \r
+  Initiate an asynchronous close token to TCP driver. After Close() is called,\r
+  any buffered transmission data will be sent by TCP driver and the current\r
+  instance will have a graceful close working flow described as RFC 793 if\r
+  AbortOnClose is set to FALSE, otherwise, a rest packet will be sent by TCP\r
+  driver to fast disconnect this connection. When the close operation completes\r
+  successfully the TCP instance is in Tcp4StateClosed state, all pending\r
+  asynchronous operation is signaled and any buffers used for TCP network traffic\r

   is flushed.\r
 \r
   @param  This                     Pointer to the EFI_TCP4_PROTOCOL instance.\r
   is flushed.\r
 \r
   @param  This                     Pointer to the EFI_TCP4_PROTOCOL instance.\r


@@ -557,7 +557,7 @@ Tcp4Receive (
   @retval EFI_SUCCESS              The operation completed successfully.\r
   @retval EFI_NOT_STARTED          The EFI_TCP4_PROTOCOL instance hasn't been\r
                                    configured.\r
   @retval EFI_SUCCESS              The operation completed successfully.\r
   @retval EFI_NOT_STARTED          The EFI_TCP4_PROTOCOL instance hasn't been\r
                                    configured.\r

-  @retval EFI_ACCESS_DENIED        One or more of the following are TRUE: \r
+  @retval EFI_ACCESS_DENIED        One or more of the following are TRUE:\r

                                    * Configure() has been called with TcpConfigData\r
                                      set to NULL and this function has not returned.\r
                                    * Previous Close() call on this instance has not\r
                                    * Configure() has been called with TcpConfigData\r
                                      set to NULL and this function has not returned.\r
                                    * Previous Close() call on this instance has not\r


@@ -593,33 +593,33 @@ Tcp4Close (
 /**\r
   Abort an asynchronous connection, listen, transmission or receive request.\r
 \r
 /**\r
   Abort an asynchronous connection, listen, transmission or receive request.\r
 \r

-  The Cancel() function aborts a pending connection, listen, transmit or receive \r
-  request. If Token is not NULL and the token is in the connection, listen, \r
-  transmission or receive queue when it is being cancelled, its Token->Status \r
-  will be set to EFI_ABORTED and then Token->Event will be signaled. If the token \r
-  is not in one of the queues, which usually means that the asynchronous operation \r
-  has completed, EFI_NOT_FOUND is returned. If Token is NULL all asynchronous token \r
+  The Cancel() function aborts a pending connection, listen, transmit or receive\r
+  request. If Token is not NULL and the token is in the connection, listen,\r
+  transmission or receive queue when it is being cancelled, its Token->Status\r
+  will be set to EFI_ABORTED and then Token->Event will be signaled. If the token\r
+  is not in one of the queues, which usually means that the asynchronous operation\r
+  has completed, EFI_NOT_FOUND is returned. If Token is NULL all asynchronous token\r

   issued by Connect(), Accept(), Transmit() and Receive()will be aborted.\r
   NOTE: It has not been implemented currently.\r
   issued by Connect(), Accept(), Transmit() and Receive()will be aborted.\r
   NOTE: It has not been implemented currently.\r

-    \r
+\r

   @param  This                     Pointer to the EFI_TCP4_PROTOCOL instance.\r
   @param  Token                    Pointer to a token that has been issued by\r
                                    Connect(), Accept(), Transmit() or Receive(). If\r
                                    NULL, all pending tokens issued by above four\r
                                    functions will be aborted.\r
   @param  This                     Pointer to the EFI_TCP4_PROTOCOL instance.\r
   @param  Token                    Pointer to a token that has been issued by\r
                                    Connect(), Accept(), Transmit() or Receive(). If\r
                                    NULL, all pending tokens issued by above four\r
                                    functions will be aborted.\r

-                                   \r
+\r

   @retval  EFI_SUCCESS             The asynchronous I/O request is aborted and Token->Event\r
                                    is signaled.\r
   @retval  EFI_INVALID_PARAMETER   This is NULL.\r
   @retval  EFI_NOT_STARTED         This instance hasn's been configured.\r
   @retval  EFI_NO_MAPPING          When using the default address, configuration\r
                                    (DHCP, BOOTP,RARP, etc.) hasn's finished yet.\r
   @retval  EFI_SUCCESS             The asynchronous I/O request is aborted and Token->Event\r
                                    is signaled.\r
   @retval  EFI_INVALID_PARAMETER   This is NULL.\r
   @retval  EFI_NOT_STARTED         This instance hasn's been configured.\r
   @retval  EFI_NO_MAPPING          When using the default address, configuration\r
                                    (DHCP, BOOTP,RARP, etc.) hasn's finished yet.\r

-  @retval  EFI_NOT_FOUND           The asynchronous I/O request isn's found in the \r
-                                   transmission or receive queue. It has either \r
+  @retval  EFI_NOT_FOUND           The asynchronous I/O request isn's found in the\r
+                                   transmission or receive queue. It has either\r

                                    completed or wasn's issued by Transmit() and Receive().\r
   @retval  EFI_UNSUPPORTED         The operation is not supported in current\r
                                    implementation.\r
                                    completed or wasn's issued by Transmit() and Receive().\r
   @retval  EFI_UNSUPPORTED         The operation is not supported in current\r
                                    implementation.\r

-  \r
+\r

 **/\r
 EFI_STATUS\r
 EFIAPI\r
 **/\r
 EFI_STATUS\r
 EFIAPI\r


@@ -635,11 +635,11 @@ Tcp4Cancel (
 /**\r
   Poll to receive incoming data and transmit outgoing segments.\r
 \r
 /**\r
   Poll to receive incoming data and transmit outgoing segments.\r
 \r

-  The Poll() function increases the rate that data is moved between the network \r
-  and application and can be called when the TCP instance is created successfully. \r
-  Its use is optional. In some implementations, the periodical timer in the MNP \r
-  driver may not poll the underlying communications device fast enough to avoid \r
-  drop packets. Drivers and applications that are experiencing packet loss should \r
+  The Poll() function increases the rate that data is moved between the network\r
+  and application and can be called when the TCP instance is created successfully.\r
+  Its use is optional. In some implementations, the periodical timer in the MNP\r
+  driver may not poll the underlying communications device fast enough to avoid\r
+  drop packets. Drivers and applications that are experiencing packet loss should\r

   try calling the Poll() function in a high frequency.\r
 \r
   @param  This                     Pointer to the EFI_TCP4_PROTOCOL instance.\r
   try calling the Poll() function in a high frequency.\r
 \r
   @param  This                     Pointer to the EFI_TCP4_PROTOCOL instance.\r

diff --git a/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Main.h b/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Main.h
index cd904584bf9a58c44164a1fd6ef1865052f9ef4a..c898a7ee2dd0d1da94765f733c3fbe84b480ca46 100644 (file)
--- a/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Main.h
+++ b/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Main.h
@@ -1,7 +1,7 @@
 /** @file\r
   TCP4 protocol services header file.\r
 \r
 /** @file\r
   TCP4 protocol services header file.\r
 \r

-Copyright (c) 2005 - 2012, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2005 - 2018, Intel Corporation. All rights reserved.<BR>\r

 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r


@@ -53,7 +53,7 @@ Tcp4Dispatcher (
   IN UINT8                   Request,\r
   IN VOID                    *Data    OPTIONAL\r
   );\r
   IN UINT8                   Request,\r
   IN VOID                    *Data    OPTIONAL\r
   );\r

-  \r
+\r

 ///\r
 /// TCP mode data\r
 ///\r
 ///\r
 /// TCP mode data\r
 ///\r


@@ -83,10 +83,10 @@ typedef struct {
 \r
 /**\r
   Get the current operational status of a TCP instance.\r
 \r
 /**\r
   Get the current operational status of a TCP instance.\r

-  \r
-  The GetModeData() function copies the current operational settings of this \r
-  EFI TCPv4 Protocol instance into user-supplied buffers. This function can \r
-  also be used to retrieve the operational setting of underlying drivers \r
+\r
+  The GetModeData() function copies the current operational settings of this\r
+  EFI TCPv4 Protocol instance into user-supplied buffers. This function can\r
+  also be used to retrieve the operational setting of underlying drivers\r

   such as IPv4, MNP, or SNP.\r
 \r
   @param  This                     Pointer to the EFI_TCP4_PROTOCOL instance.\r
   such as IPv4, MNP, or SNP.\r
 \r
   @param  This                     Pointer to the EFI_TCP4_PROTOCOL instance.\r


@@ -94,7 +94,7 @@ typedef struct {
                                    state.\r
   @param  Tcp4ConfigData           Pointer to the buffer to receive the current TCP\r
                                    configuration.\r
                                    state.\r
   @param  Tcp4ConfigData           Pointer to the buffer to receive the current TCP\r
                                    configuration.\r

-  @param  Ip4ModeData              Pointer to the buffer to receive the current IPv4 \r
+  @param  Ip4ModeData              Pointer to the buffer to receive the current IPv4\r

                                    configuration data used by the TCPv4 instance.\r
   @param  MnpConfigData            Pointer to the buffer to receive the current MNP\r
                                    configuration data indirectly used by the TCPv4\r
                                    configuration data used by the TCPv4 instance.\r
   @param  MnpConfigData            Pointer to the buffer to receive the current MNP\r
                                    configuration data indirectly used by the TCPv4\r


@@ -124,21 +124,21 @@ Tcp4GetModeData (
 /**\r
   Initialize or brutally reset the operational parameters for\r
   this EFI TCPv4 instance.\r
 /**\r
   Initialize or brutally reset the operational parameters for\r
   this EFI TCPv4 instance.\r

-  \r
+\r

   The Configure() function does the following:\r
   The Configure() function does the following:\r

-  * Initialize this EFI TCPv4 instance, i.e., initialize the communication end \r
+  * Initialize this EFI TCPv4 instance, i.e., initialize the communication end\r

   setting, specify active open or passive open for an instance.\r
   setting, specify active open or passive open for an instance.\r

-  * Reset this TCPv4 instance brutally, i.e., cancel all pending asynchronous \r
-  tokens, flush transmission and receiving buffer directly without informing \r
+  * Reset this TCPv4 instance brutally, i.e., cancel all pending asynchronous\r
+  tokens, flush transmission and receiving buffer directly without informing\r

   the communication peer.\r
   the communication peer.\r

-  No other TCPv4 Protocol operation can be executed by this instance \r
-  until it is configured properly. For an active TCP4 instance, after a proper \r
-  configuration it may call Connect() to initiates the three-way handshake. \r
-  For a passive TCP4 instance, its state will transit to Tcp4StateListen after \r
-  configuration, and Accept() may be called to listen the incoming TCP connection \r
-  request. If TcpConfigData is set to NULL, the instance is reset. Resetting \r
-  process will be done brutally, the state machine will be set to Tcp4StateClosed \r
-  directly, the receive queue and transmit queue will be flushed, and no traffic is \r
+  No other TCPv4 Protocol operation can be executed by this instance\r
+  until it is configured properly. For an active TCP4 instance, after a proper\r
+  configuration it may call Connect() to initiates the three-way handshake.\r
+  For a passive TCP4 instance, its state will transit to Tcp4StateListen after\r
+  configuration, and Accept() may be called to listen the incoming TCP connection\r
+  request. If TcpConfigData is set to NULL, the instance is reset. Resetting\r
+  process will be done brutally, the state machine will be set to Tcp4StateClosed\r
+  directly, the receive queue and transmit queue will be flushed, and no traffic is\r

   allowed through this instance.\r
 \r
   @param  This                     Pointer to the EFI_TCP4_PROTOCOL instance.\r
   allowed through this instance.\r
 \r
   @param  This                     Pointer to the EFI_TCP4_PROTOCOL instance.\r


@@ -168,35 +168,35 @@ Tcp4Configure (
 \r
 /**\r
   Add or delete routing entries.\r
 \r
 /**\r
   Add or delete routing entries.\r

-  \r
+\r

   The Routes() function adds or deletes a route from the instance's routing table.\r
   The Routes() function adds or deletes a route from the instance's routing table.\r

-  The most specific route is selected by comparing the SubnetAddress with the \r
+  The most specific route is selected by comparing the SubnetAddress with the\r

   destination IP address's arithmetical AND to the SubnetMask.\r
   destination IP address's arithmetical AND to the SubnetMask.\r

-  The default route is added with both SubnetAddress and SubnetMask set to 0.0.0.0. \r
+  The default route is added with both SubnetAddress and SubnetMask set to 0.0.0.0.\r

   The default route matches all destination IP addresses if there is no more specific route.\r
   The default route matches all destination IP addresses if there is no more specific route.\r

-  Direct route is added with GatewayAddress set to 0.0.0.0. Packets are sent to \r
-  the destination host if its address can be found in the Address Resolution Protocol (ARP) \r
-  cache or it is on the local subnet. If the instance is configured to use default \r
+  Direct route is added with GatewayAddress set to 0.0.0.0. Packets are sent to\r
+  the destination host if its address can be found in the Address Resolution Protocol (ARP)\r
+  cache or it is on the local subnet. If the instance is configured to use default\r

   address, a direct route to the local network will be added automatically.\r
   address, a direct route to the local network will be added automatically.\r

-  Each TCP instance has its own independent routing table. Instance that uses the \r
-  default IP address will have a copy of the EFI_IP4_CONFIG_PROTOCOL's routing table. \r
-  The copy will be updated automatically whenever the IP driver reconfigures its \r
-  instance. As a result, the previous modification to the instance's local copy \r
-  will be lost. The priority of checking the route table is specific with IP \r
+  Each TCP instance has its own independent routing table. Instance that uses the\r
+  default IP address will have a copy of the EFI_IP4_CONFIG_PROTOCOL's routing table.\r
+  The copy will be updated automatically whenever the IP driver reconfigures its\r
+  instance. As a result, the previous modification to the instance's local copy\r
+  will be lost. The priority of checking the route table is specific with IP\r

   implementation and every IP implementation must comply with RFC 1122.\r
 \r
   @param  This                     Pointer to the EFI_TCP4_PROTOCOL instance.\r
   @param  DeleteRoute              If TRUE, delete the specified route from routing\r
                                    table; if FALSE, add the specified route to\r
                                    routing table.\r
   implementation and every IP implementation must comply with RFC 1122.\r
 \r
   @param  This                     Pointer to the EFI_TCP4_PROTOCOL instance.\r
   @param  DeleteRoute              If TRUE, delete the specified route from routing\r
                                    table; if FALSE, add the specified route to\r
                                    routing table.\r

-                                   DestinationAddress and SubnetMask are used as \r
+                                   DestinationAddress and SubnetMask are used as\r

                                    the keywords to search route entry.\r
   @param  SubnetAddress            The destination network.\r
   @param  SubnetMask               The subnet mask for the destination network.\r
                                    the keywords to search route entry.\r
   @param  SubnetAddress            The destination network.\r
   @param  SubnetMask               The subnet mask for the destination network.\r

-  @param  GatewayAddress           The gateway address for this route. \r
-                                   It must be on the same subnet with the station \r
+  @param  GatewayAddress           The gateway address for this route.\r
+                                   It must be on the same subnet with the station\r

                                    address unless a direct route is specified.\r
                                    address unless a direct route is specified.\r

-                                   \r
+\r

   @retval EFI_SUCCESS              The operation completed successfully.\r
   @retval EFI_NOT_STARTED          The EFI_TCP4_PROTOCOL instance has not been\r
                                    configured.\r
   @retval EFI_SUCCESS              The operation completed successfully.\r
   @retval EFI_NOT_STARTED          The EFI_TCP4_PROTOCOL instance has not been\r
                                    configured.\r


@@ -224,21 +224,21 @@ Tcp4Routes (
 /**\r
   Initiate a nonblocking TCP connection request for an active TCP instance.\r
 \r
 /**\r
   Initiate a nonblocking TCP connection request for an active TCP instance.\r
 \r

-  The Connect() function will initiate an active open to the remote peer configured \r
-  in current TCP instance if it is configured active. If the connection succeeds \r
-  or fails due to any error, the ConnectionToken->CompletionToken.Event will be \r
-  signaled and ConnectionToken->CompletionToken.Status will be updated accordingly. \r
-  This function can only be called for the TCP instance in Tcp4StateClosed state. \r
-  The instance will transfer into Tcp4StateSynSent if the function returns EFI_SUCCESS. \r
-  If TCP three way handshake succeeds, its state will become Tcp4StateEstablished, \r
+  The Connect() function will initiate an active open to the remote peer configured\r
+  in current TCP instance if it is configured active. If the connection succeeds\r
+  or fails due to any error, the ConnectionToken->CompletionToken.Event will be\r
+  signaled and ConnectionToken->CompletionToken.Status will be updated accordingly.\r
+  This function can only be called for the TCP instance in Tcp4StateClosed state.\r
+  The instance will transfer into Tcp4StateSynSent if the function returns EFI_SUCCESS.\r
+  If TCP three way handshake succeeds, its state will become Tcp4StateEstablished,\r

   otherwise, the state will return to Tcp4StateClosed.\r
   otherwise, the state will return to Tcp4StateClosed.\r

-  \r
+\r

   @param  This                     Pointer to the EFI_TCP4_PROTOCOL instance\r
   @param  ConnectionToken          Pointer to the connection token to return when\r
                                    the TCP three way handshake finishes.\r
 \r
   @param  This                     Pointer to the EFI_TCP4_PROTOCOL instance\r
   @param  ConnectionToken          Pointer to the connection token to return when\r
                                    the TCP three way handshake finishes.\r
 \r

-  @retval EFI_SUCCESS              The connection request is successfully initiated \r
-                                   and the state of this TCPv4 instance has \r
+  @retval EFI_SUCCESS              The connection request is successfully initiated\r
+                                   and the state of this TCPv4 instance has\r

                                    been changed to Tcp4StateSynSent.\r
   @retval EFI_NOT_STARTED          This EFI_TCP4_PROTOCOL instance hasn't been\r
                                    configured.\r
                                    been changed to Tcp4StateSynSent.\r
   @retval EFI_NOT_STARTED          This EFI_TCP4_PROTOCOL instance hasn't been\r
                                    configured.\r


@@ -260,14 +260,14 @@ Tcp4Connect (
 /**\r
   Listen on the passive instance to accept an incoming connection request.\r
 \r
 /**\r
   Listen on the passive instance to accept an incoming connection request.\r
 \r

-  The Accept() function initiates an asynchronous accept request to wait for an \r
-  incoming connection on the passive TCP instance. If a remote peer successfully \r
-  establishes a connection with this instance, a new TCP instance will be created \r
-  and its handle will be returned in ListenToken->NewChildHandle. The newly created \r
-  instance is configured by inheriting the passive instance's configuration and is \r
+  The Accept() function initiates an asynchronous accept request to wait for an\r
+  incoming connection on the passive TCP instance. If a remote peer successfully\r
+  establishes a connection with this instance, a new TCP instance will be created\r
+  and its handle will be returned in ListenToken->NewChildHandle. The newly created\r
+  instance is configured by inheriting the passive instance's configuration and is\r

   ready for use upon return. The instance is in the Tcp4StateEstablished state.\r
   ready for use upon return. The instance is in the Tcp4StateEstablished state.\r

-  The ListenToken->CompletionToken.Event will be signaled when a new connection \r
-  is accepted, user aborts the listen or connection is reset. This function only \r
+  The ListenToken->CompletionToken.Event will be signaled when a new connection\r
+  is accepted, user aborts the listen or connection is reset. This function only\r

   can be called when current TCP instance is in Tcp4StateListen state.\r
 \r
   @param  This                     Pointer to the EFI_TCP4_PROTOCOL instance\r
   can be called when current TCP instance is in Tcp4StateListen state.\r
 \r
   @param  This                     Pointer to the EFI_TCP4_PROTOCOL instance\r


@@ -297,8 +297,8 @@ Tcp4Accept (
 /**\r
   Queues outgoing data into the transmit queue.\r
 \r
 /**\r
   Queues outgoing data into the transmit queue.\r
 \r

-  The Transmit() function queues a sending request to this TCPv4 instance along \r
-  with the user data. The status of the token is updated and the event in the token \r
+  The Transmit() function queues a sending request to this TCPv4 instance along\r
+  with the user data. The status of the token is updated and the event in the token\r

   will be signaled once the data is sent out or some error occurs.\r
 \r
   @param  This                     Pointer to the EFI_TCP4_PROTOCOL instance\r
   will be signaled once the data is sent out or some error occurs.\r
 \r
   @param  This                     Pointer to the EFI_TCP4_PROTOCOL instance\r


@@ -314,11 +314,11 @@ Tcp4Accept (
   @retval EFI_ACCESS_DENIED        One or more of the following conditions is TRUE:\r
                                    * A transmit completion token with the same\r
                                      Token-> CompletionToken.Event was already in the\r
   @retval EFI_ACCESS_DENIED        One or more of the following conditions is TRUE:\r
                                    * A transmit completion token with the same\r
                                      Token-> CompletionToken.Event was already in the\r

-                                     transmission queue. \r
-                                   * The current instance is in Tcp4StateClosed state \r
-                                   * The current instance is a passive one and \r
-                                     it is in Tcp4StateListen state. \r
-                                   * User has called Close() to disconnect this \r
+                                     transmission queue.\r
+                                   * The current instance is in Tcp4StateClosed state\r
+                                   * The current instance is a passive one and\r
+                                     it is in Tcp4StateListen state.\r
+                                   * User has called Close() to disconnect this\r

                                      connection.\r
   @retval EFI_NOT_READY            The completion token could not be queued because\r
                                    the transmit queue is full.\r
                                      connection.\r
   @retval EFI_NOT_READY            The completion token could not be queued because\r
                                    the transmit queue is full.\r


@@ -338,16 +338,16 @@ Tcp4Transmit (
 /**\r
   Place an asynchronous receive request into the receiving queue.\r
 \r
 /**\r
   Place an asynchronous receive request into the receiving queue.\r
 \r

-  The Receive() function places a completion token into the receive packet queue. \r
-  This function is always asynchronous. The caller must allocate the \r
-  Token->CompletionToken.Event and the FragmentBuffer used to receive data. He also \r
-  must fill the DataLength which represents the whole length of all FragmentBuffer. \r
-  When the receive operation completes, the EFI TCPv4 Protocol driver updates the \r
-  Token->CompletionToken.Status and Token->Packet.RxData fields and the \r
-  Token->CompletionToken.Event is signaled. If got data the data and its length \r
-  will be copy into the FragmentTable, in the same time the full length of received \r
-  data will be recorded in the DataLength fields. Providing a proper notification \r
-  function and context for the event will enable the user to receive the notification \r
+  The Receive() function places a completion token into the receive packet queue.\r
+  This function is always asynchronous. The caller must allocate the\r
+  Token->CompletionToken.Event and the FragmentBuffer used to receive data. He also\r
+  must fill the DataLength which represents the whole length of all FragmentBuffer.\r
+  When the receive operation completes, the EFI TCPv4 Protocol driver updates the\r
+  Token->CompletionToken.Status and Token->Packet.RxData fields and the\r
+  Token->CompletionToken.Event is signaled. If got data the data and its length\r
+  will be copy into the FragmentTable, in the same time the full length of received\r
+  data will be recorded in the DataLength fields. Providing a proper notification\r
+  function and context for the event will enable the user to receive the notification\r

   and receiving status. That notification function is guaranteed to not be re-entered.\r
 \r
   @param  This                     Pointer to the EFI_TCP4_PROTOCOL instance.\r
   and receiving status. That notification function is guaranteed to not be re-entered.\r
 \r
   @param  This                     Pointer to the EFI_TCP4_PROTOCOL instance.\r


@@ -363,16 +363,16 @@ Tcp4Transmit (
   @retval EFI_OUT_OF_RESOURCES     The receive completion token could not be queued\r
                                    due to a lack of system resources.\r
   @retval EFI_DEVICE_ERROR         An unexpected system or network error occurred.\r
   @retval EFI_OUT_OF_RESOURCES     The receive completion token could not be queued\r
                                    due to a lack of system resources.\r
   @retval EFI_DEVICE_ERROR         An unexpected system or network error occurred.\r

-                                   The EFI TCPv4 Protocol instance has been reset \r
+                                   The EFI TCPv4 Protocol instance has been reset\r

                                    to startup defaults.\r
   @retval EFI_ACCESS_DENIED        One or more of the following conditions is TRUE:\r
                                    * A receive completion token with the same\r
                                    to startup defaults.\r
   @retval EFI_ACCESS_DENIED        One or more of the following conditions is TRUE:\r
                                    * A receive completion token with the same\r

-                                     Token->CompletionToken.Event was already in \r
-                                     the receive queue. \r
-                                   * The current instance is in Tcp4StateClosed state. \r
-                                   * The current instance is a passive one and it \r
-                                     is in Tcp4StateListen state. \r
-                                   * User has called Close() to disconnect this \r
+                                     Token->CompletionToken.Event was already in\r
+                                     the receive queue.\r
+                                   * The current instance is in Tcp4StateClosed state.\r
+                                   * The current instance is a passive one and it\r
+                                     is in Tcp4StateListen state.\r
+                                   * User has called Close() to disconnect this\r

                                      connection.\r
   @retval EFI_CONNECTION_FIN       The communication peer has closed the connection\r
                                    and there is no any buffered data in the receive\r
                                      connection.\r
   @retval EFI_CONNECTION_FIN       The communication peer has closed the connection\r
                                    and there is no any buffered data in the receive\r


@@ -391,13 +391,13 @@ Tcp4Receive (
 /**\r
   Disconnecting a TCP connection gracefully or reset a TCP connection.\r
 \r
 /**\r
   Disconnecting a TCP connection gracefully or reset a TCP connection.\r
 \r

-  Initiate an asynchronous close token to TCP driver. After Close() is called, \r
-  any buffered transmission data will be sent by TCP driver and the current \r
-  instance will have a graceful close working flow described as RFC 793 if \r
-  AbortOnClose is set to FALSE, otherwise, a rest packet will be sent by TCP \r
-  driver to fast disconnect this connection. When the close operation completes \r
-  successfully the TCP instance is in Tcp4StateClosed state, all pending \r
-  asynchronous operation is signaled and any buffers used for TCP network traffic \r
+  Initiate an asynchronous close token to TCP driver. After Close() is called,\r
+  any buffered transmission data will be sent by TCP driver and the current\r
+  instance will have a graceful close working flow described as RFC 793 if\r
+  AbortOnClose is set to FALSE, otherwise, a rest packet will be sent by TCP\r
+  driver to fast disconnect this connection. When the close operation completes\r
+  successfully the TCP instance is in Tcp4StateClosed state, all pending\r
+  asynchronous operation is signaled and any buffers used for TCP network traffic\r

   is flushed.\r
 \r
   @param  This                     Pointer to the EFI_TCP4_PROTOCOL instance.\r
   is flushed.\r
 \r
   @param  This                     Pointer to the EFI_TCP4_PROTOCOL instance.\r


@@ -407,7 +407,7 @@ Tcp4Receive (
   @retval EFI_SUCCESS              The operation completed successfully.\r
   @retval EFI_NOT_STARTED          The EFI_TCP4_PROTOCOL instance hasn't been\r
                                    configured.\r
   @retval EFI_SUCCESS              The operation completed successfully.\r
   @retval EFI_NOT_STARTED          The EFI_TCP4_PROTOCOL instance hasn't been\r
                                    configured.\r

-  @retval EFI_ACCESS_DENIED        One or more of the following are TRUE: \r
+  @retval EFI_ACCESS_DENIED        One or more of the following are TRUE:\r

                                    * Configure() has been called with TcpConfigData\r
                                      set to NULL and this function has not returned.\r
                                    * Previous Close() call on this instance has not\r
                                    * Configure() has been called with TcpConfigData\r
                                      set to NULL and this function has not returned.\r
                                    * Previous Close() call on this instance has not\r


@@ -429,33 +429,33 @@ Tcp4Close (
 /**\r
   Abort an asynchronous connection, listen, transmission or receive request.\r
 \r
 /**\r
   Abort an asynchronous connection, listen, transmission or receive request.\r
 \r

-  The Cancel() function aborts a pending connection, listen, transmit or receive \r
-  request. If Token is not NULL and the token is in the connection, listen, \r
-  transmission or receive queue when it is being cancelled, its Token->Status \r
-  will be set to EFI_ABORTED and then Token->Event will be signaled. If the token \r
-  is not in one of the queues, which usually means that the asynchronous operation \r
-  has completed, EFI_NOT_FOUND is returned. If Token is NULL all asynchronous token \r
+  The Cancel() function aborts a pending connection, listen, transmit or receive\r
+  request. If Token is not NULL and the token is in the connection, listen,\r
+  transmission or receive queue when it is being cancelled, its Token->Status\r
+  will be set to EFI_ABORTED and then Token->Event will be signaled. If the token\r
+  is not in one of the queues, which usually means that the asynchronous operation\r
+  has completed, EFI_NOT_FOUND is returned. If Token is NULL all asynchronous token\r

   issued by Connect(), Accept(), Transmit() and Receive()will be aborted.\r
   NOTE: It has not been implemented currently.\r
   issued by Connect(), Accept(), Transmit() and Receive()will be aborted.\r
   NOTE: It has not been implemented currently.\r

-    \r
+\r

   @param  This                     Pointer to the EFI_TCP4_PROTOCOL instance.\r
   @param  Token                    Pointer to a token that has been issued by\r
                                    Connect(), Accept(), Transmit() or Receive(). If\r
                                    NULL, all pending tokens issued by above four\r
                                    functions will be aborted.\r
   @param  This                     Pointer to the EFI_TCP4_PROTOCOL instance.\r
   @param  Token                    Pointer to a token that has been issued by\r
                                    Connect(), Accept(), Transmit() or Receive(). If\r
                                    NULL, all pending tokens issued by above four\r
                                    functions will be aborted.\r

-                                   \r
+\r

   @retval  EFI_SUCCESS             The asynchronous I/O request is aborted and Token->Event\r
                                    is signaled.\r
   @retval  EFI_INVALID_PARAMETER   This is NULL.\r
   @retval  EFI_NOT_STARTED         This instance hasn's been configured.\r
   @retval  EFI_NO_MAPPING          When using the default address, configuration\r
                                    (DHCP, BOOTP,RARP, etc.) hasn's finished yet.\r
   @retval  EFI_SUCCESS             The asynchronous I/O request is aborted and Token->Event\r
                                    is signaled.\r
   @retval  EFI_INVALID_PARAMETER   This is NULL.\r
   @retval  EFI_NOT_STARTED         This instance hasn's been configured.\r
   @retval  EFI_NO_MAPPING          When using the default address, configuration\r
                                    (DHCP, BOOTP,RARP, etc.) hasn's finished yet.\r

-  @retval  EFI_NOT_FOUND           The asynchronous I/O request isn's found in the \r
-                                   transmission or receive queue. It has either \r
+  @retval  EFI_NOT_FOUND           The asynchronous I/O request isn's found in the\r
+                                   transmission or receive queue. It has either\r

                                    completed or wasn's issued by Transmit() and Receive().\r
   @retval  EFI_UNSUPPORTED         The operation is not supported in current\r
                                    implementation.\r
                                    completed or wasn's issued by Transmit() and Receive().\r
   @retval  EFI_UNSUPPORTED         The operation is not supported in current\r
                                    implementation.\r

-  \r
+\r

 **/\r
 EFI_STATUS\r
 EFIAPI\r
 **/\r
 EFI_STATUS\r
 EFIAPI\r


@@ -467,11 +467,11 @@ Tcp4Cancel (
 /**\r
   Poll to receive incoming data and transmit outgoing segments.\r
 \r
 /**\r
   Poll to receive incoming data and transmit outgoing segments.\r
 \r

-  The Poll() function increases the rate that data is moved between the network \r
-  and application and can be called when the TCP instance is created successfully. \r
-  Its use is optional. In some implementations, the periodical timer in the MNP \r
-  driver may not poll the underlying communications device fast enough to avoid \r
-  drop packets. Drivers and applications that are experiencing packet loss should \r
+  The Poll() function increases the rate that data is moved between the network\r
+  and application and can be called when the TCP instance is created successfully.\r
+  Its use is optional. In some implementations, the periodical timer in the MNP\r
+  driver may not poll the underlying communications device fast enough to avoid\r
+  drop packets. Drivers and applications that are experiencing packet loss should\r

   try calling the Poll() function in a high frequency.\r
 \r
   @param  This                     Pointer to the EFI_TCP4_PROTOCOL instance.\r
   try calling the Poll() function in a high frequency.\r
 \r
   @param  This                     Pointer to the EFI_TCP4_PROTOCOL instance.\r

diff --git a/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Misc.c b/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Misc.c
index 892d19b0721437c4ee7ce477227fe727480c3114..7fd8bb1fbe09ce99621a4dcba4915e4bcd5c9bdc 100644 (file)
--- a/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Misc.c
+++ b/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Misc.c
@@ -1,7 +1,7 @@
 /** @file\r
   Misc support routines for tcp.\r
 \r
 /** @file\r
   Misc support routines for tcp.\r
 \r

-Copyright (c) 2005 - 2017, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2005 - 2018, Intel Corporation. All rights reserved.<BR>\r

 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r


@@ -79,7 +79,7 @@ TcpInitTcbLocal (
   //\r
   Tcb->RcvWndScale  = 0;\r
   Tcb->RetxmitSeqMax = 0;\r
   //\r
   Tcb->RcvWndScale  = 0;\r
   Tcb->RetxmitSeqMax = 0;\r

-  \r
+\r

   Tcb->ProbeTimerOn = FALSE;\r
 }\r
 \r
   Tcb->ProbeTimerOn = FALSE;\r
 }\r
 \r

diff --git a/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Option.c b/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Option.c
index 0da249c3ccff79fdf359e5cab1a5939654043381..2817b80295874621c0d20240a82717ea7530d33e 100644 (file)
--- a/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Option.c
+++ b/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Option.c
@@ -1,7 +1,7 @@
 /** @file\r
   Routines to process TCP option.\r
 /** @file\r
   Routines to process TCP option.\r

-    \r
-Copyright (c) 2005 - 2006, Intel Corporation. All rights reserved.<BR>\r
+\r
+Copyright (c) 2005 - 2018, Intel Corporation. All rights reserved.<BR>\r

 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r


@@ -16,9 +16,9 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 \r
 /**\r
     Get a UINT16 value from buffer.\r
 \r
 /**\r
     Get a UINT16 value from buffer.\r

-    \r
+\r

     @param Buf                  Pointer to input buffer.\r
     @param Buf                  Pointer to input buffer.\r

-    \r
+\r

     @return                     The UINT16 value get from buffer.\r
 \r
 **/\r
     @return                     The UINT16 value get from buffer.\r
 \r
 **/\r


@@ -34,9 +34,9 @@ TcpGetUint16 (
 \r
 /**\r
     Get a UINT32 value from buffer.\r
 \r
 /**\r
     Get a UINT32 value from buffer.\r

-    \r
+\r

     @param Buf                  Pointer to input buffer.\r
     @param Buf                  Pointer to input buffer.\r

-    \r
+\r

     @return                     The UINT32 value get from buffer.\r
 \r
 **/\r
     @return                     The UINT32 value get from buffer.\r
 \r
 **/\r


@@ -52,9 +52,9 @@ TcpGetUint32 (
 \r
 /**\r
     Put a UINT32 value in buffer.\r
 \r
 /**\r
     Put a UINT32 value in buffer.\r

-    \r
+\r

     @param Buf                  Pointer to the buffer.\r
     @param Buf                  Pointer to the buffer.\r

-    @param Data                 The UINT32 Date to put in buffer \r
+    @param Data                 The UINT32 Date to put in buffer\r

 \r
 **/\r
 VOID\r
 \r
 **/\r
 VOID\r

diff --git a/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Option.h b/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Option.h
index 9676df015d5fa58bd03d7435c1f8b64efda3bfe9..5185aecea8e0157d52dc86ddd2fecc58a04dbecd 100644 (file)
--- a/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Option.h
+++ b/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Option.h
@@ -1,7 +1,7 @@
 /** @file\r
   Tcp option's routine header file.\r
 /** @file\r
   Tcp option's routine header file.\r

-    \r
-Copyright (c) 2005 - 2009, Intel Corporation. All rights reserved.<BR>\r
+\r
+Copyright (c) 2005 - 2018, Intel Corporation. All rights reserved.<BR>\r

 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r

diff --git a/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Output.c b/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Output.c
index 5a3d837e1dab37e34e79b3074d4a4fe627a1d19e..760b09a1eda1fe58fe4aebb0d29c58a04066790e 100644 (file)
--- a/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Output.c
+++ b/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Output.c
@@ -1,7 +1,7 @@
 /** @file\r
   TCP output process routines.\r
 /** @file\r
   TCP output process routines.\r

-    \r
-Copyright (c) 2005 - 2017, Intel Corporation. All rights reserved.<BR>\r
+\r
+Copyright (c) 2005 - 2018, Intel Corporation. All rights reserved.<BR>\r

 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r


@@ -687,10 +687,10 @@ TcpRetransmit (
       "TcpRetransmit: retransmission without regard to the receiver window for TCB %p\n",\r
       Tcb)\r
       );\r
       "TcpRetransmit: retransmission without regard to the receiver window for TCB %p\n",\r
       Tcb)\r
       );\r

-    \r
+\r

   } else if (TCP_SEQ_GEQ (Tcb->SndWl2 + Tcb->SndWnd, Seq)) {\r
     Len = TCP_SUB_SEQ (Tcb->SndWl2 + Tcb->SndWnd, Seq);\r
   } else if (TCP_SEQ_GEQ (Tcb->SndWl2 + Tcb->SndWnd, Seq)) {\r
     Len = TCP_SUB_SEQ (Tcb->SndWl2 + Tcb->SndWnd, Seq);\r

-    \r
+\r

   } else {\r
     DEBUG (\r
       (EFI_D_WARN,\r
   } else {\r
     DEBUG (\r
       (EFI_D_WARN,\r


@@ -700,7 +700,7 @@ TcpRetransmit (
 \r
     return 0;\r
   }\r
 \r
     return 0;\r
   }\r

-  \r
+\r

   Len = MIN (Len, Tcb->SndMss);\r
 \r
   Nbuf = TcpGetSegmentSndQue (Tcb, Seq, Len);\r
   Len = MIN (Len, Tcb->SndMss);\r
 \r
   Nbuf = TcpGetSegmentSndQue (Tcb, Seq, Len);\r


@@ -713,7 +713,7 @@ TcpRetransmit (
   if (TcpTransmitSegment (Tcb, Nbuf) != 0) {\r
     goto OnError;\r
   }\r
   if (TcpTransmitSegment (Tcb, Nbuf) != 0) {\r
     goto OnError;\r
   }\r

-  \r
+\r

   if (TCP_SEQ_GT (Seq, Tcb->RetxmitSeqMax)) {\r
     Tcb->RetxmitSeqMax = Seq;\r
   }\r
   if (TCP_SEQ_GT (Seq, Tcb->RetxmitSeqMax)) {\r
     Tcb->RetxmitSeqMax = Seq;\r
   }\r


@@ -793,7 +793,7 @@ SEND_AGAIN:
   // only send a segment without data if SYN or\r
   // FIN is set.\r
   //\r
   // only send a segment without data if SYN or\r
   // FIN is set.\r
   //\r

-  if ((Len == 0) && \r
+  if ((Len == 0) &&\r

       ((Flag & (TCP_FLG_SYN | TCP_FLG_FIN)) == 0)) {\r
     return Sent;\r
   }\r
       ((Flag & (TCP_FLG_SYN | TCP_FLG_FIN)) == 0)) {\r
     return Sent;\r
   }\r


@@ -831,10 +831,10 @@ SEND_AGAIN:
         TCP_SEQ_LT (End + 1, Tcb->SndWnd + Tcb->SndWl2)) {\r
 \r
       DEBUG (\r
         TCP_SEQ_LT (End + 1, Tcb->SndWnd + Tcb->SndWl2)) {\r
 \r
       DEBUG (\r

-               (EFI_D_NET, \r
-               "TcpToSendData: send FIN "\r
-        "to peer for TCB %p in state %s\n", \r
-        Tcb, \r
+      (EFI_D_NET,\r
+      "TcpToSendData: send FIN "\r
+        "to peer for TCB %p in state %s\n",\r
+        Tcb,\r

         mTcpStateName[Tcb->State])\r
       );\r
 \r
         mTcpStateName[Tcb->State])\r
       );\r
 \r

diff --git a/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Proto.h b/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Proto.h
index 49d8a1da3b6b0d3793ed1c86602d09dec29749ca..37191fe65112d60f1f6de9fc722e554e4d6fa965 100644 (file)
--- a/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Proto.h
+++ b/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Proto.h
@@ -1,7 +1,7 @@
 /** @file\r
   Tcp Protocol header file.\r
 \r
 /** @file\r
   Tcp Protocol header file.\r
 \r

-Copyright (c) 2005 - 2017, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2005 - 2018, Intel Corporation. All rights reserved.<BR>\r

 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r


@@ -49,11 +49,11 @@ typedef struct _TCP_CB  TCP_CB;
 #define TCP_FLG_PSH      0x08\r
 #define TCP_FLG_ACK      0x10\r
 #define TCP_FLG_URG      0x20\r
 #define TCP_FLG_PSH      0x08\r
 #define TCP_FLG_ACK      0x10\r
 #define TCP_FLG_URG      0x20\r

- \r
+\r

  //\r
  // mask for all the flags\r
  //\r
  //\r
  // mask for all the flags\r
  //\r

-#define TCP_FLG_FLAG     0x3F  \r
+#define TCP_FLG_FLAG     0x3F\r

 \r
 \r
 #define TCP_CONNECT_REFUSED      (-1) ///< TCP error status\r
 \r
 \r
 #define TCP_CONNECT_REFUSED      (-1) ///< TCP error status\r

diff --git a/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Timer.c b/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Timer.c
index a8e4a933cfd62452c5a1865bde03ca7ab872c7cd..4cb0ee7b5e6f9fe3797fbda90cea62b1ed6e7b59 100644 (file)
--- a/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Timer.c
+++ b/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Timer.c
@@ -1,7 +1,7 @@
 /** @file\r
   TCP timer related functions.\r
 /** @file\r
   TCP timer related functions.\r

-    \r
-Copyright (c) 2005 - 2010, Intel Corporation. All rights reserved.<BR>\r
+\r
+Copyright (c) 2005 - 2018, Intel Corporation. All rights reserved.<BR>\r

 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r


@@ -37,7 +37,7 @@ VOID
 TcpRexmitTimeout (\r
   IN OUT TCP_CB *Tcb\r
   );\r
 TcpRexmitTimeout (\r
   IN OUT TCP_CB *Tcb\r
   );\r

-  \r
+\r

 /**\r
   Timeout handler for window probe timer.\r
 \r
 /**\r
   Timeout handler for window probe timer.\r
 \r


@@ -289,7 +289,7 @@ Tcp2MSLTimeout (
 \r
 \r
 /**\r
 \r
 \r
 /**\r

-  Update the timer status and the next expire time according to the timers \r
+  Update the timer status and the next expire time according to the timers\r

   to expire in a specific future time slot.\r
 \r
   @param  Tcb      Pointer to the TCP_CB of this TCP instance.\r
   to expire in a specific future time slot.\r
 \r
   @param  Tcb      Pointer to the TCP_CB of this TCP instance.\r


@@ -555,7 +555,7 @@ TcpTickingDpc (
         }\r
       }\r
     }\r
         }\r
       }\r
     }\r

-    \r
+\r

     //\r
     // If the Tcb still exist or some timer is set, update the timer\r
     //\r
     //\r
     // If the Tcb still exist or some timer is set, update the timer\r
     //\r

diff --git a/MdeModulePkg/Universal/Network/Udp4Dxe/ComponentName.c b/MdeModulePkg/Universal/Network/Udp4Dxe/ComponentName.c
index cf311055e2ba2a20d21bcdedc35e1f73e726304b..8baf395bc63cd8253b0b4b179e4a4127d92adf5c 100644 (file)
--- a/MdeModulePkg/Universal/Network/Udp4Dxe/ComponentName.c
+++ b/MdeModulePkg/Universal/Network/Udp4Dxe/ComponentName.c
@@ -1,6 +1,6 @@
 /** @file\r
 \r
 /** @file\r
 \r

-Copyright (c) 2006 - 2012, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r

 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r


@@ -175,7 +175,7 @@ GLOBAL_REMOVE_IF_UNREFERENCED EFI_UNICODE_STRING_TABLE mUdpDriverNameTable[] = {
 };\r
 \r
 GLOBAL_REMOVE_IF_UNREFERENCED EFI_UNICODE_STRING_TABLE *gUdpControllerNameTable = NULL;\r
 };\r
 \r
 GLOBAL_REMOVE_IF_UNREFERENCED EFI_UNICODE_STRING_TABLE *gUdpControllerNameTable = NULL;\r

-  \r
+\r

 /**\r
   Retrieves a Unicode string that is the user readable name of the driver.\r
 \r
 /**\r
   Retrieves a Unicode string that is the user readable name of the driver.\r
 \r


@@ -237,10 +237,10 @@ UdpComponentNameGetDriverName (
 \r
   @param  Udp4[in]                   A pointer to the EFI_UDP4_PROTOCOL.\r
 \r
 \r
   @param  Udp4[in]                   A pointer to the EFI_UDP4_PROTOCOL.\r
 \r

-  \r
+\r

   @retval EFI_SUCCESS                Update the ControllerNameTable of this instance successfully.\r
   @retval EFI_INVALID_PARAMETER      The input parameter is invalid.\r
   @retval EFI_SUCCESS                Update the ControllerNameTable of this instance successfully.\r
   @retval EFI_INVALID_PARAMETER      The input parameter is invalid.\r

-  \r
+\r

 **/\r
 EFI_STATUS\r
 UpdateName (\r
 **/\r
 EFI_STATUS\r
 UpdateName (\r


@@ -280,7 +280,7 @@ UpdateName (
     FreeUnicodeStringTable (gUdpControllerNameTable);\r
     gUdpControllerNameTable = NULL;\r
   }\r
     FreeUnicodeStringTable (gUdpControllerNameTable);\r
     gUdpControllerNameTable = NULL;\r
   }\r

-  \r
+\r

   Status = AddUnicodeString2 (\r
              "eng",\r
              gUdp4ComponentName.SupportedLanguages,\r
   Status = AddUnicodeString2 (\r
              "eng",\r
              gUdp4ComponentName.SupportedLanguages,\r


@@ -291,7 +291,7 @@ UpdateName (
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r

-  \r
+\r

   return AddUnicodeString2 (\r
            "en",\r
            gUdp4ComponentName2.SupportedLanguages,\r
   return AddUnicodeString2 (\r
            "en",\r
            gUdp4ComponentName2.SupportedLanguages,\r


@@ -388,7 +388,7 @@ UdpComponentNameGetControllerName (
   if (ChildHandle == NULL) {\r
     return EFI_UNSUPPORTED;\r
   }\r
   if (ChildHandle == NULL) {\r
     return EFI_UNSUPPORTED;\r
   }\r

-  \r
+\r

   //\r
   // Make sure this driver produced ChildHandle\r
   //\r
   //\r
   // Make sure this driver produced ChildHandle\r
   //\r

diff --git a/MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Driver.c b/MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Driver.c
index 4d179d1b2810a8f08d1d89595aa39a0a9fb3b397..8731995fb6d7dc50ad70bafcf9bb8d03131ee95c 100644 (file)
--- a/MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Driver.c
+++ b/MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Driver.c
@@ -1,6 +1,6 @@
 /** @file\r
 \r
 /** @file\r
 \r

-Copyright (c) 2006 - 2016, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r

 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r


@@ -30,7 +30,7 @@ EFI_SERVICE_BINDING_PROTOCOL mUdp4ServiceBinding = {
 \r
 /**\r
   Callback function which provided by user to remove one node in NetDestroyLinkList process.\r
 \r
 /**\r
   Callback function which provided by user to remove one node in NetDestroyLinkList process.\r

-  \r
+\r

   @param[in]    Entry           The entry to be removed.\r
   @param[in]    Context         Pointer to the callback context corresponds to the Context in NetDestroyLinkList.\r
 \r
   @param[in]    Entry           The entry to be removed.\r
   @param[in]    Context         Pointer to the callback context corresponds to the Context in NetDestroyLinkList.\r
 \r


@@ -194,7 +194,7 @@ Udp4DriverBindingStart (
   restrictions for this service. DisconnectController()\r
   must follow these calling restrictions. If any other agent wishes\r
   to call Stop() it must also follow these calling restrictions.\r
   restrictions for this service. DisconnectController()\r
   must follow these calling restrictions. If any other agent wishes\r
   to call Stop() it must also follow these calling restrictions.\r

-  \r
+\r

   @param[in]  This              Protocol instance pointer.\r
   @param[in]  ControllerHandle  Handle of device to stop driver on\r
   @param[in]  NumberOfChildren  Number of Handles in ChildHandleBuffer. If number of\r
   @param[in]  This              Protocol instance pointer.\r
   @param[in]  ControllerHandle  Handle of device to stop driver on\r
   @param[in]  NumberOfChildren  Number of Handles in ChildHandleBuffer. If number of\r


@@ -266,7 +266,7 @@ Udp4DriverBindingStop (
            &Udp4Service->ServiceBinding,\r
            NULL\r
            );\r
            &Udp4Service->ServiceBinding,\r
            NULL\r
            );\r

- \r
+\r

     Udp4CleanService (Udp4Service);\r
 \r
     if (gUdpControllerNameTable != NULL) {\r
     Udp4CleanService (Udp4Service);\r
 \r
     if (gUdpControllerNameTable != NULL) {\r


@@ -282,14 +282,14 @@ Udp4DriverBindingStop (
 \r
 /**\r
   Creates a child handle and installs a protocol.\r
 \r
 /**\r
   Creates a child handle and installs a protocol.\r

-  \r
-  The CreateChild() function installs a protocol on ChildHandle. \r
-  If ChildHandle is a pointer to NULL, then a new handle is created and returned in ChildHandle. \r
+\r
+  The CreateChild() function installs a protocol on ChildHandle.\r
+  If ChildHandle is a pointer to NULL, then a new handle is created and returned in ChildHandle.\r

   If ChildHandle is not a pointer to NULL, then the protocol installs on the existing ChildHandle.\r
 \r
   @param[in] This        Pointer to the EFI_SERVICE_BINDING_PROTOCOL instance.\r
   @param[in] ChildHandle Pointer to the handle of the child to create. If it is NULL,\r
   If ChildHandle is not a pointer to NULL, then the protocol installs on the existing ChildHandle.\r
 \r
   @param[in] This        Pointer to the EFI_SERVICE_BINDING_PROTOCOL instance.\r
   @param[in] ChildHandle Pointer to the handle of the child to create. If it is NULL,\r

-                         then a new handle is created. If it is a pointer to an existing UEFI handle, \r
+                         then a new handle is created. If it is a pointer to an existing UEFI handle,\r

                          then the protocol is added to the existing UEFI handle.\r
 \r
   @retval EFI_SUCCES            The protocol was added to ChildHandle.\r
                          then the protocol is added to the existing UEFI handle.\r
 \r
   @retval EFI_SUCCES            The protocol was added to ChildHandle.\r


@@ -419,9 +419,9 @@ ON_ERROR:
 \r
 /**\r
   Destroys a child handle with a protocol installed on it.\r
 \r
 /**\r
   Destroys a child handle with a protocol installed on it.\r

-  \r
-  The DestroyChild() function does the opposite of CreateChild(). It removes a protocol \r
-  that was installed by CreateChild() from ChildHandle. If the removed protocol is the \r
+\r
+  The DestroyChild() function does the opposite of CreateChild(). It removes a protocol\r
+  that was installed by CreateChild() from ChildHandle. If the removed protocol is the\r

   last protocol on ChildHandle, then ChildHandle is destroyed.\r
 \r
   @param[in] This        Pointer to the EFI_SERVICE_BINDING_PROTOCOL instance.\r
   last protocol on ChildHandle, then ChildHandle is destroyed.\r
 \r
   @param[in] This        Pointer to the EFI_SERVICE_BINDING_PROTOCOL instance.\r


@@ -497,7 +497,7 @@ Udp4ServiceBindingDestroyChild (
          &gEfiIp4ProtocolGuid,\r
          gUdp4DriverBinding.DriverBindingHandle,\r
          Instance->ChildHandle\r
          &gEfiIp4ProtocolGuid,\r
          gUdp4DriverBinding.DriverBindingHandle,\r
          Instance->ChildHandle\r

-         );  \r
+         );\r

 \r
   //\r
   // Uninstall the Udp4Protocol previously installed on the ChildHandle.\r
 \r
   //\r
   // Uninstall the Udp4Protocol previously installed on the ChildHandle.\r


@@ -547,7 +547,7 @@ Udp4ServiceBindingDestroyChild (
   This is the declaration of an EFI image entry point. This entry point is\r
   the same for UEFI Applications, UEFI OS Loaders, and UEFI Drivers including\r
   both device drivers and bus drivers.\r
   This is the declaration of an EFI image entry point. This entry point is\r
   the same for UEFI Applications, UEFI OS Loaders, and UEFI Drivers including\r
   both device drivers and bus drivers.\r

-  \r
+\r

   The entry point for Udp4 driver which installs the driver binding\r
   and component name protocol on its ImageHandle.\r
 \r
   The entry point for Udp4 driver which installs the driver binding\r
   and component name protocol on its ImageHandle.\r
 \r

diff --git a/MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Driver.h b/MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Driver.h
index 88421aa816ecf4b933e71cc6f6c882839f99a337..0f96cd527fc5caac51ded0de4b6b7c86a4ac30c7 100644 (file)
--- a/MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Driver.h
+++ b/MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Driver.h
@@ -1,6 +1,6 @@
 /** @file\r
 \r
 /** @file\r
 \r

-Copyright (c) 2006 - 2016, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r

 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r


@@ -79,7 +79,7 @@ Udp4DriverBindingStart (
   restrictions for this service. DisconnectController()\r
   must follow these calling restrictions. If any other agent wishes\r
   to call Stop() it must also follow these calling restrictions.\r
   restrictions for this service. DisconnectController()\r
   must follow these calling restrictions. If any other agent wishes\r
   to call Stop() it must also follow these calling restrictions.\r

-  \r
+\r

   @param[in]  This              Protocol instance pointer.\r
   @param[in]  ControllerHandle  Handle of device to stop driver on\r
   @param[in]  NumberOfChildren  Number of Handles in ChildHandleBuffer. If number of\r
   @param[in]  This              Protocol instance pointer.\r
   @param[in]  ControllerHandle  Handle of device to stop driver on\r
   @param[in]  NumberOfChildren  Number of Handles in ChildHandleBuffer. If number of\r


@@ -101,14 +101,14 @@ Udp4DriverBindingStop (
 \r
 /**\r
   Creates a child handle and installs a protocol.\r
 \r
 /**\r
   Creates a child handle and installs a protocol.\r

-  \r
-  The CreateChild() function installs a protocol on ChildHandle. \r
-  If ChildHandle is a pointer to NULL, then a new handle is created and returned in ChildHandle. \r
+\r
+  The CreateChild() function installs a protocol on ChildHandle.\r
+  If ChildHandle is a pointer to NULL, then a new handle is created and returned in ChildHandle.\r

   If ChildHandle is not a pointer to NULL, then the protocol installs on the existing ChildHandle.\r
 \r
   @param[in] This        Pointer to the EFI_SERVICE_BINDING_PROTOCOL instance.\r
   @param[in] ChildHandle Pointer to the handle of the child to create. If it is NULL,\r
   If ChildHandle is not a pointer to NULL, then the protocol installs on the existing ChildHandle.\r
 \r
   @param[in] This        Pointer to the EFI_SERVICE_BINDING_PROTOCOL instance.\r
   @param[in] ChildHandle Pointer to the handle of the child to create. If it is NULL,\r

-                         then a new handle is created. If it is a pointer to an existing UEFI handle, \r
+                         then a new handle is created. If it is a pointer to an existing UEFI handle,\r

                          then the protocol is added to the existing UEFI handle.\r
 \r
   @retval EFI_SUCCES            The protocol was added to ChildHandle.\r
                          then the protocol is added to the existing UEFI handle.\r
 \r
   @retval EFI_SUCCES            The protocol was added to ChildHandle.\r


@@ -127,9 +127,9 @@ Udp4ServiceBindingCreateChild (
 \r
 /**\r
   Destroys a child handle with a protocol installed on it.\r
 \r
 /**\r
   Destroys a child handle with a protocol installed on it.\r

-  \r
-  The DestroyChild() function does the opposite of CreateChild(). It removes a protocol \r
-  that was installed by CreateChild() from ChildHandle. If the removed protocol is the \r
+\r
+  The DestroyChild() function does the opposite of CreateChild(). It removes a protocol\r
+  that was installed by CreateChild() from ChildHandle. If the removed protocol is the\r

   last protocol on ChildHandle, then ChildHandle is destroyed.\r
 \r
   @param[in] This        Pointer to the EFI_SERVICE_BINDING_PROTOCOL instance.\r
   last protocol on ChildHandle, then ChildHandle is destroyed.\r
 \r
   @param[in] This        Pointer to the EFI_SERVICE_BINDING_PROTOCOL instance.\r

diff --git a/MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf b/MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf
index e1b4898c318c8eb1dc7db86dd58d8dc14e6c14c9..69b6d5d943b7cebf3f815a27d33a37ba087d68e0 100644 (file)
--- a/MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf
+++ b/MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf
@@ -4,7 +4,7 @@
 #  This module produces EFI UDP(User Datagram Protocol) Protocol upon EFI IPv4\r
 #  Protocol, to provide basic UDPv4 I/O services.\r
 #\r
 #  This module produces EFI UDP(User Datagram Protocol) Protocol upon EFI IPv4\r
 #  Protocol, to provide basic UDPv4 I/O services.\r
 #\r

-#  Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.<BR>\r
+#  Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r

 #  This program and the accompanying materials\r
 #  are licensed and made available under the terms and conditions of the BSD License\r
 #  which accompanies this distribution. The full text of the license may be found at\r
 #  This program and the accompanying materials\r
 #  are licensed and made available under the terms and conditions of the BSD License\r
 #  which accompanies this distribution. The full text of the license may be found at\r


@@ -30,7 +30,7 @@
 #\r
 #  VALID_ARCHITECTURES           = IA32 X64 IPF EBC\r
 #\r
 #\r
 #  VALID_ARCHITECTURES           = IA32 X64 IPF EBC\r
 #\r

-#  DRIVER_BINDING                =  gUdp4DriverBinding                        \r
+#  DRIVER_BINDING                =  gUdp4DriverBinding\r

 #  COMPONENT_NAME                =  gUdp4ComponentName\r
 #  COMPONENT_NAME2               =  gUdp4ComponentName2\r
 #\r
 #  COMPONENT_NAME                =  gUdp4ComponentName\r
 #  COMPONENT_NAME2               =  gUdp4ComponentName2\r
 #\r

diff --git a/MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.uni b/MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.uni
index 87c235d52816c6abaabafb3a8a88190c1881e40b..891850bb0913e1669af84d3e34f2f216e87fba0b 100644 (file)
--- a/MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.uni
+++ b/MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.uni
@@ -4,13 +4,13 @@
 // This module produces EFI UDP(User Datagram Protocol) Protocol upon EFI IPv4\r
 // Protocol, to provide basic UDPv4 I/O services.\r
 //\r
 // This module produces EFI UDP(User Datagram Protocol) Protocol upon EFI IPv4\r
 // Protocol, to provide basic UDPv4 I/O services.\r
 //\r

-// Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.<BR>\r
+// Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r

 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r
 // which accompanies this distribution. The full text of the license may be found at\r
 // http://opensource.org/licenses/bsd-license.php\r
 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r
 // which accompanies this distribution. The full text of the license may be found at\r
 // http://opensource.org/licenses/bsd-license.php\r

-// \r
+//\r

 // THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 // WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 //\r
 // THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 // WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 //\r

diff --git a/MdeModulePkg/Universal/Network/Udp4Dxe/Udp4DxeExtra.uni b/MdeModulePkg/Universal/Network/Udp4Dxe/Udp4DxeExtra.uni
index 249c4407ef73d467e0a1bac892b69609c689b4f7..33a78d6c376877186bd70cfa3b8467c0f5498c61 100644 (file)
--- a/MdeModulePkg/Universal/Network/Udp4Dxe/Udp4DxeExtra.uni
+++ b/MdeModulePkg/Universal/Network/Udp4Dxe/Udp4DxeExtra.uni
@@ -1,7 +1,7 @@
 // /** @file\r
 // Udp4Dxe Localized Strings and Content\r
 //\r
 // /** @file\r
 // Udp4Dxe Localized Strings and Content\r
 //\r

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

 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r
 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r


@@ -13,8 +13,8 @@
 //\r
 // **/\r
 \r
 //\r
 // **/\r
 \r

-#string STR_PROPERTIES_MODULE_NAME \r
-#language en-US \r
+#string STR_PROPERTIES_MODULE_NAME\r
+#language en-US\r

 "UDP v4 DXE Driver"\r
 \r
 \r
 "UDP v4 DXE Driver"\r
 \r
 \r

diff --git a/MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Impl.c b/MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Impl.c
index df41433a1a8dd30b1305d60096315d78f170b687..7a09c7fe6662157176f749482e0ac53da24e686a 100644 (file)
--- a/MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Impl.c
+++ b/MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Impl.c
@@ -1,7 +1,7 @@
 /** @file\r
   The implementation of the Udp4 protocol.\r
 /** @file\r
   The implementation of the Udp4 protocol.\r

-  \r
-Copyright (c) 2006 - 2016, Intel Corporation. All rights reserved.<BR>\r
+\r
+Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r

 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r


@@ -844,7 +844,7 @@ Udp4ValidateTxToken (
 \r
     CopyMem (&SourceAddress, &UdpSessionData->SourceAddress, sizeof (IP4_ADDR));\r
 \r
 \r
     CopyMem (&SourceAddress, &UdpSessionData->SourceAddress, sizeof (IP4_ADDR));\r
 \r

-    if ((SourceAddress != 0) && \r
+    if ((SourceAddress != 0) &&\r

         !Instance->ConfigData.UseDefaultAddress &&\r
         (EFI_NTOHL(Instance->ConfigData.SubnetMask) != 0) &&\r
         !NetIp4IsUnicast (HTONL (SourceAddress), EFI_NTOHL(Instance->ConfigData.SubnetMask))) {\r
         !Instance->ConfigData.UseDefaultAddress &&\r
         (EFI_NTOHL(Instance->ConfigData.SubnetMask) != 0) &&\r
         !NetIp4IsUnicast (HTONL (SourceAddress), EFI_NTOHL(Instance->ConfigData.SubnetMask))) {\r


@@ -1812,7 +1812,7 @@ Udp4IcmpHandler (
     NetbufFree (Packet);\r
     return;\r
   }\r
     NetbufFree (Packet);\r
     return;\r
   }\r

-  \r
+\r

   Udp4Header = (EFI_UDP_HEADER *) NetbufGetByte (Packet, 0, NULL);\r
   ASSERT (Udp4Header != NULL);\r
 \r
   Udp4Header = (EFI_UDP_HEADER *) NetbufGetByte (Packet, 0, NULL);\r
   ASSERT (Udp4Header != NULL);\r
 \r

diff --git a/MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Impl.h b/MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Impl.h
index 31edfbda43556e8c7223548d742a8c4c83dafbad..dd4909e57ac12cc6d6e636d26bede1b6e26871c2 100644 (file)
--- a/MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Impl.h
+++ b/MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Impl.h
@@ -1,7 +1,7 @@
 /** @file\r
   EFI UDPv4 protocol implementation.\r
 /** @file\r
   EFI UDPv4 protocol implementation.\r

-   \r
-Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.<BR>\r
+\r
+Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r

 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r


@@ -158,7 +158,7 @@ Udp4GetModeData (
 /**\r
   Initializes, changes, or resets the operational parameters for this instance of the EFI UDPv4\r
   Protocol.\r
 /**\r
   Initializes, changes, or resets the operational parameters for this instance of the EFI UDPv4\r
   Protocol.\r

-  \r
+\r

   The Configure() function is used to do the following:\r
   * Initialize and start this instance of the EFI UDPv4 Protocol.\r
   * Change the filtering rules and operational parameters.\r
   The Configure() function is used to do the following:\r
   * Initialize and start this instance of the EFI UDPv4 Protocol.\r
   * Change the filtering rules and operational parameters.\r


@@ -185,7 +185,7 @@ Udp4GetModeData (
   @retval EFI_OUT_OF_RESOURCES  The EFI UDPv4 Protocol driver cannot allocate memory for this\r
                                 EFI UDPv4 Protocol instance.\r
   @retval EFI_DEVICE_ERROR      An unexpected network or system error occurred and this instance\r
   @retval EFI_OUT_OF_RESOURCES  The EFI UDPv4 Protocol driver cannot allocate memory for this\r
                                 EFI UDPv4 Protocol instance.\r
   @retval EFI_DEVICE_ERROR      An unexpected network or system error occurred and this instance\r

-                                 was not opened. \r
+                                 was not opened.\r

 \r
 **/\r
 EFI_STATUS\r
 \r
 **/\r
 EFI_STATUS\r


@@ -197,7 +197,7 @@ Udp4Configure (
 \r
 /**\r
   Joins and leaves multicast groups.\r
 \r
 /**\r
   Joins and leaves multicast groups.\r

-  \r
+\r

   The Groups() function is used to enable and disable the multicast group\r
   filtering. If the JoinFlag is FALSE and the MulticastAddress is NULL, then all\r
   currently joined groups are left.\r
   The Groups() function is used to enable and disable the multicast group\r
   filtering. If the JoinFlag is FALSE and the MulticastAddress is NULL, then all\r
   currently joined groups are left.\r


@@ -234,7 +234,7 @@ Udp4Groups (
 \r
 /**\r
   Adds and deletes routing table entries.\r
 \r
 /**\r
   Adds and deletes routing table entries.\r

-  \r
+\r

   The Routes() function adds a route to or deletes a route from the routing table.\r
   Routes are determined by comparing the SubnetAddress with the destination IP\r
   address and arithmetically AND-ing it with the SubnetMask. The gateway address\r
   The Routes() function adds a route to or deletes a route from the routing table.\r
   Routes are determined by comparing the SubnetAddress with the destination IP\r
   address and arithmetically AND-ing it with the SubnetMask. The gateway address\r


@@ -282,7 +282,7 @@ Udp4Routes (
 \r
 /**\r
   Queues outgoing data packets into the transmit queue.\r
 \r
 /**\r
   Queues outgoing data packets into the transmit queue.\r

-  \r
+\r

   The Transmit() function places a sending request to this instance of the EFI\r
   UDPv4 Protocol, alongside the transmit data that was filled by the user. Whenever\r
   the packet in the token is sent out or some errors occur, the Token.Event will\r
   The Transmit() function places a sending request to this instance of the EFI\r
   UDPv4 Protocol, alongside the transmit data that was filled by the user. Whenever\r
   the packet in the token is sent out or some errors occur, the Token.Event will\r


@@ -319,7 +319,7 @@ Udp4Transmit (
 \r
 /**\r
   Places an asynchronous receive request into the receiving queue.\r
 \r
 /**\r
   Places an asynchronous receive request into the receiving queue.\r

-  \r
+\r

   The Receive() function places a completion token into the receive packet queue.\r
   This function is always asynchronous.\r
   The caller must fill in the Token.Event field in the completion token, and this\r
   The Receive() function places a completion token into the receive packet queue.\r
   This function is always asynchronous.\r
   The caller must fill in the Token.Event field in the completion token, and this\r


@@ -355,7 +355,7 @@ Udp4Receive (
 \r
 /**\r
   Aborts an asynchronous transmit or receive request.\r
 \r
 /**\r
   Aborts an asynchronous transmit or receive request.\r

-  \r
+\r

   The Cancel() function is used to abort a pending transmit or receive request.\r
   If the token is in the transmit or receive request queues, after calling this\r
   function, Token.Status will be set to EFI_ABORTED and then Token.Event will be\r
   The Cancel() function is used to abort a pending transmit or receive request.\r
   If the token is in the transmit or receive request queues, after calling this\r
   function, Token.Status will be set to EFI_ABORTED and then Token.Event will be\r


@@ -390,7 +390,7 @@ Udp4Cancel (
 \r
 /**\r
   Polls for incoming data packets and processes outgoing data packets.\r
 \r
 /**\r
   Polls for incoming data packets and processes outgoing data packets.\r

-  \r
+\r

   The Poll() function can be used by network drivers and applications to increase\r
   the rate that data packets are moved between the communications device and the\r
   transmit and receive queues.\r
   The Poll() function can be used by network drivers and applications to increase\r
   the rate that data packets are moved between the communications device and the\r
   transmit and receive queues.\r


@@ -691,5 +691,5 @@ EFIAPI
 Udp4NetVectorExtFree (\r
   VOID  *Context\r
   );\r
 Udp4NetVectorExtFree (\r
   VOID  *Context\r
   );\r

- \r
+\r

 #endif\r
 #endif\r

diff --git a/MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Main.c b/MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Main.c
index d719883925e30681dc779216b4b50616e3f965f4..6950c693aed45adfd12d659fed5df506534f1903 100644 (file)
--- a/MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Main.c
+++ b/MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Main.c
@@ -1,7 +1,7 @@
 /** @file\r
 \r
 (C) Copyright 2014 Hewlett-Packard Development Company, L.P.<BR>\r
 /** @file\r
 \r
 (C) Copyright 2014 Hewlett-Packard Development Company, L.P.<BR>\r

-Copyright (c) 2006 - 2017, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r

 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r


@@ -96,7 +96,7 @@ Udp4GetModeData (
 /**\r
   Initializes, changes, or resets the operational parameters for this instance of the EFI UDPv4\r
   Protocol.\r
 /**\r
   Initializes, changes, or resets the operational parameters for this instance of the EFI UDPv4\r
   Protocol.\r

-  \r
+\r

   The Configure() function is used to do the following:\r
   * Initialize and start this instance of the EFI UDPv4 Protocol.\r
   * Change the filtering rules and operational parameters.\r
   The Configure() function is used to do the following:\r
   * Initialize and start this instance of the EFI UDPv4 Protocol.\r
   * Change the filtering rules and operational parameters.\r


@@ -123,7 +123,7 @@ Udp4GetModeData (
   @retval EFI_OUT_OF_RESOURCES  The EFI UDPv4 Protocol driver cannot allocate memory for this\r
                                 EFI UDPv4 Protocol instance.\r
   @retval EFI_DEVICE_ERROR      An unexpected network or system error occurred and this instance\r
   @retval EFI_OUT_OF_RESOURCES  The EFI UDPv4 Protocol driver cannot allocate memory for this\r
                                 EFI UDPv4 Protocol instance.\r
   @retval EFI_DEVICE_ERROR      An unexpected network or system error occurred and this instance\r

-                                 was not opened. \r
+                                 was not opened.\r

 \r
 **/\r
 EFI_STATUS\r
 \r
 **/\r
 EFI_STATUS\r


@@ -281,7 +281,7 @@ Udp4Configure (
 \r
     ASSERT (IsListEmpty (&Instance->DeliveredDgramQue));\r
   }\r
 \r
     ASSERT (IsListEmpty (&Instance->DeliveredDgramQue));\r
   }\r

- \r
+\r

 ON_EXIT:\r
 \r
   gBS->RestoreTPL (OldTpl);\r
 ON_EXIT:\r
 \r
   gBS->RestoreTPL (OldTpl);\r


@@ -292,7 +292,7 @@ ON_EXIT:
 \r
 /**\r
   Joins and leaves multicast groups.\r
 \r
 /**\r
   Joins and leaves multicast groups.\r

-  \r
+\r

   The Groups() function is used to enable and disable the multicast group\r
   filtering. If the JoinFlag is FALSE and the MulticastAddress is NULL, then all\r
   currently joined groups are left.\r
   The Groups() function is used to enable and disable the multicast group\r
   filtering. If the JoinFlag is FALSE and the MulticastAddress is NULL, then all\r
   currently joined groups are left.\r


@@ -393,7 +393,7 @@ ON_EXIT:
 \r
 /**\r
   Adds and deletes routing table entries.\r
 \r
 /**\r
   Adds and deletes routing table entries.\r

-  \r
+\r

   The Routes() function adds a route to or deletes a route from the routing table.\r
   Routes are determined by comparing the SubnetAddress with the destination IP\r
   address and arithmetically AND-ing it with the SubnetMask. The gateway address\r
   The Routes() function adds a route to or deletes a route from the routing table.\r
   Routes are determined by comparing the SubnetAddress with the destination IP\r
   address and arithmetically AND-ing it with the SubnetMask. The gateway address\r


@@ -467,7 +467,7 @@ Udp4Routes (
 \r
 /**\r
   Queues outgoing data packets into the transmit queue.\r
 \r
 /**\r
   Queues outgoing data packets into the transmit queue.\r

-  \r
+\r

   The Transmit() function places a sending request to this instance of the EFI\r
   UDPv4 Protocol, alongside the transmit data that was filled by the user. Whenever\r
   the packet in the token is sent out or some errors occur, the Token.Event will\r
   The Transmit() function places a sending request to this instance of the EFI\r
   UDPv4 Protocol, alongside the transmit data that was filled by the user. Whenever\r
   the packet in the token is sent out or some errors occur, the Token.Event will\r


@@ -696,7 +696,7 @@ ON_EXIT:
 \r
 /**\r
   Places an asynchronous receive request into the receiving queue.\r
 \r
 /**\r
   Places an asynchronous receive request into the receiving queue.\r

-  \r
+\r

   The Receive() function places a completion token into the receive packet queue.\r
   This function is always asynchronous.\r
   The caller must fill in the Token.Event field in the completion token, and this\r
   The Receive() function places a completion token into the receive packet queue.\r
   This function is always asynchronous.\r
   The caller must fill in the Token.Event field in the completion token, and this\r


@@ -796,7 +796,7 @@ ON_EXIT:
 \r
 /**\r
   Aborts an asynchronous transmit or receive request.\r
 \r
 /**\r
   Aborts an asynchronous transmit or receive request.\r

-  \r
+\r

   The Cancel() function is used to abort a pending transmit or receive request.\r
   If the token is in the transmit or receive request queues, after calling this\r
   function, Token.Status will be set to EFI_ABORTED and then Token.Event will be\r
   The Cancel() function is used to abort a pending transmit or receive request.\r
   If the token is in the transmit or receive request queues, after calling this\r
   function, Token.Status will be set to EFI_ABORTED and then Token.Event will be\r


@@ -867,7 +867,7 @@ Udp4Cancel (
 \r
 /**\r
   Polls for incoming data packets and processes outgoing data packets.\r
 \r
 /**\r
   Polls for incoming data packets and processes outgoing data packets.\r

-  \r
+\r

   The Poll() function can be used by network drivers and applications to increase\r
   the rate that data packets are moved between the communications device and the\r
   transmit and receive queues.\r
   The Poll() function can be used by network drivers and applications to increase\r
   the rate that data packets are moved between the communications device and the\r
   transmit and receive queues.\r

diff --git a/MdeModulePkg/Universal/Network/UefiPxeBcDxe/ComponentName.c b/MdeModulePkg/Universal/Network/UefiPxeBcDxe/ComponentName.c
index f4ef59ce5e814ff6858cd865216e6aa5e47767de..a085ef61f3414556d0db1b37d22e88b62bb21ad2 100644 (file)
--- a/MdeModulePkg/Universal/Network/UefiPxeBcDxe/ComponentName.c
+++ b/MdeModulePkg/Universal/Network/UefiPxeBcDxe/ComponentName.c
@@ -1,6 +1,6 @@
 /** @file\r
 \r
 /** @file\r
 \r

-Copyright (c) 2007 - 2012, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2007 - 2018, Intel Corporation. All rights reserved.<BR>\r

 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r


@@ -316,7 +316,7 @@ PxeBcComponentNameGetControllerName (
   EFI_PXE_BASE_CODE_PROTOCOL  *PxeBc;\r
   EFI_HANDLE                  NicHandle;\r
   EFI_STATUS                  Status;\r
   EFI_PXE_BASE_CODE_PROTOCOL  *PxeBc;\r
   EFI_HANDLE                  NicHandle;\r
   EFI_STATUS                  Status;\r

-  \r
+\r

   if (ControllerHandle == NULL || ChildHandle != NULL) {\r
     return EFI_UNSUPPORTED;\r
   }\r
   if (ControllerHandle == NULL || ChildHandle != NULL) {\r
     return EFI_UNSUPPORTED;\r
   }\r

diff --git a/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcDhcp.c b/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcDhcp.c
index e48b54c876fc8ccea1c5e8390d213cbae5867d98..f7b975f2997f19db2a328c2aaf423f090d7659bf 100644 (file)
--- a/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcDhcp.c
+++ b/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcDhcp.c
@@ -171,7 +171,7 @@ PxeBcParseCachedDhcpPacket (
                        );\r
   }\r
   //\r
                        );\r
   }\r
   //\r

-  // Second, Check if bootfilename and serverhostname is overloaded to carry DHCP options refers to rfc-2132. \r
+  // Second, Check if bootfilename and serverhostname is overloaded to carry DHCP options refers to rfc-2132.\r

   // If yes, try to parse options from the BootFileName field, then ServerName field.\r
   //\r
   Option = Options[PXEBC_DHCP4_TAG_INDEX_OVERLOAD];\r
   // If yes, try to parse options from the BootFileName field, then ServerName field.\r
   //\r
   Option = Options[PXEBC_DHCP4_TAG_INDEX_OVERLOAD];\r


@@ -229,7 +229,7 @@ PxeBcParseCachedDhcpPacket (
   //\r
   if (Options[PXEBC_DHCP4_TAG_INDEX_BOOTFILE] != NULL) {\r
     //\r
   //\r
   if (Options[PXEBC_DHCP4_TAG_INDEX_BOOTFILE] != NULL) {\r
     //\r

-    // RFC 2132, Section 9.5 does not strictly state Bootfile name (option 67) is null \r
+    // RFC 2132, Section 9.5 does not strictly state Bootfile name (option 67) is null\r

     // terminated string. So force to append null terminated character at the end of string.\r
     //\r
     Ptr8 =  (UINT8*)&Options[PXEBC_DHCP4_TAG_INDEX_BOOTFILE]->Data[0];\r
     // terminated string. So force to append null terminated character at the end of string.\r
     //\r
     Ptr8 =  (UINT8*)&Options[PXEBC_DHCP4_TAG_INDEX_BOOTFILE]->Data[0];\r


@@ -685,7 +685,7 @@ PxeBcCacheDhcpOffer (
 \r
 **/\r
 EFI_STATUS\r
 \r
 **/\r
 EFI_STATUS\r

-PxeBcSetIp4Policy (   \r
+PxeBcSetIp4Policy (\r

   IN PXEBC_PRIVATE_DATA            *Private\r
   )\r
 {\r
   IN PXEBC_PRIVATE_DATA            *Private\r
   )\r
 {\r


@@ -705,7 +705,7 @@ PxeBcSetIp4Policy (
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r

-  \r
+\r

   if (Policy != Ip4Config2PolicyStatic) {\r
     Policy = Ip4Config2PolicyStatic;\r
     Status= Ip4Config2->SetData (\r
   if (Policy != Ip4Config2PolicyStatic) {\r
     Policy = Ip4Config2PolicyStatic;\r
     Status= Ip4Config2->SetData (\r


@@ -716,7 +716,7 @@ PxeBcSetIp4Policy (
                           );\r
     if (EFI_ERROR (Status)) {\r
       return Status;\r
                           );\r
     if (EFI_ERROR (Status)) {\r
       return Status;\r

-    } \r
+    }\r

   }\r
 \r
   return  EFI_SUCCESS;\r
   }\r
 \r
   return  EFI_SUCCESS;\r


@@ -943,7 +943,7 @@ PxeBcDhcpCallBack (
       Status = EFI_ABORTED;\r
       break;\r
     }\r
       Status = EFI_ABORTED;\r
       break;\r
     }\r

-    \r
+\r

     if (Mode->SendGUID) {\r
       //\r
       // send the system GUID instead of the MAC address as the hardware address\r
     if (Mode->SendGUID) {\r
       //\r
       // send the system GUID instead of the MAC address as the hardware address\r


@@ -981,7 +981,7 @@ PxeBcDhcpCallBack (
       //\r
       break;\r
     }\r
       //\r
       break;\r
     }\r

-    \r
+\r

     if (Private->NumOffers < PXEBC_MAX_OFFER_NUM) {\r
       //\r
       // Cache the dhcp offers in Private->Dhcp4Offers[]\r
     if (Private->NumOffers < PXEBC_MAX_OFFER_NUM) {\r
       //\r
       // Cache the dhcp offers in Private->Dhcp4Offers[]\r


@@ -1669,12 +1669,12 @@ PxeBcSelectBootPrompt (
 \r
   VendorOpt = &Packet->PxeVendorOption;\r
   //\r
 \r
   VendorOpt = &Packet->PxeVendorOption;\r
   //\r

-  // According to the PXE specification 2.1, Table 2-1 PXE DHCP Options  (Full  \r
-  // List), we must not consider a boot prompt or boot menu if all of the  \r
+  // According to the PXE specification 2.1, Table 2-1 PXE DHCP Options  (Full\r
+  // List), we must not consider a boot prompt or boot menu if all of the\r

   // following hold:\r
   // - the PXE_DISCOVERY_CONTROL PXE tag is present inside the Vendor Options\r
   //   (=43) DHCP tag, and\r
   // following hold:\r
   // - the PXE_DISCOVERY_CONTROL PXE tag is present inside the Vendor Options\r
   //   (=43) DHCP tag, and\r

-  // - the PXE_DISCOVERY_CONTROL PXE tag has bit 3 set, and  \r
+  // - the PXE_DISCOVERY_CONTROL PXE tag has bit 3 set, and\r

   // - a boot file name has been presented with DHCP option 67.\r
   //\r
   if (IS_DISABLE_PROMPT_MENU (VendorOpt->DiscoverCtrl) &&\r
   // - a boot file name has been presented with DHCP option 67.\r
   //\r
   if (IS_DISABLE_PROMPT_MENU (VendorOpt->DiscoverCtrl) &&\r

diff --git a/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcDhcp.h b/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcDhcp.h
index d19d2a318f3c154961ed4af54d097158436e9951..d8336c5e82e98aad2dc9a5b80f12c7449b669e5a 100644 (file)
--- a/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcDhcp.h
+++ b/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcDhcp.h
@@ -2,7 +2,7 @@
   Dhcp and Discover routines for PxeBc.\r
 \r
 Copyright (c) 2013, Red Hat, Inc.\r
   Dhcp and Discover routines for PxeBc.\r
 \r
 Copyright (c) 2013, Red Hat, Inc.\r

-Copyright (c) 2007 - 2016, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2007 - 2018, Intel Corporation. All rights reserved.<BR>\r

 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r


@@ -258,7 +258,7 @@ typedef struct {
   This function initialize the DHCP4 message instance.\r
 \r
   This function will pad each item of dhcp4 message packet.\r
   This function initialize the DHCP4 message instance.\r
 \r
   This function will pad each item of dhcp4 message packet.\r

-  \r
+\r

   @param  Seed    Pointer to the message instance of the DHCP4 packet.\r
   @param  Udp4    Pointer to the EFI_UDP4_PROTOCOL instance.\r
 \r
   @param  Seed    Pointer to the message instance of the DHCP4 packet.\r
   @param  Udp4    Pointer to the EFI_UDP4_PROTOCOL instance.\r
 \r


@@ -304,7 +304,7 @@ PxeBcCheckSelectedOffer (
 \r
 /**\r
   Callback routine.\r
 \r
 /**\r
   Callback routine.\r

-  \r
+\r

   EFI_DHCP4_CALLBACK is provided by the consumer of the EFI DHCPv4 Protocol driver\r
   to intercept events that occurred in the configuration process. This structure\r
   provides advanced control of each state transition of the DHCP process. The\r
   EFI_DHCP4_CALLBACK is provided by the consumer of the EFI DHCPv4 Protocol driver\r
   to intercept events that occurred in the configuration process. This structure\r
   provides advanced control of each state transition of the DHCP process. The\r


@@ -352,7 +352,7 @@ PxeBcDhcpCallBack (
 \r
 **/\r
 EFI_STATUS\r
 \r
 **/\r
 EFI_STATUS\r

-PxeBcSetIp4Policy (   \r
+PxeBcSetIp4Policy (\r

   IN PXEBC_PRIVATE_DATA            *Private\r
   );\r
 \r
   IN PXEBC_PRIVATE_DATA            *Private\r
   );\r
 \r


@@ -363,8 +363,8 @@ PxeBcSetIp4Policy (
   @param  Type                  PxeBc option boot item type\r
   @param  Layer                 PxeBc option boot item layer\r
   @param  UseBis                Use BIS or not\r
   @param  Type                  PxeBc option boot item type\r
   @param  Layer                 PxeBc option boot item layer\r
   @param  UseBis                Use BIS or not\r

-  @param  DestIp                Ip address for server      \r
-  @param  IpCount               The total count of the server ip address    \r
+  @param  DestIp                Ip address for server\r
+  @param  IpCount               The total count of the server ip address\r

   @param  SrvList               Server list\r
   @param  IsDiscv               Discover the vendor or not\r
   @param  Reply                 The dhcp4 packet of Pxe reply\r
   @param  SrvList               Server list\r
   @param  IsDiscv               Discover the vendor or not\r
   @param  Reply                 The dhcp4 packet of Pxe reply\r


@@ -372,8 +372,8 @@ PxeBcSetIp4Policy (
   @retval EFI_SUCCESS           Operation succeeds.\r
   @retval EFI_OUT_OF_RESOURCES  Allocate memory pool failed.\r
   @retval EFI_NOT_FOUND         There is no vendor option exists.\r
   @retval EFI_SUCCESS           Operation succeeds.\r
   @retval EFI_OUT_OF_RESOURCES  Allocate memory pool failed.\r
   @retval EFI_NOT_FOUND         There is no vendor option exists.\r

-  @retval EFI_TIMEOUT           Send Pxe Discover time out. \r
-  \r
+  @retval EFI_TIMEOUT           Send Pxe Discover time out.\r
+\r

 **/\r
 EFI_STATUS\r
 PxeBcDiscvBootService (\r
 **/\r
 EFI_STATUS\r
 PxeBcDiscvBootService (\r


@@ -394,8 +394,8 @@ PxeBcDiscvBootService (
 \r
   @param  Private          Pointer to PxeBc private data.\r
   @param  OptList          Pointer to a DHCP option list.\r
 \r
   @param  Private          Pointer to PxeBc private data.\r
   @param  OptList          Pointer to a DHCP option list.\r

-                           \r
-  @param  IsDhcpDiscover   Discover dhcp option or not.     \r
+\r
+  @param  IsDhcpDiscover   Discover dhcp option or not.\r

 \r
   @return The index item number of the option list.\r
 \r
 \r
   @return The index item number of the option list.\r
 \r


@@ -413,7 +413,7 @@ PxeBcBuildDhcpOptions (
 \r
   @param  OptList    Pointer to the list of the options\r
   @param  Type       the type of option\r
 \r
   @param  OptList    Pointer to the list of the options\r
   @param  Type       the type of option\r

-  @param  Layer      the layer of the boot options \r
+  @param  Layer      the layer of the boot options\r

   @param  OptLen     length of opotion\r
 \r
 **/\r
   @param  OptLen     length of opotion\r
 \r
 **/\r


@@ -433,7 +433,7 @@ PxeBcCreateBootOptions (
   @param  Length     The length of the dhcp options.\r
   @param  OptTag     The option OpCode.\r
 \r
   @param  Length     The length of the dhcp options.\r
   @param  OptTag     The option OpCode.\r
 \r

-  @return NULL if the buffer length is 0 and OpCode is not \r
+  @return NULL if the buffer length is 0 and OpCode is not\r

           DHCP4_TAG_EOP, or the pointer to the buffer.\r
 \r
 **/\r
           DHCP4_TAG_EOP, or the pointer to the buffer.\r
 \r
 **/\r


@@ -467,11 +467,11 @@ PxeBcParseVendorOptions (
   @param  Private              Pointer to PxeBc private data.\r
 \r
   @retval EFI_SUCCESS          Select boot prompt done.\r
   @param  Private              Pointer to PxeBc private data.\r
 \r
   @retval EFI_SUCCESS          Select boot prompt done.\r

-  @retval EFI_TIMEOUT          Select boot prompt time out. \r
+  @retval EFI_TIMEOUT          Select boot prompt time out.\r

   @retval EFI_NOT_FOUND        The proxy offer is not Pxe10.\r
   @retval EFI_ABORTED          User cancel the operation.\r
   @retval EFI_NOT_READY        Read the input key from the keybroad has not finish.\r
   @retval EFI_NOT_FOUND        The proxy offer is not Pxe10.\r
   @retval EFI_ABORTED          User cancel the operation.\r
   @retval EFI_NOT_READY        Read the input key from the keybroad has not finish.\r

-  \r
+\r

 **/\r
 EFI_STATUS\r
 PxeBcSelectBootPrompt (\r
 **/\r
 EFI_STATUS\r
 PxeBcSelectBootPrompt (\r


@@ -485,10 +485,10 @@ PxeBcSelectBootPrompt (
   @param  Private         Pointer to PxeBc private data.\r
   @param  Type            The type of the menu.\r
   @param  UseDefaultItem  Use default item or not.\r
   @param  Private         Pointer to PxeBc private data.\r
   @param  Type            The type of the menu.\r
   @param  UseDefaultItem  Use default item or not.\r

-  \r
+\r

   @retval EFI_ABORTED     User cancel operation.\r
   @retval EFI_SUCCESS     Select the boot menu success.\r
   @retval EFI_ABORTED     User cancel operation.\r
   @retval EFI_SUCCESS     Select the boot menu success.\r

-  @retval EFI_NOT_READY   Read the input key from the keybroad has not finish.    \r
+  @retval EFI_NOT_READY   Read the input key from the keybroad has not finish.\r

 \r
 **/\r
 EFI_STATUS\r
 \r
 **/\r
 EFI_STATUS\r

diff --git a/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcDriver.h b/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcDriver.h
index f436c895b443b174353a5782e4af265310e4c09b..b7bf069dd6375f4ddf631d7040a2b3489dd49076 100644 (file)
--- a/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcDriver.h
+++ b/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcDriver.h
@@ -1,6 +1,6 @@
 /** @file\r
 \r
 /** @file\r
 \r

-Copyright (c) 2007, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2007 - 2018, Intel Corporation. All rights reserved.<BR>\r

 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r


@@ -20,7 +20,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   order to make drivers as small as possible, there are a few calling\r
   restrictions for this service. ConnectController() must\r
   follow these calling restrictions. If any other agent wishes to call\r
   order to make drivers as small as possible, there are a few calling\r
   restrictions for this service. ConnectController() must\r
   follow these calling restrictions. If any other agent wishes to call\r

-  Supported() it must also follow these calling restrictions.  \r
+  Supported() it must also follow these calling restrictions.\r

   PxeBc requires DHCP4 and MTFTP4 protocols.\r
 \r
   @param  This                Protocol instance pointer.\r
   PxeBc requires DHCP4 and MTFTP4 protocols.\r
 \r
   @param  This                Protocol instance pointer.\r


@@ -40,7 +40,7 @@ PxeBcDriverBindingSupported (
   IN EFI_HANDLE                   ControllerHandle,\r
   IN EFI_DEVICE_PATH_PROTOCOL     * RemainingDevicePath OPTIONAL\r
   );\r
   IN EFI_HANDLE                   ControllerHandle,\r
   IN EFI_DEVICE_PATH_PROTOCOL     * RemainingDevicePath OPTIONAL\r
   );\r

-  \r
+\r

 /**\r
   Start this driver on ControllerHandle. This service is called by the\r
   EFI boot service ConnectController(). In order to make\r
 /**\r
   Start this driver on ControllerHandle. This service is called by the\r
   EFI boot service ConnectController(). In order to make\r


@@ -66,7 +66,7 @@ PxeBcDriverBindingStart (
   IN EFI_HANDLE                   ControllerHandle,\r
   IN EFI_DEVICE_PATH_PROTOCOL     * RemainingDevicePath OPTIONAL\r
   );\r
   IN EFI_HANDLE                   ControllerHandle,\r
   IN EFI_DEVICE_PATH_PROTOCOL     * RemainingDevicePath OPTIONAL\r
   );\r

-  \r
+\r

 /**\r
   Stop this driver on ControllerHandle. This service is called by the\r
   EFI boot service DisconnectController(). In order to\r
 /**\r
   Stop this driver on ControllerHandle. This service is called by the\r
   EFI boot service DisconnectController(). In order to\r


@@ -74,7 +74,7 @@ PxeBcDriverBindingStart (
   restrictions for this service. DisconnectController()\r
   must follow these calling restrictions. If any other agent wishes\r
   to call Stop() it must also follow these calling restrictions.\r
   restrictions for this service. DisconnectController()\r
   must follow these calling restrictions. If any other agent wishes\r
   to call Stop() it must also follow these calling restrictions.\r

-  \r
+\r

   @param  This              Protocol instance pointer.\r
   @param  ControllerHandle  Handle of device to stop driver on\r
   @param  NumberOfChildren  Number of Handles in ChildHandleBuffer. If number of\r
   @param  This              Protocol instance pointer.\r
   @param  ControllerHandle  Handle of device to stop driver on\r
   @param  NumberOfChildren  Number of Handles in ChildHandleBuffer. If number of\r


@@ -93,7 +93,7 @@ PxeBcDriverBindingStop (
   IN UINTN                        NumberOfChildren,\r
   IN EFI_HANDLE                   *ChildHandleBuffer\r
   );\r
   IN UINTN                        NumberOfChildren,\r
   IN EFI_HANDLE                   *ChildHandleBuffer\r
   );\r

-  \r
+\r

 extern EFI_COMPONENT_NAME2_PROTOCOL gPxeBcComponentName2;\r
 extern EFI_COMPONENT_NAME_PROTOCOL  gPxeBcComponentName;\r
 extern EFI_DRIVER_BINDING_PROTOCOL  gPxeBcDriverBinding;\r
 extern EFI_COMPONENT_NAME2_PROTOCOL gPxeBcComponentName2;\r
 extern EFI_COMPONENT_NAME_PROTOCOL  gPxeBcComponentName;\r
 extern EFI_DRIVER_BINDING_PROTOCOL  gPxeBcDriverBinding;\r

diff --git a/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcImpl.c b/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcImpl.c
index 825a22cae951438be08b1a94106ef79a9f6510aa..3fa3be99c1786e34d96dc5ce289d622ca82c4e29 100644 (file)
--- a/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcImpl.c
+++ b/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcImpl.c
@@ -1,7 +1,7 @@
 /** @file\r
   Interface routines for PxeBc.\r
 \r
 /** @file\r
   Interface routines for PxeBc.\r
 \r

-Copyright (c) 2007 - 2017, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2007 - 2018, Intel Corporation. All rights reserved.<BR>\r

 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r


@@ -354,7 +354,7 @@ EfiPxeBcStart (
 \r
   //\r
   // Configure block size for TFTP as a default value to handle all link layers.\r
 \r
   //\r
   // Configure block size for TFTP as a default value to handle all link layers.\r

-  // \r
+  //\r

   Private->BlockSize   = MIN (Private->Ip4MaxPacketSize, PXEBC_DEFAULT_PACKET_SIZE) -\r
                            PXEBC_DEFAULT_UDP_OVERHEAD_SIZE - PXEBC_DEFAULT_TFTP_OVERHEAD_SIZE;\r
   //\r
   Private->BlockSize   = MIN (Private->Ip4MaxPacketSize, PXEBC_DEFAULT_PACKET_SIZE) -\r
                            PXEBC_DEFAULT_UDP_OVERHEAD_SIZE - PXEBC_DEFAULT_TFTP_OVERHEAD_SIZE;\r
   //\r


@@ -363,7 +363,7 @@ EfiPxeBcStart (
   if (PcdGet64 (PcdTftpBlockSize) != 0) {\r
     Private->BlockSize   = (UINTN) PcdGet64 (PcdTftpBlockSize);\r
   }\r
   if (PcdGet64 (PcdTftpBlockSize) != 0) {\r
     Private->BlockSize   = (UINTN) PcdGet64 (PcdTftpBlockSize);\r
   }\r

-  \r
+\r

   Private->AddressIsOk = FALSE;\r
 \r
   ZeroMem (Mode, sizeof (EFI_PXE_BASE_CODE_MODE));\r
   Private->AddressIsOk = FALSE;\r
 \r
   ZeroMem (Mode, sizeof (EFI_PXE_BASE_CODE_MODE));\r


@@ -415,17 +415,17 @@ EfiPxeBcStart (
   }\r
 \r
   //\r
   }\r
 \r
   //\r

-  //DHCP4 service allows only one of its children to be configured in  \r
-  //the active state, If the DHCP4 D.O.R.A started by IP4 auto  \r
-  //configuration and has not been completed, the Dhcp4 state machine \r
-  //will not be in the right state for the PXE to start a new round D.O.R.A. \r
+  //DHCP4 service allows only one of its children to be configured in\r
+  //the active state, If the DHCP4 D.O.R.A started by IP4 auto\r
+  //configuration and has not been completed, the Dhcp4 state machine\r
+  //will not be in the right state for the PXE to start a new round D.O.R.A.\r

   //so we need to switch it's policy to static.\r
   //\r
   Status = PxeBcSetIp4Policy (Private);\r
   if (EFI_ERROR (Status)) {\r
     goto ON_EXIT;\r
   }\r
   //so we need to switch it's policy to static.\r
   //\r
   Status = PxeBcSetIp4Policy (Private);\r
   if (EFI_ERROR (Status)) {\r
     goto ON_EXIT;\r
   }\r

-    \r
+\r

   Status = Private->Ip4->Configure (Private->Ip4, &Private->Ip4ConfigData);\r
   if (EFI_ERROR (Status)) {\r
     goto ON_EXIT;\r
   Status = Private->Ip4->Configure (Private->Ip4, &Private->Ip4ConfigData);\r
   if (EFI_ERROR (Status)) {\r
     goto ON_EXIT;\r


@@ -726,35 +726,35 @@ ON_EXIT:
       CopyMem (&Private->Udp4CfgData.SubnetMask, &Private->SubnetMask, sizeof (EFI_IPv4_ADDRESS));\r
       CopyMem (&Private->Ip4ConfigData.StationAddress, &Private->StationIp, sizeof (EFI_IPv4_ADDRESS));\r
       CopyMem (&Private->Ip4ConfigData.SubnetMask, &Private->SubnetMask, sizeof (EFI_IPv4_ADDRESS));\r
       CopyMem (&Private->Udp4CfgData.SubnetMask, &Private->SubnetMask, sizeof (EFI_IPv4_ADDRESS));\r
       CopyMem (&Private->Ip4ConfigData.StationAddress, &Private->StationIp, sizeof (EFI_IPv4_ADDRESS));\r
       CopyMem (&Private->Ip4ConfigData.SubnetMask, &Private->SubnetMask, sizeof (EFI_IPv4_ADDRESS));\r

-  \r
+\r

       //\r
       // Reconfigure the Ip4 instance to capture background ICMP packets with new station Ip address.\r
       //\r
       Private->Ip4->Cancel (Private->Ip4, &Private->IcmpErrorRcvToken);\r
       Private->Ip4->Configure (Private->Ip4, NULL);\r
       //\r
       // Reconfigure the Ip4 instance to capture background ICMP packets with new station Ip address.\r
       //\r
       Private->Ip4->Cancel (Private->Ip4, &Private->IcmpErrorRcvToken);\r
       Private->Ip4->Configure (Private->Ip4, NULL);\r

-  \r
+\r

       Status = Private->Ip4->Configure (Private->Ip4, &Private->Ip4ConfigData);\r
       if (EFI_ERROR (Status)) {\r
         goto ON_EXIT;\r
       }\r
       Status = Private->Ip4->Configure (Private->Ip4, &Private->Ip4ConfigData);\r
       if (EFI_ERROR (Status)) {\r
         goto ON_EXIT;\r
       }\r

-  \r
+\r

       Status = Private->Ip4->Receive (Private->Ip4, &Private->IcmpErrorRcvToken);\r
       if (EFI_ERROR (Status)) {\r
         goto ON_EXIT;\r
       Status = Private->Ip4->Receive (Private->Ip4, &Private->IcmpErrorRcvToken);\r
       if (EFI_ERROR (Status)) {\r
         goto ON_EXIT;\r

-      } \r
+      }\r

     }\r
   }\r
 \r
   Private->Udp4Read->Configure (Private->Udp4Read, &Private->Udp4CfgData);\r
 \r
   //\r
     }\r
   }\r
 \r
   Private->Udp4Read->Configure (Private->Udp4Read, &Private->Udp4CfgData);\r
 \r
   //\r

-  // Dhcp(), Discover(), and Mtftp() set the IP filter, and return with the IP \r
+  // Dhcp(), Discover(), and Mtftp() set the IP filter, and return with the IP\r

   // receive filter list emptied and the filter set to EFI_PXE_BASE_CODE_IP_FILTER_STATION_IP.\r
   //\r
   ZeroMem(&IpFilter, sizeof (EFI_PXE_BASE_CODE_IP_FILTER));\r
   IpFilter.Filters = EFI_PXE_BASE_CODE_IP_FILTER_STATION_IP;\r
   This->SetIpFilter (This, &IpFilter);\r
   // receive filter list emptied and the filter set to EFI_PXE_BASE_CODE_IP_FILTER_STATION_IP.\r
   //\r
   ZeroMem(&IpFilter, sizeof (EFI_PXE_BASE_CODE_IP_FILTER));\r
   IpFilter.Filters = EFI_PXE_BASE_CODE_IP_FILTER_STATION_IP;\r
   This->SetIpFilter (This, &IpFilter);\r

-  \r
+\r

   return Status;\r
 }\r
 \r
   return Status;\r
 }\r
 \r


@@ -864,7 +864,7 @@ EfiPxeBcDiscover (
     if (!Mode->PxeDiscoverValid || !Mode->PxeReplyReceived || (!Mode->PxeBisReplyReceived && UseBis)) {\r
 \r
       Status = EFI_INVALID_PARAMETER;\r
     if (!Mode->PxeDiscoverValid || !Mode->PxeReplyReceived || (!Mode->PxeBisReplyReceived && UseBis)) {\r
 \r
       Status = EFI_INVALID_PARAMETER;\r

-      goto ON_EXIT;  \r
+      goto ON_EXIT;\r

     }\r
 \r
     DefaultInfo.IpCnt                 = 1;\r
     }\r
 \r
     DefaultInfo.IpCnt                 = 1;\r


@@ -888,7 +888,7 @@ EfiPxeBcDiscover (
       // Address is not acquired or no discovery options.\r
       //\r
       Status = EFI_INVALID_PARAMETER;\r
       // Address is not acquired or no discovery options.\r
       //\r
       Status = EFI_INVALID_PARAMETER;\r

-      goto ON_EXIT;  \r
+      goto ON_EXIT;\r

     }\r
 \r
     DefaultInfo.UseMCast    = (BOOLEAN)!IS_DISABLE_MCAST_DISCOVER (VendorOpt->DiscoverCtrl);\r
     }\r
 \r
     DefaultInfo.UseMCast    = (BOOLEAN)!IS_DISABLE_MCAST_DISCOVER (VendorOpt->DiscoverCtrl);\r


@@ -936,9 +936,9 @@ EfiPxeBcDiscover (
         if (CreatedInfo == NULL) {\r
           Status = EFI_OUT_OF_RESOURCES;\r
           goto ON_EXIT;\r
         if (CreatedInfo == NULL) {\r
           Status = EFI_OUT_OF_RESOURCES;\r
           goto ON_EXIT;\r

-          \r
-        }     \r
-      \r
+\r
+        }\r
+\r

         CopyMem (CreatedInfo, &DefaultInfo, sizeof (DefaultInfo));\r
         Info    = CreatedInfo;\r
         SrvList = Info->SrvList;\r
         CopyMem (CreatedInfo, &DefaultInfo, sizeof (DefaultInfo));\r
         Info    = CreatedInfo;\r
         SrvList = Info->SrvList;\r


@@ -965,7 +965,7 @@ EfiPxeBcDiscover (
 \r
       if (Index != Info->IpCnt) {\r
         Status = EFI_INVALID_PARAMETER;\r
 \r
       if (Index != Info->IpCnt) {\r
         Status = EFI_INVALID_PARAMETER;\r

-        goto ON_EXIT;        \r
+        goto ON_EXIT;\r

       }\r
     }\r
   }\r
       }\r
     }\r
   }\r


@@ -1005,7 +1005,7 @@ EfiPxeBcDiscover (
                 );\r
       if (!EFI_ERROR (Status)) {\r
         break;\r
                 );\r
       if (!EFI_ERROR (Status)) {\r
         break;\r

-      }                \r
+      }\r

     }\r
 \r
   } else if (Info->UseMCast) {\r
     }\r
 \r
   } else if (Info->UseMCast) {\r


@@ -1063,15 +1063,15 @@ EfiPxeBcDiscover (
 ON_EXIT:\r
 \r
   Private->Udp4Read->Configure (Private->Udp4Read, &Private->Udp4CfgData);\r
 ON_EXIT:\r
 \r
   Private->Udp4Read->Configure (Private->Udp4Read, &Private->Udp4CfgData);\r

-  \r
+\r

   //\r
   //\r

-  // Dhcp(), Discover(), and Mtftp() set the IP filter, and return with the IP \r
+  // Dhcp(), Discover(), and Mtftp() set the IP filter, and return with the IP\r

   // receive filter list emptied and the filter set to EFI_PXE_BASE_CODE_IP_FILTER_STATION_IP.\r
   //\r
   ZeroMem(&IpFilter, sizeof (EFI_PXE_BASE_CODE_IP_FILTER));\r
   IpFilter.Filters = EFI_PXE_BASE_CODE_IP_FILTER_STATION_IP;\r
   This->SetIpFilter (This, &IpFilter);\r
   // receive filter list emptied and the filter set to EFI_PXE_BASE_CODE_IP_FILTER_STATION_IP.\r
   //\r
   ZeroMem(&IpFilter, sizeof (EFI_PXE_BASE_CODE_IP_FILTER));\r
   IpFilter.Filters = EFI_PXE_BASE_CODE_IP_FILTER_STATION_IP;\r
   This->SetIpFilter (This, &IpFilter);\r

-  \r
+\r

   return Status;\r
 }\r
 \r
   return Status;\r
 }\r
 \r


@@ -1172,8 +1172,8 @@ EfiPxeBcMtftp (
   if ((This == NULL)                                                          ||\r
       (Filename == NULL)                                                      ||\r
       (BufferSize == NULL)                                                    ||\r
   if ((This == NULL)                                                          ||\r
       (Filename == NULL)                                                      ||\r
       (BufferSize == NULL)                                                    ||\r

-      ((ServerIp == NULL) || \r
-       (IP4_IS_UNSPECIFIED (NTOHL (ServerIp->Addr[0])) || \r
+      ((ServerIp == NULL) ||\r
+       (IP4_IS_UNSPECIFIED (NTOHL (ServerIp->Addr[0])) ||\r

         IP4_IS_LOCAL_BROADCAST (NTOHL (ServerIp->Addr[0]))))                  ||\r
       ((BufferPtr == NULL) && DontUseBuffer)                                  ||\r
       ((BlockSize != NULL) && (*BlockSize < 512))) {\r
         IP4_IS_LOCAL_BROADCAST (NTOHL (ServerIp->Addr[0]))))                  ||\r
       ((BufferPtr == NULL) && DontUseBuffer)                                  ||\r
       ((BlockSize != NULL) && (*BlockSize < 512))) {\r


@@ -1307,7 +1307,7 @@ EfiPxeBcMtftp (
 ON_EXIT:\r
   Private->Udp4Read->Configure (Private->Udp4Read, &Private->Udp4CfgData);\r
   //\r
 ON_EXIT:\r
   Private->Udp4Read->Configure (Private->Udp4Read, &Private->Udp4CfgData);\r
   //\r

-  // Dhcp(), Discover(), and Mtftp() set the IP filter, and return with the IP \r
+  // Dhcp(), Discover(), and Mtftp() set the IP filter, and return with the IP\r

   // receive filter list emptied and the filter set to EFI_PXE_BASE_CODE_IP_FILTER_STATION_IP.\r
   //\r
   ZeroMem(&IpFilter, sizeof (EFI_PXE_BASE_CODE_IP_FILTER));\r
   // receive filter list emptied and the filter set to EFI_PXE_BASE_CODE_IP_FILTER_STATION_IP.\r
   //\r
   ZeroMem(&IpFilter, sizeof (EFI_PXE_BASE_CODE_IP_FILTER));\r


@@ -1454,7 +1454,7 @@ EfiPxeBcUdpWrite (
     Private->CurrentUdpSrcPort = 0;\r
     return EFI_INVALID_PARAMETER;\r
   }\r
     Private->CurrentUdpSrcPort = 0;\r
     return EFI_INVALID_PARAMETER;\r
   }\r

-  \r
+\r

   ZeroMem (&Token, sizeof (EFI_UDP4_COMPLETION_TOKEN));\r
   ZeroMem (&Udp4Session, sizeof (EFI_UDP4_SESSION_DATA));\r
 \r
   ZeroMem (&Token, sizeof (EFI_UDP4_COMPLETION_TOKEN));\r
   ZeroMem (&Udp4Session, sizeof (EFI_UDP4_SESSION_DATA));\r
 \r


@@ -2022,13 +2022,13 @@ EfiPxeBcSetIpFilter (
       }\r
     }\r
   }\r
       }\r
     }\r
   }\r

-  \r
+\r

   //\r
   // Check whether we need reconfigure the UDP instance.\r
   //\r
   Udp4Cfg = &Private->Udp4CfgData;\r
   if ((AcceptPromiscuous != Udp4Cfg->AcceptPromiscuous) ||\r
   //\r
   // Check whether we need reconfigure the UDP instance.\r
   //\r
   Udp4Cfg = &Private->Udp4CfgData;\r
   if ((AcceptPromiscuous != Udp4Cfg->AcceptPromiscuous) ||\r

-         (AcceptBroadcast != Udp4Cfg->AcceptBroadcast)     || MultiCastUpdate) {\r
+      (AcceptBroadcast != Udp4Cfg->AcceptBroadcast)     || MultiCastUpdate) {\r

     //\r
     // Clear the UDP instance configuration, all joined groups will be left\r
     // during the operation.\r
     //\r
     // Clear the UDP instance configuration, all joined groups will be left\r
     // during the operation.\r


@@ -2326,13 +2326,13 @@ EfiPxeBcSetStationIP (
   }\r
 \r
   if (NewStationIp != NULL) {\r
   }\r
 \r
   if (NewStationIp != NULL) {\r

-    if (IP4_IS_UNSPECIFIED(NTOHL (NewStationIp->Addr[0])) || \r
+    if (IP4_IS_UNSPECIFIED(NTOHL (NewStationIp->Addr[0])) ||\r

         IP4_IS_LOCAL_BROADCAST(NTOHL (NewStationIp->Addr[0])) ||\r
         (NewSubnetMask != NULL && NewSubnetMask->Addr[0] != 0 && !NetIp4IsUnicast (NTOHL (NewStationIp->Addr[0]), NTOHL (NewSubnetMask->Addr[0])))) {\r
       return EFI_INVALID_PARAMETER;\r
     }\r
   }\r
         IP4_IS_LOCAL_BROADCAST(NTOHL (NewStationIp->Addr[0])) ||\r
         (NewSubnetMask != NULL && NewSubnetMask->Addr[0] != 0 && !NetIp4IsUnicast (NTOHL (NewStationIp->Addr[0]), NTOHL (NewSubnetMask->Addr[0])))) {\r
       return EFI_INVALID_PARAMETER;\r
     }\r
   }\r

-  \r
+\r

   Private = PXEBC_PRIVATE_DATA_FROM_PXEBC (This);\r
   Mode    = Private->PxeBc.Mode;\r
 \r
   Private = PXEBC_PRIVATE_DATA_FROM_PXEBC (This);\r
   Mode    = Private->PxeBc.Mode;\r
 \r


@@ -2806,7 +2806,7 @@ EfiPxeLoadFile (
   if (FilePath == NULL || !IsDevicePathEnd (FilePath)) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
   if (FilePath == NULL || !IsDevicePathEnd (FilePath)) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r

-  \r
+\r

   Private         = PXEBC_PRIVATE_DATA_FROM_LOADFILE (This);\r
   PxeBc           = &Private->PxeBc;\r
   NewMakeCallback = FALSE;\r
   Private         = PXEBC_PRIVATE_DATA_FROM_LOADFILE (This);\r
   PxeBc           = &Private->PxeBc;\r
   NewMakeCallback = FALSE;\r


@@ -2933,7 +2933,7 @@ EfiPxeLoadFile (
     AsciiPrint ("\n  NBP file downloaded successfully.\n");\r
     //\r
     // The DHCP4 can have only one configured child instance so we need to stop\r
     AsciiPrint ("\n  NBP file downloaded successfully.\n");\r
     //\r
     // The DHCP4 can have only one configured child instance so we need to stop\r

-    // reset the DHCP4 child before we return. Otherwise the other programs which \r
+    // reset the DHCP4 child before we return. Otherwise the other programs which\r

     // also need to use DHCP4 will be impacted.\r
     // The functionality of PXE Base Code protocol will not be stopped,\r
     // when downloading is successfully.\r
     // also need to use DHCP4 will be impacted.\r
     // The functionality of PXE Base Code protocol will not be stopped,\r
     // when downloading is successfully.\r

diff --git a/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcMtftp.c b/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcMtftp.c
index 8017b73dd7ba618e39d36ed858f154a1464188f6..88767c8394ab847cb3fd1eada9ffdab474611d2f 100644 (file)
--- a/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcMtftp.c
+++ b/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcMtftp.c
@@ -1,7 +1,7 @@
 /** @file\r
   PxeBc MTFTP functions.\r
 /** @file\r
   PxeBc MTFTP functions.\r

-  \r
-Copyright (c) 2007 - 2015, Intel Corporation. All rights reserved.<BR>\r
+\r
+Copyright (c) 2007 - 2018, Intel Corporation. All rights reserved.<BR>\r

 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r


@@ -25,19 +25,19 @@ CHAR8 *mMtftpOptions[PXE_MTFTP_OPTION_MAXIMUM_INDEX] = {
 /**\r
   This is a callback function when packets received/transmitted in Mtftp driver.\r
 \r
 /**\r
   This is a callback function when packets received/transmitted in Mtftp driver.\r
 \r

-  A callback function that is provided by the caller to intercept               \r
+  A callback function that is provided by the caller to intercept\r

   the EFI_MTFTP4_OPCODE_DATA or EFI_MTFTP4_OPCODE_DATA8 packets processed in the\r
   the EFI_MTFTP4_OPCODE_DATA or EFI_MTFTP4_OPCODE_DATA8 packets processed in the\r

-  EFI_MTFTP4_PROTOCOL.ReadFile() function, and alternatively to intercept       \r
-  EFI_MTFTP4_OPCODE_OACK or EFI_MTFTP4_OPCODE_ERROR packets during a call to    \r
+  EFI_MTFTP4_PROTOCOL.ReadFile() function, and alternatively to intercept\r
+  EFI_MTFTP4_OPCODE_OACK or EFI_MTFTP4_OPCODE_ERROR packets during a call to\r

   EFI_MTFTP4_PROTOCOL.ReadFile(), WriteFile() or ReadDirectory().\r
   EFI_MTFTP4_PROTOCOL.ReadFile(), WriteFile() or ReadDirectory().\r

-   \r
+\r

   @param  This           Pointer to Mtftp protocol instance\r
   @param  Token          Pointer to Mtftp token\r
   @param  PacketLen      Length of Mtftp packet\r
   @param  Packet         Pointer to Mtftp packet\r
 \r
   @retval EFI_SUCCESS    Operation sucess\r
   @param  This           Pointer to Mtftp protocol instance\r
   @param  Token          Pointer to Mtftp token\r
   @param  PacketLen      Length of Mtftp packet\r
   @param  Packet         Pointer to Mtftp packet\r
 \r
   @retval EFI_SUCCESS    Operation sucess\r

-  @retval EFI_ABORTED    Abort transfer process \r
+  @retval EFI_ABORTED    Abort transfer process\r

 \r
 **/\r
 EFI_STATUS\r
 \r
 **/\r
 EFI_STATUS\r


@@ -88,7 +88,7 @@ PxeBcCheckPacket (
 \r
 /**\r
   This function is to get size of a file by Tftp.\r
 \r
 /**\r
   This function is to get size of a file by Tftp.\r

-  \r
+\r

   @param  Private        Pointer to PxeBc private data\r
   @param  Config         Pointer to Mtftp configuration data\r
   @param  Filename       Pointer to file name\r
   @param  Private        Pointer to PxeBc private data\r
   @param  Config         Pointer to Mtftp configuration data\r
   @param  Filename       Pointer to file name\r


@@ -99,7 +99,7 @@ PxeBcCheckPacket (
   @retval EFI_NOT_FOUND      Parse the tftp ptions failed.\r
   @retval EFI_DEVICE_ERROR   The network device encountered an error during this operation.\r
   @retval Other              Has not get the size of the file.\r
   @retval EFI_NOT_FOUND      Parse the tftp ptions failed.\r
   @retval EFI_DEVICE_ERROR   The network device encountered an error during this operation.\r
   @retval Other              Has not get the size of the file.\r

-  \r
+\r

 **/\r
 EFI_STATUS\r
 PxeBcTftpGetFileSize (\r
 **/\r
 EFI_STATUS\r
 PxeBcTftpGetFileSize (\r


@@ -227,7 +227,7 @@ ON_ERROR:
   @retval EFI_SUCCESS        Read the data success from the special file.\r
   @retval EFI_DEVICE_ERROR   The network device encountered an error during this operation.\r
   @retval other              Read data from file failed.\r
   @retval EFI_SUCCESS        Read the data success from the special file.\r
   @retval EFI_DEVICE_ERROR   The network device encountered an error during this operation.\r
   @retval other              Read data from file failed.\r

-  \r
+\r

 **/\r
 EFI_STATUS\r
 PxeBcTftpReadFile (\r
 **/\r
 EFI_STATUS\r
 PxeBcTftpReadFile (\r


@@ -310,7 +310,7 @@ PxeBcTftpReadFile (
   @retval EFI_SUCCESS        Write the data success into the special file.\r
   @retval EFI_DEVICE_ERROR   The network device encountered an error during this operation.\r
   @retval other              Write data into file failed.\r
   @retval EFI_SUCCESS        Write the data success into the special file.\r
   @retval EFI_DEVICE_ERROR   The network device encountered an error during this operation.\r
   @retval other              Write data into file failed.\r

-  \r
+\r

 **/\r
 EFI_STATUS\r
 PxeBcTftpWriteFile (\r
 **/\r
 EFI_STATUS\r
 PxeBcTftpWriteFile (\r


@@ -381,10 +381,10 @@ PxeBcTftpWriteFile (
   @param  BufferSize     Pointer to buffer size.\r
   @param  DontUseBuffer  Indicate whether with a receive buffer.\r
 \r
   @param  BufferSize     Pointer to buffer size.\r
   @param  DontUseBuffer  Indicate whether with a receive buffer.\r
 \r

-  @retval EFI_SUCCES         Get the data from the file included in directory success. \r
+  @retval EFI_SUCCES         Get the data from the file included in directory success.\r

   @retval EFI_DEVICE_ERROR   The network device encountered an error during this operation.\r
   @retval other              Operation failed.\r
   @retval EFI_DEVICE_ERROR   The network device encountered an error during this operation.\r
   @retval other              Operation failed.\r

-  \r
+\r

 **/\r
 EFI_STATUS\r
 PxeBcTftpReadDirectory (\r
 **/\r
 EFI_STATUS\r
 PxeBcTftpReadDirectory (\r

diff --git a/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcMtftp.h b/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcMtftp.h
index 241b079d721c728f6059d5dfa51ed4a8e2b21666..903dd4fbb69a7ebccd429e2f0598a7d6b8223371 100644 (file)
--- a/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcMtftp.h
+++ b/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcMtftp.h
@@ -1,7 +1,7 @@
 /** @file\r
   Mtftp routines for PxeBc.\r
 /** @file\r
   Mtftp routines for PxeBc.\r

-    \r
-Copyright (c) 2007 - 2015, Intel Corporation. All rights reserved.<BR>\r
+\r
+Copyright (c) 2007 - 2018, Intel Corporation. All rights reserved.<BR>\r

 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r


@@ -27,7 +27,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 \r
 /**\r
   This function is to get size of a file by Tftp.\r
 \r
 /**\r
   This function is to get size of a file by Tftp.\r

-  \r
+\r

   @param  Private        Pointer to PxeBc private data\r
   @param  Config         Pointer to Mtftp configuration data\r
   @param  Filename       Pointer to file name\r
   @param  Private        Pointer to PxeBc private data\r
   @param  Config         Pointer to Mtftp configuration data\r
   @param  Filename       Pointer to file name\r


@@ -38,7 +38,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   @retval EFI_NOT_FOUND      Parse the tftp ptions failed.\r
   @retval EFI_DEVICE_ERROR   The network device encountered an error during this operation.\r
   @retval Other              Has not get the size of the file.\r
   @retval EFI_NOT_FOUND      Parse the tftp ptions failed.\r
   @retval EFI_DEVICE_ERROR   The network device encountered an error during this operation.\r
   @retval Other              Has not get the size of the file.\r

-  \r
+\r

 **/\r
 EFI_STATUS\r
 PxeBcTftpGetFileSize (\r
 **/\r
 EFI_STATUS\r
 PxeBcTftpGetFileSize (\r


@@ -64,7 +64,7 @@ PxeBcTftpGetFileSize (
   @retval EFI_SUCCESS        Read the data success from the special file.\r
   @retval EFI_DEVICE_ERROR   The network device encountered an error during this operation.\r
   @retval other              Read data from file failed.\r
   @retval EFI_SUCCESS        Read the data success from the special file.\r
   @retval EFI_DEVICE_ERROR   The network device encountered an error during this operation.\r
   @retval other              Read data from file failed.\r

-  \r
+\r

 **/\r
 EFI_STATUS\r
 PxeBcTftpReadFile (\r
 **/\r
 EFI_STATUS\r
 PxeBcTftpReadFile (\r


@@ -92,7 +92,7 @@ PxeBcTftpReadFile (
   @retval EFI_SUCCESS        Write the data success into the special file.\r
   @retval EFI_DEVICE_ERROR   The network device encountered an error during this operation.\r
   @retval other              Write data into file failed.\r
   @retval EFI_SUCCESS        Write the data success into the special file.\r
   @retval EFI_DEVICE_ERROR   The network device encountered an error during this operation.\r
   @retval other              Write data into file failed.\r

-  \r
+\r

 **/\r
 EFI_STATUS\r
 PxeBcTftpWriteFile (\r
 **/\r
 EFI_STATUS\r
 PxeBcTftpWriteFile (\r


@@ -117,10 +117,10 @@ PxeBcTftpWriteFile (
   @param  BufferSize     Pointer to buffer size.\r
   @param  DontUseBuffer  Indicate whether with a receive buffer.\r
 \r
   @param  BufferSize     Pointer to buffer size.\r
   @param  DontUseBuffer  Indicate whether with a receive buffer.\r
 \r

-  @retval EFI_SUCCES         Get the data from the file included in directory success. \r
+  @retval EFI_SUCCES         Get the data from the file included in directory success.\r

   @retval EFI_DEVICE_ERROR   The network device encountered an error during this operation.\r
   @retval other              Operation failed.\r
   @retval EFI_DEVICE_ERROR   The network device encountered an error during this operation.\r
   @retval other              Operation failed.\r

-  \r
+\r

 **/\r
 EFI_STATUS\r
 PxeBcTftpReadDirectory (\r
 **/\r
 EFI_STATUS\r
 PxeBcTftpReadDirectory (\r

diff --git a/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcSupport.c b/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcSupport.c
index c1cabca8b96a2a7524d5f4c0d5d2d78ada1d0d28..1401ca5ec2fd0584601f4eee4b84b01f8fba9f96 100644 (file)
--- a/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcSupport.c
+++ b/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcSupport.c
@@ -1,7 +1,7 @@
 /** @file\r
   Support routines for PxeBc.\r
 \r
 /** @file\r
   Support routines for PxeBc.\r
 \r

-Copyright (c) 2007 - 2017, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2007 - 2018, Intel Corporation. All rights reserved.<BR>\r

 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r


@@ -42,7 +42,7 @@ PxeBcCommonNotify (
   @param  SubnetMask Pointer to the subnetmask of the station ip address.\r
   @param  Gateway    Pointer to the gateway ip address.\r
   @param  SrcPort    Pointer to the srouce port of the station.\r
   @param  SubnetMask Pointer to the subnetmask of the station ip address.\r
   @param  Gateway    Pointer to the gateway ip address.\r
   @param  SrcPort    Pointer to the srouce port of the station.\r

-  @param  Ttl        The time to live field of the IP header. \r
+  @param  Ttl        The time to live field of the IP header.\r

   @param  ToS        The type of service field of the IP header.\r
 \r
   @retval EFI_SUCCESS           The configuration settings were set, changed, or reset successfully.\r
   @param  ToS        The type of service field of the IP header.\r
 \r
   @retval EFI_SUCCESS           The configuration settings were set, changed, or reset successfully.\r


@@ -166,7 +166,7 @@ CvtNum (
   @param      Number         The unsigned int number will be converted.\r
   @param      Buffer         Pointer to the buffer to store the decimal number after transform.\r
   @param[in]  BufferSize     The maxsize of the buffer.\r
   @param      Number         The unsigned int number will be converted.\r
   @param      Buffer         Pointer to the buffer to store the decimal number after transform.\r
   @param[in]  BufferSize     The maxsize of the buffer.\r

-  \r
+\r

   @return the length of the number after transform.\r
 \r
 **/\r
   @return the length of the number after transform.\r
 \r
 **/\r

diff --git a/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcSupport.h b/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcSupport.h
index 59e9b3276e7f8c4c3f4fbc7be3259971dd90f32a..a28c9740c171f5cbf8a73867d6b402dead5ce181 100644 (file)
--- a/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcSupport.h
+++ b/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcSupport.h
@@ -1,6 +1,6 @@
 /** @file\r
   Support routines for PxeBc.\r
 /** @file\r
   Support routines for PxeBc.\r

-Copyright (c) 2007 - 2017, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2007 - 2018, Intel Corporation. All rights reserved.<BR>\r

 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r


@@ -16,7 +16,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 \r
 \r
 /**\r
 \r
 \r
 /**\r

-  The common notify function associated with various PxeBc events. \r
+  The common notify function associated with various PxeBc events.\r

 \r
   @param  Event     The event signaled.\r
   @param  Context   The context.\r
 \r
   @param  Event     The event signaled.\r
   @param  Context   The context.\r


@@ -38,7 +38,7 @@ PxeBcCommonNotify (
   @param  SubnetMask Pointer to the subnetmask of the station ip address.\r
   @param  Gateway    Pointer to the gateway ip address.\r
   @param  SrcPort    Pointer to the srouce port of the station.\r
   @param  SubnetMask Pointer to the subnetmask of the station ip address.\r
   @param  Gateway    Pointer to the gateway ip address.\r
   @param  SrcPort    Pointer to the srouce port of the station.\r

-  @param  Ttl        The time to live field of the IP header. \r
+  @param  Ttl        The time to live field of the IP header.\r

   @param  ToS        The type of service field of the IP header.\r
 \r
   @retval EFI_SUCCESS           The configuration settings were set, changed, or reset successfully.\r
   @param  ToS        The type of service field of the IP header.\r
 \r
   @retval EFI_SUCCESS           The configuration settings were set, changed, or reset successfully.\r


@@ -79,7 +79,7 @@ VOID
 PxeBcShowIp4Addr (\r
   IN EFI_IPv4_ADDRESS   *Ip\r
   );\r
 PxeBcShowIp4Addr (\r
   IN EFI_IPv4_ADDRESS   *Ip\r
   );\r

-  \r
+\r

 \r
 /**\r
   Convert number to ASCII value.\r
 \r
 /**\r
   Convert number to ASCII value.\r


@@ -103,7 +103,7 @@ CvtNum (
   @param      Number         The unsigned int number will be converted.\r
   @param      Buffer         Pointer to the buffer to store the decimal number after transform.\r
   @param[in]  BufferSize     The maxsize of the buffer.\r
   @param      Number         The unsigned int number will be converted.\r
   @param      Buffer         Pointer to the buffer to store the decimal number after transform.\r
   @param[in]  BufferSize     The maxsize of the buffer.\r

-  \r
+\r

   @return the length of the number after transform.\r
 \r
 **/\r
   @return the length of the number after transform.\r
 \r
 **/\r


@@ -112,7 +112,7 @@ UtoA10 (
   IN UINTN Number,\r
   IN CHAR8 *Buffer,\r
   IN UINTN BufferSize\r
   IN UINTN Number,\r
   IN CHAR8 *Buffer,\r
   IN UINTN BufferSize\r

-  \r
+\r

   );\r
 \r
 \r
   );\r
 \r
 \r

diff --git a/MdeModulePkg/Universal/Network/UefiPxeBcDxe/UefiPxe4BcDxe.uni b/MdeModulePkg/Universal/Network/UefiPxeBcDxe/UefiPxe4BcDxe.uni
index 1770b15b6f0f9c359afde14f15afad6e2d285e8f..e97c3cadd97375d9355a4b8bf057a458d46c80e1 100644 (file)
--- a/MdeModulePkg/Universal/Network/UefiPxeBcDxe/UefiPxe4BcDxe.uni
+++ b/MdeModulePkg/Universal/Network/UefiPxeBcDxe/UefiPxe4BcDxe.uni
@@ -6,13 +6,13 @@
 // Protocol to provide one clean way to otain control from the boot manager if the\r
 // boot patch is from the remote device.\r
 //\r
 // Protocol to provide one clean way to otain control from the boot manager if the\r
 // boot patch is from the remote device.\r
 //\r

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

 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r
 // which accompanies this distribution. The full text of the license may be found at\r
 // http://opensource.org/licenses/bsd-license.php\r
 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r
 // which accompanies this distribution. The full text of the license may be found at\r
 // http://opensource.org/licenses/bsd-license.php\r

-// \r
+//\r

 // THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 // WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 //\r
 // THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 // WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 //\r

diff --git a/MdeModulePkg/Universal/Network/UefiPxeBcDxe/UefiPxe4BcDxeExtra.uni b/MdeModulePkg/Universal/Network/UefiPxeBcDxe/UefiPxe4BcDxeExtra.uni
index eb59002e3a598d813b04a3912beef270294d2f7f..2c1bda1a8bd2a09b3a7696ddf03a782aef1c094c 100644 (file)
--- a/MdeModulePkg/Universal/Network/UefiPxeBcDxe/UefiPxe4BcDxeExtra.uni
+++ b/MdeModulePkg/Universal/Network/UefiPxeBcDxe/UefiPxe4BcDxeExtra.uni
@@ -1,7 +1,7 @@
 // /** @file\r
 // UefiPxe4BcDxe Localized Strings and Content\r
 //\r
 // /** @file\r
 // UefiPxe4BcDxe Localized Strings and Content\r
 //\r

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

 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r
 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r


@@ -13,8 +13,8 @@
 //\r
 // **/\r
 \r
 //\r
 // **/\r
 \r

-#string STR_PROPERTIES_MODULE_NAME \r
-#language en-US \r
+#string STR_PROPERTIES_MODULE_NAME\r
+#language en-US\r

 "UEFI PXE Base Code DXE Driver"\r
 \r
 \r
 "UEFI PXE Base Code DXE Driver"\r
 \r
 \r

diff --git a/MdeModulePkg/Universal/Network/UefiPxeBcDxe/UefiPxeBcDxe.inf b/MdeModulePkg/Universal/Network/UefiPxeBcDxe/UefiPxeBcDxe.inf
index fe8f210467a582bf432ae31d7b2385c7331fc6ab..121d68ed26060c4e02e6043c79ac872861614c97 100644 (file)
--- a/MdeModulePkg/Universal/Network/UefiPxeBcDxe/UefiPxeBcDxe.inf
+++ b/MdeModulePkg/Universal/Network/UefiPxeBcDxe/UefiPxeBcDxe.inf
@@ -6,7 +6,7 @@
 #  Protocol to provide one clean way to otain control from the boot manager if the\r
 #  boot patch is from the remote device.\r
 #\r
 #  Protocol to provide one clean way to otain control from the boot manager if the\r
 #  boot patch is from the remote device.\r
 #\r

-#  Copyright (c) 2007 - 2015, Intel Corporation. All rights reserved.<BR>\r
+#  Copyright (c) 2007 - 2018, Intel Corporation. All rights reserved.<BR>\r

 #  This program and the accompanying materials\r
 #  are licensed and made available under the terms and conditions of the BSD License\r
 #  which accompanies this distribution. The full text of the license may be found at\r
 #  This program and the accompanying materials\r
 #  are licensed and made available under the terms and conditions of the BSD License\r
 #  which accompanies this distribution. The full text of the license may be found at\r


@@ -34,7 +34,7 @@
 #\r
 #  VALID_ARCHITECTURES           = IA32 X64 IPF\r
 #\r
 #\r
 #  VALID_ARCHITECTURES           = IA32 X64 IPF\r
 #\r

-#  DRIVER_BINDING                =  gPxeBcDriverBinding                        \r
+#  DRIVER_BINDING                =  gPxeBcDriverBinding\r

 #  COMPONENT_NAME                =  gPxeBcComponentName\r
 #  COMPONENT_NAME2               =  gPxeBcComponentName2\r
 #\r
 #  COMPONENT_NAME                =  gPxeBcComponentName\r
 #  COMPONENT_NAME2               =  gPxeBcComponentName2\r
 #\r


@@ -51,7 +51,7 @@
   PxeBcDhcp.c\r
   PxeBcMtftp.h\r
   PxeBcDriver.h\r
   PxeBcDhcp.c\r
   PxeBcMtftp.h\r
   PxeBcDriver.h\r

- \r
+\r

 \r
 [Packages]\r
   MdePkg/MdePkg.dec\r
 \r
 [Packages]\r
   MdePkg/MdePkg.dec\r


@@ -86,8 +86,8 @@
   gEfiIp4ProtocolGuid                              ## TO_START\r
   gEfiIp4Config2ProtocolGuid                       ## TO_START\r
 \r
   gEfiIp4ProtocolGuid                              ## TO_START\r
   gEfiIp4Config2ProtocolGuid                       ## TO_START\r
 \r

-[Pcd]  \r
-  gEfiMdeModulePkgTokenSpaceGuid.PcdTftpBlockSize  ## SOMETIMES_CONSUMES  \r
+[Pcd]\r
+  gEfiMdeModulePkgTokenSpaceGuid.PcdTftpBlockSize  ## SOMETIMES_CONSUMES\r

 \r
 [UserExtensions.TianoCore."ExtraFiles"]\r
   UefiPxe4BcDxeExtra.uni\r
 \r
 [UserExtensions.TianoCore."ExtraFiles"]\r
   UefiPxe4BcDxeExtra.uni\r

diff --git a/MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigDriver.c b/MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigDriver.c
index 7dfea2e32a810bfb832a3b74f9723b23eb65ec6e..91d0ed2b39a462a2b5c9a280140a19faa2e31bba 100644 (file)
--- a/MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigDriver.c
+++ b/MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigDriver.c
@@ -1,7 +1,7 @@
 /** @file\r
   The driver binding for VLAN configuration module.\r
 \r
 /** @file\r
   The driver binding for VLAN configuration module.\r
 \r

-Copyright (c) 2009 - 2014, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2009 - 2018, Intel Corporation. All rights reserved.<BR>\r

 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions\r
 of the BSD License which accompanies this distribution.  The full\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions\r
 of the BSD License which accompanies this distribution.  The full\r


@@ -279,7 +279,7 @@ VlanConfigDriverBindingStop (
     if (NumberOfChildren != 1 || ChildHandleBuffer[0] != PrivateData->DriverHandle) {\r
       return EFI_DEVICE_ERROR;\r
     }\r
     if (NumberOfChildren != 1 || ChildHandleBuffer[0] != PrivateData->DriverHandle) {\r
       return EFI_DEVICE_ERROR;\r
     }\r

-    \r
+\r

     return UninstallVlanConfigForm (PrivateData);\r
   }\r
 \r
     return UninstallVlanConfigForm (PrivateData);\r
   }\r
 \r

diff --git a/MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigDxe.uni b/MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigDxe.uni
index dabec1f1c5fcbdd8d4bc0e07b43c6a162b0bb4df..715bf8c5e2fad2f64ee97373fd7b5c612a167503 100644 (file)
--- a/MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigDxe.uni
+++ b/MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigDxe.uni
@@ -4,13 +4,13 @@
 // This module produces EFI HII Configuration Access Protocol to provide one way to\r
 // configurate VALN setting\r
 //\r
 // This module produces EFI HII Configuration Access Protocol to provide one way to\r
 // configurate VALN setting\r
 //\r

-// Copyright (c) 2009 - 2014, Intel Corporation. All rights reserved.<BR>\r
+// Copyright (c) 2009 - 2018, Intel Corporation. All rights reserved.<BR>\r

 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r
 // which accompanies this distribution. The full text of the license may be found at\r
 // http://opensource.org/licenses/bsd-license.php\r
 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r
 // which accompanies this distribution. The full text of the license may be found at\r
 // http://opensource.org/licenses/bsd-license.php\r

-// \r
+//\r

 // THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 // WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 //\r
 // THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 // WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 //\r

diff --git a/MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigDxeExtra.uni b/MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigDxeExtra.uni
index 1c15b7cedb909c121f35b2108ce4eb370b9f046a..d338520cab11e2a417d533236026b2e024f67991 100644 (file)
--- a/MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigDxeExtra.uni
+++ b/MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigDxeExtra.uni
@@ -1,7 +1,7 @@
 // /** @file\r
 // VlanConfigDxe Localized Strings and Content\r
 //\r
 // /** @file\r
 // VlanConfigDxe Localized Strings and Content\r
 //\r

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

 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r
 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r


@@ -13,8 +13,8 @@
 //\r
 // **/\r
 \r
 //\r
 // **/\r
 \r

-#string STR_PROPERTIES_MODULE_NAME \r
-#language en-US \r
+#string STR_PROPERTIES_MODULE_NAME\r
+#language en-US\r

 "VLAN Configuration DXE Driver"\r
 \r
 \r
 "VLAN Configuration DXE Driver"\r
 \r
 \r

diff --git a/MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigImpl.c b/MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigImpl.c
index f0357062186657aa498e0142fd57fbc810e7a767..0bdffa2ee4373a45cc4d6258e05b76846b6747f5 100644 (file)
--- a/MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigImpl.c
+++ b/MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigImpl.c
@@ -1,7 +1,7 @@
 /** @file\r
   HII Config Access protocol implementation of VLAN configuration module.\r
 \r
 /** @file\r
   HII Config Access protocol implementation of VLAN configuration module.\r
 \r

-Copyright (c) 2009 - 2017, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2009 - 2018, Intel Corporation. All rights reserved.<BR>\r

 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions\r
 of the BSD License which accompanies this distribution.  The full\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions\r
 of the BSD License which accompanies this distribution.  The full\r


@@ -327,7 +327,7 @@ VlanCallback (
       break;\r
     }\r
   }\r
       break;\r
     }\r
   }\r

-  \r
+\r

   HiiSetBrowserData (&gVlanConfigFormSetGuid, mVlanStorageName, sizeof (VLAN_CONFIGURATION), (UINT8 *) Configuration, NULL);\r
   FreePool (Configuration);\r
   return EFI_SUCCESS;\r
   HiiSetBrowserData (&gVlanConfigFormSetGuid, mVlanStorageName, sizeof (VLAN_CONFIGURATION), (UINT8 *) Configuration, NULL);\r
   FreePool (Configuration);\r
   return EFI_SUCCESS;\r


@@ -607,7 +607,7 @@ UninstallVlanConfigForm (
 {\r
   EFI_STATUS                   Status;\r
   EFI_VLAN_CONFIG_PROTOCOL     *VlanConfig;\r
 {\r
   EFI_STATUS                   Status;\r
   EFI_VLAN_CONFIG_PROTOCOL     *VlanConfig;\r

-  \r
+\r

   //\r
   // End the parent-child relationship.\r
   //\r
   //\r
   // End the parent-child relationship.\r
   //\r

diff --git a/MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigStrings.uni b/MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigStrings.uni
index d7a1769ff4317339ec4ea89ee5dfe681c7c41ddd..0e658378f5b5526659a190647c5d608d92b37ba3 100644 (file)
--- a/MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigStrings.uni
+++ b/MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigStrings.uni
@@ -1,7 +1,7 @@
 ///** @file\r
 //  String definitions for VLAN Configuration Form.\r
 //\r
 ///** @file\r
 //  String definitions for VLAN Configuration Form.\r
 //\r

-//  Copyright (c) 2010 - 2011, Intel Corporation. All rights reserved.<BR>\r
+//  Copyright (c) 2010 - 2018, Intel Corporation. All rights reserved.<BR>\r

 //  This program and the accompanying materials\r
 //  are licensed and made available under the terms and conditions\r
 //  of the BSD License which accompanies this distribution.  The full\r
 //  This program and the accompanying materials\r
 //  are licensed and made available under the terms and conditions\r
 //  of the BSD License which accompanies this distribution.  The full\r


@@ -35,4 +35,4 @@
 #string STR_VLAN_REMOVE_VLAN_HELP     #language en-US "Remove selected VLANs"\r
 #string STR_VLAN_NULL_STRING          #language en-US ""\r
 #string STR_GET_CURRENT_SETTING       #language en-US "Enter Configuration Menu"\r
 #string STR_VLAN_REMOVE_VLAN_HELP     #language en-US "Remove selected VLANs"\r
 #string STR_VLAN_NULL_STRING          #language en-US ""\r
 #string STR_GET_CURRENT_SETTING       #language en-US "Enter Configuration Menu"\r

-#string STR_GET_CURRENT_SETTING_HELP  #language en-US "Press ENTER to enter configuration menu for VLAN configuration."
\ No newline at end of file
+#string STR_GET_CURRENT_SETTING_HELP  #language en-US "Press ENTER to enter configuration menu for VLAN configuration."\r

diff --git a/MdeModulePkg/Universal/PCD/Dxe/Pcd.c b/MdeModulePkg/Universal/PCD/Dxe/Pcd.c
index c30e9d3b158d851313187912a260e1418e407b0e..bc308af1c5d8f263e7704f76d9b7335a8c52e3a5 100644 (file)
--- a/MdeModulePkg/Universal/PCD/Dxe/Pcd.c
+++ b/MdeModulePkg/Universal/PCD/Dxe/Pcd.c
@@ -3,7 +3,7 @@
   produce the implementation of native PCD protocol and EFI_PCD_PROTOCOL defined in\r
   PI 1.4a Vol3.\r
 \r
   produce the implementation of native PCD protocol and EFI_PCD_PROTOCOL defined in\r
   PI 1.4a Vol3.\r
 \r

-Copyright (c) 2006 - 2017, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r

 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r


@@ -22,7 +22,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 EFI_LOCK mPcdDatabaseLock = EFI_INITIALIZE_LOCK_VARIABLE(TPL_NOTIFY);\r
 \r
 ///\r
 EFI_LOCK mPcdDatabaseLock = EFI_INITIALIZE_LOCK_VARIABLE(TPL_NOTIFY);\r
 \r
 ///\r

-/// PCD_PROTOCOL the EDKII native implementation which support dynamic \r
+/// PCD_PROTOCOL the EDKII native implementation which support dynamic\r

 /// type and dynamicEx type PCDs.\r
 ///\r
 PCD_PROTOCOL mPcdInstance = {\r
 /// type and dynamicEx type PCDs.\r
 ///\r
 PCD_PROTOCOL mPcdInstance = {\r


@@ -112,9 +112,9 @@ EFI_HANDLE mPcdHandle = NULL;
 \r
 /**\r
   Main entry for PCD DXE driver.\r
 \r
 /**\r
   Main entry for PCD DXE driver.\r

-  \r
+\r

   This routine initialize the PCD database and install PCD_PROTOCOL.\r
   This routine initialize the PCD database and install PCD_PROTOCOL.\r

-  \r
+\r

   @param ImageHandle     Image handle for PCD DXE driver.\r
   @param SystemTable     Pointer to SystemTable.\r
 \r
   @param ImageHandle     Image handle for PCD DXE driver.\r
   @param SystemTable     Pointer to SystemTable.\r
 \r


@@ -245,21 +245,21 @@ DxeGetPcdInfoGetSku (
 /**\r
   Sets the SKU value for subsequent calls to set or get PCD token values.\r
 \r
 /**\r
   Sets the SKU value for subsequent calls to set or get PCD token values.\r
 \r

-  SetSku() sets the SKU Id to be used for subsequent calls to set or get PCD values. \r
+  SetSku() sets the SKU Id to be used for subsequent calls to set or get PCD values.\r

   SetSku() is normally called only once by the system.\r
 \r
   SetSku() is normally called only once by the system.\r
 \r

-  For each item (token), the database can hold a single value that applies to all SKUs, \r
-  or multiple values, where each value is associated with a specific SKU Id. Items with multiple, \r
-  SKU-specific values are called SKU enabled. \r
-  \r
+  For each item (token), the database can hold a single value that applies to all SKUs,\r
+  or multiple values, where each value is associated with a specific SKU Id. Items with multiple,\r
+  SKU-specific values are called SKU enabled.\r
+\r

   The SKU Id of zero is reserved as a default.\r
   The SKU Id of zero is reserved as a default.\r

-  For tokens that are not SKU enabled, the system ignores any set SKU Id and works with the \r
-  single value for that token. For SKU-enabled tokens, the system will use the SKU Id set by the \r
-  last call to SetSku(). If no SKU Id is set or the currently set SKU Id isn't valid for the specified token, \r
-  the system uses the default SKU Id. If the system attempts to use the default SKU Id and no value has been \r
+  For tokens that are not SKU enabled, the system ignores any set SKU Id and works with the\r
+  single value for that token. For SKU-enabled tokens, the system will use the SKU Id set by the\r
+  last call to SetSku(). If no SKU Id is set or the currently set SKU Id isn't valid for the specified token,\r
+  the system uses the default SKU Id. If the system attempts to use the default SKU Id and no value has been\r

   set for that Id, the results are unpredictable.\r
 \r
   set for that Id, the results are unpredictable.\r
 \r

-  @param[in]  SkuId The SKU value that will be used when the PCD service will retrieve and \r
+  @param[in]  SkuId The SKU value that will be used when the PCD service will retrieve and\r

               set values associated with a PCD token.\r
 \r
 **/\r
               set values associated with a PCD token.\r
 \r
 **/\r


@@ -318,13 +318,13 @@ DxePcdSetSku (
 /**\r
   Retrieves an 8-bit value for a given PCD token.\r
 \r
 /**\r
   Retrieves an 8-bit value for a given PCD token.\r
 \r

-  Retrieves the current byte-sized value for a PCD token number.  \r
+  Retrieves the current byte-sized value for a PCD token number.\r

   If the TokenNumber is invalid, the results are unpredictable.\r
   If the TokenNumber is invalid, the results are unpredictable.\r

-  \r
-  @param[in]  TokenNumber The PCD token number. \r
+\r
+  @param[in]  TokenNumber The PCD token number.\r

 \r
   @return The UINT8 value.\r
 \r
   @return The UINT8 value.\r

-  \r
+\r

 **/\r
 UINT8\r
 EFIAPI\r
 **/\r
 UINT8\r
 EFIAPI\r


@@ -338,13 +338,13 @@ DxePcdGet8 (
 /**\r
   Retrieves an 16-bit value for a given PCD token.\r
 \r
 /**\r
   Retrieves an 16-bit value for a given PCD token.\r
 \r

-  Retrieves the current 16-bits value for a PCD token number.  \r
+  Retrieves the current 16-bits value for a PCD token number.\r

   If the TokenNumber is invalid, the results are unpredictable.\r
   If the TokenNumber is invalid, the results are unpredictable.\r

-  \r
-  @param[in]  TokenNumber The PCD token number. \r
+\r
+  @param[in]  TokenNumber The PCD token number.\r

 \r
   @return The UINT16 value.\r
 \r
   @return The UINT16 value.\r

-  \r
+\r

 **/\r
 UINT16\r
 EFIAPI\r
 **/\r
 UINT16\r
 EFIAPI\r


@@ -358,13 +358,13 @@ DxePcdGet16 (
 /**\r
   Retrieves an 32-bit value for a given PCD token.\r
 \r
 /**\r
   Retrieves an 32-bit value for a given PCD token.\r
 \r

-  Retrieves the current 32-bits value for a PCD token number.  \r
+  Retrieves the current 32-bits value for a PCD token number.\r

   If the TokenNumber is invalid, the results are unpredictable.\r
   If the TokenNumber is invalid, the results are unpredictable.\r

-  \r
-  @param[in]  TokenNumber The PCD token number. \r
+\r
+  @param[in]  TokenNumber The PCD token number.\r

 \r
   @return The UINT32 value.\r
 \r
   @return The UINT32 value.\r

-  \r
+\r

 **/\r
 UINT32\r
 EFIAPI\r
 **/\r
 UINT32\r
 EFIAPI\r


@@ -378,13 +378,13 @@ DxePcdGet32 (
 /**\r
   Retrieves an 64-bit value for a given PCD token.\r
 \r
 /**\r
   Retrieves an 64-bit value for a given PCD token.\r
 \r

-  Retrieves the current 64-bits value for a PCD token number.  \r
+  Retrieves the current 64-bits value for a PCD token number.\r

   If the TokenNumber is invalid, the results are unpredictable.\r
   If the TokenNumber is invalid, the results are unpredictable.\r

-  \r
-  @param[in]  TokenNumber The PCD token number. \r
+\r
+  @param[in]  TokenNumber The PCD token number.\r

 \r
   @return The UINT64 value.\r
 \r
   @return The UINT64 value.\r

-  \r
+\r

 **/\r
 UINT64\r
 EFIAPI\r
 **/\r
 UINT64\r
 EFIAPI\r


@@ -398,15 +398,15 @@ DxePcdGet64 (
 /**\r
   Retrieves a pointer to a value for a given PCD token.\r
 \r
 /**\r
   Retrieves a pointer to a value for a given PCD token.\r
 \r

-  Retrieves the current pointer to the buffer for a PCD token number.  \r
-  Do not make any assumptions about the alignment of the pointer that \r
-  is returned by this function call.  If the TokenNumber is invalid, \r
+  Retrieves the current pointer to the buffer for a PCD token number.\r
+  Do not make any assumptions about the alignment of the pointer that\r
+  is returned by this function call.  If the TokenNumber is invalid,\r

   the results are unpredictable.\r
 \r
   the results are unpredictable.\r
 \r

-  @param[in]  TokenNumber The PCD token number. \r
+  @param[in]  TokenNumber The PCD token number.\r

 \r
   @return The pointer to the buffer to be retrived.\r
 \r
   @return The pointer to the buffer to be retrived.\r

-  \r
+\r

 **/\r
 VOID *\r
 EFIAPI\r
 **/\r
 VOID *\r
 EFIAPI\r


@@ -420,15 +420,15 @@ DxePcdGetPtr (
 /**\r
   Retrieves a Boolean value for a given PCD token.\r
 \r
 /**\r
   Retrieves a Boolean value for a given PCD token.\r
 \r

-  Retrieves the current boolean value for a PCD token number.  \r
-  Do not make any assumptions about the alignment of the pointer that \r
-  is returned by this function call.  If the TokenNumber is invalid, \r
+  Retrieves the current boolean value for a PCD token number.\r
+  Do not make any assumptions about the alignment of the pointer that\r
+  is returned by this function call.  If the TokenNumber is invalid,\r

   the results are unpredictable.\r
 \r
   the results are unpredictable.\r
 \r

-  @param[in]  TokenNumber The PCD token number. \r
+  @param[in]  TokenNumber The PCD token number.\r

 \r
   @return The Boolean value.\r
 \r
   @return The Boolean value.\r

-  \r
+\r

 **/\r
 BOOLEAN\r
 EFIAPI\r
 **/\r
 BOOLEAN\r
 EFIAPI\r


@@ -442,13 +442,13 @@ DxePcdGetBool (
 /**\r
   Retrieves the size of the value for a given PCD token.\r
 \r
 /**\r
   Retrieves the size of the value for a given PCD token.\r
 \r

-  Retrieves the current size of a particular PCD token.  \r
+  Retrieves the current size of a particular PCD token.\r

   If the TokenNumber is invalid, the results are unpredictable.\r
 \r
   If the TokenNumber is invalid, the results are unpredictable.\r
 \r

-  @param[in]  TokenNumber The PCD token number. \r
+  @param[in]  TokenNumber The PCD token number.\r

 \r
   @return The size of the value for the PCD token.\r
 \r
   @return The size of the value for the PCD token.\r

-  \r
+\r

 **/\r
 UINTN\r
 EFIAPI\r
 **/\r
 UINTN\r
 EFIAPI\r


@@ -470,23 +470,23 @@ DxePcdGetSize (
 \r
   //\r
   // Backup the TokenNumber passed in as GetPtrTypeSize need the original TokenNumber\r
 \r
   //\r
   // Backup the TokenNumber passed in as GetPtrTypeSize need the original TokenNumber\r

-  // \r
+  //\r

   TmpTokenNumber = TokenNumber;\r
 \r
   // EBC compiler is very choosy. It may report warning about comparison\r
   TmpTokenNumber = TokenNumber;\r
 \r
   // EBC compiler is very choosy. It may report warning about comparison\r

-  // between UINTN and 0 . So we add 1 in each size of the \r
+  // between UINTN and 0 . So we add 1 in each size of the\r

   // comparison.\r
   ASSERT (TokenNumber + 1 < mPcdTotalTokenCount + 1);\r
 \r
   // EBC compiler is very choosy. It may report warning about comparison\r
   // comparison.\r
   ASSERT (TokenNumber + 1 < mPcdTotalTokenCount + 1);\r
 \r
   // EBC compiler is very choosy. It may report warning about comparison\r

-  // between UINTN and 0 . So we add 1 in each size of the \r
+  // between UINTN and 0 . So we add 1 in each size of the\r

   // comparison.\r
   IsPeiDb = (BOOLEAN) (TokenNumber + 1 < mPeiLocalTokenCount + 1);\r
   // comparison.\r
   IsPeiDb = (BOOLEAN) (TokenNumber + 1 < mPeiLocalTokenCount + 1);\r

-  \r
-  TokenNumber = IsPeiDb ? TokenNumber : \r
+\r
+  TokenNumber = IsPeiDb ? TokenNumber :\r

                           (TokenNumber - mPeiLocalTokenCount);\r
 \r
                           (TokenNumber - mPeiLocalTokenCount);\r
 \r

-  LocalTokenNumberTable = IsPeiDb ? (UINT32 *)((UINT8 *)mPcdDatabase.PeiDb + mPcdDatabase.PeiDb->LocalTokenNumberTableOffset) \r
+  LocalTokenNumberTable = IsPeiDb ? (UINT32 *)((UINT8 *)mPcdDatabase.PeiDb + mPcdDatabase.PeiDb->LocalTokenNumberTableOffset)\r

                                   : (UINT32 *)((UINT8 *)mPcdDatabase.DxeDb + mPcdDatabase.DxeDb->LocalTokenNumberTableOffset);\r
 \r
   Size = (LocalTokenNumberTable[TokenNumber] & PCD_DATUM_TYPE_ALL_SET) >> PCD_DATUM_TYPE_SHIFT;\r
                                   : (UINT32 *)((UINT8 *)mPcdDatabase.DxeDb + mPcdDatabase.DxeDb->LocalTokenNumberTableOffset);\r
 \r
   Size = (LocalTokenNumberTable[TokenNumber] & PCD_DATUM_TYPE_ALL_SET) >> PCD_DATUM_TYPE_SHIFT;\r


@@ -505,16 +505,16 @@ DxePcdGetSize (
 /**\r
   Retrieves an 8-bit value for a given PCD token.\r
 \r
 /**\r
   Retrieves an 8-bit value for a given PCD token.\r
 \r

-  Retrieves the 8-bit value of a particular PCD token.  \r
+  Retrieves the 8-bit value of a particular PCD token.\r

   If the TokenNumber is invalid or the token space\r
   If the TokenNumber is invalid or the token space\r

-  specified by Guid does not exist, the results are \r
+  specified by Guid does not exist, the results are\r

   unpredictable.\r
 \r
   @param[in]  Guid          The token space for the token number.\r
   unpredictable.\r
 \r
   @param[in]  Guid          The token space for the token number.\r

-  @param[in]  ExTokenNumber The PCD token number. \r
+  @param[in]  ExTokenNumber The PCD token number.\r

 \r
   @return The size 8-bit value for the PCD token.\r
 \r
   @return The size 8-bit value for the PCD token.\r

-  \r
+\r

 **/\r
 UINT8\r
 EFIAPI\r
 **/\r
 UINT8\r
 EFIAPI\r


@@ -529,16 +529,16 @@ DxePcdGet8Ex (
 /**\r
   Retrieves an 16-bit value for a given PCD token.\r
 \r
 /**\r
   Retrieves an 16-bit value for a given PCD token.\r
 \r

-  Retrieves the 16-bit value of a particular PCD token.  \r
+  Retrieves the 16-bit value of a particular PCD token.\r

   If the TokenNumber is invalid or the token space\r
   If the TokenNumber is invalid or the token space\r

-  specified by Guid does not exist, the results are \r
+  specified by Guid does not exist, the results are\r

   unpredictable.\r
 \r
   @param[in]  Guid The token space for the token number.\r
   unpredictable.\r
 \r
   @param[in]  Guid The token space for the token number.\r

-  @param[in]  ExTokenNumber The PCD token number. \r
+  @param[in]  ExTokenNumber The PCD token number.\r

 \r
   @return The size 16-bit value for the PCD token.\r
 \r
   @return The size 16-bit value for the PCD token.\r

-  \r
+\r

 **/\r
 UINT16\r
 EFIAPI\r
 **/\r
 UINT16\r
 EFIAPI\r


@@ -553,16 +553,16 @@ DxePcdGet16Ex (
 /**\r
   Retrieves an 32-bit value for a given PCD token.\r
 \r
 /**\r
   Retrieves an 32-bit value for a given PCD token.\r
 \r

-  Retrieves the 32-bit value of a particular PCD token.  \r
+  Retrieves the 32-bit value of a particular PCD token.\r

   If the TokenNumber is invalid or the token space\r
   If the TokenNumber is invalid or the token space\r

-  specified by Guid does not exist, the results are \r
+  specified by Guid does not exist, the results are\r

   unpredictable.\r
 \r
   @param[in]  Guid The token space for the token number.\r
   unpredictable.\r
 \r
   @param[in]  Guid The token space for the token number.\r

-  @param[in]  ExTokenNumber The PCD token number. \r
+  @param[in]  ExTokenNumber The PCD token number.\r

 \r
   @return The size 32-bit value for the PCD token.\r
 \r
   @return The size 32-bit value for the PCD token.\r

-  \r
+\r

 **/\r
 UINT32\r
 EFIAPI\r
 **/\r
 UINT32\r
 EFIAPI\r


@@ -577,16 +577,16 @@ DxePcdGet32Ex (
 /**\r
   Retrieves an 64-bit value for a given PCD token.\r
 \r
 /**\r
   Retrieves an 64-bit value for a given PCD token.\r
 \r

-  Retrieves the 64-bit value of a particular PCD token.  \r
+  Retrieves the 64-bit value of a particular PCD token.\r

   If the TokenNumber is invalid or the token space\r
   If the TokenNumber is invalid or the token space\r

-  specified by Guid does not exist, the results are \r
+  specified by Guid does not exist, the results are\r

   unpredictable.\r
 \r
   @param[in]  Guid The token space for the token number.\r
   unpredictable.\r
 \r
   @param[in]  Guid The token space for the token number.\r

-  @param[in]  ExTokenNumber The PCD token number. \r
+  @param[in]  ExTokenNumber The PCD token number.\r

 \r
   @return The size 64-bit value for the PCD token.\r
 \r
   @return The size 64-bit value for the PCD token.\r

-  \r
+\r

 **/\r
 UINT64\r
 EFIAPI\r
 **/\r
 UINT64\r
 EFIAPI\r


@@ -601,16 +601,16 @@ DxePcdGet64Ex (
 /**\r
   Retrieves a pointer to a value for a given PCD token.\r
 \r
 /**\r
   Retrieves a pointer to a value for a given PCD token.\r
 \r

-  Retrieves the current pointer to the buffer for a PCD token number.  \r
-  Do not make any assumptions about the alignment of the pointer that \r
-  is returned by this function call.  If the TokenNumber is invalid, \r
+  Retrieves the current pointer to the buffer for a PCD token number.\r
+  Do not make any assumptions about the alignment of the pointer that\r
+  is returned by this function call.  If the TokenNumber is invalid,\r

   the results are unpredictable.\r
 \r
   @param[in]  Guid The token space for the token number.\r
   the results are unpredictable.\r
 \r
   @param[in]  Guid The token space for the token number.\r

-  @param[in]  ExTokenNumber The PCD token number. \r
+  @param[in]  ExTokenNumber The PCD token number.\r

 \r
   @return The pointer to the buffer to be retrived.\r
 \r
   @return The pointer to the buffer to be retrived.\r

-  \r
+\r

 **/\r
 VOID *\r
 EFIAPI\r
 **/\r
 VOID *\r
 EFIAPI\r


@@ -625,16 +625,16 @@ DxePcdGetPtrEx (
 /**\r
   Retrieves an Boolean value for a given PCD token.\r
 \r
 /**\r
   Retrieves an Boolean value for a given PCD token.\r
 \r

-  Retrieves the Boolean value of a particular PCD token.  \r
+  Retrieves the Boolean value of a particular PCD token.\r

   If the TokenNumber is invalid or the token space\r
   If the TokenNumber is invalid or the token space\r

-  specified by Guid does not exist, the results are \r
+  specified by Guid does not exist, the results are\r

   unpredictable.\r
 \r
   @param[in]  Guid The token space for the token number.\r
   unpredictable.\r
 \r
   @param[in]  Guid The token space for the token number.\r

-  @param[in]  ExTokenNumber The PCD token number. \r
+  @param[in]  ExTokenNumber The PCD token number.\r

 \r
   @return The size Boolean value for the PCD token.\r
 \r
   @return The size Boolean value for the PCD token.\r

-  \r
+\r

 **/\r
 BOOLEAN\r
 EFIAPI\r
 **/\r
 BOOLEAN\r
 EFIAPI\r


@@ -649,14 +649,14 @@ DxePcdGetBoolEx (
 /**\r
   Retrieves the size of the value for a given PCD token.\r
 \r
 /**\r
   Retrieves the size of the value for a given PCD token.\r
 \r

-  Retrieves the current size of a particular PCD token.  \r
+  Retrieves the current size of a particular PCD token.\r

   If the TokenNumber is invalid, the results are unpredictable.\r
 \r
   @param[in]  Guid The token space for the token number.\r
   If the TokenNumber is invalid, the results are unpredictable.\r
 \r
   @param[in]  Guid The token space for the token number.\r

-  @param[in]  ExTokenNumber The PCD token number. \r
+  @param[in]  ExTokenNumber The PCD token number.\r

 \r
   @return The size of the value for the PCD token.\r
 \r
   @return The size of the value for the PCD token.\r

-  \r
+\r

 **/\r
 UINTN\r
 EFIAPI\r
 **/\r
 UINTN\r
 EFIAPI\r


@@ -671,19 +671,19 @@ DxePcdGetSizeEx (
 /**\r
   Sets an 8-bit value for a given PCD token.\r
 \r
 /**\r
   Sets an 8-bit value for a given PCD token.\r
 \r

-  When the PCD service sets a value, it will check to ensure that the \r
-  size of the value being set is compatible with the Token's existing definition.  \r
+  When the PCD service sets a value, it will check to ensure that the\r
+  size of the value being set is compatible with the Token's existing definition.\r

   If it is not, an error will be returned.\r
 \r
   If it is not, an error will be returned.\r
 \r

-  @param[in]  TokenNumber The PCD token number. \r
+  @param[in]  TokenNumber The PCD token number.\r

   @param[in]  Value The value to set for the PCD token.\r
 \r
   @retval EFI_SUCCESS  Procedure returned successfully.\r
   @param[in]  Value The value to set for the PCD token.\r
 \r
   @retval EFI_SUCCESS  Procedure returned successfully.\r

-  @retval EFI_INVALID_PARAMETER The PCD service determined that the size of the data \r
-                                  being set was incompatible with a call to this function.  \r
+  @retval EFI_INVALID_PARAMETER The PCD service determined that the size of the data\r
+                                  being set was incompatible with a call to this function.\r

                                   Use GetSize() to retrieve the size of the target data.\r
   @retval EFI_NOT_FOUND The PCD service could not find the requested token number.\r
                                   Use GetSize() to retrieve the size of the target data.\r
   @retval EFI_NOT_FOUND The PCD service could not find the requested token number.\r

-  \r
+\r

 **/\r
 EFI_STATUS\r
 EFIAPI\r
 **/\r
 EFI_STATUS\r
 EFIAPI\r


@@ -698,19 +698,19 @@ DxePcdSet8 (
 /**\r
   Sets an 16-bit value for a given PCD token.\r
 \r
 /**\r
   Sets an 16-bit value for a given PCD token.\r
 \r

-  When the PCD service sets a value, it will check to ensure that the \r
-  size of the value being set is compatible with the Token's existing definition.  \r
+  When the PCD service sets a value, it will check to ensure that the\r
+  size of the value being set is compatible with the Token's existing definition.\r

   If it is not, an error will be returned.\r
 \r
   If it is not, an error will be returned.\r
 \r

-  @param[in]  TokenNumber The PCD token number. \r
+  @param[in]  TokenNumber The PCD token number.\r

   @param[in]  Value The value to set for the PCD token.\r
 \r
   @retval EFI_SUCCESS  Procedure returned successfully.\r
   @param[in]  Value The value to set for the PCD token.\r
 \r
   @retval EFI_SUCCESS  Procedure returned successfully.\r

-  @retval EFI_INVALID_PARAMETER The PCD service determined that the size of the data \r
-                                  being set was incompatible with a call to this function.  \r
+  @retval EFI_INVALID_PARAMETER The PCD service determined that the size of the data\r
+                                  being set was incompatible with a call to this function.\r

                                   Use GetSize() to retrieve the size of the target data.\r
   @retval EFI_NOT_FOUND The PCD service could not find the requested token number.\r
                                   Use GetSize() to retrieve the size of the target data.\r
   @retval EFI_NOT_FOUND The PCD service could not find the requested token number.\r

-  \r
+\r

 **/\r
 EFI_STATUS\r
 EFIAPI\r
 **/\r
 EFI_STATUS\r
 EFIAPI\r


@@ -725,19 +725,19 @@ DxePcdSet16 (
 /**\r
   Sets an 32-bit value for a given PCD token.\r
 \r
 /**\r
   Sets an 32-bit value for a given PCD token.\r
 \r

-  When the PCD service sets a value, it will check to ensure that the \r
-  size of the value being set is compatible with the Token's existing definition.  \r
+  When the PCD service sets a value, it will check to ensure that the\r
+  size of the value being set is compatible with the Token's existing definition.\r

   If it is not, an error will be returned.\r
 \r
   If it is not, an error will be returned.\r
 \r

-  @param[in]  TokenNumber The PCD token number. \r
+  @param[in]  TokenNumber The PCD token number.\r

   @param[in]  Value The value to set for the PCD token.\r
 \r
   @retval EFI_SUCCESS  Procedure returned successfully.\r
   @param[in]  Value The value to set for the PCD token.\r
 \r
   @retval EFI_SUCCESS  Procedure returned successfully.\r

-  @retval EFI_INVALID_PARAMETER The PCD service determined that the size of the data \r
-                                  being set was incompatible with a call to this function.  \r
+  @retval EFI_INVALID_PARAMETER The PCD service determined that the size of the data\r
+                                  being set was incompatible with a call to this function.\r

                                   Use GetSize() to retrieve the size of the target data.\r
   @retval EFI_NOT_FOUND The PCD service could not find the requested token number.\r
                                   Use GetSize() to retrieve the size of the target data.\r
   @retval EFI_NOT_FOUND The PCD service could not find the requested token number.\r

-  \r
+\r

 **/\r
 EFI_STATUS\r
 EFIAPI\r
 **/\r
 EFI_STATUS\r
 EFIAPI\r


@@ -752,19 +752,19 @@ DxePcdSet32 (
 /**\r
   Sets an 64-bit value for a given PCD token.\r
 \r
 /**\r
   Sets an 64-bit value for a given PCD token.\r
 \r

-  When the PCD service sets a value, it will check to ensure that the \r
-  size of the value being set is compatible with the Token's existing definition.  \r
+  When the PCD service sets a value, it will check to ensure that the\r
+  size of the value being set is compatible with the Token's existing definition.\r

   If it is not, an error will be returned.\r
 \r
   If it is not, an error will be returned.\r
 \r

-  @param[in]  TokenNumber The PCD token number. \r
+  @param[in]  TokenNumber The PCD token number.\r

   @param[in]  Value The value to set for the PCD token.\r
 \r
   @retval EFI_SUCCESS  Procedure returned successfully.\r
   @param[in]  Value The value to set for the PCD token.\r
 \r
   @retval EFI_SUCCESS  Procedure returned successfully.\r

-  @retval EFI_INVALID_PARAMETER The PCD service determined that the size of the data \r
-                                  being set was incompatible with a call to this function.  \r
+  @retval EFI_INVALID_PARAMETER The PCD service determined that the size of the data\r
+                                  being set was incompatible with a call to this function.\r

                                   Use GetSize() to retrieve the size of the target data.\r
   @retval EFI_NOT_FOUND The PCD service could not find the requested token number.\r
                                   Use GetSize() to retrieve the size of the target data.\r
   @retval EFI_NOT_FOUND The PCD service could not find the requested token number.\r

-  \r
+\r

 **/\r
 EFI_STATUS\r
 EFIAPI\r
 **/\r
 EFI_STATUS\r
 EFIAPI\r


@@ -779,23 +779,23 @@ DxePcdSet64 (
 /**\r
   Sets a value of a specified size for a given PCD token.\r
 \r
 /**\r
   Sets a value of a specified size for a given PCD token.\r
 \r

-  When the PCD service sets a value, it will check to ensure that the \r
-  size of the value being set is compatible with the Token's existing definition.  \r
+  When the PCD service sets a value, it will check to ensure that the\r
+  size of the value being set is compatible with the Token's existing definition.\r

   If it is not, an error will be returned.\r
 \r
   If it is not, an error will be returned.\r
 \r

-  @param[in]  TokenNumber The PCD token number. \r
-  @param[in, out] SizeOfBuffer A pointer to the length of the value being set for the PCD token.  \r
-                              On input, if the SizeOfValue is greater than the maximum size supported \r
-                              for this TokenNumber then the output value of SizeOfValue will reflect \r
+  @param[in]  TokenNumber The PCD token number.\r
+  @param[in, out] SizeOfBuffer A pointer to the length of the value being set for the PCD token.\r
+                              On input, if the SizeOfValue is greater than the maximum size supported\r
+                              for this TokenNumber then the output value of SizeOfValue will reflect\r

                               the maximum size supported for this TokenNumber.\r
   @param[in]  Buffer The buffer to set for the PCD token.\r
 \r
   @retval EFI_SUCCESS  Procedure returned successfully.\r
                               the maximum size supported for this TokenNumber.\r
   @param[in]  Buffer The buffer to set for the PCD token.\r
 \r
   @retval EFI_SUCCESS  Procedure returned successfully.\r

-  @retval EFI_INVALID_PARAMETER The PCD service determined that the size of the data \r
-                                  being set was incompatible with a call to this function.  \r
+  @retval EFI_INVALID_PARAMETER The PCD service determined that the size of the data\r
+                                  being set was incompatible with a call to this function.\r

                                   Use GetSize() to retrieve the size of the target data.\r
   @retval EFI_NOT_FOUND The PCD service could not find the requested token number.\r
                                   Use GetSize() to retrieve the size of the target data.\r
   @retval EFI_NOT_FOUND The PCD service could not find the requested token number.\r

-  \r
+\r

 **/\r
 EFI_STATUS\r
 EFIAPI\r
 **/\r
 EFI_STATUS\r
 EFIAPI\r


@@ -811,19 +811,19 @@ DxePcdSetPtr (
 /**\r
   Sets an Boolean value for a given PCD token.\r
 \r
 /**\r
   Sets an Boolean value for a given PCD token.\r
 \r

-  When the PCD service sets a value, it will check to ensure that the \r
-  size of the value being set is compatible with the Token's existing definition.  \r
+  When the PCD service sets a value, it will check to ensure that the\r
+  size of the value being set is compatible with the Token's existing definition.\r

   If it is not, an error will be returned.\r
 \r
   If it is not, an error will be returned.\r
 \r

-  @param[in]  TokenNumber The PCD token number. \r
+  @param[in]  TokenNumber The PCD token number.\r

   @param[in]  Value The value to set for the PCD token.\r
 \r
   @retval EFI_SUCCESS  Procedure returned successfully.\r
   @param[in]  Value The value to set for the PCD token.\r
 \r
   @retval EFI_SUCCESS  Procedure returned successfully.\r

-  @retval EFI_INVALID_PARAMETER The PCD service determined that the size of the data \r
-                                  being set was incompatible with a call to this function.  \r
+  @retval EFI_INVALID_PARAMETER The PCD service determined that the size of the data\r
+                                  being set was incompatible with a call to this function.\r

                                   Use GetSize() to retrieve the size of the target data.\r
   @retval EFI_NOT_FOUND The PCD service could not find the requested token number.\r
                                   Use GetSize() to retrieve the size of the target data.\r
   @retval EFI_NOT_FOUND The PCD service could not find the requested token number.\r

-  \r
+\r

 **/\r
 EFI_STATUS\r
 EFIAPI\r
 **/\r
 EFI_STATUS\r
 EFIAPI\r


@@ -838,20 +838,20 @@ DxePcdSetBool (
 /**\r
   Sets an 8-bit value for a given PCD token.\r
 \r
 /**\r
   Sets an 8-bit value for a given PCD token.\r
 \r

-  When the PCD service sets a value, it will check to ensure that the \r
-  size of the value being set is compatible with the Token's existing definition.  \r
+  When the PCD service sets a value, it will check to ensure that the\r
+  size of the value being set is compatible with the Token's existing definition.\r

   If it is not, an error will be returned.\r
 \r
   @param[in]  Guid The 128-bit unique value that designates the namespace from which to extract the value.\r
   If it is not, an error will be returned.\r
 \r
   @param[in]  Guid The 128-bit unique value that designates the namespace from which to extract the value.\r

-  @param[in]  ExTokenNumber The PCD token number. \r
+  @param[in]  ExTokenNumber The PCD token number.\r

   @param[in]  Value The value to set for the PCD token.\r
 \r
   @retval EFI_SUCCESS  Procedure returned successfully.\r
   @param[in]  Value The value to set for the PCD token.\r
 \r
   @retval EFI_SUCCESS  Procedure returned successfully.\r

-  @retval EFI_INVALID_PARAMETER The PCD service determined that the size of the data \r
-                                  being set was incompatible with a call to this function.  \r
+  @retval EFI_INVALID_PARAMETER The PCD service determined that the size of the data\r
+                                  being set was incompatible with a call to this function.\r

                                   Use GetSize() to retrieve the size of the target data.\r
   @retval EFI_NOT_FOUND The PCD service could not find the requested token number.\r
                                   Use GetSize() to retrieve the size of the target data.\r
   @retval EFI_NOT_FOUND The PCD service could not find the requested token number.\r

-  \r
+\r

 **/\r
 EFI_STATUS\r
 EFIAPI\r
 **/\r
 EFI_STATUS\r
 EFIAPI\r


@@ -867,20 +867,20 @@ DxePcdSet8Ex (
 /**\r
   Sets an 16-bit value for a given PCD token.\r
 \r
 /**\r
   Sets an 16-bit value for a given PCD token.\r
 \r

-  When the PCD service sets a value, it will check to ensure that the \r
-  size of the value being set is compatible with the Token's existing definition.  \r
+  When the PCD service sets a value, it will check to ensure that the\r
+  size of the value being set is compatible with the Token's existing definition.\r

   If it is not, an error will be returned.\r
 \r
   @param[in]  Guid The 128-bit unique value that designates the namespace from which to extract the value.\r
   If it is not, an error will be returned.\r
 \r
   @param[in]  Guid The 128-bit unique value that designates the namespace from which to extract the value.\r

-  @param[in]  ExTokenNumber The PCD token number. \r
+  @param[in]  ExTokenNumber The PCD token number.\r

   @param[in]  Value The value to set for the PCD token.\r
 \r
   @retval EFI_SUCCESS  Procedure returned successfully.\r
   @param[in]  Value The value to set for the PCD token.\r
 \r
   @retval EFI_SUCCESS  Procedure returned successfully.\r

-  @retval EFI_INVALID_PARAMETER The PCD service determined that the size of the data \r
-                                  being set was incompatible with a call to this function.  \r
+  @retval EFI_INVALID_PARAMETER The PCD service determined that the size of the data\r
+                                  being set was incompatible with a call to this function.\r

                                   Use GetSize() to retrieve the size of the target data.\r
   @retval EFI_NOT_FOUND The PCD service could not find the requested token number.\r
                                   Use GetSize() to retrieve the size of the target data.\r
   @retval EFI_NOT_FOUND The PCD service could not find the requested token number.\r

-  \r
+\r

 **/\r
 EFI_STATUS\r
 EFIAPI\r
 **/\r
 EFI_STATUS\r
 EFIAPI\r


@@ -896,20 +896,20 @@ DxePcdSet16Ex (
 /**\r
   Sets an 32-bit value for a given PCD token.\r
 \r
 /**\r
   Sets an 32-bit value for a given PCD token.\r
 \r

-  When the PCD service sets a value, it will check to ensure that the \r
-  size of the value being set is compatible with the Token's existing definition.  \r
+  When the PCD service sets a value, it will check to ensure that the\r
+  size of the value being set is compatible with the Token's existing definition.\r

   If it is not, an error will be returned.\r
 \r
   @param[in]  Guid The 128-bit unique value that designates the namespace from which to extract the value.\r
   If it is not, an error will be returned.\r
 \r
   @param[in]  Guid The 128-bit unique value that designates the namespace from which to extract the value.\r

-  @param[in]  ExTokenNumber The PCD token number. \r
+  @param[in]  ExTokenNumber The PCD token number.\r

   @param[in]  Value The value to set for the PCD token.\r
 \r
   @retval EFI_SUCCESS  Procedure returned successfully.\r
   @param[in]  Value The value to set for the PCD token.\r
 \r
   @retval EFI_SUCCESS  Procedure returned successfully.\r

-  @retval EFI_INVALID_PARAMETER The PCD service determined that the size of the data \r
-                                  being set was incompatible with a call to this function.  \r
+  @retval EFI_INVALID_PARAMETER The PCD service determined that the size of the data\r
+                                  being set was incompatible with a call to this function.\r

                                   Use GetSize() to retrieve the size of the target data.\r
   @retval EFI_NOT_FOUND The PCD service could not find the requested token number.\r
                                   Use GetSize() to retrieve the size of the target data.\r
   @retval EFI_NOT_FOUND The PCD service could not find the requested token number.\r

-  \r
+\r

 **/\r
 EFI_STATUS\r
 EFIAPI\r
 **/\r
 EFI_STATUS\r
 EFIAPI\r


@@ -925,20 +925,20 @@ DxePcdSet32Ex (
 /**\r
   Sets an 64-bit value for a given PCD token.\r
 \r
 /**\r
   Sets an 64-bit value for a given PCD token.\r
 \r

-  When the PCD service sets a value, it will check to ensure that the \r
-  size of the value being set is compatible with the Token's existing definition.  \r
+  When the PCD service sets a value, it will check to ensure that the\r
+  size of the value being set is compatible with the Token's existing definition.\r

   If it is not, an error will be returned.\r
 \r
   @param[in]  Guid The 128-bit unique value that designates the namespace from which to extract the value.\r
   If it is not, an error will be returned.\r
 \r
   @param[in]  Guid The 128-bit unique value that designates the namespace from which to extract the value.\r

-  @param[in]  ExTokenNumber The PCD token number. \r
+  @param[in]  ExTokenNumber The PCD token number.\r

   @param[in]  Value The value to set for the PCD token.\r
 \r
   @retval EFI_SUCCESS  Procedure returned successfully.\r
   @param[in]  Value The value to set for the PCD token.\r
 \r
   @retval EFI_SUCCESS  Procedure returned successfully.\r

-  @retval EFI_INVALID_PARAMETER The PCD service determined that the size of the data \r
-                                  being set was incompatible with a call to this function.  \r
+  @retval EFI_INVALID_PARAMETER The PCD service determined that the size of the data\r
+                                  being set was incompatible with a call to this function.\r

                                   Use GetSize() to retrieve the size of the target data.\r
   @retval EFI_NOT_FOUND The PCD service could not find the requested token number.\r
                                   Use GetSize() to retrieve the size of the target data.\r
   @retval EFI_NOT_FOUND The PCD service could not find the requested token number.\r

-  \r
+\r

 **/\r
 EFI_STATUS\r
 EFIAPI\r
 **/\r
 EFI_STATUS\r
 EFIAPI\r


@@ -954,24 +954,24 @@ DxePcdSet64Ex (
 /**\r
   Sets a value of a specified size for a given PCD token.\r
 \r
 /**\r
   Sets a value of a specified size for a given PCD token.\r
 \r

-  When the PCD service sets a value, it will check to ensure that the \r
-  size of the value being set is compatible with the Token's existing definition.  \r
+  When the PCD service sets a value, it will check to ensure that the\r
+  size of the value being set is compatible with the Token's existing definition.\r

   If it is not, an error will be returned.\r
 \r
   @param[in]  Guid The 128-bit unique value that designates the namespace from which to extract the value.\r
   If it is not, an error will be returned.\r
 \r
   @param[in]  Guid The 128-bit unique value that designates the namespace from which to extract the value.\r

-  @param[in]  ExTokenNumber The PCD token number. \r
-  @param[in, out] SizeOfBuffer A pointer to the length of the value being set for the PCD token.  \r
-                              On input, if the SizeOfValue is greater than the maximum size supported \r
-                              for this TokenNumber then the output value of SizeOfValue will reflect \r
+  @param[in]  ExTokenNumber The PCD token number.\r
+  @param[in, out] SizeOfBuffer A pointer to the length of the value being set for the PCD token.\r
+                              On input, if the SizeOfValue is greater than the maximum size supported\r
+                              for this TokenNumber then the output value of SizeOfValue will reflect\r

                               the maximum size supported for this TokenNumber.\r
   @param[in]  Buffer The buffer to set for the PCD token.\r
 \r
   @retval EFI_SUCCESS  Procedure returned successfully.\r
                               the maximum size supported for this TokenNumber.\r
   @param[in]  Buffer The buffer to set for the PCD token.\r
 \r
   @retval EFI_SUCCESS  Procedure returned successfully.\r

-  @retval EFI_INVALID_PARAMETER The PCD service determined that the size of the data \r
-                                  being set was incompatible with a call to this function.  \r
+  @retval EFI_INVALID_PARAMETER The PCD service determined that the size of the data\r
+                                  being set was incompatible with a call to this function.\r

                                   Use GetSize() to retrieve the size of the target data.\r
   @retval EFI_NOT_FOUND The PCD service could not find the requested token number.\r
                                   Use GetSize() to retrieve the size of the target data.\r
   @retval EFI_NOT_FOUND The PCD service could not find the requested token number.\r

-  \r
+\r

 **/\r
 EFI_STATUS\r
 EFIAPI\r
 **/\r
 EFI_STATUS\r
 EFIAPI\r


@@ -988,20 +988,20 @@ DxePcdSetPtrEx (
 /**\r
   Sets an Boolean value for a given PCD token.\r
 \r
 /**\r
   Sets an Boolean value for a given PCD token.\r
 \r

-  When the PCD service sets a value, it will check to ensure that the \r
-  size of the value being set is compatible with the Token's existing definition.  \r
+  When the PCD service sets a value, it will check to ensure that the\r
+  size of the value being set is compatible with the Token's existing definition.\r

   If it is not, an error will be returned.\r
 \r
   @param[in]  Guid The 128-bit unique value that designates the namespace from which to extract the value.\r
   If it is not, an error will be returned.\r
 \r
   @param[in]  Guid The 128-bit unique value that designates the namespace from which to extract the value.\r

-  @param[in]  ExTokenNumber The PCD token number. \r
+  @param[in]  ExTokenNumber The PCD token number.\r

   @param[in]  Value The value to set for the PCD token.\r
 \r
   @retval EFI_SUCCESS  Procedure returned successfully.\r
   @param[in]  Value The value to set for the PCD token.\r
 \r
   @retval EFI_SUCCESS  Procedure returned successfully.\r

-  @retval EFI_INVALID_PARAMETER The PCD service determined that the size of the data \r
-                                  being set was incompatible with a call to this function.  \r
+  @retval EFI_INVALID_PARAMETER The PCD service determined that the size of the data\r
+                                  being set was incompatible with a call to this function.\r

                                   Use GetSize() to retrieve the size of the target data.\r
   @retval EFI_NOT_FOUND The PCD service could not find the requested token number.\r
                                   Use GetSize() to retrieve the size of the target data.\r
   @retval EFI_NOT_FOUND The PCD service could not find the requested token number.\r

-  \r
+\r

 **/\r
 EFI_STATUS\r
 EFIAPI\r
 **/\r
 EFI_STATUS\r
 EFIAPI\r


@@ -1018,10 +1018,10 @@ DxePcdSetBoolEx (
   Specifies a function to be called anytime the value of a designated token is changed.\r
 \r
   @param[in]  Guid The 128-bit unique value that designates the namespace from which to extract the value.\r
   Specifies a function to be called anytime the value of a designated token is changed.\r
 \r
   @param[in]  Guid The 128-bit unique value that designates the namespace from which to extract the value.\r

-  @param[in]  TokenNumber The PCD token number. \r
-  @param[in]  CallBackFunction The function prototype called when the value associated with the CallBackToken is set.  \r
+  @param[in]  TokenNumber The PCD token number.\r
+  @param[in]  CallBackFunction The function prototype called when the value associated with the CallBackToken is set.\r

 \r
 \r

-  @retval EFI_SUCCESS  The PCD service has successfully established a call event \r
+  @retval EFI_SUCCESS  The PCD service has successfully established a call event\r

                         for the CallBackToken requested.\r
   @retval EFI_NOT_FOUND The PCD service could not find the referenced token number.\r
 \r
                         for the CallBackToken requested.\r
   @retval EFI_NOT_FOUND The PCD service could not find the referenced token number.\r
 \r


@@ -1035,7 +1035,7 @@ DxeRegisterCallBackOnSet (
   )\r
 {\r
   EFI_STATUS Status;\r
   )\r
 {\r
   EFI_STATUS Status;\r

-  \r
+\r

   if (CallBackFunction == NULL) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
   if (CallBackFunction == NULL) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r


@@ -1047,7 +1047,7 @@ DxeRegisterCallBackOnSet (
   Status = DxeRegisterCallBackWorker (TokenNumber, Guid, CallBackFunction);\r
 \r
   EfiReleaseLock (&mPcdDatabaseLock);\r
   Status = DxeRegisterCallBackWorker (TokenNumber, Guid, CallBackFunction);\r
 \r
   EfiReleaseLock (&mPcdDatabaseLock);\r

-  \r
+\r

   return Status;\r
 }\r
 \r
   return Status;\r
 }\r
 \r


@@ -1055,10 +1055,10 @@ DxeRegisterCallBackOnSet (
   Cancels a previously set callback function for a particular PCD token number.\r
 \r
   @param[in]  Guid The 128-bit unique value that designates the namespace from which to extract the value.\r
   Cancels a previously set callback function for a particular PCD token number.\r
 \r
   @param[in]  Guid The 128-bit unique value that designates the namespace from which to extract the value.\r

-  @param[in]  TokenNumber The PCD token number. \r
-  @param[in]  CallBackFunction The function prototype called when the value associated with the CallBackToken is set.  \r
+  @param[in]  TokenNumber The PCD token number.\r
+  @param[in]  CallBackFunction The function prototype called when the value associated with the CallBackToken is set.\r

 \r
 \r

-  @retval EFI_SUCCESS  The PCD service has successfully established a call event \r
+  @retval EFI_SUCCESS  The PCD service has successfully established a call event\r

                         for the CallBackToken requested.\r
   @retval EFI_NOT_FOUND The PCD service could not find the referenced token number.\r
 \r
                         for the CallBackToken requested.\r
   @retval EFI_NOT_FOUND The PCD service could not find the referenced token number.\r
 \r


@@ -1072,7 +1072,7 @@ DxeUnRegisterCallBackOnSet (
   )\r
 {\r
   EFI_STATUS Status;\r
   )\r
 {\r
   EFI_STATUS Status;\r

-  \r
+\r

   if (CallBackFunction == NULL) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
   if (CallBackFunction == NULL) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r


@@ -1081,35 +1081,35 @@ DxeUnRegisterCallBackOnSet (
   // Aquire lock to prevent reentrance from TPL_CALLBACK level\r
   //\r
   EfiAcquireLock (&mPcdDatabaseLock);\r
   // Aquire lock to prevent reentrance from TPL_CALLBACK level\r
   //\r
   EfiAcquireLock (&mPcdDatabaseLock);\r

-  \r
+\r

   Status = DxeUnRegisterCallBackWorker (TokenNumber, Guid, CallBackFunction);\r
 \r
   EfiReleaseLock (&mPcdDatabaseLock);\r
   Status = DxeUnRegisterCallBackWorker (TokenNumber, Guid, CallBackFunction);\r
 \r
   EfiReleaseLock (&mPcdDatabaseLock);\r

-  \r
+\r

   return Status;\r
 }\r
 \r
 /**\r
   return Status;\r
 }\r
 \r
 /**\r

-  Retrieves the next valid token number in a given namespace.  \r
-  \r
-  This is useful since the PCD infrastructure contains a sparse list of token numbers, \r
-  and one cannot a priori know what token numbers are valid in the database. \r
-  \r
-  If TokenNumber is 0 and Guid is not NULL, then the first token from the token space specified by Guid is returned.  \r
-  If TokenNumber is not 0 and Guid is not NULL, then the next token in the token space specified by Guid is returned.  \r
-  If TokenNumber is 0 and Guid is NULL, then the first token in the default token space is returned.  \r
-  If TokenNumber is not 0 and Guid is NULL, then the next token in the default token space is returned.  \r
-  The token numbers in the default token space may not be related to token numbers in token spaces that are named by Guid.  \r
-  If the next token number can be retrieved, then it is returned in TokenNumber, and EFI_SUCCESS is returned.  \r
-  If TokenNumber represents the last token number in the token space specified by Guid, then EFI_NOT_FOUND is returned.  \r
+  Retrieves the next valid token number in a given namespace.\r
+\r
+  This is useful since the PCD infrastructure contains a sparse list of token numbers,\r
+  and one cannot a priori know what token numbers are valid in the database.\r
+\r
+  If TokenNumber is 0 and Guid is not NULL, then the first token from the token space specified by Guid is returned.\r
+  If TokenNumber is not 0 and Guid is not NULL, then the next token in the token space specified by Guid is returned.\r
+  If TokenNumber is 0 and Guid is NULL, then the first token in the default token space is returned.\r
+  If TokenNumber is not 0 and Guid is NULL, then the next token in the default token space is returned.\r
+  The token numbers in the default token space may not be related to token numbers in token spaces that are named by Guid.\r
+  If the next token number can be retrieved, then it is returned in TokenNumber, and EFI_SUCCESS is returned.\r
+  If TokenNumber represents the last token number in the token space specified by Guid, then EFI_NOT_FOUND is returned.\r

   If TokenNumber is not present in the token space specified by Guid, then EFI_NOT_FOUND is returned.\r
 \r
 \r
   If TokenNumber is not present in the token space specified by Guid, then EFI_NOT_FOUND is returned.\r
 \r
 \r

-  @param[in]      Guid    The 128-bit unique value that designates the namespace from which to retrieve the next token. \r
-                          This is an optional parameter that may be NULL.  If this parameter is NULL, then a request is \r
+  @param[in]      Guid    The 128-bit unique value that designates the namespace from which to retrieve the next token.\r
+                          This is an optional parameter that may be NULL.  If this parameter is NULL, then a request is\r

                           being made to retrieve tokens from the default token space.\r
                           being made to retrieve tokens from the default token space.\r

-  @param[in, out] TokenNumber \r
-                          A pointer to the PCD token number to use to find the subsequent token number.  \r
+  @param[in, out] TokenNumber\r
+                          A pointer to the PCD token number to use to find the subsequent token number.\r

 \r
   @retval EFI_SUCCESS   The PCD service has retrieved the next valid token number.\r
   @retval EFI_NOT_FOUND The PCD service could not find data from the requested token number.\r
 \r
   @retval EFI_SUCCESS   The PCD service has retrieved the next valid token number.\r
   @retval EFI_NOT_FOUND The PCD service could not find data from the requested token number.\r


@@ -1135,18 +1135,18 @@ DxePcdGetNextToken (
   //\r
   if (Guid == NULL) {\r
     // EBC compiler is very choosy. It may report warning about comparison\r
   //\r
   if (Guid == NULL) {\r
     // EBC compiler is very choosy. It may report warning about comparison\r

-    // between UINTN and 0 . So we add 1 in each size of the \r
+    // between UINTN and 0 . So we add 1 in each size of the\r

     // comparison.\r
     if (((*TokenNumber + 1 > mPeiNexTokenCount + 1) && (*TokenNumber + 1 <= mPeiLocalTokenCount + 1)) ||\r
         ((*TokenNumber + 1 > (mPeiLocalTokenCount + mDxeNexTokenCount + 1)))) {\r
       return EFI_NOT_FOUND;\r
     }\r
     // comparison.\r
     if (((*TokenNumber + 1 > mPeiNexTokenCount + 1) && (*TokenNumber + 1 <= mPeiLocalTokenCount + 1)) ||\r
         ((*TokenNumber + 1 > (mPeiLocalTokenCount + mDxeNexTokenCount + 1)))) {\r
       return EFI_NOT_FOUND;\r
     }\r

-    \r
+\r

     (*TokenNumber)++;\r
     if ((*TokenNumber + 1 > mPeiNexTokenCount + 1) &&\r
         (*TokenNumber + 1 <= mPeiLocalTokenCount + 1)) {\r
       //\r
     (*TokenNumber)++;\r
     if ((*TokenNumber + 1 > mPeiNexTokenCount + 1) &&\r
         (*TokenNumber + 1 <= mPeiLocalTokenCount + 1)) {\r
       //\r

-      // The first Non-Ex type Token Number for DXE PCD \r
+      // The first Non-Ex type Token Number for DXE PCD\r

       // database is mPeiLocalTokenCount + 1\r
       //\r
       if (mDxeNexTokenCount > 0) {\r
       // database is mPeiLocalTokenCount + 1\r
       //\r
       if (mDxeNexTokenCount > 0) {\r


@@ -1249,9 +1249,9 @@ GetDistinctTokenSpace (
   //\r
   *ExMapTableSize = TsIdx + 1;\r
   return DistinctTokenSpace;\r
   //\r
   *ExMapTableSize = TsIdx + 1;\r
   return DistinctTokenSpace;\r

-    \r
+\r

 }\r
 }\r

-  \r
+\r

 /**\r
   Retrieves the next valid PCD token namespace for a given namespace.\r
 \r
 /**\r
   Retrieves the next valid PCD token namespace for a given namespace.\r
 \r


@@ -1263,7 +1263,7 @@ GetDistinctTokenSpace (
                             token namespace on the platform. If *Guid is NULL, then the GUID of the first token\r
                             space of the current platform is returned. If the search cannot locate the next valid\r
                             token namespace, an error is returned and the value of *Guid is undefined.\r
                             token namespace on the platform. If *Guid is NULL, then the GUID of the first token\r
                             space of the current platform is returned. If the search cannot locate the next valid\r
                             token namespace, an error is returned and the value of *Guid is undefined.\r

- \r
+\r

   @retval  EFI_SUCCESS      The PCD service retrieved the value requested.\r
   @retval  EFI_NOT_FOUND    The PCD service could not find the next valid token namespace.\r
 \r
   @retval  EFI_SUCCESS      The PCD service retrieved the value requested.\r
   @retval  EFI_NOT_FOUND    The PCD service could not find the next valid token namespace.\r
 \r


@@ -1286,14 +1286,14 @@ DxePcdGetNextTokenSpace (
   BOOLEAN             DxeExMapTableEmpty;\r
 \r
   ASSERT (Guid != NULL);\r
   BOOLEAN             DxeExMapTableEmpty;\r
 \r
   ASSERT (Guid != NULL);\r

-  \r
+\r

   PeiExMapTableEmpty = mPeiExMapTableEmpty;\r
   DxeExMapTableEmpty = mDxeExMapTableEmpty;\r
 \r
   if (PeiExMapTableEmpty && DxeExMapTableEmpty) {\r
     return EFI_NOT_FOUND;\r
   }\r
   PeiExMapTableEmpty = mPeiExMapTableEmpty;\r
   DxeExMapTableEmpty = mDxeExMapTableEmpty;\r
 \r
   if (PeiExMapTableEmpty && DxeExMapTableEmpty) {\r
     return EFI_NOT_FOUND;\r
   }\r

-  \r
+\r

   if (TmpTokenSpaceBuffer[0] == NULL) {\r
     PeiTokenSpaceTableSize = 0;\r
 \r
   if (TmpTokenSpaceBuffer[0] == NULL) {\r
     PeiTokenSpaceTableSize = 0;\r
 \r


@@ -1340,7 +1340,7 @@ DxePcdGetNextTokenSpace (
     *Guid = TmpTokenSpaceBuffer[0];\r
     return EFI_SUCCESS;\r
   }\r
     *Guid = TmpTokenSpaceBuffer[0];\r
     return EFI_SUCCESS;\r
   }\r

-  \r
+\r

   for (Idx = 0; Idx < TmpTokenSpaceBufferCount; Idx++) {\r
     if (CompareGuid (*Guid, TmpTokenSpaceBuffer[Idx])) {\r
       if (Idx == TmpTokenSpaceBufferCount - 1) {\r
   for (Idx = 0; Idx < TmpTokenSpaceBufferCount; Idx++) {\r
     if (CompareGuid (*Guid, TmpTokenSpaceBuffer[Idx])) {\r
       if (Idx == TmpTokenSpaceBufferCount - 1) {\r

diff --git a/MdeModulePkg/Universal/PCD/Dxe/Pcd.inf b/MdeModulePkg/Universal/PCD/Dxe/Pcd.inf
index a20b645a450b9f05db4ea9508c9dcab532535f92..e6b3e0d920d6390bf35b8f41cb9d401c6698bf42 100644 (file)
--- a/MdeModulePkg/Universal/PCD/Dxe/Pcd.inf
+++ b/MdeModulePkg/Universal/PCD/Dxe/Pcd.inf
@@ -1,19 +1,19 @@
 ## @file\r
 # PCD DXE driver manage database contains all dynamic PCD entries and produce the implementation of PCD protocol.\r
 #\r
 ## @file\r
 # PCD DXE driver manage database contains all dynamic PCD entries and produce the implementation of PCD protocol.\r
 #\r

-# This version PCD DXE depends on the external PCD database binary file, not built in PCD data base. \r
+# This version PCD DXE depends on the external PCD database binary file, not built in PCD data base.\r

 # There are two PCD Protocols as follows:\r
 # There are two PCD Protocols as follows:\r

-#   1) PCD_PROTOCOL \r
+#   1) PCD_PROTOCOL\r

 #      It is EDKII implementation which support Dynamic/DynamicEx type Pcds.\r
 #   2) EFI_PCD_PROTOCOL\r
 #      It is EDKII implementation which support Dynamic/DynamicEx type Pcds.\r
 #   2) EFI_PCD_PROTOCOL\r

-#      It is defined by PI specification 1.2, Vol 3 which only support dynamicEx \r
+#      It is defined by PI specification 1.2, Vol 3 which only support dynamicEx\r

 #      type Pcd.\r
 #\r
 #      type Pcd.\r
 #\r

-# For dynamicEx type PCD, it is compatible between PCD_PROTOCOL and EFI_PCD_PROTOCOL. \r
+# For dynamicEx type PCD, it is compatible between PCD_PROTOCOL and EFI_PCD_PROTOCOL.\r

 # PCD DXE driver will produce above two protocols at same time.\r
 #\r
 # PCD DXE driver will produce above two protocols at same time.\r
 #\r

-# PCD database is generated as the separate binary image at build time. The binary image \r
-# will be intergrated into Firmware volume together with PCD driver. \r
+# PCD database is generated as the separate binary image at build time. The binary image\r
+# will be intergrated into Firmware volume together with PCD driver.\r

 #\r
 # ////////////////////////////////////////////////////////////////////////////////\r
 # //                                                                            //\r
 #\r
 # ////////////////////////////////////////////////////////////////////////////////\r
 # //                                                                            //\r


@@ -22,94 +22,94 @@
 # ////////////////////////////////////////////////////////////////////////////////\r
 #\r
 # 1, Introduction\r
 # ////////////////////////////////////////////////////////////////////////////////\r
 #\r
 # 1, Introduction\r

-#    PCD database hold all dynamic type PCD information. The structure of PEI PCD \r
-#    database is generated by build tools according to dynamic PCD usage for \r
+#    PCD database hold all dynamic type PCD information. The structure of PEI PCD\r
+#    database is generated by build tools according to dynamic PCD usage for\r

 #    specified platform.\r
 #    specified platform.\r

-#    \r
+#\r

 # 2, Dynamic Type PCD\r
 #    Dynamic type PCD is used for the configuration/setting which value is determined\r
 # 2, Dynamic Type PCD\r
 #    Dynamic type PCD is used for the configuration/setting which value is determined\r

-#    dynamic. In contrast, the value of static type PCD (FeatureFlag, FixedPcd, \r
-#    PatchablePcd) is fixed in final generated FD image in build time. \r
-#        \r
+#    dynamic. In contrast, the value of static type PCD (FeatureFlag, FixedPcd,\r
+#    PatchablePcd) is fixed in final generated FD image in build time.\r
+#\r

 #    2.1 The "dynamic" determination means one of below cases:\r
 #    2.1 The "dynamic" determination means one of below cases:\r

-#      a) The PCD setting value is produced by someone driver and consumed by \r
+#      a) The PCD setting value is produced by someone driver and consumed by\r

 #         other driver in execution time.\r
 #      b) The PCD setting value is set/get by user from FrontPage.\r
 #      c) The PCD setting value is produced by platform OEM vendor in specified area.\r
 #         other driver in execution time.\r
 #      b) The PCD setting value is set/get by user from FrontPage.\r
 #      c) The PCD setting value is produced by platform OEM vendor in specified area.\r

-#    \r
+#\r

 #    2.2 According to module distribution way, dynamic PCD could be classfied as:\r
 #      a) Dynamic:\r
 #    2.2 According to module distribution way, dynamic PCD could be classfied as:\r
 #      a) Dynamic:\r

-#         If module is released in source code and will be built with platform \r
+#         If module is released in source code and will be built with platform\r

 #         DSC, the dynamic PCD used by this module can be accessed as:\r
 #         DSC, the dynamic PCD used by this module can be accessed as:\r

-#                 PcdGetxx(PcdSampleDynamicPcd); \r
+#                 PcdGetxx(PcdSampleDynamicPcd);\r

 #         In building platform, build tools will translate PcdSampleDynamicPcd to\r
 #         In building platform, build tools will translate PcdSampleDynamicPcd to\r

-#         pair of {Token Space Guid: Token Number} for this PCD. \r
+#         pair of {Token Space Guid: Token Number} for this PCD.\r

 #      b) DynamicEx:\r
 #         If module is release as binary and will not pariticpate platform building,\r
 #         the dynamic PCD used by this module need be accessed as:\r
 #               PcdGetxxEx(gEfiMyTokenspaceGuid, PcdSampleDynamicPcd)\r
 #         Developer need explicity gives {Token Space Guid:Token Number} as parameter\r
 #         in writting source code.\r
 #      b) DynamicEx:\r
 #         If module is release as binary and will not pariticpate platform building,\r
 #         the dynamic PCD used by this module need be accessed as:\r
 #               PcdGetxxEx(gEfiMyTokenspaceGuid, PcdSampleDynamicPcd)\r
 #         Developer need explicity gives {Token Space Guid:Token Number} as parameter\r
 #         in writting source code.\r

-#         \r
+#\r

 #    2.3 According to PCD value's storage method, dynamic PCD could be classfied as:\r
 #    2.3 According to PCD value's storage method, dynamic PCD could be classfied as:\r

-#      a) Default Storage: \r
-#         - The PCD value is stored in PCD database maintained by PCD driver in boot \r
+#      a) Default Storage:\r
+#         - The PCD value is stored in PCD database maintained by PCD driver in boot\r

 #           time memory.\r
 #           time memory.\r

-#         - This type is used for communication between PEIM/DXE driver, DXE/DXE \r
-#           driver. But all set/get value will be losted after boot-time memory \r
+#         - This type is used for communication between PEIM/DXE driver, DXE/DXE\r
+#           driver. But all set/get value will be losted after boot-time memory\r

 #           is turn off.\r
 #           is turn off.\r

-#         - [PcdsDynamicDefault] is used as section name for this type PCD in \r
+#         - [PcdsDynamicDefault] is used as section name for this type PCD in\r

 #           platform DSC file. [PcdsDynamicExDefault] is used for dynamicEx type PCD.\r
 #           platform DSC file. [PcdsDynamicExDefault] is used for dynamicEx type PCD.\r

-#         \r
-#      b) Variable Storage: \r
-#         - The PCD value is stored in variable area. \r
+#\r
+#      b) Variable Storage:\r
+#         - The PCD value is stored in variable area.\r

 #         - As default storage type, this type PCD could be used for PEI/DXE driver\r
 #         - As default storage type, this type PCD could be used for PEI/DXE driver\r

-#           communication. But beside it, this type PCD could also be used to store \r
+#           communication. But beside it, this type PCD could also be used to store\r

 #           the value associate with a HII setting via variable interface.\r
 #           the value associate with a HII setting via variable interface.\r

-#         - In PEI phase, the PCD value could only be got but can not be set due \r
+#         - In PEI phase, the PCD value could only be got but can not be set due\r

 #           to variable area is readonly.\r
 #           to variable area is readonly.\r

-#         - [PcdsDynamicHii] is used as section name for this type PCD in platform \r
+#         - [PcdsDynamicHii] is used as section name for this type PCD in platform\r

 #           DSC file. [PcdsDynamicExHii] is for dynamicEx type PCD.\r
 #           DSC file. [PcdsDynamicExHii] is for dynamicEx type PCD.\r

-#           \r
+#\r

 #      c) OEM specificed storage area:\r
 #      c) OEM specificed storage area:\r

-#         - The PCD value is stored in OEM specified area which base address is \r
+#         - The PCD value is stored in OEM specified area which base address is\r

 #           specified by a FixedAtBuild PCD setting - PcdVpdBaseAddress.\r
 #         - The area is read only for PEI and DXE phase.\r
 #           specified by a FixedAtBuild PCD setting - PcdVpdBaseAddress.\r
 #         - The area is read only for PEI and DXE phase.\r

-#         - [PcdsDynamicVpd] is used as section name for this type PCD in platform \r
+#         - [PcdsDynamicVpd] is used as section name for this type PCD in platform\r

 #           DSC file. [PcdsDynamicExVpd] is for dynamicex type PCD.\r
 #           DSC file. [PcdsDynamicExVpd] is for dynamicex type PCD.\r

-#      \r
+#\r

 #    2.4 When and how to use dynamic PCD\r
 #      Module developer do not care the used PCD is dynamic or static when writting\r
 #    2.4 When and how to use dynamic PCD\r
 #      Module developer do not care the used PCD is dynamic or static when writting\r

-#      source code/INF. Dynamic PCD and dynamic type is pointed by platform integrator \r
+#      source code/INF. Dynamic PCD and dynamic type is pointed by platform integrator\r

 #      in platform DSC file. Please ref section 2.3 to get matching between dynamic\r
 #      PCD type and section name in DSC file.\r
 #      in platform DSC file. Please ref section 2.3 to get matching between dynamic\r
 #      PCD type and section name in DSC file.\r

-#    \r
+#\r

 # 3, PCD database:\r
 # 3, PCD database:\r

-#    Although dynamic PCD could be in different storage type as above description, \r
+#    Although dynamic PCD could be in different storage type as above description,\r

 #    but the basic information and default value for all dynamic PCD is hold\r
 #    by PCD database maintained by PEI/DXE driver.\r
 #    but the basic information and default value for all dynamic PCD is hold\r
 #    by PCD database maintained by PEI/DXE driver.\r

-#    \r
+#\r

 #    As the whole EFI BIOS boot path is divided into PEI/DXE phase, the PCD database\r
 #    also is divided into Pei/Dxe database maintaied by PcdPeim/PcdDxe driver separatly.\r
 #    To make PcdPeim's driver image smaller, PEI PCD database only hold all dynamic\r
 #    PCD information used in PEI phase or use in both PEI/DXE phase. And DXE PCD\r
 #    database contains all PCDs used in PEI/DXE phase in memory.\r
 #    As the whole EFI BIOS boot path is divided into PEI/DXE phase, the PCD database\r
 #    also is divided into Pei/Dxe database maintaied by PcdPeim/PcdDxe driver separatly.\r
 #    To make PcdPeim's driver image smaller, PEI PCD database only hold all dynamic\r
 #    PCD information used in PEI phase or use in both PEI/DXE phase. And DXE PCD\r
 #    database contains all PCDs used in PEI/DXE phase in memory.\r

-#    \r
-#    Build tool will generate PCD database into the separate binary file for \r
-#    PEI/DXE PCD driver according to dynamic PCD section in platform DSC file. \r
-#    \r
+#\r
+#    Build tool will generate PCD database into the separate binary file for\r
+#    PEI/DXE PCD driver according to dynamic PCD section in platform DSC file.\r
+#\r

 #    3.1 PcdPeim and PcdDxe\r
 #      PEI PCD database is maintained by PcdPeim driver run from flash. PcdPeim driver\r
 #    3.1 PcdPeim and PcdDxe\r
 #      PEI PCD database is maintained by PcdPeim driver run from flash. PcdPeim driver\r

-#      build guid hob in temporary memory and copy the binary data base from flash \r
-#      to temporary memory for PEI PCD database. \r
+#      build guid hob in temporary memory and copy the binary data base from flash\r
+#      to temporary memory for PEI PCD database.\r

 #      DXE PCD database is maintained by PcdDxe driver.At entry point of PcdDxe driver,\r
 #      a new PCD database is allocated in boot-time memory which including all\r
 #      PEI PCD and DXE PCD entry.\r
 #      DXE PCD database is maintained by PcdDxe driver.At entry point of PcdDxe driver,\r
 #      a new PCD database is allocated in boot-time memory which including all\r
 #      PEI PCD and DXE PCD entry.\r

-#      \r
+#\r

 #      Pcd driver should run as early as possible before any other driver access\r
 #      dynamic PCD's value. PEI/DXE "Apriori File" mechanism make it possible by\r
 #      making PcdPeim/PcdDxe as first dispatching driver in PEI/DXE phase.\r
 #      Pcd driver should run as early as possible before any other driver access\r
 #      dynamic PCD's value. PEI/DXE "Apriori File" mechanism make it possible by\r
 #      making PcdPeim/PcdDxe as first dispatching driver in PEI/DXE phase.\r

-#      \r
+#\r

 #    3.2 Token space Guid/Token number, Platform token, Local token number\r
 #           Dynamic PCD\r
 #          +-----------+               +---------+\r
 #    3.2 Token space Guid/Token number, Platform token, Local token number\r
 #           Dynamic PCD\r
 #          +-----------+               +---------+\r


@@ -129,42 +129,42 @@
 #                               |  Token    |\r
 #                               |  Number   |\r
 #                               +-----------+\r
 #                               |  Token    |\r
 #                               |  Number   |\r
 #                               +-----------+\r

-#    \r
-#    \r
+#\r
+#\r

 #      3.2.1 Pair of Token space guid + Token number\r
 #        Any type PCD is identified by pair of "TokenSpaceGuid + TokeNumber". But it\r
 #      3.2.1 Pair of Token space guid + Token number\r
 #        Any type PCD is identified by pair of "TokenSpaceGuid + TokeNumber". But it\r

-#        is not easy maintained by PCD driver, and hashed token number will make \r
-#        searching slowly. \r
+#        is not easy maintained by PCD driver, and hashed token number will make\r
+#        searching slowly.\r

 #\r
 #      3.2.2 Platform Token Number\r
 #\r
 #      3.2.2 Platform Token Number\r

-#        "Platform token number" concept is introduced for mapping to a pair of \r
-#        "TokenSpaceGuid + TokenNumber". The platform token number is generated by \r
-#        build tool in autogen.h and all of them are continual in a platform scope \r
+#        "Platform token number" concept is introduced for mapping to a pair of\r
+#        "TokenSpaceGuid + TokenNumber". The platform token number is generated by\r
+#        build tool in autogen.h and all of them are continual in a platform scope\r

 #        started from 1.(0 meaning invalid internal token number)\r
 #        With auto-generated "platform token number", PcdGet(PcdSampleDynamicPcd)\r
 #        started from 1.(0 meaning invalid internal token number)\r
 #        With auto-generated "platform token number", PcdGet(PcdSampleDynamicPcd)\r

-#        in source code is translated to LibPcdGet(_PCD_TOKEN_PcdSampleDynamicPcd) \r
+#        in source code is translated to LibPcdGet(_PCD_TOKEN_PcdSampleDynamicPcd)\r

 #        in autogen.h.\r
 #        Notes: The mapping between pair of "tokenspace guid + token number" and\r
 #        "internal token number" need build tool establish, so "platform token number"\r
 #        mechanism is not suitable for binary module which use DynamicEx type PCD.\r
 #        To access a dynamicEx type PCD, pair of "token space guid/token number" all need\r
 #        to be specificed for PcdSet/PcdGet accessing macro.\r
 #        in autogen.h.\r
 #        Notes: The mapping between pair of "tokenspace guid + token number" and\r
 #        "internal token number" need build tool establish, so "platform token number"\r
 #        mechanism is not suitable for binary module which use DynamicEx type PCD.\r
 #        To access a dynamicEx type PCD, pair of "token space guid/token number" all need\r
 #        to be specificed for PcdSet/PcdGet accessing macro.\r

-#      \r
-#        Platform Token Number is started from 1, and inceased continuous. From whole \r
+#\r
+#        Platform Token Number is started from 1, and inceased continuous. From whole\r

 #        platform scope, there are two zones: PEI Zone and DXE Zone\r
 #                  |                      Platform Token Number\r
 #        ----------|----------------------------------------------------------------\r
 #        PEI Zone: |            1                 ~  PEI_LOCAL_TOKEN_NUMBER\r
 #        DXE Zone: | (PEI_LOCAL_TOKEN_NUMBER + 1) ~ (PEI_LOCAL_TOKEN_NUMBER + DXE_LOCAL_TOKEN_NUMBER)\r
 #        platform scope, there are two zones: PEI Zone and DXE Zone\r
 #                  |                      Platform Token Number\r
 #        ----------|----------------------------------------------------------------\r
 #        PEI Zone: |            1                 ~  PEI_LOCAL_TOKEN_NUMBER\r
 #        DXE Zone: | (PEI_LOCAL_TOKEN_NUMBER + 1) ~ (PEI_LOCAL_TOKEN_NUMBER + DXE_LOCAL_TOKEN_NUMBER)\r

-#        \r
+#\r

 #      3.2.3 Local Token Number\r
 #      3.2.3 Local Token Number\r

-#        To fast searching a PCD entry in PCD database, PCD driver translate \r
+#        To fast searching a PCD entry in PCD database, PCD driver translate\r

 #        platform token number to local token number via a mapping table.\r
 #        For binary DynamicEx type PCD, there is a another mapping table to translate\r
 #        "token space guid + token number" to local token number directly.\r
 #        Local token number is identifier for all internal interface in PCD PEI/DXE\r
 #        driver.\r
 #        platform token number to local token number via a mapping table.\r
 #        For binary DynamicEx type PCD, there is a another mapping table to translate\r
 #        "token space guid + token number" to local token number directly.\r
 #        Local token number is identifier for all internal interface in PCD PEI/DXE\r
 #        driver.\r

-#        \r
+#\r

 #        A local token number is a 32-bit value in following meaning:\r
 #         32 ------------- 28 ---------- 24 -------- 0\r
 #          | PCD type mask  | Datum Type  |  Offset  |\r
 #        A local token number is a 32-bit value in following meaning:\r
 #         32 ------------- 28 ---------- 24 -------- 0\r
 #          | PCD type mask  | Datum Type  |  Offset  |\r


@@ -184,13 +184,13 @@
 #          Offset      : indicate the related offset of PCD value in PCD database array.\r
 #       Based on local token number, PCD driver could fast determine PCD type, value\r
 #       type and get PCD entry from PCD database.\r
 #          Offset      : indicate the related offset of PCD value in PCD database array.\r
 #       Based on local token number, PCD driver could fast determine PCD type, value\r
 #       type and get PCD entry from PCD database.\r

-#       \r
+#\r

 #    3.3 PCD Database binary file\r
 #    3.3 PCD Database binary file\r

-#      PCD Database binary file will be created at build time as the standalone binary image. \r
-#      To understand the binary image layout, PCD Database C structure is still generated \r
+#      PCD Database binary file will be created at build time as the standalone binary image.\r
+#      To understand the binary image layout, PCD Database C structure is still generated\r

 #      as comments by build tools in PCD driver's autogen.h/\r
 #      autogen.c file. In generated C structure, following information is stored:\r
 #      as comments by build tools in PCD driver's autogen.h/\r
 #      autogen.c file. In generated C structure, following information is stored:\r

-#      - ExMapTable: This table is used translate a binary dynamicex type PCD's \r
+#      - ExMapTable: This table is used translate a binary dynamicex type PCD's\r

 #                    "tokenguid + token" to local token number.\r
 #      - LocalTokenNumberTable:\r
 #                    This table stores all local token number in array, use "Internal\r
 #                    "tokenguid + token" to local token number.\r
 #      - LocalTokenNumberTable:\r
 #                    This table stores all local token number in array, use "Internal\r


@@ -200,19 +200,19 @@
 #                    HII type PCD's variable GUID.\r
 #      - SkuIdTable: TBD\r
 #      - SystemSkuId: TBD\r
 #                    HII type PCD's variable GUID.\r
 #      - SkuIdTable: TBD\r
 #      - SystemSkuId: TBD\r

-#      - PCD value structure:  \r
+#      - PCD value structure:\r

 #                    Every PCD has a value record in PCD database. For different\r
 #                    Every PCD has a value record in PCD database. For different\r

-#                    datum type PCD has different record structure which will be \r
+#                    datum type PCD has different record structure which will be\r

 #                    introduced in 3.3.1\r
 #                    introduced in 3.3.1\r

-#      \r
-#      In a PCD database structure, there are two major area: Init and UnInit. \r
-#      Init area is use stored above PCD internal structure such as ExMapTable, \r
-#      LocalTokenNumberTable etc and the (default) value of PCD which has default \r
+#\r
+#      In a PCD database structure, there are two major area: Init and UnInit.\r
+#      Init area is use stored above PCD internal structure such as ExMapTable,\r
+#      LocalTokenNumberTable etc and the (default) value of PCD which has default\r

 #      value specified in platform DSC file.\r
 #      Unint area is used stored the value of PCD which has no default value in\r
 #      platform DSC file, the value of NULL, 0 specified in platform DSC file can\r
 #      be seemed as "no default value".\r
 #      value specified in platform DSC file.\r
 #      Unint area is used stored the value of PCD which has no default value in\r
 #      platform DSC file, the value of NULL, 0 specified in platform DSC file can\r
 #      be seemed as "no default value".\r

-#      \r
+#\r

 #      3.3.1 Simple Sample PCD Database C Structure\r
 #        A general sample of PCD database structue is as follows:\r
 #        typedef struct _PCD_DATABASE {\r
 #      3.3.1 Simple Sample PCD Database C Structure\r
 #        A general sample of PCD database structue is as follows:\r
 #        typedef struct _PCD_DATABASE {\r


@@ -224,7 +224,7 @@
 #            SIZE_INFO         SizeTable[PEI_SIZE_TABLE_SIZE];\r
 #            UINT8             SkuIdTable[PEI_SKUID_TABLE_SIZE];\r
 #            SKU_ID            SystemSkuId;\r
 #            SIZE_INFO         SizeTable[PEI_SIZE_TABLE_SIZE];\r
 #            UINT8             SkuIdTable[PEI_SKUID_TABLE_SIZE];\r
 #            SKU_ID            SystemSkuId;\r

-#            \r
+#\r

 #            //===== Following is value structure for PCD with default value\r
 #            ....\r
 #            ....\r
 #            //===== Following is value structure for PCD with default value\r
 #            ....\r
 #            ....\r


@@ -236,11 +236,11 @@
 #            ....\r
 #          } UnInit;\r
 #        }\r
 #            ....\r
 #          } UnInit;\r
 #        }\r

-#      \r
+#\r

 #      3.3.2 PCD value structure in PCD database C structure\r
 #        The value's structure is generated by build tool in PCD database C structure.\r
 #        The PCDs in different datum type has different value structure.\r
 #      3.3.2 PCD value structure in PCD database C structure\r
 #        The value's structure is generated by build tool in PCD database C structure.\r
 #        The PCDs in different datum type has different value structure.\r

-#        \r
+#\r

 #        3.3.2.1 UINT8/UINT16/UINT32/UINT64 datum type PCD\r
 #          The C structure for these datum type PCD is just a UINT8/UINT16/UINT32/UINT64\r
 #          data member in PCD database, For example:\r
 #        3.3.2.1 UINT8/UINT16/UINT32/UINT64 datum type PCD\r
 #          The C structure for these datum type PCD is just a UINT8/UINT16/UINT32/UINT64\r
 #          data member in PCD database, For example:\r


@@ -248,36 +248,36 @@
 #          Above structure is generated by build tool, the member name is "PcdCName_Guidvalue"\r
 #          Member type is UINT16 according to PcdHardwareErrorRecordLevel declaration\r
 #          in DEC file.\r
 #          Above structure is generated by build tool, the member name is "PcdCName_Guidvalue"\r
 #          Member type is UINT16 according to PcdHardwareErrorRecordLevel declaration\r
 #          in DEC file.\r

-#          \r
+#\r

 #        3.3.2.2 VOID* datum type PCD\r
 #          The value of VOID* datum type PCD is a UINT8/UINT16 array in PCD database.\r
 #        3.3.2.2 VOID* datum type PCD\r
 #          The value of VOID* datum type PCD is a UINT8/UINT16 array in PCD database.\r

-#          \r
+#\r

 #          3.3.2.2.1 VOID* - string type\r
 #          3.3.2.2.1 VOID* - string type\r

-#            If the default value for VOID* datum type PCD like L"xxx", the PCD is \r
-#            used for unicode string, and C structure of this datum type PCD is \r
+#            If the default value for VOID* datum type PCD like L"xxx", the PCD is\r
+#            used for unicode string, and C structure of this datum type PCD is\r

 #            UINT16 string array in PCD database, for example:\r
 #            UINT16 StringTable[29];\r
 #            The number of 29 in above sample is max size of a unicode string.\r
 #            UINT16 string array in PCD database, for example:\r
 #            UINT16 StringTable[29];\r
 #            The number of 29 in above sample is max size of a unicode string.\r

-#            \r
+#\r

 #            If the default value for VOID* datum type PCD like "xxx", the PCD is\r
 #            If the default value for VOID* datum type PCD like "xxx", the PCD is\r

-#            used for ascii string, and C structure of this datum type PCD is \r
+#            used for ascii string, and C structure of this datum type PCD is\r

 #            UINT8 string array in PCD database, for example:\r
 #            UINT8 StringTable[20];\r
 #            The number of 20 in above sample is max size of a ascii string.\r
 #            UINT8 string array in PCD database, for example:\r
 #            UINT8 StringTable[20];\r
 #            The number of 20 in above sample is max size of a ascii string.\r

-#            \r
+#\r

 #          3.3.2.2.2 VOID* - byte array\r
 #            If the default value of VOID* datum type PCD like {'0x29', '0x01', '0xf2'}\r
 #          3.3.2.2.2 VOID* - byte array\r
 #            If the default value of VOID* datum type PCD like {'0x29', '0x01', '0xf2'}\r

-#            the PCD is used for byte array. The generated structrue is same as \r
+#            the PCD is used for byte array. The generated structrue is same as\r

 #            above ascii string table,\r
 #            UINT8 StringTable[13];\r
 #            The number of 13 in above sample is max size of byte array.\r
 #            above ascii string table,\r
 #            UINT8 StringTable[13];\r
 #            The number of 13 in above sample is max size of byte array.\r

-#       \r
+#\r

 #      3.3.3 Some utility structures in PCD Database\r
 #        3.3.3.1 GuidTable\r
 #          GuidTable array is used to store all related GUID value in PCD database:\r
 #            - Variable GUID for HII type PCD\r
 #      3.3.3 Some utility structures in PCD Database\r
 #        3.3.3.1 GuidTable\r
 #          GuidTable array is used to store all related GUID value in PCD database:\r
 #            - Variable GUID for HII type PCD\r

-#            - Token space GUID for dynamicex type PCD \r
-#    \r
+#            - Token space GUID for dynamicex type PCD\r
+#\r

 #  Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r
 #\r
 #  This program and the accompanying materials\r
 #  Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r
 #\r
 #  This program and the accompanying materials\r

diff --git a/MdeModulePkg/Universal/PCD/Dxe/PcdDxe.uni b/MdeModulePkg/Universal/PCD/Dxe/PcdDxe.uni
index 0883ad881ec79fed17cff830c0baed8dc7c5d0ee..90b37e01cc05184fe1cbd78f232c09b79ff9bc21 100644 (file)
--- a/MdeModulePkg/Universal/PCD/Dxe/PcdDxe.uni
+++ b/MdeModulePkg/Universal/PCD/Dxe/PcdDxe.uni
@@ -8,35 +8,35 @@
 // 2) EFI_PCD_PROTOCOL\r
 // It is defined by PI specification 1.2, Vol 3 which only support dynamicEx\r
 // type Pcd.\r
 // 2) EFI_PCD_PROTOCOL\r
 // It is defined by PI specification 1.2, Vol 3 which only support dynamicEx\r
 // type Pcd.\r

-// \r
+//\r

 // For dynamicEx type PCD, it is compatible between PCD_PROTOCOL and EFI_PCD_PROTOCOL.\r
 // PCD DXE driver will produce above two protocols at same time.\r
 // For dynamicEx type PCD, it is compatible between PCD_PROTOCOL and EFI_PCD_PROTOCOL.\r
 // PCD DXE driver will produce above two protocols at same time.\r

-// \r
+//\r

 // PCD database is generated as the separate binary image at build time. The binary image\r
 // will be intergrated into Firmware volume together with PCD driver.\r
 // PCD database is generated as the separate binary image at build time. The binary image\r
 // will be intergrated into Firmware volume together with PCD driver.\r

-// \r
+//\r

 // ////////////////////////////////////////////////////////////////////////////////\r
 // //                                                                            //\r
 // //                      Introduction of PCD database                          //\r
 // //                                                                            //\r
 // ////////////////////////////////////////////////////////////////////////////////\r
 // ////////////////////////////////////////////////////////////////////////////////\r
 // //                                                                            //\r
 // //                      Introduction of PCD database                          //\r
 // //                                                                            //\r
 // ////////////////////////////////////////////////////////////////////////////////\r

-// \r
+//\r

 // 1, Introduction\r
 // PCD database hold all dynamic type PCD information. The structure of PEI PCD\r
 // database is generated by build tools according to dynamic PCD usage for\r
 // specified platform.\r
 // 1, Introduction\r
 // PCD database hold all dynamic type PCD information. The structure of PEI PCD\r
 // database is generated by build tools according to dynamic PCD usage for\r
 // specified platform.\r

-// \r
+//\r

 // 2, Dynamic Type PCD\r
 // Dynamic type PCD is used for the configuration/setting which value is determined\r
 // dynamic. In contrast, the value of static type PCD (FeatureFlag, FixedPcd,\r
 // PatchablePcd) is fixed in final generated FD image in build time.\r
 // 2, Dynamic Type PCD\r
 // Dynamic type PCD is used for the configuration/setting which value is determined\r
 // dynamic. In contrast, the value of static type PCD (FeatureFlag, FixedPcd,\r
 // PatchablePcd) is fixed in final generated FD image in build time.\r

-// \r
+//\r

 // 2.1 The "dynamic" determination means one of below cases:\r
 // a) The PCD setting value is produced by someone driver and consumed by\r
 // other driver in execution time.\r
 // b) The PCD setting value is set/get by user from FrontPage.\r
 // c) The PCD setting value is produced by platform OEM vendor in specified area.\r
 // 2.1 The "dynamic" determination means one of below cases:\r
 // a) The PCD setting value is produced by someone driver and consumed by\r
 // other driver in execution time.\r
 // b) The PCD setting value is set/get by user from FrontPage.\r
 // c) The PCD setting value is produced by platform OEM vendor in specified area.\r

-// \r
+//\r

 // 2.2 According to module distribution way, dynamic PCD could be classfied as:\r
 // a) Dynamic:\r
 // If module is released in source code and will be built with platform\r
 // 2.2 According to module distribution way, dynamic PCD could be classfied as:\r
 // a) Dynamic:\r
 // If module is released in source code and will be built with platform\r


@@ -50,7 +50,7 @@
 // PcdGetxxEx(gEfiMyTokenspaceGuid, PcdSampleDynamicPcd)\r
 // Developer need explicity gives {Token Space Guid:Token Number} as parameter\r
 // in writting source code.\r
 // PcdGetxxEx(gEfiMyTokenspaceGuid, PcdSampleDynamicPcd)\r
 // Developer need explicity gives {Token Space Guid:Token Number} as parameter\r
 // in writting source code.\r

-// \r
+//\r

 // 2.3 According to PCD value's storage method, dynamic PCD could be classfied as:\r
 // a) Default Storage:\r
 // - The PCD value is stored in PCD database maintained by PCD driver in boot\r
 // 2.3 According to PCD value's storage method, dynamic PCD could be classfied as:\r
 // a) Default Storage:\r
 // - The PCD value is stored in PCD database maintained by PCD driver in boot\r


@@ -60,7 +60,7 @@
 // is turn off.\r
 // - [PcdsDynamicDefault] is used as section name for this type PCD in\r
 // platform DSC file. [PcdsDynamicExDefault] is used for dynamicEx type PCD.\r
 // is turn off.\r
 // - [PcdsDynamicDefault] is used as section name for this type PCD in\r
 // platform DSC file. [PcdsDynamicExDefault] is used for dynamicEx type PCD.\r

-// \r
+//\r

 // b) Variable Storage:\r
 // - The PCD value is stored in variable area.\r
 // - As default storage type, this type PCD could be used for PEI/DXE driver\r
 // b) Variable Storage:\r
 // - The PCD value is stored in variable area.\r
 // - As default storage type, this type PCD could be used for PEI/DXE driver\r


@@ -70,34 +70,34 @@
 // to variable area is readonly.\r
 // - [PcdsDynamicHii] is used as section name for this type PCD in platform\r
 // DSC file. [PcdsDynamicExHii] is for dynamicEx type PCD.\r
 // to variable area is readonly.\r
 // - [PcdsDynamicHii] is used as section name for this type PCD in platform\r
 // DSC file. [PcdsDynamicExHii] is for dynamicEx type PCD.\r

-// \r
+//\r

 // c) OEM specificed storage area:\r
 // - The PCD value is stored in OEM specified area which base address is\r
 // specified by a FixedAtBuild PCD setting - PcdVpdBaseAddress.\r
 // - The area is read only for PEI and DXE phase.\r
 // - [PcdsDynamicVpd] is used as section name for this type PCD in platform\r
 // DSC file. [PcdsDynamicExVpd] is for dynamicex type PCD.\r
 // c) OEM specificed storage area:\r
 // - The PCD value is stored in OEM specified area which base address is\r
 // specified by a FixedAtBuild PCD setting - PcdVpdBaseAddress.\r
 // - The area is read only for PEI and DXE phase.\r
 // - [PcdsDynamicVpd] is used as section name for this type PCD in platform\r
 // DSC file. [PcdsDynamicExVpd] is for dynamicex type PCD.\r

-// \r
+//\r

 // 2.4 When and how to use dynamic PCD\r
 // Module developer do not care the used PCD is dynamic or static when writting\r
 // source code/INF. Dynamic PCD and dynamic type is pointed by platform integrator\r
 // in platform DSC file. Please ref section 2.3 to get matching between dynamic\r
 // PCD type and section name in DSC file.\r
 // 2.4 When and how to use dynamic PCD\r
 // Module developer do not care the used PCD is dynamic or static when writting\r
 // source code/INF. Dynamic PCD and dynamic type is pointed by platform integrator\r
 // in platform DSC file. Please ref section 2.3 to get matching between dynamic\r
 // PCD type and section name in DSC file.\r

-// \r
+//\r

 // 3, PCD database:\r
 // Although dynamic PCD could be in different storage type as above description,\r
 // but the basic information and default value for all dynamic PCD is hold\r
 // by PCD database maintained by PEI/DXE driver.\r
 // 3, PCD database:\r
 // Although dynamic PCD could be in different storage type as above description,\r
 // but the basic information and default value for all dynamic PCD is hold\r
 // by PCD database maintained by PEI/DXE driver.\r

-// \r
+//\r

 // As the whole EFI BIOS boot path is divided into PEI/DXE phase, the PCD database\r
 // also is divided into Pei/Dxe database maintaied by PcdPeim/PcdDxe driver separatly.\r
 // To make PcdPeim's driver image smaller, PEI PCD database only hold all dynamic\r
 // PCD information used in PEI phase or use in both PEI/DXE phase. And DXE PCD\r
 // database contains all PCDs used in PEI/DXE phase in memory.\r
 // As the whole EFI BIOS boot path is divided into PEI/DXE phase, the PCD database\r
 // also is divided into Pei/Dxe database maintaied by PcdPeim/PcdDxe driver separatly.\r
 // To make PcdPeim's driver image smaller, PEI PCD database only hold all dynamic\r
 // PCD information used in PEI phase or use in both PEI/DXE phase. And DXE PCD\r
 // database contains all PCDs used in PEI/DXE phase in memory.\r

-// \r
+//\r

 // Build tool will generate PCD database into the separate binary file for\r
 // PEI/DXE PCD driver according to dynamic PCD section in platform DSC file.\r
 // Build tool will generate PCD database into the separate binary file for\r
 // PEI/DXE PCD driver according to dynamic PCD section in platform DSC file.\r

-// \r
+//\r

 // 3.1 PcdPeim and PcdDxe\r
 // PEI PCD database is maintained by PcdPeim driver run from flash. PcdPeim driver\r
 // build guid hob in temporary memory and copy the binary data base from flash\r
 // 3.1 PcdPeim and PcdDxe\r
 // PEI PCD database is maintained by PcdPeim driver run from flash. PcdPeim driver\r
 // build guid hob in temporary memory and copy the binary data base from flash\r


@@ -105,11 +105,11 @@
 // DXE PCD database is maintained by PcdDxe driver.At entry point of PcdDxe driver,\r
 // a new PCD database is allocated in boot-time memory which including all\r
 // PEI PCD and DXE PCD entry.\r
 // DXE PCD database is maintained by PcdDxe driver.At entry point of PcdDxe driver,\r
 // a new PCD database is allocated in boot-time memory which including all\r
 // PEI PCD and DXE PCD entry.\r

-// \r
+//\r

 // Pcd driver should run as early as possible before any other driver access\r
 // dynamic PCD's value. PEI/DXE "Apriori File" mechanism make it possible by\r
 // making PcdPeim/PcdDxe as first dispatching driver in PEI/DXE phase.\r
 // Pcd driver should run as early as possible before any other driver access\r
 // dynamic PCD's value. PEI/DXE "Apriori File" mechanism make it possible by\r
 // making PcdPeim/PcdDxe as first dispatching driver in PEI/DXE phase.\r

-// \r
+//\r

 // 3.2 Token space Guid/Token number, Platform token, Local token number\r
 // Dynamic PCD\r
 // +-----------+               +---------+\r
 // 3.2 Token space Guid/Token number, Platform token, Local token number\r
 // Dynamic PCD\r
 // +-----------+               +---------+\r


@@ -129,13 +129,13 @@
 // |  Token    |\r
 // |  Number   |\r
 // +-----------+\r
 // |  Token    |\r
 // |  Number   |\r
 // +-----------+\r

-// \r
-// \r
+//\r
+//\r

 // 3.2.1 Pair of Token space guid + Token number\r
 // Any type PCD is identified by pair of "TokenSpaceGuid + TokeNumber". But it\r
 // is not easy maintained by PCD driver, and hashed token number will make\r
 // searching slowly.\r
 // 3.2.1 Pair of Token space guid + Token number\r
 // Any type PCD is identified by pair of "TokenSpaceGuid + TokeNumber". But it\r
 // is not easy maintained by PCD driver, and hashed token number will make\r
 // searching slowly.\r

-// \r
+//\r

 // 3.2.2 Platform Token Number\r
 // "Platform token number" concept is introduced for mapping to a pair of\r
 // "TokenSpaceGuid + TokenNumber". The platform token number is generated by\r
 // 3.2.2 Platform Token Number\r
 // "Platform token number" concept is introduced for mapping to a pair of\r
 // "TokenSpaceGuid + TokenNumber". The platform token number is generated by\r


@@ -149,14 +149,14 @@
 // mechanism is not suitable for binary module which use DynamicEx type PCD.\r
 // To access a dynamicEx type PCD, pair of "token space guid/token number" all need\r
 // to be specificed for PcdSet/PcdGet accessing macro.\r
 // mechanism is not suitable for binary module which use DynamicEx type PCD.\r
 // To access a dynamicEx type PCD, pair of "token space guid/token number" all need\r
 // to be specificed for PcdSet/PcdGet accessing macro.\r

-// \r
+//\r

 // Platform Token Number is started from 1, and inceased continuous. From whole\r
 // platform scope, there are two zones: PEI Zone and DXE Zone\r
 // |                      Platform Token Number\r
 // ----------|----------------------------------------------------------------\r
 // PEI Zone: |            1                 ~  PEI_LOCAL_TOKEN_NUMBER\r
 // DXE Zone: | (PEI_LOCAL_TOKEN_NUMBER + 1) ~ (PEI_LOCAL_TOKEN_NUMBER + DXE_LOCAL_TOKEN_NUMBER)\r
 // Platform Token Number is started from 1, and inceased continuous. From whole\r
 // platform scope, there are two zones: PEI Zone and DXE Zone\r
 // |                      Platform Token Number\r
 // ----------|----------------------------------------------------------------\r
 // PEI Zone: |            1                 ~  PEI_LOCAL_TOKEN_NUMBER\r
 // DXE Zone: | (PEI_LOCAL_TOKEN_NUMBER + 1) ~ (PEI_LOCAL_TOKEN_NUMBER + DXE_LOCAL_TOKEN_NUMBER)\r

-// \r
+//\r

 // 3.2.3 Local Token Number\r
 // To fast searching a PCD entry in PCD database, PCD driver translate\r
 // platform token number to local token number via a mapping table.\r
 // 3.2.3 Local Token Number\r
 // To fast searching a PCD entry in PCD database, PCD driver translate\r
 // platform token number to local token number via a mapping table.\r


@@ -164,7 +164,7 @@
 // "token space guid + token number" to local token number directly.\r
 // Local token number is identifier for all internal interface in PCD PEI/DXE\r
 // driver.\r
 // "token space guid + token number" to local token number directly.\r
 // Local token number is identifier for all internal interface in PCD PEI/DXE\r
 // driver.\r

-// \r
+//\r

 // A local token number is a 32-bit value in following meaning:\r
 // 32 ------------- 28 ---------- 24 -------- 0\r
 // | PCD type mask  | Datum Type  |  Offset  |\r
 // A local token number is a 32-bit value in following meaning:\r
 // 32 ------------- 28 ---------- 24 -------- 0\r
 // | PCD type mask  | Datum Type  |  Offset  |\r


@@ -184,7 +184,7 @@
 // Offset      : indicate the related offset of PCD value in PCD database array.\r
 // Based on local token number, PCD driver could fast determine PCD type, value\r
 // type and get PCD entry from PCD database.\r
 // Offset      : indicate the related offset of PCD value in PCD database array.\r
 // Based on local token number, PCD driver could fast determine PCD type, value\r
 // type and get PCD entry from PCD database.\r

-// \r
+//\r

 // 3.3 PCD Database binary file\r
 // PCD Database binary file will be created at build time as the standalone binary image.\r
 // To understand the binary image layout, PCD Database C structure is still generated\r
 // 3.3 PCD Database binary file\r
 // PCD Database binary file will be created at build time as the standalone binary image.\r
 // To understand the binary image layout, PCD Database C structure is still generated\r


@@ -204,7 +204,7 @@
 // Every PCD has a value record in PCD database. For different\r
 // datum type PCD has different record structure which will be\r
 // introduced in 3.3.1\r
 // Every PCD has a value record in PCD database. For different\r
 // datum type PCD has different record structure which will be\r
 // introduced in 3.3.1\r

-// \r
+//\r

 // In a PCD database structure, there are two major area: Init and UnInit.\r
 // Init area is use stored above PCD internal structure such as ExMapTable,\r
 // LocalTokenNumberTable etc and the (default) value of PCD which has default\r
 // In a PCD database structure, there are two major area: Init and UnInit.\r
 // Init area is use stored above PCD internal structure such as ExMapTable,\r
 // LocalTokenNumberTable etc and the (default) value of PCD which has default\r


@@ -212,7 +212,7 @@
 // Unint area is used stored the value of PCD which has no default value in\r
 // platform DSC file, the value of NULL, 0 specified in platform DSC file can\r
 // be seemed as "no default value".\r
 // Unint area is used stored the value of PCD which has no default value in\r
 // platform DSC file, the value of NULL, 0 specified in platform DSC file can\r
 // be seemed as "no default value".\r

-// \r
+//\r

 // 3.3.1 Simple Sample PCD Database C Structure\r
 // A general sample of PCD database structue is as follows:\r
 // typedef struct _PCD_DATABASE {\r
 // 3.3.1 Simple Sample PCD Database C Structure\r
 // A general sample of PCD database structue is as follows:\r
 // typedef struct _PCD_DATABASE {\r


@@ -224,7 +224,7 @@
 // SIZE_INFO         SizeTable[PEI_SIZE_TABLE_SIZE];\r
 // UINT8             SkuIdTable[PEI_SKUID_TABLE_SIZE];\r
 // SKU_ID            SystemSkuId;\r
 // SIZE_INFO         SizeTable[PEI_SIZE_TABLE_SIZE];\r
 // UINT8             SkuIdTable[PEI_SKUID_TABLE_SIZE];\r
 // SKU_ID            SystemSkuId;\r

-// \r
+//\r

 // //===== Following is value structure for PCD with default value\r
 // ....\r
 // ....\r
 // //===== Following is value structure for PCD with default value\r
 // ....\r
 // ....\r


@@ -236,11 +236,11 @@
 // ....\r
 // } UnInit;\r
 // }\r
 // ....\r
 // } UnInit;\r
 // }\r

-// \r
+//\r

 // 3.3.2 PCD value structure in PCD database C structure\r
 // The value's structure is generated by build tool in PCD database C structure.\r
 // The PCDs in different datum type has different value structure.\r
 // 3.3.2 PCD value structure in PCD database C structure\r
 // The value's structure is generated by build tool in PCD database C structure.\r
 // The PCDs in different datum type has different value structure.\r

-// \r
+//\r

 // 3.3.2.1 UINT8/UINT16/UINT32/UINT64 datum type PCD\r
 // The C structure for these datum type PCD is just a UINT8/UINT16/UINT32/UINT64\r
 // data member in PCD database, For example:\r
 // 3.3.2.1 UINT8/UINT16/UINT32/UINT64 datum type PCD\r
 // The C structure for these datum type PCD is just a UINT8/UINT16/UINT32/UINT64\r
 // data member in PCD database, For example:\r


@@ -248,30 +248,30 @@
 // Above structure is generated by build tool, the member name is "PcdCName_Guidvalue"\r
 // Member type is UINT16 according to PcdHardwareErrorRecordLevel declaration\r
 // in DEC file.\r
 // Above structure is generated by build tool, the member name is "PcdCName_Guidvalue"\r
 // Member type is UINT16 according to PcdHardwareErrorRecordLevel declaration\r
 // in DEC file.\r

-// \r
+//\r

 // 3.3.2.2 VOID* datum type PCD\r
 // The value of VOID* datum type PCD is a UINT8/UINT16 array in PCD database.\r
 // 3.3.2.2 VOID* datum type PCD\r
 // The value of VOID* datum type PCD is a UINT8/UINT16 array in PCD database.\r

-// \r
+//\r

 // 3.3.2.2.1 VOID* - string type\r
 // If the default value for VOID* datum type PCD like L"xxx", the PCD is\r
 // used for unicode string, and C structure of this datum type PCD is\r
 // UINT16 string array in PCD database, for example:\r
 // UINT16 StringTable[29];\r
 // The number of 29 in above sample is max size of a unicode string.\r
 // 3.3.2.2.1 VOID* - string type\r
 // If the default value for VOID* datum type PCD like L"xxx", the PCD is\r
 // used for unicode string, and C structure of this datum type PCD is\r
 // UINT16 string array in PCD database, for example:\r
 // UINT16 StringTable[29];\r
 // The number of 29 in above sample is max size of a unicode string.\r

-// \r
+//\r

 // If the default value for VOID* datum type PCD like "xxx", the PCD is\r
 // used for ascii string, and C structure of this datum type PCD is\r
 // UINT8 string array in PCD database, for example:\r
 // UINT8 StringTable[20];\r
 // The number of 20 in above sample is max size of a ascii string.\r
 // If the default value for VOID* datum type PCD like "xxx", the PCD is\r
 // used for ascii string, and C structure of this datum type PCD is\r
 // UINT8 string array in PCD database, for example:\r
 // UINT8 StringTable[20];\r
 // The number of 20 in above sample is max size of a ascii string.\r

-// \r
+//\r

 // 3.3.2.2.2 VOID* - byte array\r
 // If the default value of VOID* datum type PCD like {'0x29', '0x01', '0xf2'}\r
 // the PCD is used for byte array. The generated structrue is same as\r
 // above ascii string table,\r
 // UINT8 StringTable[13];\r
 // The number of 13 in above sample is max size of byte array.\r
 // 3.3.2.2.2 VOID* - byte array\r
 // If the default value of VOID* datum type PCD like {'0x29', '0x01', '0xf2'}\r
 // the PCD is used for byte array. The generated structrue is same as\r
 // above ascii string table,\r
 // UINT8 StringTable[13];\r
 // The number of 13 in above sample is max size of byte array.\r

-// \r
+//\r

 // 3.3.3 Some utility structures in PCD Database\r
 // 3.3.3.1 GuidTable\r
 // GuidTable array is used to store all related GUID value in PCD database:\r
 // 3.3.3 Some utility structures in PCD Database\r
 // 3.3.3.1 GuidTable\r
 // GuidTable array is used to store all related GUID value in PCD database:\r

diff --git a/MdeModulePkg/Universal/PCD/Dxe/PcdDxeExtra.uni b/MdeModulePkg/Universal/PCD/Dxe/PcdDxeExtra.uni
index 729312a2d8143c1c5ad37a169e8ee8a017876b52..436cd7ce60a82e56aebb907a6e5aee951cfa3053 100644 (file)
--- a/MdeModulePkg/Universal/PCD/Dxe/PcdDxeExtra.uni
+++ b/MdeModulePkg/Universal/PCD/Dxe/PcdDxeExtra.uni
@@ -1,7 +1,7 @@
 // /** @file\r
 // PcdDxe Localized Strings and Content\r
 //\r
 // /** @file\r
 // PcdDxe Localized Strings and Content\r
 //\r

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

 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r
 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r


@@ -12,8 +12,8 @@
 //\r
 // **/\r
 \r
 //\r
 // **/\r
 \r

-#string STR_PROPERTIES_MODULE_NAME \r
-#language en-US \r
+#string STR_PROPERTIES_MODULE_NAME\r
+#language en-US\r

 "Platform Configuration Database DXE Driver"\r
 \r
 \r
 "Platform Configuration Database DXE Driver"\r
 \r
 \r

diff --git a/MdeModulePkg/Universal/PCD/Dxe/Service.c b/MdeModulePkg/Universal/PCD/Dxe/Service.c
index 1e487f04c3bdcfdee65ed7c491a8485111508e2a..05171523662b3af8f612181af537e1ee78a74bd1 100644 (file)
--- a/MdeModulePkg/Universal/PCD/Dxe/Service.c
+++ b/MdeModulePkg/Universal/PCD/Dxe/Service.c
@@ -2,7 +2,7 @@
     Help functions used by PCD DXE driver.\r
 \r
 Copyright (c) 2014, Hewlett-Packard Development Company, L.P.<BR>\r
     Help functions used by PCD DXE driver.\r
 \r
 Copyright (c) 2014, Hewlett-Packard Development Company, L.P.<BR>\r

-Copyright (c) 2006 - 2017, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r

 (C) Copyright 2016 Hewlett Packard Enterprise Development LP<BR>\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 (C) Copyright 2016 Hewlett Packard Enterprise Development LP<BR>\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r


@@ -19,23 +19,23 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 \r
 PCD_DATABASE   mPcdDatabase;\r
 \r
 \r
 PCD_DATABASE   mPcdDatabase;\r
 \r

-UINT32         mPcdTotalTokenCount; \r
-UINT32         mPeiLocalTokenCount; \r
-UINT32         mDxeLocalTokenCount; \r
-UINT32         mPeiNexTokenCount;   \r
-UINT32         mDxeNexTokenCount;  \r
+UINT32         mPcdTotalTokenCount;\r
+UINT32         mPeiLocalTokenCount;\r
+UINT32         mDxeLocalTokenCount;\r
+UINT32         mPeiNexTokenCount;\r
+UINT32         mDxeNexTokenCount;\r

 UINT32         mPeiExMapppingTableSize;\r
 UINT32         mDxeExMapppingTableSize;\r
 UINT32         mPeiGuidTableSize;\r
 UINT32         mDxeGuidTableSize;\r
 \r
 UINT32         mPeiExMapppingTableSize;\r
 UINT32         mDxeExMapppingTableSize;\r
 UINT32         mPeiGuidTableSize;\r
 UINT32         mDxeGuidTableSize;\r
 \r

-BOOLEAN        mPeiExMapTableEmpty; \r
-BOOLEAN        mDxeExMapTableEmpty; \r
+BOOLEAN        mPeiExMapTableEmpty;\r
+BOOLEAN        mDxeExMapTableEmpty;\r

 BOOLEAN        mPeiDatabaseEmpty;\r
 \r
 LIST_ENTRY    *mCallbackFnTable;\r
 EFI_GUID     **TmpTokenSpaceBuffer;\r
 BOOLEAN        mPeiDatabaseEmpty;\r
 \r
 LIST_ENTRY    *mCallbackFnTable;\r
 EFI_GUID     **TmpTokenSpaceBuffer;\r

-UINTN          TmpTokenSpaceBufferCount; \r
+UINTN          TmpTokenSpaceBufferCount;\r

 \r
 UINTN                 mPeiPcdDbSize    = 0;\r
 PEI_PCD_DATABASE      *mPeiPcdDbBinary = NULL;\r
 \r
 UINTN                 mPeiPcdDbSize    = 0;\r
 PEI_PCD_DATABASE      *mPeiPcdDbBinary = NULL;\r


@@ -66,7 +66,7 @@ GetLocalTokenNumber (
   //\r
   TokenNumber--;\r
 \r
   //\r
   TokenNumber--;\r
 \r

-  LocalTokenNumberTable  = IsPeiDb ? (UINT32 *)((UINT8 *)mPcdDatabase.PeiDb + mPcdDatabase.PeiDb->LocalTokenNumberTableOffset) : \r
+  LocalTokenNumberTable  = IsPeiDb ? (UINT32 *)((UINT8 *)mPcdDatabase.PeiDb + mPcdDatabase.PeiDb->LocalTokenNumberTableOffset) :\r

                                      (UINT32 *)((UINT8 *)mPcdDatabase.DxeDb + mPcdDatabase.DxeDb->LocalTokenNumberTableOffset);\r
   TokenNumber            = IsPeiDb ? TokenNumber : TokenNumber - mPeiLocalTokenCount;\r
 \r
                                      (UINT32 *)((UINT8 *)mPcdDatabase.DxeDb + mPcdDatabase.DxeDb->LocalTokenNumberTableOffset);\r
   TokenNumber            = IsPeiDb ? TokenNumber : TokenNumber - mPeiLocalTokenCount;\r
 \r


@@ -133,7 +133,7 @@ GetPcdName (
   CHAR8             *Name;\r
 \r
   //\r
   CHAR8             *Name;\r
 \r
   //\r

-  // Return NULL when PCD name table is absent. \r
+  // Return NULL when PCD name table is absent.\r

   //\r
   if (IsPeiDb) {\r
     if (mPcdDatabase.PeiDb->PcdNameTableOffset == 0) {\r
   //\r
   if (IsPeiDb) {\r
     if (mPcdDatabase.PeiDb->PcdNameTableOffset == 0) {\r


@@ -181,7 +181,7 @@ GetPcdName (
     //\r
     AsciiStrCatS (Name, NameSize, TokenSpaceName);\r
     Name[AsciiStrSize (TokenSpaceName) - sizeof (CHAR8)] = '.';\r
     //\r
     AsciiStrCatS (Name, NameSize, TokenSpaceName);\r
     Name[AsciiStrSize (TokenSpaceName) - sizeof (CHAR8)] = '.';\r

-    AsciiStrCatS (Name, NameSize, PcdName);  \r
+    AsciiStrCatS (Name, NameSize, PcdName);\r

   }\r
 \r
   return Name;\r
   }\r
 \r
   return Name;\r


@@ -198,7 +198,7 @@ GetPcdName (
   @param[in]    Guid        The 128-bit unique value that designates the namespace from which to extract the value.\r
   @param[in]    TokenNumber The PCD token number.\r
   @param[out]   PcdInfo     The returned information associated with the requested TokenNumber.\r
   @param[in]    Guid        The 128-bit unique value that designates the namespace from which to extract the value.\r
   @param[in]    TokenNumber The PCD token number.\r
   @param[out]   PcdInfo     The returned information associated with the requested TokenNumber.\r

-                            The caller is responsible for freeing the buffer that is allocated by callee for PcdInfo->PcdName. \r
+                            The caller is responsible for freeing the buffer that is allocated by callee for PcdInfo->PcdName.\r

 \r
   @retval  EFI_SUCCESS      The PCD information was returned successfully\r
   @retval  EFI_NOT_FOUND    The PCD service could not find the requested token number.\r
 \r
   @retval  EFI_SUCCESS      The PCD information was returned successfully\r
   @retval  EFI_NOT_FOUND    The PCD service could not find the requested token number.\r


@@ -247,7 +247,7 @@ ExGetPcdInfo (
         PcdInfo->PcdSize = 0;\r
         //\r
         // Here use one representative in the token space to get the TokenSpaceCName.\r
         PcdInfo->PcdSize = 0;\r
         //\r
         // Here use one representative in the token space to get the TokenSpaceCName.\r

-        // \r
+        //\r

         PcdInfo->PcdName = GetPcdName (TRUE, IsPeiDb, ExMapTable[Index].TokenNumber);\r
         return EFI_SUCCESS;\r
       } else if (ExMapTable[Index].ExTokenNumber == TokenNumber) {\r
         PcdInfo->PcdName = GetPcdName (TRUE, IsPeiDb, ExMapTable[Index].TokenNumber);\r
         return EFI_SUCCESS;\r
       } else if (ExMapTable[Index].ExTokenNumber == TokenNumber) {\r


@@ -352,10 +352,10 @@ DxeGetPcdInfo (
 \r
 /**\r
   Get the PCD entry pointer in PCD database.\r
 \r
 /**\r
   Get the PCD entry pointer in PCD database.\r

-  \r
+\r

   This routine will visit PCD database to find the PCD entry according to given\r
   This routine will visit PCD database to find the PCD entry according to given\r

-  token number. The given token number is autogened by build tools and it will be \r
-  translated to local token number. Local token number contains PCD's type and \r
+  token number. The given token number is autogened by build tools and it will be\r
+  translated to local token number. Local token number contains PCD's type and\r

   offset of PCD entry in PCD database.\r
 \r
   @param TokenNumber     Token's number, it is autogened by build tools\r
   offset of PCD entry in PCD database.\r
 \r
   @param TokenNumber     Token's number, it is autogened by build tools\r


@@ -385,7 +385,7 @@ GetWorker (
   EFI_STATUS          Status;\r
   UINT32              LocalTokenNumber;\r
   UINT32              Offset;\r
   EFI_STATUS          Status;\r
   UINT32              LocalTokenNumber;\r
   UINT32              Offset;\r

-  STRING_HEAD         StringTableIdx;      \r
+  STRING_HEAD         StringTableIdx;\r

   BOOLEAN             IsPeiDb;\r
 \r
   //\r
   BOOLEAN             IsPeiDb;\r
 \r
   //\r


@@ -407,7 +407,7 @@ GetWorker (
 \r
   //\r
   // EBC compiler is very choosy. It may report warning about comparison\r
 \r
   //\r
   // EBC compiler is very choosy. It may report warning about comparison\r

-  // between UINTN and 0 . So we add 1 in each size of the \r
+  // between UINTN and 0 . So we add 1 in each size of the\r

   // comparison.\r
   //\r
   ASSERT (TokenNumber + 1 < mPcdTotalTokenCount + 1);\r
   // comparison.\r
   //\r
   ASSERT (TokenNumber + 1 < mPcdTotalTokenCount + 1);\r


@@ -415,14 +415,14 @@ GetWorker (
   ASSERT ((GetSize == DxePcdGetSize (TokenNumber + 1)) || (GetSize == 0));\r
 \r
   // EBC compiler is very choosy. It may report warning about comparison\r
   ASSERT ((GetSize == DxePcdGetSize (TokenNumber + 1)) || (GetSize == 0));\r
 \r
   // EBC compiler is very choosy. It may report warning about comparison\r

-  // between UINTN and 0 . So we add 1 in each size of the \r
+  // between UINTN and 0 . So we add 1 in each size of the\r

   // comparison.\r
   IsPeiDb = (BOOLEAN) ((TokenNumber + 1 < mPeiLocalTokenCount + 1) ? TRUE : FALSE);\r
 \r
   LocalTokenNumber = GetLocalTokenNumber (IsPeiDb, TokenNumber + 1);\r
 \r
   PcdDb = IsPeiDb ? ((UINT8 *) mPcdDatabase.PeiDb) : ((UINT8 *) mPcdDatabase.DxeDb);\r
   // comparison.\r
   IsPeiDb = (BOOLEAN) ((TokenNumber + 1 < mPeiLocalTokenCount + 1) ? TRUE : FALSE);\r
 \r
   LocalTokenNumber = GetLocalTokenNumber (IsPeiDb, TokenNumber + 1);\r
 \r
   PcdDb = IsPeiDb ? ((UINT8 *) mPcdDatabase.PeiDb) : ((UINT8 *) mPcdDatabase.DxeDb);\r

-                                    \r
+\r

   if (IsPeiDb) {\r
     StringTable = (UINT8 *) ((UINT8 *)mPcdDatabase.PeiDb + mPcdDatabase.PeiDb->StringTableOffset);\r
   } else {\r
   if (IsPeiDb) {\r
     StringTable = (UINT8 *) ((UINT8 *)mPcdDatabase.PeiDb + mPcdDatabase.PeiDb->StringTableOffset);\r
   } else {\r


@@ -453,11 +453,11 @@ GetWorker (
 \r
       if ((LocalTokenNumber & PCD_TYPE_ALL_SET) == (PCD_TYPE_HII|PCD_TYPE_STRING)) {\r
         //\r
 \r
       if ((LocalTokenNumber & PCD_TYPE_ALL_SET) == (PCD_TYPE_HII|PCD_TYPE_STRING)) {\r
         //\r

-        // If a HII type PCD's datum type is VOID*, the DefaultValueOffset is the index of \r
+        // If a HII type PCD's datum type is VOID*, the DefaultValueOffset is the index of\r

         // string array in string table.\r
         //\r
         // string array in string table.\r
         //\r

-        StringTableIdx = *(STRING_HEAD*)((UINT8 *) PcdDb + VariableHead->DefaultValueOffset);   \r
-        VaraiableDefaultBuffer = (UINT8 *) (StringTable + StringTableIdx);     \r
+        StringTableIdx = *(STRING_HEAD*)((UINT8 *) PcdDb + VariableHead->DefaultValueOffset);\r
+        VaraiableDefaultBuffer = (UINT8 *) (StringTable + StringTableIdx);\r

       } else {\r
         VaraiableDefaultBuffer = (UINT8 *) PcdDb + VariableHead->DefaultValueOffset;\r
       }\r
       } else {\r
         VaraiableDefaultBuffer = (UINT8 *) PcdDb + VariableHead->DefaultValueOffset;\r
       }\r


@@ -501,7 +501,7 @@ GetWorker (
     default:\r
       ASSERT (FALSE);\r
       break;\r
     default:\r
       ASSERT (FALSE);\r
       break;\r

-      \r
+\r

   }\r
 \r
   EfiReleaseLock (&mPcdDatabaseLock);\r
   }\r
 \r
   EfiReleaseLock (&mPcdDatabaseLock);\r


@@ -515,9 +515,9 @@ GetWorker (
 \r
   This routine will register a callback function to a PCD entry by given token number\r
   and token space guid.\r
 \r
   This routine will register a callback function to a PCD entry by given token number\r
   and token space guid.\r

-  \r
+\r

   @param TokenNumber        PCD token's number, it is autogened by build tools.\r
   @param TokenNumber        PCD token's number, it is autogened by build tools.\r

-  @param Guid               PCD token space's guid, \r
+  @param Guid               PCD token space's guid,\r

                             if not NULL, this PCD is dynamicEx type PCD.\r
   @param CallBackFunction   Callback function pointer\r
 \r
                             if not NULL, this PCD is dynamicEx type PCD.\r
   @param CallBackFunction   Callback function pointer\r
 \r


@@ -565,7 +565,7 @@ DxeRegisterCallBackWorker (
 \r
   FnTableEntry->CallbackFn = CallBackFunction;\r
   InsertTailList (ListHead, &FnTableEntry->Node);\r
 \r
   FnTableEntry->CallbackFn = CallBackFunction;\r
   InsertTailList (ListHead, &FnTableEntry->Node);\r

-  \r
+\r

   return EFI_SUCCESS;\r
 }\r
 \r
   return EFI_SUCCESS;\r
 }\r
 \r


@@ -617,7 +617,7 @@ DxeUnRegisterCallBackWorker (
       //\r
       RemoveEntryList (ListNode);\r
       FreePool (FnTableEntry);\r
       //\r
       RemoveEntryList (ListNode);\r
       FreePool (FnTableEntry);\r

-      \r
+\r

       return EFI_SUCCESS;\r
     }\r
     ListNode = GetNextNode (ListHead, ListNode);\r
       return EFI_SUCCESS;\r
     }\r
     ListNode = GetNextNode (ListHead, ListNode);\r


@@ -628,16 +628,16 @@ DxeUnRegisterCallBackWorker (
 \r
 /**\r
   Get next token number in given token space.\r
 \r
 /**\r
   Get next token number in given token space.\r

-  \r
+\r

   This routine is used for dynamicEx type PCD. It will firstly scan token space\r
   This routine is used for dynamicEx type PCD. It will firstly scan token space\r

-  table to get token space according to given token space guid. Then scan given \r
-  token number in found token space, if found, then return next token number in \r
+  table to get token space according to given token space guid. Then scan given\r
+  token number in found token space, if found, then return next token number in\r

   this token space.\r
 \r
   this token space.\r
 \r

-  @param Guid            Token space guid. Next token number will be scaned in \r
+  @param Guid            Token space guid. Next token number will be scaned in\r

                          this token space.\r
                          this token space.\r

-  @param TokenNumber     Token number. \r
-                         If PCD_INVALID_TOKEN_NUMBER, return first token number in \r
+  @param TokenNumber     Token number.\r
+                         If PCD_INVALID_TOKEN_NUMBER, return first token number in\r

                          token space table.\r
                          If not PCD_INVALID_TOKEN_NUMBER, return next token number\r
                          in token space table.\r
                          token space table.\r
                          If not PCD_INVALID_TOKEN_NUMBER, return next token number\r
                          in token space table.\r


@@ -668,8 +668,8 @@ ExGetNextTokeNumber (
   UINTN            ExMapTableCount;\r
 \r
   //\r
   UINTN            ExMapTableCount;\r
 \r
   //\r

-  // Scan token space guid \r
-  // \r
+  // Scan token space guid\r
+  //\r

   MatchGuid = ScanGuid (GuidTable, SizeOfGuidTable, Guid);\r
   if (MatchGuid == NULL) {\r
     return EFI_NOT_FOUND;\r
   MatchGuid = ScanGuid (GuidTable, SizeOfGuidTable, Guid);\r
   if (MatchGuid == NULL) {\r
     return EFI_NOT_FOUND;\r


@@ -734,12 +734,12 @@ ExGetNextTokeNumber (
 DXE_PCD_DATABASE *\r
 LocateExPcdBinary (\r
   VOID\r
 DXE_PCD_DATABASE *\r
 LocateExPcdBinary (\r
   VOID\r

-) \r
+)\r

 {\r
   EFI_STATUS            Status;\r
 {\r
   EFI_STATUS            Status;\r

- \r
+\r

   //\r
   //\r

-  // Search the External Pcd database from one section of current FFS, \r
+  // Search the External Pcd database from one section of current FFS,\r

   // and read it to memory\r
   //\r
   Status = GetSectionFromFfs (\r
   // and read it to memory\r
   //\r
   Status = GetSectionFromFfs (\r


@@ -838,7 +838,7 @@ UpdatePcdDatabase (
 \r
 /**\r
   Initialize the PCD database in DXE phase.\r
 \r
 /**\r
   Initialize the PCD database in DXE phase.\r

-  \r
+\r

   PCD database in DXE phase also contains PCD database in PEI phase which is copied\r
   from GUID Hob.\r
 \r
   PCD database in DXE phase also contains PCD database in PEI phase which is copied\r
   from GUID Hob.\r
 \r


@@ -869,7 +869,7 @@ BuildPcdDxeDataBase (
   GuidHob = GetFirstGuidHob (&gPcdDataBaseHobGuid);\r
   if (GuidHob != NULL) {\r
 \r
   GuidHob = GetFirstGuidHob (&gPcdDataBaseHobGuid);\r
   if (GuidHob != NULL) {\r
 \r

-    // \r
+    //\r

     // If no PEIMs use dynamic Pcd Entry, the Pcd Service PEIM\r
     // should not be included at all. So the GuidHob could\r
     // be NULL. If it is NULL, we just copy over the DXE Default\r
     // If no PEIMs use dynamic Pcd Entry, the Pcd Service PEIM\r
     // should not be included at all. So the GuidHob could\r
     // be NULL. If it is NULL, we just copy over the DXE Default\r


@@ -916,7 +916,7 @@ BuildPcdDxeDataBase (
 \r
   mPcdTotalTokenCount     = mPeiLocalTokenCount + mDxeLocalTokenCount;\r
   mPeiNexTokenCount       = mPeiLocalTokenCount - mPcdDatabase.PeiDb->ExTokenCount;\r
 \r
   mPcdTotalTokenCount     = mPeiLocalTokenCount + mDxeLocalTokenCount;\r
   mPeiNexTokenCount       = mPeiLocalTokenCount - mPcdDatabase.PeiDb->ExTokenCount;\r

-  mDxeNexTokenCount       = mDxeLocalTokenCount - mPcdDatabase.DxeDb->ExTokenCount;  \r
+  mDxeNexTokenCount       = mDxeLocalTokenCount - mPcdDatabase.DxeDb->ExTokenCount;\r

 \r
   mPeiExMapTableEmpty     = (mPcdDatabase.PeiDb->ExTokenCount == 0) ? TRUE : FALSE;\r
   mDxeExMapTableEmpty     = (mPcdDatabase.DxeDb->ExTokenCount == 0) ? TRUE : FALSE;\r
 \r
   mPeiExMapTableEmpty     = (mPcdDatabase.PeiDb->ExTokenCount == 0) ? TRUE : FALSE;\r
   mDxeExMapTableEmpty     = (mPcdDatabase.DxeDb->ExTokenCount == 0) ? TRUE : FALSE;\r


@@ -933,7 +933,7 @@ BuildPcdDxeDataBase (
 \r
   //\r
   // EBC compiler is very choosy. It may report warning about comparison\r
 \r
   //\r
   // EBC compiler is very choosy. It may report warning about comparison\r

-  // between UINTN and 0 . So we add 1 in each size of the \r
+  // between UINTN and 0 . So we add 1 in each size of the\r

   // comparison.\r
   //\r
   for (Index = 0; Index + 1 < mPcdTotalTokenCount + 1; Index++) {\r
   // comparison.\r
   //\r
   for (Index = 0; Index + 1 < mPcdTotalTokenCount + 1; Index++) {\r


@@ -946,7 +946,7 @@ BuildPcdDxeDataBase (
 \r
   @param VariableGuid    Variable's guid\r
   @param VariableName    Variable's unicode name string\r
 \r
   @param VariableGuid    Variable's guid\r
   @param VariableName    Variable's unicode name string\r

-  @param VariableData    Variable's data pointer, \r
+  @param VariableData    Variable's data pointer,\r

   @param VariableSize    Variable's size.\r
 \r
   @return the status of gRT->GetVariable\r
   @param VariableSize    Variable's size.\r
 \r
   @return the status of gRT->GetVariable\r


@@ -965,7 +965,7 @@ GetHiiVariable (
 \r
   Size = 0;\r
   Buffer = NULL;\r
 \r
   Size = 0;\r
   Buffer = NULL;\r

-  \r
+\r

   //\r
   // Firstly get the real size of HII variable\r
   //\r
   //\r
   // Firstly get the real size of HII variable\r
   //\r


@@ -976,7 +976,7 @@ GetHiiVariable (
     &Size,\r
     Buffer\r
     );\r
     &Size,\r
     Buffer\r
     );\r

-  \r
+\r

   //\r
   // Allocate buffer to hold whole variable data according to variable size.\r
   //\r
   //\r
   // Allocate buffer to hold whole variable data according to variable size.\r
   //\r


@@ -998,7 +998,7 @@ GetHiiVariable (
     *VariableSize = Size;\r
   } else {\r
     //\r
     *VariableSize = Size;\r
   } else {\r
     //\r

-    // Use Default Data only when variable is not found. \r
+    // Use Default Data only when variable is not found.\r

     // For other error status, correct data can't be got, and trig ASSERT().\r
     //\r
     ASSERT (Status == EFI_NOT_FOUND);\r
     // For other error status, correct data can't be got, and trig ASSERT().\r
     //\r
     ASSERT (Status == EFI_NOT_FOUND);\r


@@ -1008,7 +1008,7 @@ GetHiiVariable (
 }\r
 \r
 /**\r
 }\r
 \r
 /**\r

-  Invoke the callback function when dynamic PCD entry was set, if this PCD entry \r
+  Invoke the callback function when dynamic PCD entry was set, if this PCD entry\r

   has registered callback function.\r
 \r
   @param ExTokenNumber   DynamicEx PCD's token number, if this PCD entry is dyanmicEx\r
   has registered callback function.\r
 \r
   @param ExTokenNumber   DynamicEx PCD's token number, if this PCD entry is dyanmicEx\r


@@ -1044,14 +1044,14 @@ InvokeCallbackOnSet (
   while (ListNode != ListHead) {\r
     FnTableEntry = CR_FNENTRY_FROM_LISTNODE (ListNode, CALLBACK_FN_ENTRY, Node);\r
 \r
   while (ListNode != ListHead) {\r
     FnTableEntry = CR_FNENTRY_FROM_LISTNODE (ListNode, CALLBACK_FN_ENTRY, Node);\r
 \r

-    FnTableEntry->CallbackFn(Guid, \r
+    FnTableEntry->CallbackFn(Guid,\r

                     (Guid == NULL) ? TokenNumber : ExTokenNumber,\r
                     Data,\r
                     Size);\r
                     (Guid == NULL) ? TokenNumber : ExTokenNumber,\r
                     Data,\r
                     Size);\r

-    \r
+\r

     ListNode = GetNextNode (ListHead, ListNode);\r
   }\r
     ListNode = GetNextNode (ListHead, ListNode);\r
   }\r

-  \r
+\r

   return;\r
 }\r
 \r
   return;\r
 }\r
 \r


@@ -1088,10 +1088,10 @@ SetValueWorker (
 \r
   @retval EFI_INVALID_PARAMETER  If this PCD type is VPD, VPD PCD can not be set.\r
   @retval EFI_INVALID_PARAMETER  If Size can not be set to size table.\r
 \r
   @retval EFI_INVALID_PARAMETER  If this PCD type is VPD, VPD PCD can not be set.\r
   @retval EFI_INVALID_PARAMETER  If Size can not be set to size table.\r

-  @retval EFI_INVALID_PARAMETER  If Size of non-Ptr type PCD does not match the size information in PCD database.  \r
+  @retval EFI_INVALID_PARAMETER  If Size of non-Ptr type PCD does not match the size information in PCD database.\r

   @retval EFI_NOT_FOUND          If value type of PCD entry is intergrate, but not in\r
                                  range of UINT8, UINT16, UINT32, UINT64\r
   @retval EFI_NOT_FOUND          If value type of PCD entry is intergrate, but not in\r
                                  range of UINT8, UINT16, UINT32, UINT64\r

-  @retval EFI_NOT_FOUND          Can not find the PCD type according to token number.                                \r
+  @retval EFI_NOT_FOUND          Can not find the PCD type according to token number.\r

 **/\r
 EFI_STATUS\r
 SetWorker (\r
 **/\r
 EFI_STATUS\r
 SetWorker (\r


@@ -1125,10 +1125,10 @@ SetWorker (
   TokenNumber--;\r
 \r
   TmpTokenNumber = TokenNumber;\r
   TokenNumber--;\r
 \r
   TmpTokenNumber = TokenNumber;\r

-  \r
+\r

   //\r
   // EBC compiler is very choosy. It may report warning about comparison\r
   //\r
   // EBC compiler is very choosy. It may report warning about comparison\r

-  // between UINTN and 0 . So we add 1 in each size of the \r
+  // between UINTN and 0 . So we add 1 in each size of the\r

   // comparison.\r
   //\r
   ASSERT (TokenNumber + 1 < mPcdTotalTokenCount + 1);\r
   // comparison.\r
   //\r
   ASSERT (TokenNumber + 1 < mPcdTotalTokenCount + 1);\r


@@ -1150,7 +1150,7 @@ SetWorker (
 \r
   //\r
   // EBC compiler is very choosy. It may report warning about comparison\r
 \r
   //\r
   // EBC compiler is very choosy. It may report warning about comparison\r

-  // between UINTN and 0 . So we add 1 in each size of the \r
+  // between UINTN and 0 . So we add 1 in each size of the\r

   // comparison.\r
   //\r
   if ((TokenNumber + 1 < mPeiNexTokenCount + 1) ||\r
   // comparison.\r
   //\r
   if ((TokenNumber + 1 < mPeiNexTokenCount + 1) ||\r


@@ -1165,7 +1165,7 @@ SetWorker (
 \r
   //\r
   // EBC compiler is very choosy. It may report warning about comparison\r
 \r
   //\r
   // EBC compiler is very choosy. It may report warning about comparison\r

-  // between UINTN and 0 . So we add 1 in each size of the \r
+  // between UINTN and 0 . So we add 1 in each size of the\r

   // comparison.\r
   //\r
   IsPeiDb = (BOOLEAN) ((TokenNumber + 1 < mPeiLocalTokenCount + 1) ? TRUE : FALSE);\r
   // comparison.\r
   //\r
   IsPeiDb = (BOOLEAN) ((TokenNumber + 1 < mPeiLocalTokenCount + 1) ? TRUE : FALSE);\r


@@ -1182,7 +1182,7 @@ SetWorker (
     StringTable = (UINT8 *) ((UINT8 *)mPcdDatabase.DxeDb + mPcdDatabase.DxeDb->StringTableOffset);\r
   }\r
 \r
     StringTable = (UINT8 *) ((UINT8 *)mPcdDatabase.DxeDb + mPcdDatabase.DxeDb->StringTableOffset);\r
   }\r
 \r

-  \r
+\r

   InternalData = PcdDb + Offset;\r
 \r
   switch (LocalTokenNumber & PCD_TYPE_ALL_SET) {\r
   InternalData = PcdDb + Offset;\r
 \r
   switch (LocalTokenNumber & PCD_TYPE_ALL_SET) {\r


@@ -1190,7 +1190,7 @@ SetWorker (
       ASSERT (FALSE);\r
       Status = EFI_INVALID_PARAMETER;\r
       break;\r
       ASSERT (FALSE);\r
       Status = EFI_INVALID_PARAMETER;\r
       break;\r

-    \r
+\r

     case PCD_TYPE_STRING:\r
       if (SetPtrTypeSize (TmpTokenNumber, Size)) {\r
         CopyMem (StringTable + *((STRING_HEAD *)InternalData), Data, *Size);\r
     case PCD_TYPE_STRING:\r
       if (SetPtrTypeSize (TmpTokenNumber, Size)) {\r
         CopyMem (StringTable + *((STRING_HEAD *)InternalData), Data, *Size);\r


@@ -1223,7 +1223,7 @@ SetWorker (
       Attributes = VariableHead->Attributes;\r
       Status = SetHiiVariable (Guid, Name, Attributes, Data, *Size, VariableOffset);\r
       break;\r
       Attributes = VariableHead->Attributes;\r
       Status = SetHiiVariable (Guid, Name, Attributes, Data, *Size, VariableOffset);\r
       break;\r

-      \r
+\r

     case PCD_TYPE_DATA:\r
       if (PtrType) {\r
         if (SetPtrTypeSize (TmpTokenNumber, Size)) {\r
     case PCD_TYPE_DATA:\r
       if (PtrType) {\r
         if (SetPtrTypeSize (TmpTokenNumber, Size)) {\r


@@ -1267,7 +1267,7 @@ SetWorker (
     }\r
 \r
   EfiReleaseLock (&mPcdDatabaseLock);\r
     }\r
 \r
   EfiReleaseLock (&mPcdDatabaseLock);\r

-  \r
+\r

   return Status;\r
 }\r
 \r
   return Status;\r
 }\r
 \r


@@ -1286,7 +1286,7 @@ ExGetWorker (
   IN CONST EFI_GUID         *Guid,\r
   IN UINTN                  ExTokenNumber,\r
   IN UINTN                  GetSize\r
   IN CONST EFI_GUID         *Guid,\r
   IN UINTN                  ExTokenNumber,\r
   IN UINTN                  GetSize\r

-  ) \r
+  )\r

 {\r
   return GetWorker(GetExPcdTokenNumber (Guid, (UINT32) ExTokenNumber), GetSize);\r
 }\r
 {\r
   return GetWorker(GetExPcdTokenNumber (Guid, (UINT32) ExTokenNumber), GetSize);\r
 }\r


@@ -1315,12 +1315,12 @@ ExSetValueWorker (
 \r
 /**\r
   Set value for a dynamic-ex PCD entry.\r
 \r
 /**\r
   Set value for a dynamic-ex PCD entry.\r

-  \r
-  This routine find the local token number according to dynamic-ex PCD's token \r
+\r
+  This routine find the local token number according to dynamic-ex PCD's token\r

   space guid and token number firstly, and invoke callback function if this PCD\r
   entry registered callback function. Finally, invoken general SetWorker to set\r
   PCD value.\r
   space guid and token number firstly, and invoke callback function if this PCD\r
   entry registered callback function. Finally, invoken general SetWorker to set\r
   PCD value.\r

-  \r
+\r

   @param ExTokenNumber   Dynamic-ex PCD token number.\r
   @param Guid            Token space guid for dynamic-ex PCD.\r
   @param Data            PCD value want to be set\r
   @param ExTokenNumber   Dynamic-ex PCD token number.\r
   @param Guid            Token space guid for dynamic-ex PCD.\r
   @param Data            PCD value want to be set\r


@@ -1341,7 +1341,7 @@ ExSetWorker (
   )\r
 {\r
   UINTN                   TokenNumber;\r
   )\r
 {\r
   UINTN                   TokenNumber;\r

-  \r
+\r

   TokenNumber = GetExPcdTokenNumber (Guid, (UINT32) ExTokenNumber);\r
 \r
   InvokeCallbackOnSet ((UINT32) ExTokenNumber, Guid, TokenNumber, Data, *SetSize);\r
   TokenNumber = GetExPcdTokenNumber (Guid, (UINT32) ExTokenNumber);\r
 \r
   InvokeCallbackOnSet ((UINT32) ExTokenNumber, Guid, TokenNumber, Data, *SetSize);\r


@@ -1431,9 +1431,9 @@ GetVariableSizeAndDataFromHiiPcd (
 /**\r
   Set value for HII-type PCD.\r
 \r
 /**\r
   Set value for HII-type PCD.\r
 \r

-  A HII-type PCD's value is stored in a variable. Setting/Getting the value of \r
+  A HII-type PCD's value is stored in a variable. Setting/Getting the value of\r

   HII-type PCD is to visit this variable.\r
   HII-type PCD is to visit this variable.\r

-  \r
+\r

   @param VariableGuid    Guid of variable which stored value of a HII-type PCD.\r
   @param VariableName    Unicode name of variable which stored value of a HII-type PCD.\r
   @param SetAttributes   Attributes bitmask to set for the variable.\r
   @param VariableGuid    Guid of variable which stored value of a HII-type PCD.\r
   @param VariableName    Unicode name of variable which stored value of a HII-type PCD.\r
   @param SetAttributes   Attributes bitmask to set for the variable.\r


@@ -1473,7 +1473,7 @@ SetHiiVariable (
     &Size,\r
     NULL\r
     );\r
     &Size,\r
     NULL\r
     );\r

-  \r
+\r

   if (Status == EFI_BUFFER_TOO_SMALL) {\r
     //\r
     // Patch new PCD's value to offset in given HII variable.\r
   if (Status == EFI_BUFFER_TOO_SMALL) {\r
     //\r
     // Patch new PCD's value to offset in given HII variable.\r


@@ -1493,7 +1493,7 @@ SetHiiVariable (
       &Size,\r
       Buffer\r
       );\r
       &Size,\r
       Buffer\r
       );\r

-    \r
+\r

     ASSERT_EFI_ERROR (Status);\r
 \r
     CopyMem ((UINT8 *)Buffer + Offset, Data, DataSize);\r
     ASSERT_EFI_ERROR (Status);\r
 \r
     CopyMem ((UINT8 *)Buffer + Offset, Data, DataSize);\r


@@ -1543,9 +1543,9 @@ SetHiiVariable (
               );\r
 \r
     FreePool (Buffer);\r
               );\r
 \r
     FreePool (Buffer);\r

-    return Status;    \r
+    return Status;\r

   }\r
   }\r

-  \r
+\r

   //\r
   // If we drop to here, the value is failed to be written in to variable area.\r
   //\r
   //\r
   // If we drop to here, the value is failed to be written in to variable area.\r
   //\r


@@ -1558,14 +1558,14 @@ SetHiiVariable (
   A dynamic-ex type PCD, developer must provide pair of token space guid: token number\r
   in DEC file. PCD database maintain a mapping table that translate pair of {token\r
   space guid: token number} to Token Number.\r
   A dynamic-ex type PCD, developer must provide pair of token space guid: token number\r
   in DEC file. PCD database maintain a mapping table that translate pair of {token\r
   space guid: token number} to Token Number.\r

-  \r
+\r

   @param Guid            Token space guid for dynamic-ex PCD entry.\r
   @param ExTokenNumber   Dynamic-ex PCD token number.\r
 \r
   @return Token Number for dynamic-ex PCD.\r
 \r
 **/\r
   @param Guid            Token space guid for dynamic-ex PCD entry.\r
   @param ExTokenNumber   Dynamic-ex PCD token number.\r
 \r
   @return Token Number for dynamic-ex PCD.\r
 \r
 **/\r

-UINTN           \r
+UINTN\r

 GetExPcdTokenNumber (\r
   IN CONST EFI_GUID             *Guid,\r
   IN UINT32                     ExTokenNumber\r
 GetExPcdTokenNumber (\r
   IN CONST EFI_GUID             *Guid,\r
   IN UINT32                     ExTokenNumber\r


@@ -1622,7 +1622,7 @@ GetExPcdTokenNumber (
 \r
 /**\r
   Wrapper function of getting index of PCD entry in size table.\r
 \r
 /**\r
   Wrapper function of getting index of PCD entry in size table.\r

-  \r
+\r

   @param LocalTokenNumberTableIdx Index of this PCD in local token number table.\r
   @param IsPeiDb                  If TRUE, the pcd entry is initialized in PEI phase,\r
                                   If FALSE, the pcd entry is initialized in DXE phase.\r
   @param LocalTokenNumberTableIdx Index of this PCD in local token number table.\r
   @param IsPeiDb                  If TRUE, the pcd entry is initialized in PEI phase,\r
                                   If FALSE, the pcd entry is initialized in DXE phase.\r


@@ -1639,7 +1639,7 @@ GetSizeTableIndex (
   UINTN  LocalTokenNumber;\r
   UINTN  Index;\r
   UINTN  SizeTableIdx;\r
   UINTN  LocalTokenNumber;\r
   UINTN  Index;\r
   UINTN  SizeTableIdx;\r

-  \r
+\r

   if (IsPeiDb) {\r
     LocalTokenNumberTable = (UINT32 *)((UINT8 *)mPcdDatabase.PeiDb + mPcdDatabase.PeiDb->LocalTokenNumberTableOffset);\r
   } else {\r
   if (IsPeiDb) {\r
     LocalTokenNumberTable = (UINT32 *)((UINT8 *)mPcdDatabase.PeiDb + mPcdDatabase.PeiDb->LocalTokenNumberTableOffset);\r
   } else {\r


@@ -1653,7 +1653,7 @@ GetSizeTableIndex (
 \r
     if ((LocalTokenNumber & PCD_DATUM_TYPE_ALL_SET) == PCD_DATUM_TYPE_POINTER) {\r
       //\r
 \r
     if ((LocalTokenNumber & PCD_DATUM_TYPE_ALL_SET) == PCD_DATUM_TYPE_POINTER) {\r
       //\r

-      // SizeTable only contain record for PCD_DATUM_TYPE_POINTER type \r
+      // SizeTable only contain record for PCD_DATUM_TYPE_POINTER type\r

       // PCD entry.\r
       //\r
       if ((LocalTokenNumber & PCD_TYPE_VPD) != 0) {\r
       // PCD entry.\r
       //\r
       if ((LocalTokenNumber & PCD_TYPE_VPD) != 0) {\r


@@ -1676,7 +1676,7 @@ GetSizeTableIndex (
 \r
   }\r
 \r
 \r
   }\r
 \r

-  return SizeTableIdx;  \r
+  return SizeTableIdx;\r

 }\r
 \r
 /**\r
 }\r
 \r
 /**\r


@@ -1701,7 +1701,7 @@ GetPtrTypeSize (
   UINT32      *LocalTokenNumberTable;\r
 \r
   // EBC compiler is very choosy. It may report warning about comparison\r
   UINT32      *LocalTokenNumberTable;\r
 \r
   // EBC compiler is very choosy. It may report warning about comparison\r

-  // between UINTN and 0 . So we add 1 in each size of the \r
+  // between UINTN and 0 . So we add 1 in each size of the\r

   // comparison.\r
   IsPeiDb = (BOOLEAN) (LocalTokenNumberTableIdx + 1 < mPeiLocalTokenCount + 1);\r
 \r
   // comparison.\r
   IsPeiDb = (BOOLEAN) (LocalTokenNumberTableIdx + 1 < mPeiLocalTokenCount + 1);\r
 \r


@@ -1718,12 +1718,12 @@ GetPtrTypeSize (
   LocalTokenNumber = LocalTokenNumberTable[LocalTokenNumberTableIdx];\r
 \r
   ASSERT ((LocalTokenNumber & PCD_DATUM_TYPE_ALL_SET) == PCD_DATUM_TYPE_POINTER);\r
   LocalTokenNumber = LocalTokenNumberTable[LocalTokenNumberTableIdx];\r
 \r
   ASSERT ((LocalTokenNumber & PCD_DATUM_TYPE_ALL_SET) == PCD_DATUM_TYPE_POINTER);\r

-  \r
+\r

   SizeTableIdx = GetSizeTableIndex (LocalTokenNumberTableIdx, IsPeiDb);\r
 \r
   *MaxSize = SizeTable[SizeTableIdx];\r
   //\r
   SizeTableIdx = GetSizeTableIndex (LocalTokenNumberTableIdx, IsPeiDb);\r
 \r
   *MaxSize = SizeTable[SizeTableIdx];\r
   //\r

-  // SizeTable only contain record for PCD_DATUM_TYPE_POINTER type \r
+  // SizeTable only contain record for PCD_DATUM_TYPE_POINTER type\r

   // PCD entry.\r
   //\r
   if ((LocalTokenNumber & PCD_TYPE_VPD) != 0) {\r
   // PCD entry.\r
   //\r
   if ((LocalTokenNumber & PCD_TYPE_VPD) != 0) {\r


@@ -1769,7 +1769,7 @@ SetPtrTypeSize (
 \r
   //\r
   // EBC compiler is very choosy. It may report warning about comparison\r
 \r
   //\r
   // EBC compiler is very choosy. It may report warning about comparison\r

-  // between UINTN and 0 . So we add 1 in each size of the \r
+  // between UINTN and 0 . So we add 1 in each size of the\r

   // comparison.\r
   //\r
   IsPeiDb = (BOOLEAN) (LocalTokenNumberTableIdx + 1 < mPeiLocalTokenCount + 1);\r
   // comparison.\r
   //\r
   IsPeiDb = (BOOLEAN) (LocalTokenNumberTableIdx + 1 < mPeiLocalTokenCount + 1);\r


@@ -1786,12 +1786,12 @@ SetPtrTypeSize (
   LocalTokenNumber = LocalTokenNumberTable[LocalTokenNumberTableIdx];\r
 \r
   ASSERT ((LocalTokenNumber & PCD_DATUM_TYPE_ALL_SET) == PCD_DATUM_TYPE_POINTER);\r
   LocalTokenNumber = LocalTokenNumberTable[LocalTokenNumberTableIdx];\r
 \r
   ASSERT ((LocalTokenNumber & PCD_DATUM_TYPE_ALL_SET) == PCD_DATUM_TYPE_POINTER);\r

-  \r
+\r

   SizeTableIdx = GetSizeTableIndex (LocalTokenNumberTableIdx, IsPeiDb);\r
 \r
   MaxSize = SizeTable[SizeTableIdx];\r
   //\r
   SizeTableIdx = GetSizeTableIndex (LocalTokenNumberTableIdx, IsPeiDb);\r
 \r
   MaxSize = SizeTable[SizeTableIdx];\r
   //\r

-  // SizeTable only contain record for PCD_DATUM_TYPE_POINTER type \r
+  // SizeTable only contain record for PCD_DATUM_TYPE_POINTER type\r

   // PCD entry.\r
   //\r
   if ((LocalTokenNumber & PCD_TYPE_VPD) != 0) {\r
   // PCD entry.\r
   //\r
   if ((LocalTokenNumber & PCD_TYPE_VPD) != 0) {\r


@@ -1805,8 +1805,8 @@ SetPtrTypeSize (
       (*CurrentSize == MAX_ADDRESS)) {\r
        *CurrentSize = MaxSize;\r
        return FALSE;\r
       (*CurrentSize == MAX_ADDRESS)) {\r
        *CurrentSize = MaxSize;\r
        return FALSE;\r

-    } \r
-    \r
+    }\r
+\r

     //\r
     // We have only two entry for Non-Sku enabled PCD entry:\r
     // 1) MAX SIZE\r
     //\r
     // We have only two entry for Non-Sku enabled PCD entry:\r
     // 1) MAX SIZE\r


@@ -1833,7 +1833,7 @@ VariableLockDynamicHiiPcd (
 {\r
   EFI_STATUS                Status;\r
   PCD_DATABASE_INIT         *Database;\r
 {\r
   EFI_STATUS                Status;\r
   PCD_DATABASE_INIT         *Database;\r

-  UINT32                    LocalTokenCount; \r
+  UINT32                    LocalTokenCount;\r

   UINTN                     TokenNumber;\r
   UINT32                    LocalTokenNumber;\r
   UINTN                     Offset;\r
   UINTN                     TokenNumber;\r
   UINT32                    LocalTokenNumber;\r
   UINTN                     Offset;\r

diff --git a/MdeModulePkg/Universal/PCD/Dxe/Service.h b/MdeModulePkg/Universal/PCD/Dxe/Service.h
index cd0e227705166429f79dd8d1b8a35456d96ad7ad..ddd5fa471ecf3a7215e30ad9b79bd4ab9916121d 100644 (file)
--- a/MdeModulePkg/Universal/PCD/Dxe/Service.h
+++ b/MdeModulePkg/Universal/PCD/Dxe/Service.h
@@ -1,7 +1,7 @@
 /** @file\r
 Private functions used by PCD DXE driver.\r
 \r
 /** @file\r
 Private functions used by PCD DXE driver.\r
 \r

-Copyright (c) 2006 - 2016, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r

 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r


@@ -109,21 +109,21 @@ DxeGetPcdInfoGetSku (
 /**\r
   Sets the SKU value for subsequent calls to set or get PCD token values.\r
 \r
 /**\r
   Sets the SKU value for subsequent calls to set or get PCD token values.\r
 \r

-  SetSku() sets the SKU Id to be used for subsequent calls to set or get PCD values. \r
+  SetSku() sets the SKU Id to be used for subsequent calls to set or get PCD values.\r

   SetSku() is normally called only once by the system.\r
 \r
   SetSku() is normally called only once by the system.\r
 \r

-  For each item (token), the database can hold a single value that applies to all SKUs, \r
-  or multiple values, where each value is associated with a specific SKU Id. Items with multiple, \r
-  SKU-specific values are called SKU enabled. \r
-  \r
-  The SKU Id of zero is reserved as a default. The valid SkuId range is 1 to 255.  \r
-  For tokens that are not SKU enabled, the system ignores any set SKU Id and works with the \r
-  single value for that token. For SKU-enabled tokens, the system will use the SKU Id set by the \r
-  last call to SetSku(). If no SKU Id is set or the currently set SKU Id isn't valid for the specified token, \r
-  the system uses the default SKU Id. If the system attempts to use the default SKU Id and no value has been \r
+  For each item (token), the database can hold a single value that applies to all SKUs,\r
+  or multiple values, where each value is associated with a specific SKU Id. Items with multiple,\r
+  SKU-specific values are called SKU enabled.\r
+\r
+  The SKU Id of zero is reserved as a default. The valid SkuId range is 1 to 255.\r
+  For tokens that are not SKU enabled, the system ignores any set SKU Id and works with the\r
+  single value for that token. For SKU-enabled tokens, the system will use the SKU Id set by the\r
+  last call to SetSku(). If no SKU Id is set or the currently set SKU Id isn't valid for the specified token,\r
+  the system uses the default SKU Id. If the system attempts to use the default SKU Id and no value has been\r

   set for that Id, the results are unpredictable.\r
 \r
   set for that Id, the results are unpredictable.\r
 \r

-  @param[in]  SkuId The SKU value that will be used when the PCD service will retrieve and \r
+  @param[in]  SkuId The SKU value that will be used when the PCD service will retrieve and\r

               set values associated with a PCD token.\r
 \r
 **/\r
               set values associated with a PCD token.\r
 \r
 **/\r


@@ -136,13 +136,13 @@ DxePcdSetSku (
 /**\r
   Retrieves an 8-bit value for a given PCD token.\r
 \r
 /**\r
   Retrieves an 8-bit value for a given PCD token.\r
 \r

-  Retrieves the current byte-sized value for a PCD token number.  \r
+  Retrieves the current byte-sized value for a PCD token number.\r

   If the TokenNumber is invalid, the results are unpredictable.\r
   If the TokenNumber is invalid, the results are unpredictable.\r

-  \r
-  @param[in]  TokenNumber The PCD token number. \r
+\r
+  @param[in]  TokenNumber The PCD token number.\r

 \r
   @return The UINT8 value.\r
 \r
   @return The UINT8 value.\r

-  \r
+\r

 **/\r
 UINT8\r
 EFIAPI\r
 **/\r
 UINT8\r
 EFIAPI\r


@@ -153,13 +153,13 @@ DxePcdGet8 (
 /**\r
   Retrieves an 16-bit value for a given PCD token.\r
 \r
 /**\r
   Retrieves an 16-bit value for a given PCD token.\r
 \r

-  Retrieves the current 16-bits value for a PCD token number.  \r
+  Retrieves the current 16-bits value for a PCD token number.\r

   If the TokenNumber is invalid, the results are unpredictable.\r
   If the TokenNumber is invalid, the results are unpredictable.\r

-  \r
-  @param[in]  TokenNumber The PCD token number. \r
+\r
+  @param[in]  TokenNumber The PCD token number.\r

 \r
   @return The UINT16 value.\r
 \r
   @return The UINT16 value.\r

-  \r
+\r

 **/\r
 UINT16\r
 EFIAPI\r
 **/\r
 UINT16\r
 EFIAPI\r


@@ -170,13 +170,13 @@ DxePcdGet16 (
 /**\r
   Retrieves an 32-bit value for a given PCD token.\r
 \r
 /**\r
   Retrieves an 32-bit value for a given PCD token.\r
 \r

-  Retrieves the current 32-bits value for a PCD token number.  \r
+  Retrieves the current 32-bits value for a PCD token number.\r

   If the TokenNumber is invalid, the results are unpredictable.\r
   If the TokenNumber is invalid, the results are unpredictable.\r

-  \r
-  @param[in]  TokenNumber The PCD token number. \r
+\r
+  @param[in]  TokenNumber The PCD token number.\r

 \r
   @return The UINT32 value.\r
 \r
   @return The UINT32 value.\r

-  \r
+\r

 **/\r
 UINT32\r
 EFIAPI\r
 **/\r
 UINT32\r
 EFIAPI\r


@@ -187,13 +187,13 @@ DxePcdGet32 (
 /**\r
   Retrieves an 64-bit value for a given PCD token.\r
 \r
 /**\r
   Retrieves an 64-bit value for a given PCD token.\r
 \r

-  Retrieves the current 64-bits value for a PCD token number.  \r
+  Retrieves the current 64-bits value for a PCD token number.\r

   If the TokenNumber is invalid, the results are unpredictable.\r
   If the TokenNumber is invalid, the results are unpredictable.\r

-  \r
-  @param[in]  TokenNumber The PCD token number. \r
+\r
+  @param[in]  TokenNumber The PCD token number.\r

 \r
   @return The UINT64 value.\r
 \r
   @return The UINT64 value.\r

-  \r
+\r

 **/\r
 UINT64\r
 EFIAPI\r
 **/\r
 UINT64\r
 EFIAPI\r


@@ -204,15 +204,15 @@ DxePcdGet64 (
 /**\r
   Retrieves a pointer to a value for a given PCD token.\r
 \r
 /**\r
   Retrieves a pointer to a value for a given PCD token.\r
 \r

-  Retrieves the current pointer to the buffer for a PCD token number.  \r
-  Do not make any assumptions about the alignment of the pointer that \r
-  is returned by this function call.  If the TokenNumber is invalid, \r
+  Retrieves the current pointer to the buffer for a PCD token number.\r
+  Do not make any assumptions about the alignment of the pointer that\r
+  is returned by this function call.  If the TokenNumber is invalid,\r

   the results are unpredictable.\r
 \r
   the results are unpredictable.\r
 \r

-  @param[in]  TokenNumber The PCD token number. \r
+  @param[in]  TokenNumber The PCD token number.\r

 \r
   @return The pointer to the buffer to be retrieved.\r
 \r
   @return The pointer to the buffer to be retrieved.\r

-  \r
+\r

 **/\r
 VOID *\r
 EFIAPI\r
 **/\r
 VOID *\r
 EFIAPI\r


@@ -223,15 +223,15 @@ DxePcdGetPtr (
 /**\r
   Retrieves a Boolean value for a given PCD token.\r
 \r
 /**\r
   Retrieves a Boolean value for a given PCD token.\r
 \r

-  Retrieves the current boolean value for a PCD token number.  \r
-  Do not make any assumptions about the alignment of the pointer that \r
-  is returned by this function call.  If the TokenNumber is invalid, \r
+  Retrieves the current boolean value for a PCD token number.\r
+  Do not make any assumptions about the alignment of the pointer that\r
+  is returned by this function call.  If the TokenNumber is invalid,\r

   the results are unpredictable.\r
 \r
   the results are unpredictable.\r
 \r

-  @param[in]  TokenNumber The PCD token number. \r
+  @param[in]  TokenNumber The PCD token number.\r

 \r
   @return The Boolean value.\r
 \r
   @return The Boolean value.\r

-  \r
+\r

 **/\r
 BOOLEAN\r
 EFIAPI\r
 **/\r
 BOOLEAN\r
 EFIAPI\r


@@ -242,13 +242,13 @@ DxePcdGetBool (
 /**\r
   Retrieves the size of the value for a given PCD token.\r
 \r
 /**\r
   Retrieves the size of the value for a given PCD token.\r
 \r

-  Retrieves the current size of a particular PCD token.  \r
+  Retrieves the current size of a particular PCD token.\r

   If the TokenNumber is invalid, the results are unpredictable.\r
 \r
   If the TokenNumber is invalid, the results are unpredictable.\r
 \r

-  @param[in]  TokenNumber The PCD token number. \r
+  @param[in]  TokenNumber The PCD token number.\r

 \r
   @return The size of the value for the PCD token.\r
 \r
   @return The size of the value for the PCD token.\r

-  \r
+\r

 **/\r
 UINTN\r
 EFIAPI\r
 **/\r
 UINTN\r
 EFIAPI\r


@@ -259,16 +259,16 @@ DxePcdGetSize (
 /**\r
   Retrieves an 8-bit value for a given PCD token.\r
 \r
 /**\r
   Retrieves an 8-bit value for a given PCD token.\r
 \r

-  Retrieves the 8-bit value of a particular PCD token.  \r
+  Retrieves the 8-bit value of a particular PCD token.\r

   If the TokenNumber is invalid or the token space\r
   If the TokenNumber is invalid or the token space\r

-  specified by Guid does not exist, the results are \r
+  specified by Guid does not exist, the results are\r

   unpredictable.\r
 \r
   @param[in]  Guid The token space for the token number.\r
   unpredictable.\r
 \r
   @param[in]  Guid The token space for the token number.\r

-  @param[in]  TokenNumber The PCD token number. \r
+  @param[in]  TokenNumber The PCD token number.\r

 \r
   @return The size 8-bit value for the PCD token.\r
 \r
   @return The size 8-bit value for the PCD token.\r

-  \r
+\r

 **/\r
 UINT8\r
 EFIAPI\r
 **/\r
 UINT8\r
 EFIAPI\r


@@ -280,16 +280,16 @@ DxePcdGet8Ex (
 /**\r
   Retrieves an 16-bit value for a given PCD token.\r
 \r
 /**\r
   Retrieves an 16-bit value for a given PCD token.\r
 \r

-  Retrieves the 16-bit value of a particular PCD token.  \r
+  Retrieves the 16-bit value of a particular PCD token.\r

   If the TokenNumber is invalid or the token space\r
   If the TokenNumber is invalid or the token space\r

-  specified by Guid does not exist, the results are \r
+  specified by Guid does not exist, the results are\r

   unpredictable.\r
 \r
   @param[in]  Guid The token space for the token number.\r
   unpredictable.\r
 \r
   @param[in]  Guid The token space for the token number.\r

-  @param[in]  TokenNumber The PCD token number. \r
+  @param[in]  TokenNumber The PCD token number.\r

 \r
   @return The size 16-bit value for the PCD token.\r
 \r
   @return The size 16-bit value for the PCD token.\r

-  \r
+\r

 **/\r
 UINT16\r
 EFIAPI\r
 **/\r
 UINT16\r
 EFIAPI\r


@@ -301,16 +301,16 @@ DxePcdGet16Ex (
 /**\r
   Retrieves an 32-bit value for a given PCD token.\r
 \r
 /**\r
   Retrieves an 32-bit value for a given PCD token.\r
 \r

-  Retrieves the 32-bit value of a particular PCD token.  \r
+  Retrieves the 32-bit value of a particular PCD token.\r

   If the TokenNumber is invalid or the token space\r
   If the TokenNumber is invalid or the token space\r

-  specified by Guid does not exist, the results are \r
+  specified by Guid does not exist, the results are\r

   unpredictable.\r
 \r
   @param[in]  Guid The token space for the token number.\r
   unpredictable.\r
 \r
   @param[in]  Guid The token space for the token number.\r

-  @param[in]  TokenNumber The PCD token number. \r
+  @param[in]  TokenNumber The PCD token number.\r

 \r
   @return The size 32-bit value for the PCD token.\r
 \r
   @return The size 32-bit value for the PCD token.\r

-  \r
+\r

 **/\r
 UINT32\r
 EFIAPI\r
 **/\r
 UINT32\r
 EFIAPI\r


@@ -322,16 +322,16 @@ DxePcdGet32Ex (
 /**\r
   Retrieves an 64-bit value for a given PCD token.\r
 \r
 /**\r
   Retrieves an 64-bit value for a given PCD token.\r
 \r

-  Retrieves the 64-bit value of a particular PCD token.  \r
+  Retrieves the 64-bit value of a particular PCD token.\r

   If the TokenNumber is invalid or the token space\r
   If the TokenNumber is invalid or the token space\r

-  specified by Guid does not exist, the results are \r
+  specified by Guid does not exist, the results are\r

   unpredictable.\r
 \r
   @param[in]  Guid The token space for the token number.\r
   unpredictable.\r
 \r
   @param[in]  Guid The token space for the token number.\r

-  @param[in]  TokenNumber The PCD token number. \r
+  @param[in]  TokenNumber The PCD token number.\r

 \r
   @return The size 64-bit value for the PCD token.\r
 \r
   @return The size 64-bit value for the PCD token.\r

-  \r
+\r

 **/\r
 UINT64\r
 EFIAPI\r
 **/\r
 UINT64\r
 EFIAPI\r


@@ -343,16 +343,16 @@ DxePcdGet64Ex (
 /**\r
   Retrieves a pointer to a value for a given PCD token.\r
 \r
 /**\r
   Retrieves a pointer to a value for a given PCD token.\r
 \r

-  Retrieves the current pointer to the buffer for a PCD token number.  \r
-  Do not make any assumptions about the alignment of the pointer that \r
-  is returned by this function call.  If the TokenNumber is invalid, \r
+  Retrieves the current pointer to the buffer for a PCD token number.\r
+  Do not make any assumptions about the alignment of the pointer that\r
+  is returned by this function call.  If the TokenNumber is invalid,\r

   the results are unpredictable.\r
 \r
   @param[in]  Guid The token space for the token number.\r
   the results are unpredictable.\r
 \r
   @param[in]  Guid The token space for the token number.\r

-  @param[in]  TokenNumber The PCD token number. \r
+  @param[in]  TokenNumber The PCD token number.\r

 \r
   @return The pointer to the buffer to be retrieved.\r
 \r
   @return The pointer to the buffer to be retrieved.\r

-  \r
+\r

 **/\r
 VOID *\r
 EFIAPI\r
 **/\r
 VOID *\r
 EFIAPI\r


@@ -364,16 +364,16 @@ DxePcdGetPtrEx (
 /**\r
   Retrieves an Boolean value for a given PCD token.\r
 \r
 /**\r
   Retrieves an Boolean value for a given PCD token.\r
 \r

-  Retrieves the Boolean value of a particular PCD token.  \r
+  Retrieves the Boolean value of a particular PCD token.\r

   If the TokenNumber is invalid or the token space\r
   If the TokenNumber is invalid or the token space\r

-  specified by Guid does not exist, the results are \r
+  specified by Guid does not exist, the results are\r

   unpredictable.\r
 \r
   @param[in]  Guid The token space for the token number.\r
   unpredictable.\r
 \r
   @param[in]  Guid The token space for the token number.\r

-  @param[in]  TokenNumber The PCD token number. \r
+  @param[in]  TokenNumber The PCD token number.\r

 \r
   @return The size Boolean value for the PCD token.\r
 \r
   @return The size Boolean value for the PCD token.\r

-  \r
+\r

 **/\r
 BOOLEAN\r
 EFIAPI\r
 **/\r
 BOOLEAN\r
 EFIAPI\r


@@ -385,14 +385,14 @@ DxePcdGetBoolEx (
 /**\r
   Retrieves the size of the value for a given PCD token.\r
 \r
 /**\r
   Retrieves the size of the value for a given PCD token.\r
 \r

-  Retrieves the current size of a particular PCD token.  \r
+  Retrieves the current size of a particular PCD token.\r

   If the TokenNumber is invalid, the results are unpredictable.\r
 \r
   @param[in]  Guid The token space for the token number.\r
   If the TokenNumber is invalid, the results are unpredictable.\r
 \r
   @param[in]  Guid The token space for the token number.\r

-  @param[in]  TokenNumber The PCD token number. \r
+  @param[in]  TokenNumber The PCD token number.\r

 \r
   @return The size of the value for the PCD token.\r
 \r
   @return The size of the value for the PCD token.\r

-  \r
+\r

 **/\r
 UINTN\r
 EFIAPI\r
 **/\r
 UINTN\r
 EFIAPI\r


@@ -404,19 +404,19 @@ DxePcdGetSizeEx (
 /**\r
   Sets an 8-bit value for a given PCD token.\r
 \r
 /**\r
   Sets an 8-bit value for a given PCD token.\r
 \r

-  When the PCD service sets a value, it will check to ensure that the \r
-  size of the value being set is compatible with the Token's existing definition.  \r
+  When the PCD service sets a value, it will check to ensure that the\r
+  size of the value being set is compatible with the Token's existing definition.\r

   If it is not, an error will be returned.\r
 \r
   If it is not, an error will be returned.\r
 \r

-  @param[in]  TokenNumber The PCD token number. \r
+  @param[in]  TokenNumber The PCD token number.\r

   @param[in]  Value The value to set for the PCD token.\r
 \r
   @retval EFI_SUCCESS  Procedure returned successfully.\r
   @param[in]  Value The value to set for the PCD token.\r
 \r
   @retval EFI_SUCCESS  Procedure returned successfully.\r

-  @retval EFI_INVALID_PARAMETER The PCD service determined that the size of the data \r
-                                  being set was incompatible with a call to this function.  \r
+  @retval EFI_INVALID_PARAMETER The PCD service determined that the size of the data\r
+                                  being set was incompatible with a call to this function.\r

                                   Use GetSize() to retrieve the size of the target data.\r
   @retval EFI_NOT_FOUND The PCD service could not find the requested token number.\r
                                   Use GetSize() to retrieve the size of the target data.\r
   @retval EFI_NOT_FOUND The PCD service could not find the requested token number.\r

-  \r
+\r

 **/\r
 EFI_STATUS\r
 EFIAPI\r
 **/\r
 EFI_STATUS\r
 EFIAPI\r


@@ -428,19 +428,19 @@ DxePcdSet8 (
 /**\r
   Sets an 16-bit value for a given PCD token.\r
 \r
 /**\r
   Sets an 16-bit value for a given PCD token.\r
 \r

-  When the PCD service sets a value, it will check to ensure that the \r
-  size of the value being set is compatible with the Token's existing definition.  \r
+  When the PCD service sets a value, it will check to ensure that the\r
+  size of the value being set is compatible with the Token's existing definition.\r

   If it is not, an error will be returned.\r
 \r
   If it is not, an error will be returned.\r
 \r

-  @param[in]  TokenNumber The PCD token number. \r
+  @param[in]  TokenNumber The PCD token number.\r

   @param[in]  Value The value to set for the PCD token.\r
 \r
   @retval EFI_SUCCESS  Procedure returned successfully.\r
   @param[in]  Value The value to set for the PCD token.\r
 \r
   @retval EFI_SUCCESS  Procedure returned successfully.\r

-  @retval EFI_INVALID_PARAMETER The PCD service determined that the size of the data \r
-                                  being set was incompatible with a call to this function.  \r
+  @retval EFI_INVALID_PARAMETER The PCD service determined that the size of the data\r
+                                  being set was incompatible with a call to this function.\r

                                   Use GetSize() to retrieve the size of the target data.\r
   @retval EFI_NOT_FOUND The PCD service could not find the requested token number.\r
                                   Use GetSize() to retrieve the size of the target data.\r
   @retval EFI_NOT_FOUND The PCD service could not find the requested token number.\r

-  \r
+\r

 **/\r
 EFI_STATUS\r
 EFIAPI\r
 **/\r
 EFI_STATUS\r
 EFIAPI\r


@@ -452,19 +452,19 @@ DxePcdSet16 (
 /**\r
   Sets an 32-bit value for a given PCD token.\r
 \r
 /**\r
   Sets an 32-bit value for a given PCD token.\r
 \r

-  When the PCD service sets a value, it will check to ensure that the \r
-  size of the value being set is compatible with the Token's existing definition.  \r
+  When the PCD service sets a value, it will check to ensure that the\r
+  size of the value being set is compatible with the Token's existing definition.\r

   If it is not, an error will be returned.\r
 \r
   If it is not, an error will be returned.\r
 \r

-  @param[in]  TokenNumber The PCD token number. \r
+  @param[in]  TokenNumber The PCD token number.\r

   @param[in]  Value The value to set for the PCD token.\r
 \r
   @retval EFI_SUCCESS  Procedure returned successfully.\r
   @param[in]  Value The value to set for the PCD token.\r
 \r
   @retval EFI_SUCCESS  Procedure returned successfully.\r

-  @retval EFI_INVALID_PARAMETER The PCD service determined that the size of the data \r
-                                  being set was incompatible with a call to this function.  \r
+  @retval EFI_INVALID_PARAMETER The PCD service determined that the size of the data\r
+                                  being set was incompatible with a call to this function.\r

                                   Use GetSize() to retrieve the size of the target data.\r
   @retval EFI_NOT_FOUND The PCD service could not find the requested token number.\r
                                   Use GetSize() to retrieve the size of the target data.\r
   @retval EFI_NOT_FOUND The PCD service could not find the requested token number.\r

-  \r
+\r

 **/\r
 EFI_STATUS\r
 EFIAPI\r
 **/\r
 EFI_STATUS\r
 EFIAPI\r


@@ -476,19 +476,19 @@ DxePcdSet32 (
 /**\r
   Sets an 64-bit value for a given PCD token.\r
 \r
 /**\r
   Sets an 64-bit value for a given PCD token.\r
 \r

-  When the PCD service sets a value, it will check to ensure that the \r
-  size of the value being set is compatible with the Token's existing definition.  \r
+  When the PCD service sets a value, it will check to ensure that the\r
+  size of the value being set is compatible with the Token's existing definition.\r

   If it is not, an error will be returned.\r
 \r
   If it is not, an error will be returned.\r
 \r

-  @param[in]  TokenNumber The PCD token number. \r
+  @param[in]  TokenNumber The PCD token number.\r

   @param[in]  Value The value to set for the PCD token.\r
 \r
   @retval EFI_SUCCESS  Procedure returned successfully.\r
   @param[in]  Value The value to set for the PCD token.\r
 \r
   @retval EFI_SUCCESS  Procedure returned successfully.\r

-  @retval EFI_INVALID_PARAMETER The PCD service determined that the size of the data \r
-                                  being set was incompatible with a call to this function.  \r
+  @retval EFI_INVALID_PARAMETER The PCD service determined that the size of the data\r
+                                  being set was incompatible with a call to this function.\r

                                   Use GetSize() to retrieve the size of the target data.\r
   @retval EFI_NOT_FOUND The PCD service could not find the requested token number.\r
                                   Use GetSize() to retrieve the size of the target data.\r
   @retval EFI_NOT_FOUND The PCD service could not find the requested token number.\r

-  \r
+\r

 **/\r
 EFI_STATUS\r
 EFIAPI\r
 **/\r
 EFI_STATUS\r
 EFIAPI\r


@@ -501,23 +501,23 @@ DxePcdSet64 (
 /**\r
   Sets a value of a specified size for a given PCD token.\r
 \r
 /**\r
   Sets a value of a specified size for a given PCD token.\r
 \r

-  When the PCD service sets a value, it will check to ensure that the \r
-  size of the value being set is compatible with the Token's existing definition.  \r
+  When the PCD service sets a value, it will check to ensure that the\r
+  size of the value being set is compatible with the Token's existing definition.\r

   If it is not, an error will be returned.\r
 \r
   If it is not, an error will be returned.\r
 \r

-  @param[in]  TokenNumber The PCD token number. \r
-  @param[in, out] SizeOfBuffer A pointer to the length of the value being set for the PCD token.  \r
-                              On input, if the SizeOfValue is greater than the maximum size supported \r
-                              for this TokenNumber then the output value of SizeOfValue will reflect \r
+  @param[in]  TokenNumber The PCD token number.\r
+  @param[in, out] SizeOfBuffer A pointer to the length of the value being set for the PCD token.\r
+                              On input, if the SizeOfValue is greater than the maximum size supported\r
+                              for this TokenNumber then the output value of SizeOfValue will reflect\r

                               the maximum size supported for this TokenNumber.\r
   @param[in]  Buffer The buffer to set for the PCD token.\r
 \r
   @retval EFI_SUCCESS  Procedure returned successfully.\r
                               the maximum size supported for this TokenNumber.\r
   @param[in]  Buffer The buffer to set for the PCD token.\r
 \r
   @retval EFI_SUCCESS  Procedure returned successfully.\r

-  @retval EFI_INVALID_PARAMETER The PCD service determined that the size of the data \r
-                                  being set was incompatible with a call to this function.  \r
+  @retval EFI_INVALID_PARAMETER The PCD service determined that the size of the data\r
+                                  being set was incompatible with a call to this function.\r

                                   Use GetSize() to retrieve the size of the target data.\r
   @retval EFI_NOT_FOUND The PCD service could not find the requested token number.\r
                                   Use GetSize() to retrieve the size of the target data.\r
   @retval EFI_NOT_FOUND The PCD service could not find the requested token number.\r

-  \r
+\r

 **/\r
 EFI_STATUS\r
 EFIAPI\r
 **/\r
 EFI_STATUS\r
 EFIAPI\r


@@ -530,19 +530,19 @@ DxePcdSetPtr (
 /**\r
   Sets an Boolean value for a given PCD token.\r
 \r
 /**\r
   Sets an Boolean value for a given PCD token.\r
 \r

-  When the PCD service sets a value, it will check to ensure that the \r
-  size of the value being set is compatible with the Token's existing definition.  \r
+  When the PCD service sets a value, it will check to ensure that the\r
+  size of the value being set is compatible with the Token's existing definition.\r

   If it is not, an error will be returned.\r
 \r
   If it is not, an error will be returned.\r
 \r

-  @param[in]  TokenNumber The PCD token number. \r
+  @param[in]  TokenNumber The PCD token number.\r

   @param[in]  Value The value to set for the PCD token.\r
 \r
   @retval EFI_SUCCESS  Procedure returned successfully.\r
   @param[in]  Value The value to set for the PCD token.\r
 \r
   @retval EFI_SUCCESS  Procedure returned successfully.\r

-  @retval EFI_INVALID_PARAMETER The PCD service determined that the size of the data \r
-                                  being set was incompatible with a call to this function.  \r
+  @retval EFI_INVALID_PARAMETER The PCD service determined that the size of the data\r
+                                  being set was incompatible with a call to this function.\r

                                   Use GetSize() to retrieve the size of the target data.\r
   @retval EFI_NOT_FOUND The PCD service could not find the requested token number.\r
                                   Use GetSize() to retrieve the size of the target data.\r
   @retval EFI_NOT_FOUND The PCD service could not find the requested token number.\r

-  \r
+\r

 **/\r
 EFI_STATUS\r
 EFIAPI\r
 **/\r
 EFI_STATUS\r
 EFIAPI\r


@@ -555,20 +555,20 @@ DxePcdSetBool (
 /**\r
   Sets an 8-bit value for a given PCD token.\r
 \r
 /**\r
   Sets an 8-bit value for a given PCD token.\r
 \r

-  When the PCD service sets a value, it will check to ensure that the \r
-  size of the value being set is compatible with the Token's existing definition.  \r
+  When the PCD service sets a value, it will check to ensure that the\r
+  size of the value being set is compatible with the Token's existing definition.\r

   If it is not, an error will be returned.\r
 \r
   @param[in]  Guid The 128-bit unique value that designates the namespace from which to extract the value.\r
   If it is not, an error will be returned.\r
 \r
   @param[in]  Guid The 128-bit unique value that designates the namespace from which to extract the value.\r

-  @param[in]  TokenNumber The PCD token number. \r
+  @param[in]  TokenNumber The PCD token number.\r

   @param[in]  Value The value to set for the PCD token.\r
 \r
   @retval EFI_SUCCESS  Procedure returned successfully.\r
   @param[in]  Value The value to set for the PCD token.\r
 \r
   @retval EFI_SUCCESS  Procedure returned successfully.\r

-  @retval EFI_INVALID_PARAMETER The PCD service determined that the size of the data \r
-                                  being set was incompatible with a call to this function.  \r
+  @retval EFI_INVALID_PARAMETER The PCD service determined that the size of the data\r
+                                  being set was incompatible with a call to this function.\r

                                   Use GetSize() to retrieve the size of the target data.\r
   @retval EFI_NOT_FOUND The PCD service could not find the requested token number.\r
                                   Use GetSize() to retrieve the size of the target data.\r
   @retval EFI_NOT_FOUND The PCD service could not find the requested token number.\r

-  \r
+\r

 **/\r
 EFI_STATUS\r
 EFIAPI\r
 **/\r
 EFI_STATUS\r
 EFIAPI\r


@@ -581,20 +581,20 @@ DxePcdSet8Ex (
 /**\r
   Sets an 16-bit value for a given PCD token.\r
 \r
 /**\r
   Sets an 16-bit value for a given PCD token.\r
 \r

-  When the PCD service sets a value, it will check to ensure that the \r
-  size of the value being set is compatible with the Token's existing definition.  \r
+  When the PCD service sets a value, it will check to ensure that the\r
+  size of the value being set is compatible with the Token's existing definition.\r

   If it is not, an error will be returned.\r
 \r
   @param[in]  Guid The 128-bit unique value that designates the namespace from which to extract the value.\r
   If it is not, an error will be returned.\r
 \r
   @param[in]  Guid The 128-bit unique value that designates the namespace from which to extract the value.\r

-  @param[in]  TokenNumber The PCD token number. \r
+  @param[in]  TokenNumber The PCD token number.\r

   @param[in]  Value The value to set for the PCD token.\r
 \r
   @retval EFI_SUCCESS  Procedure returned successfully.\r
   @param[in]  Value The value to set for the PCD token.\r
 \r
   @retval EFI_SUCCESS  Procedure returned successfully.\r

-  @retval EFI_INVALID_PARAMETER The PCD service determined that the size of the data \r
-                                  being set was incompatible with a call to this function.  \r
+  @retval EFI_INVALID_PARAMETER The PCD service determined that the size of the data\r
+                                  being set was incompatible with a call to this function.\r

                                   Use GetSize() to retrieve the size of the target data.\r
   @retval EFI_NOT_FOUND The PCD service could not find the requested token number.\r
                                   Use GetSize() to retrieve the size of the target data.\r
   @retval EFI_NOT_FOUND The PCD service could not find the requested token number.\r

-  \r
+\r

 **/\r
 EFI_STATUS\r
 EFIAPI\r
 **/\r
 EFI_STATUS\r
 EFIAPI\r


@@ -607,20 +607,20 @@ DxePcdSet16Ex (
 /**\r
   Sets an 32-bit value for a given PCD token.\r
 \r
 /**\r
   Sets an 32-bit value for a given PCD token.\r
 \r

-  When the PCD service sets a value, it will check to ensure that the \r
-  size of the value being set is compatible with the Token's existing definition.  \r
+  When the PCD service sets a value, it will check to ensure that the\r
+  size of the value being set is compatible with the Token's existing definition.\r

   If it is not, an error will be returned.\r
 \r
   @param[in]  Guid The 128-bit unique value that designates the namespace from which to extract the value.\r
   If it is not, an error will be returned.\r
 \r
   @param[in]  Guid The 128-bit unique value that designates the namespace from which to extract the value.\r

-  @param[in]  TokenNumber The PCD token number. \r
+  @param[in]  TokenNumber The PCD token number.\r

   @param[in]  Value The value to set for the PCD token.\r
 \r
   @retval EFI_SUCCESS  Procedure returned successfully.\r
   @param[in]  Value The value to set for the PCD token.\r
 \r
   @retval EFI_SUCCESS  Procedure returned successfully.\r

-  @retval EFI_INVALID_PARAMETER The PCD service determined that the size of the data \r
-                                  being set was incompatible with a call to this function.  \r
+  @retval EFI_INVALID_PARAMETER The PCD service determined that the size of the data\r
+                                  being set was incompatible with a call to this function.\r

                                   Use GetSize() to retrieve the size of the target data.\r
   @retval EFI_NOT_FOUND The PCD service could not find the requested token number.\r
                                   Use GetSize() to retrieve the size of the target data.\r
   @retval EFI_NOT_FOUND The PCD service could not find the requested token number.\r

-  \r
+\r

 **/\r
 EFI_STATUS\r
 EFIAPI\r
 **/\r
 EFI_STATUS\r
 EFIAPI\r


@@ -633,20 +633,20 @@ DxePcdSet32Ex (
 /**\r
   Sets an 64-bit value for a given PCD token.\r
 \r
 /**\r
   Sets an 64-bit value for a given PCD token.\r
 \r

-  When the PCD service sets a value, it will check to ensure that the \r
-  size of the value being set is compatible with the Token's existing definition.  \r
+  When the PCD service sets a value, it will check to ensure that the\r
+  size of the value being set is compatible with the Token's existing definition.\r

   If it is not, an error will be returned.\r
 \r
   @param[in]  Guid The 128-bit unique value that designates the namespace from which to extract the value.\r
   If it is not, an error will be returned.\r
 \r
   @param[in]  Guid The 128-bit unique value that designates the namespace from which to extract the value.\r

-  @param[in]  TokenNumber The PCD token number. \r
+  @param[in]  TokenNumber The PCD token number.\r

   @param[in]  Value The value to set for the PCD token.\r
 \r
   @retval EFI_SUCCESS  Procedure returned successfully.\r
   @param[in]  Value The value to set for the PCD token.\r
 \r
   @retval EFI_SUCCESS  Procedure returned successfully.\r

-  @retval EFI_INVALID_PARAMETER The PCD service determined that the size of the data \r
-                                  being set was incompatible with a call to this function.  \r
+  @retval EFI_INVALID_PARAMETER The PCD service determined that the size of the data\r
+                                  being set was incompatible with a call to this function.\r

                                   Use GetSize() to retrieve the size of the target data.\r
   @retval EFI_NOT_FOUND The PCD service could not find the requested token number.\r
                                   Use GetSize() to retrieve the size of the target data.\r
   @retval EFI_NOT_FOUND The PCD service could not find the requested token number.\r

-  \r
+\r

 **/\r
 EFI_STATUS\r
 EFIAPI\r
 **/\r
 EFI_STATUS\r
 EFIAPI\r


@@ -659,24 +659,24 @@ DxePcdSet64Ex (
 /**\r
   Sets a value of a specified size for a given PCD token.\r
 \r
 /**\r
   Sets a value of a specified size for a given PCD token.\r
 \r

-  When the PCD service sets a value, it will check to ensure that the \r
-  size of the value being set is compatible with the Token's existing definition.  \r
+  When the PCD service sets a value, it will check to ensure that the\r
+  size of the value being set is compatible with the Token's existing definition.\r

   If it is not, an error will be returned.\r
 \r
   @param[in]  Guid The 128-bit unique value that designates the namespace from which to extract the value.\r
   If it is not, an error will be returned.\r
 \r
   @param[in]  Guid The 128-bit unique value that designates the namespace from which to extract the value.\r

-  @param[in]  TokenNumber The PCD token number. \r
-  @param[in, out] SizeOfBuffer A pointer to the length of the value being set for the PCD token.  \r
-                              On input, if the SizeOfValue is greater than the maximum size supported \r
-                              for this TokenNumber then the output value of SizeOfValue will reflect \r
+  @param[in]  TokenNumber The PCD token number.\r
+  @param[in, out] SizeOfBuffer A pointer to the length of the value being set for the PCD token.\r
+                              On input, if the SizeOfValue is greater than the maximum size supported\r
+                              for this TokenNumber then the output value of SizeOfValue will reflect\r

                               the maximum size supported for this TokenNumber.\r
   @param[in]  Buffer The buffer to set for the PCD token.\r
 \r
   @retval EFI_SUCCESS  Procedure returned successfully.\r
                               the maximum size supported for this TokenNumber.\r
   @param[in]  Buffer The buffer to set for the PCD token.\r
 \r
   @retval EFI_SUCCESS  Procedure returned successfully.\r

-  @retval EFI_INVALID_PARAMETER The PCD service determined that the size of the data \r
-                                  being set was incompatible with a call to this function.  \r
+  @retval EFI_INVALID_PARAMETER The PCD service determined that the size of the data\r
+                                  being set was incompatible with a call to this function.\r

                                   Use GetSize() to retrieve the size of the target data.\r
   @retval EFI_NOT_FOUND The PCD service could not find the requested token number.\r
                                   Use GetSize() to retrieve the size of the target data.\r
   @retval EFI_NOT_FOUND The PCD service could not find the requested token number.\r

-  \r
+\r

 **/\r
 EFI_STATUS\r
 EFIAPI\r
 **/\r
 EFI_STATUS\r
 EFIAPI\r


@@ -690,20 +690,20 @@ DxePcdSetPtrEx (
 /**\r
   Sets an Boolean value for a given PCD token.\r
 \r
 /**\r
   Sets an Boolean value for a given PCD token.\r
 \r

-  When the PCD service sets a value, it will check to ensure that the \r
-  size of the value being set is compatible with the Token's existing definition.  \r
+  When the PCD service sets a value, it will check to ensure that the\r
+  size of the value being set is compatible with the Token's existing definition.\r

   If it is not, an error will be returned.\r
 \r
   @param[in]  Guid The 128-bit unique value that designates the namespace from which to extract the value.\r
   If it is not, an error will be returned.\r
 \r
   @param[in]  Guid The 128-bit unique value that designates the namespace from which to extract the value.\r

-  @param[in]  TokenNumber The PCD token number. \r
+  @param[in]  TokenNumber The PCD token number.\r

   @param[in]  Value The value to set for the PCD token.\r
 \r
   @retval EFI_SUCCESS  Procedure returned successfully.\r
   @param[in]  Value The value to set for the PCD token.\r
 \r
   @retval EFI_SUCCESS  Procedure returned successfully.\r

-  @retval EFI_INVALID_PARAMETER The PCD service determined that the size of the data \r
-                                  being set was incompatible with a call to this function.  \r
+  @retval EFI_INVALID_PARAMETER The PCD service determined that the size of the data\r
+                                  being set was incompatible with a call to this function.\r

                                   Use GetSize() to retrieve the size of the target data.\r
   @retval EFI_NOT_FOUND The PCD service could not find the requested token number.\r
                                   Use GetSize() to retrieve the size of the target data.\r
   @retval EFI_NOT_FOUND The PCD service could not find the requested token number.\r

-  \r
+\r

 **/\r
 EFI_STATUS\r
 EFIAPI\r
 **/\r
 EFI_STATUS\r
 EFIAPI\r


@@ -717,10 +717,10 @@ DxePcdSetBoolEx (
   Specifies a function to be called anytime the value of a designated token is changed.\r
 \r
   @param[in]  Guid The 128-bit unique value that designates the namespace from which to extract the value.\r
   Specifies a function to be called anytime the value of a designated token is changed.\r
 \r
   @param[in]  Guid The 128-bit unique value that designates the namespace from which to extract the value.\r

-  @param[in]  TokenNumber The PCD token number. \r
-  @param[in]  CallBackFunction The function prototype called when the value associated with the CallBackToken is set.  \r
+  @param[in]  TokenNumber The PCD token number.\r
+  @param[in]  CallBackFunction The function prototype called when the value associated with the CallBackToken is set.\r

 \r
 \r

-  @retval EFI_SUCCESS  The PCD service has successfully established a call event \r
+  @retval EFI_SUCCESS  The PCD service has successfully established a call event\r

                         for the CallBackToken requested.\r
   @retval EFI_NOT_FOUND The PCD service could not find the referenced token number.\r
 \r
                         for the CallBackToken requested.\r
   @retval EFI_NOT_FOUND The PCD service could not find the referenced token number.\r
 \r


@@ -737,10 +737,10 @@ DxeRegisterCallBackOnSet (
   Cancels a previously set callback function for a particular PCD token number.\r
 \r
   @param[in]  Guid The 128-bit unique value that designates the namespace from which to extract the value.\r
   Cancels a previously set callback function for a particular PCD token number.\r
 \r
   @param[in]  Guid The 128-bit unique value that designates the namespace from which to extract the value.\r

-  @param[in]  TokenNumber The PCD token number. \r
-  @param[in]  CallBackFunction The function prototype called when the value associated with the CallBackToken is set.  \r
+  @param[in]  TokenNumber The PCD token number.\r
+  @param[in]  CallBackFunction The function prototype called when the value associated with the CallBackToken is set.\r

 \r
 \r

-  @retval EFI_SUCCESS  The PCD service has successfully established a call event \r
+  @retval EFI_SUCCESS  The PCD service has successfully established a call event\r

                         for the CallBackToken requested.\r
   @retval EFI_NOT_FOUND The PCD service could not find the referenced token number.\r
 \r
                         for the CallBackToken requested.\r
   @retval EFI_NOT_FOUND The PCD service could not find the referenced token number.\r
 \r


@@ -754,29 +754,29 @@ DxeUnRegisterCallBackOnSet (
   );\r
 \r
 /**\r
   );\r
 \r
 /**\r

-  Retrieves the next valid token number in a given namespace.  \r
-  \r
-  This is useful since the PCD infrastructure contains a sparse list of token numbers, \r
-  and one cannot a priori know what token numbers are valid in the database. \r
-  \r
-  If TokenNumber is 0 and Guid is not NULL, then the first token from the token space specified by Guid is returned.  \r
-  If TokenNumber is not 0 and Guid is not NULL, then the next token in the token space specified by Guid is returned.  \r
-  If TokenNumber is 0 and Guid is NULL, then the first token in the default token space is returned.  \r
-  If TokenNumber is not 0 and Guid is NULL, then the next token in the default token space is returned.  \r
-  The token numbers in the default token space may not be related to token numbers in token spaces that are named by Guid.  \r
-  If the next token number can be retrieved, then it is returned in TokenNumber, and EFI_SUCCESS is returned.  \r
-  If TokenNumber represents the last token number in the token space specified by Guid, then EFI_NOT_FOUND is returned.  \r
+  Retrieves the next valid token number in a given namespace.\r
+\r
+  This is useful since the PCD infrastructure contains a sparse list of token numbers,\r
+  and one cannot a priori know what token numbers are valid in the database.\r
+\r
+  If TokenNumber is 0 and Guid is not NULL, then the first token from the token space specified by Guid is returned.\r
+  If TokenNumber is not 0 and Guid is not NULL, then the next token in the token space specified by Guid is returned.\r
+  If TokenNumber is 0 and Guid is NULL, then the first token in the default token space is returned.\r
+  If TokenNumber is not 0 and Guid is NULL, then the next token in the default token space is returned.\r
+  The token numbers in the default token space may not be related to token numbers in token spaces that are named by Guid.\r
+  If the next token number can be retrieved, then it is returned in TokenNumber, and EFI_SUCCESS is returned.\r
+  If TokenNumber represents the last token number in the token space specified by Guid, then EFI_NOT_FOUND is returned.\r

   If TokenNumber is not present in the token space specified by Guid, then EFI_NOT_FOUND is returned.\r
 \r
 \r
   If TokenNumber is not present in the token space specified by Guid, then EFI_NOT_FOUND is returned.\r
 \r
 \r

-  @param[in]      Guid    The 128-bit unique value that designates the namespace from which to retrieve the next token. \r
-                          This is an optional parameter that may be NULL.  If this parameter is NULL, then a request is \r
+  @param[in]      Guid    The 128-bit unique value that designates the namespace from which to retrieve the next token.\r
+                          This is an optional parameter that may be NULL.  If this parameter is NULL, then a request is\r

                           being made to retrieve tokens from the default token space.\r
                           being made to retrieve tokens from the default token space.\r

-  @param[in, out] TokenNumber \r
-                          A pointer to the PCD token number to use to find the subsequent token number.  \r
+  @param[in, out] TokenNumber\r
+                          A pointer to the PCD token number to use to find the subsequent token number.\r

 \r
 \r

-  @retval EFI_SUCCESS   The PCD service retrieved the next valid token number. Or the input token number \r
-                        is already the last valid token number in the PCD database. \r
+  @retval EFI_SUCCESS   The PCD service retrieved the next valid token number. Or the input token number\r
+                        is already the last valid token number in the PCD database.\r

                         In the later case, *TokenNumber is updated with the value of 0.\r
   @retval EFI_NOT_FOUND If this input token number and token namespace does not exist on the platform.\r
 \r
                         In the later case, *TokenNumber is updated with the value of 0.\r
   @retval EFI_NOT_FOUND If this input token number and token namespace does not exist on the platform.\r
 \r


@@ -790,8 +790,8 @@ DxePcdGetNextToken (
 \r
 /**\r
   Get next token space in PCD database according to given token space guid.\r
 \r
 /**\r
   Get next token space in PCD database according to given token space guid.\r

-  \r
-  @param Guid            Given token space guid. If NULL, then Guid will be set to \r
+\r
+  @param Guid            Given token space guid. If NULL, then Guid will be set to\r

                          the first PCD token space in PCD database, If not NULL, then\r
                          Guid will be set to next PCD token space.\r
 \r
                          the first PCD token space in PCD database, If not NULL, then\r
                          Guid will be set to next PCD token space.\r
 \r


@@ -825,7 +825,7 @@ typedef struct {
   @param[in]    Guid        The 128-bit unique value that designates the namespace from which to extract the value.\r
   @param[in]    TokenNumber The PCD token number.\r
   @param[out]   PcdInfo     The returned information associated with the requested TokenNumber.\r
   @param[in]    Guid        The 128-bit unique value that designates the namespace from which to extract the value.\r
   @param[in]    TokenNumber The PCD token number.\r
   @param[out]   PcdInfo     The returned information associated with the requested TokenNumber.\r

-                            The caller is responsible for freeing the buffer that is allocated by callee for PcdInfo->PcdName. \r
+                            The caller is responsible for freeing the buffer that is allocated by callee for PcdInfo->PcdName.\r

 \r
   @retval  EFI_SUCCESS      The PCD information was returned successfully\r
   @retval  EFI_NOT_FOUND    The PCD service could not find the requested token number.\r
 \r
   @retval  EFI_SUCCESS      The PCD information was returned successfully\r
   @retval  EFI_NOT_FOUND    The PCD service could not find the requested token number.\r


@@ -865,10 +865,10 @@ SetValueWorker (
 \r
   @retval EFI_INVALID_PARAMETER  If this PCD type is VPD, VPD PCD can not be set.\r
   @retval EFI_INVALID_PARAMETER  If Size can not be set to size table.\r
 \r
   @retval EFI_INVALID_PARAMETER  If this PCD type is VPD, VPD PCD can not be set.\r
   @retval EFI_INVALID_PARAMETER  If Size can not be set to size table.\r

-  @retval EFI_INVALID_PARAMETER  If Size of non-Ptr type PCD does not match the size information in PCD database.  \r
+  @retval EFI_INVALID_PARAMETER  If Size of non-Ptr type PCD does not match the size information in PCD database.\r

   @retval EFI_NOT_FOUND          If value type of PCD entry is intergrate, but not in\r
                                  range of UINT8, UINT16, UINT32, UINT64\r
   @retval EFI_NOT_FOUND          If value type of PCD entry is intergrate, but not in\r
                                  range of UINT8, UINT16, UINT32, UINT64\r

-  @retval EFI_NOT_FOUND          Can not find the PCD type according to token number.                                \r
+  @retval EFI_NOT_FOUND          Can not find the PCD type according to token number.\r

 **/\r
 EFI_STATUS\r
 SetWorker (\r
 **/\r
 EFI_STATUS\r
 SetWorker (\r


@@ -899,12 +899,12 @@ ExSetValueWorker (
 \r
 /**\r
   Set value for a dynamic PCD entry.\r
 \r
 /**\r
   Set value for a dynamic PCD entry.\r

-  \r
-  This routine find the local token number according to dynamic-ex PCD's token \r
+\r
+  This routine find the local token number according to dynamic-ex PCD's token\r

   space guid and token number firstly, and invoke callback function if this PCD\r
   entry registered callback function. Finally, invoken general SetWorker to set\r
   PCD value.\r
   space guid and token number firstly, and invoke callback function if this PCD\r
   entry registered callback function. Finally, invoken general SetWorker to set\r
   PCD value.\r

-  \r
+\r

   @param ExTokenNumber   Dynamic-ex PCD token number.\r
   @param Guid            Token space guid for dynamic-ex PCD.\r
   @param Data            PCD value want to be set\r
   @param ExTokenNumber   Dynamic-ex PCD token number.\r
   @param Guid            Token space guid for dynamic-ex PCD.\r
   @param Data            PCD value want to be set\r


@@ -926,10 +926,10 @@ ExSetWorker (
 \r
 /**\r
   Get the PCD entry pointer in PCD database.\r
 \r
 /**\r
   Get the PCD entry pointer in PCD database.\r

-  \r
+\r

   This routine will visit PCD database to find the PCD entry according to given\r
   This routine will visit PCD database to find the PCD entry according to given\r

-  token number. The given token number is autogened by build tools and it will be \r
-  translated to local token number. Local token number contains PCD's type and \r
+  token number. The given token number is autogened by build tools and it will be\r
+  translated to local token number. Local token number contains PCD's type and\r

   offset of PCD entry in PCD database.\r
 \r
   @param TokenNumber     Token's number, it is autogened by build tools\r
   offset of PCD entry in PCD database.\r
 \r
   @param TokenNumber     Token's number, it is autogened by build tools\r


@@ -966,7 +966,7 @@ ExGetWorker (
 \r
   @param VariableGuid    Variable's guid\r
   @param VariableName    Variable's unicode name string\r
 \r
   @param VariableGuid    Variable's guid\r
   @param VariableName    Variable's unicode name string\r

-  @param VariableData    Variable's data pointer, \r
+  @param VariableData    Variable's data pointer,\r

   @param VariableSize    Variable's size.\r
 \r
   @return the status of gRT->GetVariable\r
   @param VariableSize    Variable's size.\r
 \r
   @return the status of gRT->GetVariable\r


@@ -982,9 +982,9 @@ GetHiiVariable (
 /**\r
   Set value for HII-type PCD.\r
 \r
 /**\r
   Set value for HII-type PCD.\r
 \r

-  A HII-type PCD's value is stored in a variable. Setting/Getting the value of \r
+  A HII-type PCD's value is stored in a variable. Setting/Getting the value of\r

   HII-type PCD is to visit this variable.\r
   HII-type PCD is to visit this variable.\r

-  \r
+\r

   @param VariableGuid    Guid of variable which stored value of a HII-type PCD.\r
   @param VariableName    Unicode name of variable which stored value of a HII-type PCD.\r
   @param SetAttributes   Attributes bitmask to set for the variable.\r
   @param VariableGuid    Guid of variable which stored value of a HII-type PCD.\r
   @param VariableName    Unicode name of variable which stored value of a HII-type PCD.\r
   @param SetAttributes   Attributes bitmask to set for the variable.\r


@@ -1010,9 +1010,9 @@ SetHiiVariable (
 \r
   This routine will register a callback function to a PCD entry by given token number\r
   and token space guid.\r
 \r
   This routine will register a callback function to a PCD entry by given token number\r
   and token space guid.\r

-  \r
+\r

   @param TokenNumber        PCD token's number, it is autogened by build tools.\r
   @param TokenNumber        PCD token's number, it is autogened by build tools.\r

-  @param Guid               PCD token space's guid, \r
+  @param Guid               PCD token space's guid,\r

                             if not NULL, this PCD is dynamicEx type PCD.\r
   @param CallBackFunction   Callback function pointer\r
 \r
                             if not NULL, this PCD is dynamicEx type PCD.\r
   @param CallBackFunction   Callback function pointer\r
 \r


@@ -1049,7 +1049,7 @@ DxeUnRegisterCallBackWorker (
 \r
 /**\r
   Initialize the PCD database in DXE phase.\r
 \r
 /**\r
   Initialize the PCD database in DXE phase.\r

-  \r
+\r

   PCD database in DXE phase also contains PCD database in PEI phase which is copied\r
   from GUID Hob.\r
 \r
   PCD database in DXE phase also contains PCD database in PEI phase which is copied\r
   from GUID Hob.\r
 \r


@@ -1065,7 +1065,7 @@ BuildPcdDxeDataBase (
   A dynamic-ex type PCD, developer must provide pair of token space guid: token number\r
   in DEC file. PCD database maintain a mapping table that translate pair of {token\r
   space guid: token number} to Token Number.\r
   A dynamic-ex type PCD, developer must provide pair of token space guid: token number\r
   in DEC file. PCD database maintain a mapping table that translate pair of {token\r
   space guid: token number} to Token Number.\r

-  \r
+\r

   @param Guid            Token space guid for dynamic-ex PCD entry.\r
   @param ExTokenNumber   Dynamic-ex PCD token number.\r
 \r
   @param Guid            Token space guid for dynamic-ex PCD entry.\r
   @param ExTokenNumber   Dynamic-ex PCD token number.\r
 \r


@@ -1080,16 +1080,16 @@ GetExPcdTokenNumber (
 \r
 /**\r
   Get next token number in given token space.\r
 \r
 /**\r
   Get next token number in given token space.\r

-  \r
+\r

   This routine is used for dynamicEx type PCD. It will firstly scan token space\r
   This routine is used for dynamicEx type PCD. It will firstly scan token space\r

-  table to get token space according to given token space guid. Then scan given \r
-  token number in found token space, if found, then return next token number in \r
+  table to get token space according to given token space guid. Then scan given\r
+  token number in found token space, if found, then return next token number in\r

   this token space.\r
 \r
   this token space.\r
 \r

-  @param Guid            Token space guid. Next token number will be scaned in \r
+  @param Guid            Token space guid. Next token number will be scaned in\r

                          this token space.\r
                          this token space.\r

-  @param TokenNumber     Token number. \r
-                         If PCD_INVALID_TOKEN_NUMBER, return first token number in \r
+  @param TokenNumber     Token number.\r
+                         If PCD_INVALID_TOKEN_NUMBER, return first token number in\r

                          token space table.\r
                          If not PCD_INVALID_TOKEN_NUMBER, return next token number\r
                          in token space table.\r
                          token space table.\r
                          If not PCD_INVALID_TOKEN_NUMBER, return next token number\r
                          in token space table.\r


@@ -1176,18 +1176,18 @@ UpdatePcdDatabase (
 \r
 extern  PCD_DATABASE   mPcdDatabase;\r
 \r
 \r
 extern  PCD_DATABASE   mPcdDatabase;\r
 \r

-extern  UINT32         mPcdTotalTokenCount; \r
-extern  UINT32         mPeiLocalTokenCount; \r
-extern  UINT32         mDxeLocalTokenCount; \r
-extern  UINT32         mPeiNexTokenCount;   \r
-extern  UINT32         mDxeNexTokenCount;  \r
+extern  UINT32         mPcdTotalTokenCount;\r
+extern  UINT32         mPeiLocalTokenCount;\r
+extern  UINT32         mDxeLocalTokenCount;\r
+extern  UINT32         mPeiNexTokenCount;\r
+extern  UINT32         mDxeNexTokenCount;\r

 extern  UINT32         mPeiExMapppingTableSize;\r
 extern  UINT32         mDxeExMapppingTableSize;\r
 extern  UINT32         mPeiGuidTableSize;\r
 extern  UINT32         mDxeGuidTableSize;\r
 \r
 extern  UINT32         mPeiExMapppingTableSize;\r
 extern  UINT32         mDxeExMapppingTableSize;\r
 extern  UINT32         mPeiGuidTableSize;\r
 extern  UINT32         mDxeGuidTableSize;\r
 \r

-extern  BOOLEAN        mPeiExMapTableEmpty; \r
-extern  BOOLEAN        mDxeExMapTableEmpty; \r
+extern  BOOLEAN        mPeiExMapTableEmpty;\r
+extern  BOOLEAN        mDxeExMapTableEmpty;\r

 extern  BOOLEAN        mPeiDatabaseEmpty;\r
 \r
 extern  EFI_GUID     **TmpTokenSpaceBuffer;\r
 extern  BOOLEAN        mPeiDatabaseEmpty;\r
 \r
 extern  EFI_GUID     **TmpTokenSpaceBuffer;\r

diff --git a/MdeModulePkg/Universal/PCD/Pei/Pcd.c b/MdeModulePkg/Universal/PCD/Pei/Pcd.c
index 8d9328b54479fe8db53656741ed62d666b36f994..e552e151760a9cf48c129d24dcbed361deaf3cc4 100644 (file)
--- a/MdeModulePkg/Universal/PCD/Pei/Pcd.c
+++ b/MdeModulePkg/Universal/PCD/Pei/Pcd.c
@@ -1,7 +1,7 @@
-/** @file \r
+/** @file\r

   All Pcd Ppi services are implemented here.\r
   All Pcd Ppi services are implemented here.\r

-  \r
-Copyright (c) 2006 - 2017, Intel Corporation. All rights reserved.<BR>\r
+\r
+Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r

 (C) Copyright 2016 Hewlett Packard Enterprise Development LP<BR>\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 (C) Copyright 2016 Hewlett Packard Enterprise Development LP<BR>\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r


@@ -23,33 +23,33 @@ PCD_PPI mPcdPpiInstance = {
   PeiPcdSetSku,\r
 \r
   PeiPcdGet8,\r
   PeiPcdSetSku,\r
 \r
   PeiPcdGet8,\r

-  PeiPcdGet16,          \r
-  PeiPcdGet32,          \r
-  PeiPcdGet64,          \r
-  PeiPcdGetPtr,         \r
-  PeiPcdGetBool,     \r
+  PeiPcdGet16,\r
+  PeiPcdGet32,\r
+  PeiPcdGet64,\r
+  PeiPcdGetPtr,\r
+  PeiPcdGetBool,\r

   PeiPcdGetSize,\r
 \r
   PeiPcdGet8Ex,\r
   PeiPcdGetSize,\r
 \r
   PeiPcdGet8Ex,\r

-  PeiPcdGet16Ex,          \r
-  PeiPcdGet32Ex,          \r
-  PeiPcdGet64Ex,          \r
-  PeiPcdGetPtrEx,         \r
-  PeiPcdGetBoolEx,     \r
+  PeiPcdGet16Ex,\r
+  PeiPcdGet32Ex,\r
+  PeiPcdGet64Ex,\r
+  PeiPcdGetPtrEx,\r
+  PeiPcdGetBoolEx,\r

   PeiPcdGetSizeEx,\r
   PeiPcdGetSizeEx,\r

-  \r
+\r

   PeiPcdSet8,\r
   PeiPcdSet8,\r

-  PeiPcdSet16,          \r
-  PeiPcdSet32,          \r
-  PeiPcdSet64,          \r
-  PeiPcdSetPtr,         \r
-  PeiPcdSetBool,     \r
+  PeiPcdSet16,\r
+  PeiPcdSet32,\r
+  PeiPcdSet64,\r
+  PeiPcdSetPtr,\r
+  PeiPcdSetBool,\r

 \r
   PeiPcdSet8Ex,\r
 \r
   PeiPcdSet8Ex,\r

-  PeiPcdSet16Ex,          \r
-  PeiPcdSet32Ex,          \r
-  PeiPcdSet64Ex,          \r
-  PeiPcdSetPtrEx,         \r
+  PeiPcdSet16Ex,\r
+  PeiPcdSet32Ex,\r
+  PeiPcdSet64Ex,\r
+  PeiPcdSetPtrEx,\r

   PeiPcdSetBoolEx,\r
 \r
   PeiRegisterCallBackOnSet,\r
   PeiPcdSetBoolEx,\r
 \r
   PeiRegisterCallBackOnSet,\r


@@ -64,7 +64,7 @@ PCD_PPI mPcdPpiInstance = {
 ///\r
 EFI_PEI_PCD_PPI  mEfiPcdPpiInstance = {\r
   PeiPcdSetSku,\r
 ///\r
 EFI_PEI_PCD_PPI  mEfiPcdPpiInstance = {\r
   PeiPcdSetSku,\r

-  \r
+\r

   PeiPcdGet8Ex,\r
   PeiPcdGet16Ex,\r
   PeiPcdGet32Ex,\r
   PeiPcdGet8Ex,\r
   PeiPcdGet16Ex,\r
   PeiPcdGet32Ex,\r


@@ -327,7 +327,7 @@ EFI_PEI_NOTIFY_DESCRIPTOR mEndOfPeiSignalPpiNotifyList[] = {
 \r
 /**\r
   Main entry for PCD PEIM driver.\r
 \r
 /**\r
   Main entry for PCD PEIM driver.\r

-  \r
+\r

   This routine initialize the PCD database for PEI phase and install PCD_PPI/EFI_PEI_PCD_PPI.\r
 \r
   @param  FileHandle  Handle of the file being invoked.\r
   This routine initialize the PCD database for PEI phase and install PCD_PPI/EFI_PEI_PCD_PPI.\r
 \r
   @param  FileHandle  Handle of the file being invoked.\r


@@ -439,21 +439,21 @@ PeiGetPcdInfoGetSku (
 /**\r
   Sets the SKU value for subsequent calls to set or get PCD token values.\r
 \r
 /**\r
   Sets the SKU value for subsequent calls to set or get PCD token values.\r
 \r

-  SetSku() sets the SKU Id to be used for subsequent calls to set or get PCD values. \r
+  SetSku() sets the SKU Id to be used for subsequent calls to set or get PCD values.\r

   SetSku() is normally called only once by the system.\r
 \r
   SetSku() is normally called only once by the system.\r
 \r

-  For each item (token), the database can hold a single value that applies to all SKUs, \r
-  or multiple values, where each value is associated with a specific SKU Id. Items with multiple, \r
-  SKU-specific values are called SKU enabled. \r
-  \r
+  For each item (token), the database can hold a single value that applies to all SKUs,\r
+  or multiple values, where each value is associated with a specific SKU Id. Items with multiple,\r
+  SKU-specific values are called SKU enabled.\r
+\r

   The SKU Id of zero is reserved as a default.\r
   The SKU Id of zero is reserved as a default.\r

-  For tokens that are not SKU enabled, the system ignores any set SKU Id and works with the \r
-  single value for that token. For SKU-enabled tokens, the system will use the SKU Id set by the \r
-  last call to SetSku(). If no SKU Id is set or the currently set SKU Id isn't valid for the specified token, \r
-  the system uses the default SKU Id. If the system attempts to use the default SKU Id and no value has been \r
+  For tokens that are not SKU enabled, the system ignores any set SKU Id and works with the\r
+  single value for that token. For SKU-enabled tokens, the system will use the SKU Id set by the\r
+  last call to SetSku(). If no SKU Id is set or the currently set SKU Id isn't valid for the specified token,\r
+  the system uses the default SKU Id. If the system attempts to use the default SKU Id and no value has been\r

   set for that Id, the results are unpredictable.\r
 \r
   set for that Id, the results are unpredictable.\r
 \r

-  @param[in]  SkuId The SKU value that will be used when the PCD service will retrieve and \r
+  @param[in]  SkuId The SKU value that will be used when the PCD service will retrieve and\r

               set values associated with a PCD token.\r
 \r
 **/\r
               set values associated with a PCD token.\r
 \r
 **/\r


@@ -582,13 +582,13 @@ PeiPcdSetSku (
 /**\r
   Retrieves an 8-bit value for a given PCD token.\r
 \r
 /**\r
   Retrieves an 8-bit value for a given PCD token.\r
 \r

-  Retrieves the current byte-sized value for a PCD token number.  \r
+  Retrieves the current byte-sized value for a PCD token number.\r

   If the TokenNumber is invalid, the results are unpredictable.\r
   If the TokenNumber is invalid, the results are unpredictable.\r

-  \r
-  @param[in]  TokenNumber The PCD token number. \r
+\r
+  @param[in]  TokenNumber The PCD token number.\r

 \r
   @return The UINT8 value.\r
 \r
   @return The UINT8 value.\r

-  \r
+\r

 **/\r
 UINT8\r
 EFIAPI\r
 **/\r
 UINT8\r
 EFIAPI\r


@@ -602,13 +602,13 @@ PeiPcdGet8 (
 /**\r
   Retrieves an 16-bit value for a given PCD token.\r
 \r
 /**\r
   Retrieves an 16-bit value for a given PCD token.\r
 \r

-  Retrieves the current 16-bits value for a PCD token number.  \r
+  Retrieves the current 16-bits value for a PCD token number.\r

   If the TokenNumber is invalid, the results are unpredictable.\r
   If the TokenNumber is invalid, the results are unpredictable.\r

-  \r
-  @param[in]  TokenNumber The PCD token number. \r
+\r
+  @param[in]  TokenNumber The PCD token number.\r

 \r
   @return The UINT16 value.\r
 \r
   @return The UINT16 value.\r

-  \r
+\r

 **/\r
 UINT16\r
 EFIAPI\r
 **/\r
 UINT16\r
 EFIAPI\r


@@ -622,13 +622,13 @@ PeiPcdGet16 (
 /**\r
   Retrieves an 32-bit value for a given PCD token.\r
 \r
 /**\r
   Retrieves an 32-bit value for a given PCD token.\r
 \r

-  Retrieves the current 32-bits value for a PCD token number.  \r
+  Retrieves the current 32-bits value for a PCD token number.\r

   If the TokenNumber is invalid, the results are unpredictable.\r
   If the TokenNumber is invalid, the results are unpredictable.\r

-  \r
-  @param[in]  TokenNumber The PCD token number. \r
+\r
+  @param[in]  TokenNumber The PCD token number.\r

 \r
   @return The UINT32 value.\r
 \r
   @return The UINT32 value.\r

-  \r
+\r

 **/\r
 UINT32\r
 EFIAPI\r
 **/\r
 UINT32\r
 EFIAPI\r


@@ -642,13 +642,13 @@ PeiPcdGet32 (
 /**\r
   Retrieves an 64-bit value for a given PCD token.\r
 \r
 /**\r
   Retrieves an 64-bit value for a given PCD token.\r
 \r

-  Retrieves the current 64-bits value for a PCD token number.  \r
+  Retrieves the current 64-bits value for a PCD token number.\r

   If the TokenNumber is invalid, the results are unpredictable.\r
   If the TokenNumber is invalid, the results are unpredictable.\r

-  \r
-  @param[in]  TokenNumber The PCD token number. \r
+\r
+  @param[in]  TokenNumber The PCD token number.\r

 \r
   @return The UINT64 value.\r
 \r
   @return The UINT64 value.\r

-  \r
+\r

 **/\r
 UINT64\r
 EFIAPI\r
 **/\r
 UINT64\r
 EFIAPI\r


@@ -662,15 +662,15 @@ PeiPcdGet64 (
 /**\r
   Retrieves a pointer to a value for a given PCD token.\r
 \r
 /**\r
   Retrieves a pointer to a value for a given PCD token.\r
 \r

-  Retrieves the current pointer to the buffer for a PCD token number.  \r
-  Do not make any assumptions about the alignment of the pointer that \r
-  is returned by this function call.  If the TokenNumber is invalid, \r
+  Retrieves the current pointer to the buffer for a PCD token number.\r
+  Do not make any assumptions about the alignment of the pointer that\r
+  is returned by this function call.  If the TokenNumber is invalid,\r

   the results are unpredictable.\r
 \r
   the results are unpredictable.\r
 \r

-  @param[in]  TokenNumber The PCD token number. \r
+  @param[in]  TokenNumber The PCD token number.\r

 \r
   @return The pointer to the buffer to be retrieved.\r
 \r
   @return The pointer to the buffer to be retrieved.\r

-  \r
+\r

 **/\r
 VOID *\r
 EFIAPI\r
 **/\r
 VOID *\r
 EFIAPI\r


@@ -684,15 +684,15 @@ PeiPcdGetPtr (
 /**\r
   Retrieves a Boolean value for a given PCD token.\r
 \r
 /**\r
   Retrieves a Boolean value for a given PCD token.\r
 \r

-  Retrieves the current boolean value for a PCD token number.  \r
-  Do not make any assumptions about the alignment of the pointer that \r
-  is returned by this function call.  If the TokenNumber is invalid, \r
+  Retrieves the current boolean value for a PCD token number.\r
+  Do not make any assumptions about the alignment of the pointer that\r
+  is returned by this function call.  If the TokenNumber is invalid,\r

   the results are unpredictable.\r
 \r
   the results are unpredictable.\r
 \r

-  @param[in]  TokenNumber The PCD token number. \r
+  @param[in]  TokenNumber The PCD token number.\r

 \r
   @return The Boolean value.\r
 \r
   @return The Boolean value.\r

-  \r
+\r

 **/\r
 BOOLEAN\r
 EFIAPI\r
 **/\r
 BOOLEAN\r
 EFIAPI\r


@@ -706,13 +706,13 @@ PeiPcdGetBool (
 /**\r
   Retrieves the size of the value for a given PCD token.\r
 \r
 /**\r
   Retrieves the size of the value for a given PCD token.\r
 \r

-  Retrieves the current size of a particular PCD token.  \r
+  Retrieves the current size of a particular PCD token.\r

   If the TokenNumber is invalid, the results are unpredictable.\r
 \r
   If the TokenNumber is invalid, the results are unpredictable.\r
 \r

-  @param[in]  TokenNumber The PCD token number. \r
+  @param[in]  TokenNumber The PCD token number.\r

 \r
   @return The size of the value for the PCD token.\r
 \r
   @return The size of the value for the PCD token.\r

-  \r
+\r

 **/\r
 UINTN\r
 EFIAPI\r
 **/\r
 UINTN\r
 EFIAPI\r


@@ -735,7 +735,7 @@ PeiPcdGetSize (
   TokenNumber--;\r
 \r
   // EBC compiler is very choosy. It may report warning about comparison\r
   TokenNumber--;\r
 \r
   // EBC compiler is very choosy. It may report warning about comparison\r

-  // between UINTN and 0 . So we add 1 in each size of the \r
+  // between UINTN and 0 . So we add 1 in each size of the\r

   // comparison.\r
   ASSERT (TokenNumber + 1 < (LocalTokenCount + 1));\r
 \r
   // comparison.\r
   ASSERT (TokenNumber + 1 < (LocalTokenCount + 1));\r
 \r


@@ -755,16 +755,16 @@ PeiPcdGetSize (
 /**\r
   Retrieves an 8-bit value for a given PCD token.\r
 \r
 /**\r
   Retrieves an 8-bit value for a given PCD token.\r
 \r

-  Retrieves the 8-bit value of a particular PCD token.  \r
+  Retrieves the 8-bit value of a particular PCD token.\r

   If the TokenNumber is invalid or the token space\r
   If the TokenNumber is invalid or the token space\r

-  specified by Guid does not exist, the results are \r
+  specified by Guid does not exist, the results are\r

   unpredictable.\r
 \r
   @param[in]  Guid              The token space for the token number.\r
   unpredictable.\r
 \r
   @param[in]  Guid              The token space for the token number.\r

-  @param[in]  ExTokenNumber     The PCD token number. \r
+  @param[in]  ExTokenNumber     The PCD token number.\r

 \r
   @return The size 8-bit value for the PCD token.\r
 \r
   @return The size 8-bit value for the PCD token.\r

-  \r
+\r

 **/\r
 UINT8\r
 EFIAPI\r
 **/\r
 UINT8\r
 EFIAPI\r


@@ -779,16 +779,16 @@ PeiPcdGet8Ex (
 /**\r
   Retrieves an 16-bit value for a given PCD token.\r
 \r
 /**\r
   Retrieves an 16-bit value for a given PCD token.\r
 \r

-  Retrieves the 16-bit value of a particular PCD token.  \r
+  Retrieves the 16-bit value of a particular PCD token.\r

   If the TokenNumber is invalid or the token space\r
   If the TokenNumber is invalid or the token space\r

-  specified by Guid does not exist, the results are \r
+  specified by Guid does not exist, the results are\r

   unpredictable.\r
 \r
   @param[in]  Guid          The token space for the token number.\r
   unpredictable.\r
 \r
   @param[in]  Guid          The token space for the token number.\r

-  @param[in]  ExTokenNumber The PCD token number. \r
+  @param[in]  ExTokenNumber The PCD token number.\r

 \r
   @return The size 16-bit value for the PCD token.\r
 \r
   @return The size 16-bit value for the PCD token.\r

-  \r
+\r

 **/\r
 UINT16\r
 EFIAPI\r
 **/\r
 UINT16\r
 EFIAPI\r


@@ -803,16 +803,16 @@ PeiPcdGet16Ex (
 /**\r
   Retrieves an 32-bit value for a given PCD token.\r
 \r
 /**\r
   Retrieves an 32-bit value for a given PCD token.\r
 \r

-  Retrieves the 32-bit value of a particular PCD token.  \r
+  Retrieves the 32-bit value of a particular PCD token.\r

   If the TokenNumber is invalid or the token space\r
   If the TokenNumber is invalid or the token space\r

-  specified by Guid does not exist, the results are \r
+  specified by Guid does not exist, the results are\r

   unpredictable.\r
 \r
   @param[in]  Guid The token space for the token number.\r
   unpredictable.\r
 \r
   @param[in]  Guid The token space for the token number.\r

-  @param[in]  ExTokenNumber The PCD token number. \r
+  @param[in]  ExTokenNumber The PCD token number.\r

 \r
   @return The size 32-bit value for the PCD token.\r
 \r
   @return The size 32-bit value for the PCD token.\r

-  \r
+\r

 **/\r
 UINT32\r
 EFIAPI\r
 **/\r
 UINT32\r
 EFIAPI\r


@@ -827,16 +827,16 @@ PeiPcdGet32Ex (
 /**\r
   Retrieves an 64-bit value for a given PCD token.\r
 \r
 /**\r
   Retrieves an 64-bit value for a given PCD token.\r
 \r

-  Retrieves the 64-bit value of a particular PCD token.  \r
+  Retrieves the 64-bit value of a particular PCD token.\r

   If the TokenNumber is invalid or the token space\r
   If the TokenNumber is invalid or the token space\r

-  specified by Guid does not exist, the results are \r
+  specified by Guid does not exist, the results are\r

   unpredictable.\r
 \r
   @param[in]  Guid The token space for the token number.\r
   unpredictable.\r
 \r
   @param[in]  Guid The token space for the token number.\r

-  @param[in]  ExTokenNumber The PCD token number. \r
+  @param[in]  ExTokenNumber The PCD token number.\r

 \r
   @return The size 64-bit value for the PCD token.\r
 \r
   @return The size 64-bit value for the PCD token.\r

-  \r
+\r

 **/\r
 UINT64\r
 EFIAPI\r
 **/\r
 UINT64\r
 EFIAPI\r


@@ -851,16 +851,16 @@ PeiPcdGet64Ex (
 /**\r
   Retrieves a pointer to a value for a given PCD token.\r
 \r
 /**\r
   Retrieves a pointer to a value for a given PCD token.\r
 \r

-  Retrieves the current pointer to the buffer for a PCD token number.  \r
-  Do not make any assumptions about the alignment of the pointer that \r
-  is returned by this function call.  If the TokenNumber is invalid, \r
+  Retrieves the current pointer to the buffer for a PCD token number.\r
+  Do not make any assumptions about the alignment of the pointer that\r
+  is returned by this function call.  If the TokenNumber is invalid,\r

   the results are unpredictable.\r
 \r
   @param[in]  Guid          The token space for the token number.\r
   the results are unpredictable.\r
 \r
   @param[in]  Guid          The token space for the token number.\r

-  @param[in]  ExTokenNumber The PCD token number. \r
+  @param[in]  ExTokenNumber The PCD token number.\r

 \r
   @return The pointer to the buffer to be retrieved.\r
 \r
   @return The pointer to the buffer to be retrieved.\r

-  \r
+\r

 **/\r
 VOID *\r
 EFIAPI\r
 **/\r
 VOID *\r
 EFIAPI\r


@@ -875,16 +875,16 @@ PeiPcdGetPtrEx (
 /**\r
   Retrieves an Boolean value for a given PCD token.\r
 \r
 /**\r
   Retrieves an Boolean value for a given PCD token.\r
 \r

-  Retrieves the Boolean value of a particular PCD token.  \r
+  Retrieves the Boolean value of a particular PCD token.\r

   If the TokenNumber is invalid or the token space\r
   If the TokenNumber is invalid or the token space\r

-  specified by Guid does not exist, the results are \r
+  specified by Guid does not exist, the results are\r

   unpredictable.\r
 \r
   @param[in]  Guid          The token space for the token number.\r
   unpredictable.\r
 \r
   @param[in]  Guid          The token space for the token number.\r

-  @param[in]  ExTokenNumber The PCD token number. \r
+  @param[in]  ExTokenNumber The PCD token number.\r

 \r
   @return The size Boolean value for the PCD token.\r
 \r
   @return The size Boolean value for the PCD token.\r

-  \r
+\r

 **/\r
 BOOLEAN\r
 EFIAPI\r
 **/\r
 BOOLEAN\r
 EFIAPI\r


@@ -899,14 +899,14 @@ PeiPcdGetBoolEx (
 /**\r
   Retrieves the size of the value for a given PCD token.\r
 \r
 /**\r
   Retrieves the size of the value for a given PCD token.\r
 \r

-  Retrieves the current size of a particular PCD token.  \r
+  Retrieves the current size of a particular PCD token.\r

   If the TokenNumber is invalid, the results are unpredictable.\r
 \r
   @param[in]  Guid          The token space for the token number.\r
   If the TokenNumber is invalid, the results are unpredictable.\r
 \r
   @param[in]  Guid          The token space for the token number.\r

-  @param[in]  ExTokenNumber The PCD token number. \r
+  @param[in]  ExTokenNumber The PCD token number.\r

 \r
   @return The size of the value for the PCD token.\r
 \r
   @return The size of the value for the PCD token.\r

-  \r
+\r

 **/\r
 UINTN\r
 EFIAPI\r
 **/\r
 UINTN\r
 EFIAPI\r


@@ -921,19 +921,19 @@ PeiPcdGetSizeEx (
 /**\r
   Sets an 8-bit value for a given PCD token.\r
 \r
 /**\r
   Sets an 8-bit value for a given PCD token.\r
 \r

-  When the PCD service sets a value, it will check to ensure that the \r
-  size of the value being set is compatible with the Token's existing definition.  \r
+  When the PCD service sets a value, it will check to ensure that the\r
+  size of the value being set is compatible with the Token's existing definition.\r

   If it is not, an error will be returned.\r
 \r
   If it is not, an error will be returned.\r
 \r

-  @param[in]  TokenNumber The PCD token number. \r
+  @param[in]  TokenNumber The PCD token number.\r

   @param[in]  Value The value to set for the PCD token.\r
 \r
   @retval EFI_SUCCESS  Procedure returned successfully.\r
   @param[in]  Value The value to set for the PCD token.\r
 \r
   @retval EFI_SUCCESS  Procedure returned successfully.\r

-  @retval EFI_INVALID_PARAMETER The PCD service determined that the size of the data \r
-                                  being set was incompatible with a call to this function.  \r
+  @retval EFI_INVALID_PARAMETER The PCD service determined that the size of the data\r
+                                  being set was incompatible with a call to this function.\r

                                   Use GetSize() to retrieve the size of the target data.\r
   @retval EFI_NOT_FOUND The PCD service could not find the requested token number.\r
                                   Use GetSize() to retrieve the size of the target data.\r
   @retval EFI_NOT_FOUND The PCD service could not find the requested token number.\r

-  \r
+\r

 **/\r
 EFI_STATUS\r
 EFIAPI\r
 **/\r
 EFI_STATUS\r
 EFIAPI\r


@@ -948,19 +948,19 @@ PeiPcdSet8 (
 /**\r
   Sets an 16-bit value for a given PCD token.\r
 \r
 /**\r
   Sets an 16-bit value for a given PCD token.\r
 \r

-  When the PCD service sets a value, it will check to ensure that the \r
-  size of the value being set is compatible with the Token's existing definition.  \r
+  When the PCD service sets a value, it will check to ensure that the\r
+  size of the value being set is compatible with the Token's existing definition.\r

   If it is not, an error will be returned.\r
 \r
   If it is not, an error will be returned.\r
 \r

-  @param[in]  TokenNumber The PCD token number. \r
+  @param[in]  TokenNumber The PCD token number.\r

   @param[in]  Value The value to set for the PCD token.\r
 \r
   @retval EFI_SUCCESS  Procedure returned successfully.\r
   @param[in]  Value The value to set for the PCD token.\r
 \r
   @retval EFI_SUCCESS  Procedure returned successfully.\r

-  @retval EFI_INVALID_PARAMETER The PCD service determined that the size of the data \r
-                                  being set was incompatible with a call to this function.  \r
+  @retval EFI_INVALID_PARAMETER The PCD service determined that the size of the data\r
+                                  being set was incompatible with a call to this function.\r

                                   Use GetSize() to retrieve the size of the target data.\r
   @retval EFI_NOT_FOUND The PCD service could not find the requested token number.\r
                                   Use GetSize() to retrieve the size of the target data.\r
   @retval EFI_NOT_FOUND The PCD service could not find the requested token number.\r

-  \r
+\r

 **/\r
 EFI_STATUS\r
 EFIAPI\r
 **/\r
 EFI_STATUS\r
 EFIAPI\r


@@ -975,19 +975,19 @@ PeiPcdSet16 (
 /**\r
   Sets an 32-bit value for a given PCD token.\r
 \r
 /**\r
   Sets an 32-bit value for a given PCD token.\r
 \r

-  When the PCD service sets a value, it will check to ensure that the \r
-  size of the value being set is compatible with the Token's existing definition.  \r
+  When the PCD service sets a value, it will check to ensure that the\r
+  size of the value being set is compatible with the Token's existing definition.\r

   If it is not, an error will be returned.\r
 \r
   If it is not, an error will be returned.\r
 \r

-  @param[in]  TokenNumber The PCD token number. \r
+  @param[in]  TokenNumber The PCD token number.\r

   @param[in]  Value The value to set for the PCD token.\r
 \r
   @retval EFI_SUCCESS  Procedure returned successfully.\r
   @param[in]  Value The value to set for the PCD token.\r
 \r
   @retval EFI_SUCCESS  Procedure returned successfully.\r

-  @retval EFI_INVALID_PARAMETER The PCD service determined that the size of the data \r
-                                  being set was incompatible with a call to this function.  \r
+  @retval EFI_INVALID_PARAMETER The PCD service determined that the size of the data\r
+                                  being set was incompatible with a call to this function.\r

                                   Use GetSize() to retrieve the size of the target data.\r
   @retval EFI_NOT_FOUND The PCD service could not find the requested token number.\r
                                   Use GetSize() to retrieve the size of the target data.\r
   @retval EFI_NOT_FOUND The PCD service could not find the requested token number.\r

-  \r
+\r

 **/\r
 EFI_STATUS\r
 EFIAPI\r
 **/\r
 EFI_STATUS\r
 EFIAPI\r


@@ -1002,19 +1002,19 @@ PeiPcdSet32 (
 /**\r
   Sets an 64-bit value for a given PCD token.\r
 \r
 /**\r
   Sets an 64-bit value for a given PCD token.\r
 \r

-  When the PCD service sets a value, it will check to ensure that the \r
-  size of the value being set is compatible with the Token's existing definition.  \r
+  When the PCD service sets a value, it will check to ensure that the\r
+  size of the value being set is compatible with the Token's existing definition.\r

   If it is not, an error will be returned.\r
 \r
   If it is not, an error will be returned.\r
 \r

-  @param[in]  TokenNumber The PCD token number. \r
+  @param[in]  TokenNumber The PCD token number.\r

   @param[in]  Value The value to set for the PCD token.\r
 \r
   @retval EFI_SUCCESS  Procedure returned successfully.\r
   @param[in]  Value The value to set for the PCD token.\r
 \r
   @retval EFI_SUCCESS  Procedure returned successfully.\r

-  @retval EFI_INVALID_PARAMETER The PCD service determined that the size of the data \r
-                                  being set was incompatible with a call to this function.  \r
+  @retval EFI_INVALID_PARAMETER The PCD service determined that the size of the data\r
+                                  being set was incompatible with a call to this function.\r

                                   Use GetSize() to retrieve the size of the target data.\r
   @retval EFI_NOT_FOUND The PCD service could not find the requested token number.\r
                                   Use GetSize() to retrieve the size of the target data.\r
   @retval EFI_NOT_FOUND The PCD service could not find the requested token number.\r

-  \r
+\r

 **/\r
 EFI_STATUS\r
 EFIAPI\r
 **/\r
 EFI_STATUS\r
 EFIAPI\r


@@ -1029,23 +1029,23 @@ PeiPcdSet64 (
 /**\r
   Sets a value of a specified size for a given PCD token.\r
 \r
 /**\r
   Sets a value of a specified size for a given PCD token.\r
 \r

-  When the PCD service sets a value, it will check to ensure that the \r
-  size of the value being set is compatible with the Token's existing definition.  \r
+  When the PCD service sets a value, it will check to ensure that the\r
+  size of the value being set is compatible with the Token's existing definition.\r

   If it is not, an error will be returned.\r
 \r
   If it is not, an error will be returned.\r
 \r

-  @param[in]  TokenNumber The PCD token number. \r
-  @param[in, out] SizeOfBuffer A pointer to the length of the value being set for the PCD token.  \r
-                              On input, if the SizeOfValue is greater than the maximum size supported \r
-                              for this TokenNumber then the output value of SizeOfValue will reflect \r
+  @param[in]  TokenNumber The PCD token number.\r
+  @param[in, out] SizeOfBuffer A pointer to the length of the value being set for the PCD token.\r
+                              On input, if the SizeOfValue is greater than the maximum size supported\r
+                              for this TokenNumber then the output value of SizeOfValue will reflect\r

                               the maximum size supported for this TokenNumber.\r
   @param[in]  Buffer The buffer to set for the PCD token.\r
 \r
   @retval EFI_SUCCESS  Procedure returned successfully.\r
                               the maximum size supported for this TokenNumber.\r
   @param[in]  Buffer The buffer to set for the PCD token.\r
 \r
   @retval EFI_SUCCESS  Procedure returned successfully.\r

-  @retval EFI_INVALID_PARAMETER The PCD service determined that the size of the data \r
-                                  being set was incompatible with a call to this function.  \r
+  @retval EFI_INVALID_PARAMETER The PCD service determined that the size of the data\r
+                                  being set was incompatible with a call to this function.\r

                                   Use GetSize() to retrieve the size of the target data.\r
   @retval EFI_NOT_FOUND The PCD service could not find the requested token number.\r
                                   Use GetSize() to retrieve the size of the target data.\r
   @retval EFI_NOT_FOUND The PCD service could not find the requested token number.\r

-  \r
+\r

 **/\r
 EFI_STATUS\r
 EFIAPI\r
 **/\r
 EFI_STATUS\r
 EFIAPI\r


@@ -1061,19 +1061,19 @@ PeiPcdSetPtr (
 /**\r
   Sets an Boolean value for a given PCD token.\r
 \r
 /**\r
   Sets an Boolean value for a given PCD token.\r
 \r

-  When the PCD service sets a value, it will check to ensure that the \r
-  size of the value being set is compatible with the Token's existing definition.  \r
+  When the PCD service sets a value, it will check to ensure that the\r
+  size of the value being set is compatible with the Token's existing definition.\r

   If it is not, an error will be returned.\r
 \r
   If it is not, an error will be returned.\r
 \r

-  @param[in]  TokenNumber The PCD token number. \r
+  @param[in]  TokenNumber The PCD token number.\r

   @param[in]  Value The value to set for the PCD token.\r
 \r
   @retval EFI_SUCCESS  Procedure returned successfully.\r
   @param[in]  Value The value to set for the PCD token.\r
 \r
   @retval EFI_SUCCESS  Procedure returned successfully.\r

-  @retval EFI_INVALID_PARAMETER The PCD service determined that the size of the data \r
-                                  being set was incompatible with a call to this function.  \r
+  @retval EFI_INVALID_PARAMETER The PCD service determined that the size of the data\r
+                                  being set was incompatible with a call to this function.\r

                                   Use GetSize() to retrieve the size of the target data.\r
   @retval EFI_NOT_FOUND The PCD service could not find the requested token number.\r
                                   Use GetSize() to retrieve the size of the target data.\r
   @retval EFI_NOT_FOUND The PCD service could not find the requested token number.\r

-  \r
+\r

 **/\r
 EFI_STATUS\r
 EFIAPI\r
 **/\r
 EFI_STATUS\r
 EFIAPI\r


@@ -1088,20 +1088,20 @@ PeiPcdSetBool (
 /**\r
   Sets an 8-bit value for a given PCD token.\r
 \r
 /**\r
   Sets an 8-bit value for a given PCD token.\r
 \r

-  When the PCD service sets a value, it will check to ensure that the \r
-  size of the value being set is compatible with the Token's existing definition.  \r
+  When the PCD service sets a value, it will check to ensure that the\r
+  size of the value being set is compatible with the Token's existing definition.\r

   If it is not, an error will be returned.\r
 \r
   @param[in]  Guid          The 128-bit unique value that designates the namespace from which to extract the value.\r
   If it is not, an error will be returned.\r
 \r
   @param[in]  Guid          The 128-bit unique value that designates the namespace from which to extract the value.\r

-  @param[in]  ExTokenNumber The PCD token number. \r
+  @param[in]  ExTokenNumber The PCD token number.\r

   @param[in]  Value         The value to set for the PCD token.\r
 \r
   @retval EFI_SUCCESS  Procedure returned successfully.\r
   @param[in]  Value         The value to set for the PCD token.\r
 \r
   @retval EFI_SUCCESS  Procedure returned successfully.\r

-  @retval EFI_INVALID_PARAMETER The PCD service determined that the size of the data \r
-                                  being set was incompatible with a call to this function.  \r
+  @retval EFI_INVALID_PARAMETER The PCD service determined that the size of the data\r
+                                  being set was incompatible with a call to this function.\r

                                   Use GetSize() to retrieve the size of the target data.\r
   @retval EFI_NOT_FOUND The PCD service could not find the requested token number.\r
                                   Use GetSize() to retrieve the size of the target data.\r
   @retval EFI_NOT_FOUND The PCD service could not find the requested token number.\r

-  \r
+\r

 **/\r
 EFI_STATUS\r
 EFIAPI\r
 **/\r
 EFI_STATUS\r
 EFIAPI\r


@@ -1117,20 +1117,20 @@ PeiPcdSet8Ex (
 /**\r
   Sets an 16-bit value for a given PCD token.\r
 \r
 /**\r
   Sets an 16-bit value for a given PCD token.\r
 \r

-  When the PCD service sets a value, it will check to ensure that the \r
-  size of the value being set is compatible with the Token's existing definition.  \r
+  When the PCD service sets a value, it will check to ensure that the\r
+  size of the value being set is compatible with the Token's existing definition.\r

   If it is not, an error will be returned.\r
 \r
   @param[in]  Guid The 128-bit unique value that designates the namespace from which to extract the value.\r
   If it is not, an error will be returned.\r
 \r
   @param[in]  Guid The 128-bit unique value that designates the namespace from which to extract the value.\r

-  @param[in]  ExTokenNumber The PCD token number. \r
+  @param[in]  ExTokenNumber The PCD token number.\r

   @param[in]  Value The value to set for the PCD token.\r
 \r
   @retval EFI_SUCCESS  Procedure returned successfully.\r
   @param[in]  Value The value to set for the PCD token.\r
 \r
   @retval EFI_SUCCESS  Procedure returned successfully.\r

-  @retval EFI_INVALID_PARAMETER The PCD service determined that the size of the data \r
-                                  being set was incompatible with a call to this function.  \r
+  @retval EFI_INVALID_PARAMETER The PCD service determined that the size of the data\r
+                                  being set was incompatible with a call to this function.\r

                                   Use GetSize() to retrieve the size of the target data.\r
   @retval EFI_NOT_FOUND The PCD service could not find the requested token number.\r
                                   Use GetSize() to retrieve the size of the target data.\r
   @retval EFI_NOT_FOUND The PCD service could not find the requested token number.\r

-  \r
+\r

 **/\r
 EFI_STATUS\r
 EFIAPI\r
 **/\r
 EFI_STATUS\r
 EFIAPI\r


@@ -1146,20 +1146,20 @@ PeiPcdSet16Ex (
 /**\r
   Sets an 32-bit value for a given PCD token.\r
 \r
 /**\r
   Sets an 32-bit value for a given PCD token.\r
 \r

-  When the PCD service sets a value, it will check to ensure that the \r
-  size of the value being set is compatible with the Token's existing definition.  \r
+  When the PCD service sets a value, it will check to ensure that the\r
+  size of the value being set is compatible with the Token's existing definition.\r

   If it is not, an error will be returned.\r
 \r
   @param[in]  Guid          The 128-bit unique value that designates the namespace from which to extract the value.\r
   If it is not, an error will be returned.\r
 \r
   @param[in]  Guid          The 128-bit unique value that designates the namespace from which to extract the value.\r

-  @param[in]  ExTokenNumber The PCD token number. \r
+  @param[in]  ExTokenNumber The PCD token number.\r

   @param[in]  Value         The value to set for the PCD token.\r
 \r
   @retval EFI_SUCCESS  Procedure returned successfully.\r
   @param[in]  Value         The value to set for the PCD token.\r
 \r
   @retval EFI_SUCCESS  Procedure returned successfully.\r

-  @retval EFI_INVALID_PARAMETER The PCD service determined that the size of the data \r
-                                  being set was incompatible with a call to this function.  \r
+  @retval EFI_INVALID_PARAMETER The PCD service determined that the size of the data\r
+                                  being set was incompatible with a call to this function.\r

                                   Use GetSize() to retrieve the size of the target data.\r
   @retval EFI_NOT_FOUND The PCD service could not find the requested token number.\r
                                   Use GetSize() to retrieve the size of the target data.\r
   @retval EFI_NOT_FOUND The PCD service could not find the requested token number.\r

-  \r
+\r

 **/\r
 EFI_STATUS\r
 EFIAPI\r
 **/\r
 EFI_STATUS\r
 EFIAPI\r


@@ -1175,20 +1175,20 @@ PeiPcdSet32Ex (
 /**\r
   Sets an 64-bit value for a given PCD token.\r
 \r
 /**\r
   Sets an 64-bit value for a given PCD token.\r
 \r

-  When the PCD service sets a value, it will check to ensure that the \r
-  size of the value being set is compatible with the Token's existing definition.  \r
+  When the PCD service sets a value, it will check to ensure that the\r
+  size of the value being set is compatible with the Token's existing definition.\r

   If it is not, an error will be returned.\r
 \r
   @param[in]  Guid          The 128-bit unique value that designates the namespace from which to extract the value.\r
   If it is not, an error will be returned.\r
 \r
   @param[in]  Guid          The 128-bit unique value that designates the namespace from which to extract the value.\r

-  @param[in]  ExTokenNumber The PCD token number. \r
+  @param[in]  ExTokenNumber The PCD token number.\r

   @param[in]  Value         The value to set for the PCD token.\r
 \r
   @retval EFI_SUCCESS  Procedure returned successfully.\r
   @param[in]  Value         The value to set for the PCD token.\r
 \r
   @retval EFI_SUCCESS  Procedure returned successfully.\r

-  @retval EFI_INVALID_PARAMETER The PCD service determined that the size of the data \r
-                                  being set was incompatible with a call to this function.  \r
+  @retval EFI_INVALID_PARAMETER The PCD service determined that the size of the data\r
+                                  being set was incompatible with a call to this function.\r

                                   Use GetSize() to retrieve the size of the target data.\r
   @retval EFI_NOT_FOUND The PCD service could not find the requested token number.\r
                                   Use GetSize() to retrieve the size of the target data.\r
   @retval EFI_NOT_FOUND The PCD service could not find the requested token number.\r

-  \r
+\r

 **/\r
 EFI_STATUS\r
 EFIAPI\r
 **/\r
 EFI_STATUS\r
 EFIAPI\r


@@ -1204,24 +1204,24 @@ PeiPcdSet64Ex (
 /**\r
   Sets a value of a specified size for a given PCD token.\r
 \r
 /**\r
   Sets a value of a specified size for a given PCD token.\r
 \r

-  When the PCD service sets a value, it will check to ensure that the \r
-  size of the value being set is compatible with the Token's existing definition.  \r
+  When the PCD service sets a value, it will check to ensure that the\r
+  size of the value being set is compatible with the Token's existing definition.\r

   If it is not, an error will be returned.\r
 \r
   @param[in]        Guid            The 128-bit unique value that designates the namespace from which to extract the value.\r
   If it is not, an error will be returned.\r
 \r
   @param[in]        Guid            The 128-bit unique value that designates the namespace from which to extract the value.\r

-  @param[in]        ExTokenNumber   The PCD token number. \r
-  @param[in, out]   SizeOfBuffer    A pointer to the length of the value being set for the PCD token.  \r
-                                    On input, if the SizeOfValue is greater than the maximum size supported \r
-                                    for this TokenNumber then the output value of SizeOfValue will reflect \r
+  @param[in]        ExTokenNumber   The PCD token number.\r
+  @param[in, out]   SizeOfBuffer    A pointer to the length of the value being set for the PCD token.\r
+                                    On input, if the SizeOfValue is greater than the maximum size supported\r
+                                    for this TokenNumber then the output value of SizeOfValue will reflect\r

                                     the maximum size supported for this TokenNumber.\r
   @param[in]        Value           The buffer to set for the PCD token.\r
 \r
   @retval EFI_SUCCESS  Procedure returned successfully.\r
                                     the maximum size supported for this TokenNumber.\r
   @param[in]        Value           The buffer to set for the PCD token.\r
 \r
   @retval EFI_SUCCESS  Procedure returned successfully.\r

-  @retval EFI_INVALID_PARAMETER The PCD service determined that the size of the data \r
-                                  being set was incompatible with a call to this function.  \r
+  @retval EFI_INVALID_PARAMETER The PCD service determined that the size of the data\r
+                                  being set was incompatible with a call to this function.\r

                                   Use GetSize() to retrieve the size of the target data.\r
   @retval EFI_NOT_FOUND The PCD service could not find the requested token number.\r
                                   Use GetSize() to retrieve the size of the target data.\r
   @retval EFI_NOT_FOUND The PCD service could not find the requested token number.\r

-  \r
+\r

 **/\r
 EFI_STATUS\r
 EFIAPI\r
 **/\r
 EFI_STATUS\r
 EFIAPI\r


@@ -1238,20 +1238,20 @@ PeiPcdSetPtrEx (
 /**\r
   Sets an Boolean value for a given PCD token.\r
 \r
 /**\r
   Sets an Boolean value for a given PCD token.\r
 \r

-  When the PCD service sets a value, it will check to ensure that the \r
-  size of the value being set is compatible with the Token's existing definition.  \r
+  When the PCD service sets a value, it will check to ensure that the\r
+  size of the value being set is compatible with the Token's existing definition.\r

   If it is not, an error will be returned.\r
 \r
   @param [in]  Guid          The 128-bit unique value that designates the namespace from which to extract the value.\r
   If it is not, an error will be returned.\r
 \r
   @param [in]  Guid          The 128-bit unique value that designates the namespace from which to extract the value.\r

-  @param [in]  ExTokenNumber The PCD token number. \r
+  @param [in]  ExTokenNumber The PCD token number.\r

   @param [in]  Value         The value to set for the PCD token.\r
 \r
   @retval EFI_SUCCESS  Procedure returned successfully.\r
   @param [in]  Value         The value to set for the PCD token.\r
 \r
   @retval EFI_SUCCESS  Procedure returned successfully.\r

-  @retval EFI_INVALID_PARAMETER The PCD service determined that the size of the data \r
-                                  being set was incompatible with a call to this function.  \r
+  @retval EFI_INVALID_PARAMETER The PCD service determined that the size of the data\r
+                                  being set was incompatible with a call to this function.\r

                                   Use GetSize() to retrieve the size of the target data.\r
   @retval EFI_NOT_FOUND The PCD service could not find the requested token number.\r
                                   Use GetSize() to retrieve the size of the target data.\r
   @retval EFI_NOT_FOUND The PCD service could not find the requested token number.\r

-  \r
+\r

 **/\r
 EFI_STATUS\r
 EFIAPI\r
 **/\r
 EFI_STATUS\r
 EFIAPI\r


@@ -1268,10 +1268,10 @@ PeiPcdSetBoolEx (
   Specifies a function to be called anytime the value of a designated token is changed.\r
 \r
   @param[in]  Guid The 128-bit unique value that designates the namespace from which to extract the value.\r
   Specifies a function to be called anytime the value of a designated token is changed.\r
 \r
   @param[in]  Guid The 128-bit unique value that designates the namespace from which to extract the value.\r

-  @param[in]  ExTokenNumber The PCD token number. \r
-  @param[in]  CallBackFunction The function prototype called when the value associated with the CallBackToken is set.  \r
+  @param[in]  ExTokenNumber The PCD token number.\r
+  @param[in]  CallBackFunction The function prototype called when the value associated with the CallBackToken is set.\r

 \r
 \r

-  @retval EFI_SUCCESS  The PCD service has successfully established a call event \r
+  @retval EFI_SUCCESS  The PCD service has successfully established a call event\r

                         for the CallBackToken requested.\r
   @retval EFI_NOT_FOUND The PCD service could not find the referenced token number.\r
 \r
                         for the CallBackToken requested.\r
   @retval EFI_NOT_FOUND The PCD service could not find the referenced token number.\r
 \r


@@ -1299,10 +1299,10 @@ PeiRegisterCallBackOnSet (
   Cancels a previously set callback function for a particular PCD token number.\r
 \r
   @param[in]  Guid The 128-bit unique value that designates the namespace from which to extract the value.\r
   Cancels a previously set callback function for a particular PCD token number.\r
 \r
   @param[in]  Guid The 128-bit unique value that designates the namespace from which to extract the value.\r

-  @param[in]  ExTokenNumber The PCD token number. \r
-  @param[in]  CallBackFunction The function prototype called when the value associated with the CallBackToken is set.  \r
+  @param[in]  ExTokenNumber The PCD token number.\r
+  @param[in]  CallBackFunction The function prototype called when the value associated with the CallBackToken is set.\r

 \r
 \r

-  @retval EFI_SUCCESS  The PCD service has successfully established a call event \r
+  @retval EFI_SUCCESS  The PCD service has successfully established a call event\r

                         for the CallBackToken requested.\r
   @retval EFI_NOT_FOUND The PCD service could not find the referenced token number.\r
 \r
                         for the CallBackToken requested.\r
   @retval EFI_NOT_FOUND The PCD service could not find the referenced token number.\r
 \r


@@ -1327,26 +1327,26 @@ PcdUnRegisterCallBackOnSet (
 }\r
 \r
 /**\r
 }\r
 \r
 /**\r

-  Retrieves the next valid token number in a given namespace.  \r
-  \r
-  This is useful since the PCD infrastructure contains a sparse list of token numbers, \r
-  and one cannot a priori know what token numbers are valid in the database. \r
-  \r
-  If TokenNumber is 0 and Guid is not NULL, then the first token from the token space specified by Guid is returned.  \r
-  If TokenNumber is not 0 and Guid is not NULL, then the next token in the token space specified by Guid is returned.  \r
-  If TokenNumber is 0 and Guid is NULL, then the first token in the default token space is returned.  \r
-  If TokenNumber is not 0 and Guid is NULL, then the next token in the default token space is returned.  \r
-  The token numbers in the default token space may not be related to token numbers in token spaces that are named by Guid.  \r
-  If the next token number can be retrieved, then it is returned in TokenNumber, and EFI_SUCCESS is returned.  \r
-  If TokenNumber represents the last token number in the token space specified by Guid, then EFI_NOT_FOUND is returned.  \r
+  Retrieves the next valid token number in a given namespace.\r
+\r
+  This is useful since the PCD infrastructure contains a sparse list of token numbers,\r
+  and one cannot a priori know what token numbers are valid in the database.\r
+\r
+  If TokenNumber is 0 and Guid is not NULL, then the first token from the token space specified by Guid is returned.\r
+  If TokenNumber is not 0 and Guid is not NULL, then the next token in the token space specified by Guid is returned.\r
+  If TokenNumber is 0 and Guid is NULL, then the first token in the default token space is returned.\r
+  If TokenNumber is not 0 and Guid is NULL, then the next token in the default token space is returned.\r
+  The token numbers in the default token space may not be related to token numbers in token spaces that are named by Guid.\r
+  If the next token number can be retrieved, then it is returned in TokenNumber, and EFI_SUCCESS is returned.\r
+  If TokenNumber represents the last token number in the token space specified by Guid, then EFI_NOT_FOUND is returned.\r

   If TokenNumber is not present in the token space specified by Guid, then EFI_NOT_FOUND is returned.\r
 \r
 \r
   If TokenNumber is not present in the token space specified by Guid, then EFI_NOT_FOUND is returned.\r
 \r
 \r

-  @param[in]       Guid        The 128-bit unique value that designates the namespace from which to extract the value.  \r
-                               This is an optional parameter that may be NULL.  If this parameter is NULL, then a request \r
+  @param[in]       Guid        The 128-bit unique value that designates the namespace from which to extract the value.\r
+                               This is an optional parameter that may be NULL.  If this parameter is NULL, then a request\r

                                is being made to retrieve tokens from the default token space.\r
   @param[in, out]  TokenNumber A pointer to the PCD token number to use to find the subsequent token number.\r
                                is being made to retrieve tokens from the default token space.\r
   @param[in, out]  TokenNumber A pointer to the PCD token number to use to find the subsequent token number.\r

-                   \r
+\r

   @retval EFI_SUCCESS   The PCD service has retrieved the next valid token number.\r
   @retval EFI_NOT_FOUND The PCD service could not find data from the requested token number.\r
 \r
   @retval EFI_SUCCESS   The PCD service has retrieved the next valid token number.\r
   @retval EFI_NOT_FOUND The PCD service could not find data from the requested token number.\r
 \r


@@ -1366,7 +1366,7 @@ PeiPcdGetNextToken (
   UINTN               Index;\r
   BOOLEAN             Found;\r
   BOOLEAN             PeiExMapTableEmpty;\r
   UINTN               Index;\r
   BOOLEAN             Found;\r
   BOOLEAN             PeiExMapTableEmpty;\r

-  UINTN               PeiNexTokenNumber; \r
+  UINTN               PeiNexTokenNumber;\r

 \r
   if (!FeaturePcdGet (PcdPeiFullPcdDatabaseEnable)) {\r
     return EFI_UNSUPPORTED;\r
 \r
   if (!FeaturePcdGet (PcdPeiFullPcdDatabaseEnable)) {\r
     return EFI_UNSUPPORTED;\r


@@ -1466,7 +1466,7 @@ PeiPcdGetNextToken (
                             token namespace on the platform. If *Guid is NULL, then the GUID of the first token\r
                             space of the current platform is returned. If the search cannot locate the next valid\r
                             token namespace, an error is returned and the value of *Guid is undefined.\r
                             token namespace on the platform. If *Guid is NULL, then the GUID of the first token\r
                             space of the current platform is returned. If the search cannot locate the next valid\r
                             token namespace, an error is returned and the value of *Guid is undefined.\r

- \r
+\r

   @retval  EFI_SUCCESS      The PCD service retrieved the value requested.\r
   @retval  EFI_NOT_FOUND    The PCD service could not find the next valid token namespace.\r
 \r
   @retval  EFI_SUCCESS      The PCD service retrieved the value requested.\r
   @retval  EFI_NOT_FOUND    The PCD service could not find the next valid token namespace.\r
 \r


@@ -1500,14 +1500,14 @@ PeiPcdGetNextTokenSpace (
   } else {\r
     PeiExMapTableEmpty = FALSE;\r
   }\r
   } else {\r
     PeiExMapTableEmpty = FALSE;\r
   }\r

-  \r
+\r

   if (PeiExMapTableEmpty) {\r
     return EFI_NOT_FOUND;\r
   }\r
 \r
   ExMapTable = (DYNAMICEX_MAPPING *)((UINT8 *)PeiPcdDb + PeiPcdDb->ExMapTableOffset);\r
   GuidTable  = (EFI_GUID *)((UINT8 *)PeiPcdDb + PeiPcdDb->GuidTableOffset);\r
   if (PeiExMapTableEmpty) {\r
     return EFI_NOT_FOUND;\r
   }\r
 \r
   ExMapTable = (DYNAMICEX_MAPPING *)((UINT8 *)PeiPcdDb + PeiPcdDb->ExMapTableOffset);\r
   GuidTable  = (EFI_GUID *)((UINT8 *)PeiPcdDb + PeiPcdDb->GuidTableOffset);\r

-  \r
+\r

   if (*Guid == NULL) {\r
     //\r
     // return the first Token Space Guid.\r
   if (*Guid == NULL) {\r
     //\r
     // return the first Token Space Guid.\r


@@ -1521,7 +1521,7 @@ PeiPcdGetNextTokenSpace (
   if (MatchGuid == NULL) {\r
     return EFI_NOT_FOUND;\r
   }\r
   if (MatchGuid == NULL) {\r
     return EFI_NOT_FOUND;\r
   }\r

-  \r
+\r

   GuidTableIdx = MatchGuid - GuidTable;\r
 \r
   Found = FALSE;\r
   GuidTableIdx = MatchGuid - GuidTable;\r
 \r
   Found = FALSE;\r


@@ -1561,7 +1561,7 @@ PeiPcdGetNextTokenSpace (
 \r
 /**\r
   Get PCD value's size for POINTER type PCD.\r
 \r
 /**\r
   Get PCD value's size for POINTER type PCD.\r

-  \r
+\r

   The POINTER type PCD's value will be stored into a buffer in specified size.\r
   The max size of this PCD's value is described in PCD's definition in DEC file.\r
 \r
   The POINTER type PCD's value will be stored into a buffer in specified size.\r
   The max size of this PCD's value is described in PCD's definition in DEC file.\r
 \r


@@ -1588,12 +1588,12 @@ GetPtrTypeSize (
   LocalTokenNumber = *((UINT32 *)((UINT8 *)Database + Database->LocalTokenNumberTableOffset) + LocalTokenNumberTableIdx);\r
 \r
   ASSERT ((LocalTokenNumber & PCD_DATUM_TYPE_ALL_SET) == PCD_DATUM_TYPE_POINTER);\r
   LocalTokenNumber = *((UINT32 *)((UINT8 *)Database + Database->LocalTokenNumberTableOffset) + LocalTokenNumberTableIdx);\r
 \r
   ASSERT ((LocalTokenNumber & PCD_DATUM_TYPE_ALL_SET) == PCD_DATUM_TYPE_POINTER);\r

-  \r
+\r

   SizeTable = (SIZE_INFO *)((UINT8 *)Database + Database->SizeTableOffset);\r
 \r
   *MaxSize = SizeTable[SizeTableIdx];\r
   //\r
   SizeTable = (SIZE_INFO *)((UINT8 *)Database + Database->SizeTableOffset);\r
 \r
   *MaxSize = SizeTable[SizeTableIdx];\r
   //\r

-  // SizeTable only contain record for PCD_DATUM_TYPE_POINTER type \r
+  // SizeTable only contain record for PCD_DATUM_TYPE_POINTER type\r

   // PCD entry.\r
   //\r
   if ((LocalTokenNumber & PCD_TYPE_VPD) != 0) {\r
   // PCD entry.\r
   //\r
   if ((LocalTokenNumber & PCD_TYPE_VPD) != 0) {\r


@@ -1616,7 +1616,7 @@ GetPtrTypeSize (
 \r
 /**\r
   Set PCD value's size for POINTER type PCD.\r
 \r
 /**\r
   Set PCD value's size for POINTER type PCD.\r

-  \r
+\r

   The POINTER type PCD's value will be stored into a buffer in specified size.\r
   The max size of this PCD's value is described in PCD's definition in DEC file.\r
 \r
   The POINTER type PCD's value will be stored into a buffer in specified size.\r
   The max size of this PCD's value is described in PCD's definition in DEC file.\r
 \r


@@ -1639,7 +1639,7 @@ SetPtrTypeSize (
   UINTN       LocalTokenNumber;\r
   SIZE_INFO   *SizeTable;\r
   UINTN       MaxSize;\r
   UINTN       LocalTokenNumber;\r
   SIZE_INFO   *SizeTable;\r
   UINTN       MaxSize;\r

-  \r
+\r

   SizeTableIdx = GetSizeTableIndex (LocalTokenNumberTableIdx, Database);\r
 \r
   LocalTokenNumber = *((UINT32 *)((UINT8 *)Database + Database->LocalTokenNumberTableOffset) + LocalTokenNumberTableIdx);\r
   SizeTableIdx = GetSizeTableIndex (LocalTokenNumberTableIdx, Database);\r
 \r
   LocalTokenNumber = *((UINT32 *)((UINT8 *)Database + Database->LocalTokenNumberTableOffset) + LocalTokenNumberTableIdx);\r


@@ -1650,7 +1650,7 @@ SetPtrTypeSize (
 \r
   MaxSize = SizeTable[SizeTableIdx];\r
   //\r
 \r
   MaxSize = SizeTable[SizeTableIdx];\r
   //\r

-  // SizeTable only contain record for PCD_DATUM_TYPE_POINTER type \r
+  // SizeTable only contain record for PCD_DATUM_TYPE_POINTER type\r

   // PCD entry.\r
   //\r
   if ((LocalTokenNumber & PCD_TYPE_VPD) != 0) {\r
   // PCD entry.\r
   //\r
   if ((LocalTokenNumber & PCD_TYPE_VPD) != 0) {\r


@@ -1665,7 +1665,7 @@ SetPtrTypeSize (
        *CurrentSize = MaxSize;\r
        return FALSE;\r
     }\r
        *CurrentSize = MaxSize;\r
        return FALSE;\r
     }\r

-    \r
+\r

     //\r
     // We have only two entry for Non-Sku enabled PCD entry:\r
     // 1) MAX SIZE\r
     //\r
     // We have only two entry for Non-Sku enabled PCD entry:\r
     // 1) MAX SIZE\r

diff --git a/MdeModulePkg/Universal/PCD/Pei/Pcd.inf b/MdeModulePkg/Universal/PCD/Pei/Pcd.inf
index 3cba28944c1e6f60851395034801362be2c6c2a4..c2a3ccbbc0c1eba471e042939f23e4f1a6f6116c 100644 (file)
--- a/MdeModulePkg/Universal/PCD/Pei/Pcd.inf
+++ b/MdeModulePkg/Universal/PCD/Pei/Pcd.inf
@@ -1,18 +1,18 @@
 ## @file\r
 # PCD PEIM produces PCD database to manage all dynamic PCD in PEI phase and install Pcd Ppi service.\r
 #\r
 ## @file\r
 # PCD PEIM produces PCD database to manage all dynamic PCD in PEI phase and install Pcd Ppi service.\r
 #\r

-# This version PCD PEIM depends on the external PCD database binary file, not built in PCD data base. \r
+# This version PCD PEIM depends on the external PCD database binary file, not built in PCD data base.\r

 # There are two PCD PPIs as follows:\r
 # There are two PCD PPIs as follows:\r

-#   1) PCD_PPI \r
+#   1) PCD_PPI\r

 #      It is EDKII implementation which support Dynamic/DynamicEx Pcds.\r
 #   2) EFI_PEI_PCD_PPI\r
 #      It is EDKII implementation which support Dynamic/DynamicEx Pcds.\r
 #   2) EFI_PEI_PCD_PPI\r

-#      It is defined by PI specification 1.2, Vol 3 which only support dynamicEx \r
+#      It is defined by PI specification 1.2, Vol 3 which only support dynamicEx\r

 #      type Pcd.\r
 # For dynamicEx type PCD, it is compatible between PCD_PPI and EFI_PEI_PCD_PPI.\r
 # PCD PEIM driver will produce above two PPIs at same time.\r
 #\r
 #      type Pcd.\r
 # For dynamicEx type PCD, it is compatible between PCD_PPI and EFI_PEI_PCD_PPI.\r
 # PCD PEIM driver will produce above two PPIs at same time.\r
 #\r

-# PCD database is generated as the separate binary image at build time. The binary image \r
-# will be intergrated into Firmware volume together with PCD driver. \r
+# PCD database is generated as the separate binary image at build time. The binary image\r
+# will be intergrated into Firmware volume together with PCD driver.\r

 #\r
 # ////////////////////////////////////////////////////////////////////////////////\r
 # //                                                                            //\r
 #\r
 # ////////////////////////////////////////////////////////////////////////////////\r
 # //                                                                            //\r


@@ -21,94 +21,94 @@
 # ////////////////////////////////////////////////////////////////////////////////\r
 #\r
 # 1, Introduction\r
 # ////////////////////////////////////////////////////////////////////////////////\r
 #\r
 # 1, Introduction\r

-#    PCD database hold all dynamic type PCD information. The structure of PEI PCD \r
-#    database is generated by build tools according to dynamic PCD usage for \r
+#    PCD database hold all dynamic type PCD information. The structure of PEI PCD\r
+#    database is generated by build tools according to dynamic PCD usage for\r

 #    specified platform.\r
 #    specified platform.\r

-#    \r
+#\r

 # 2, Dynamic Type PCD\r
 #    Dynamic type PCD is used for the configuration/setting which value is determined\r
 # 2, Dynamic Type PCD\r
 #    Dynamic type PCD is used for the configuration/setting which value is determined\r

-#    dynamic. In contrast, the value of static type PCD (FeatureFlag, FixedPcd, \r
-#    PatchablePcd) is fixed in final generated FD image in build time. \r
-#        \r
+#    dynamic. In contrast, the value of static type PCD (FeatureFlag, FixedPcd,\r
+#    PatchablePcd) is fixed in final generated FD image in build time.\r
+#\r

 #    2.1 The "dynamic" determination means one of below cases:\r
 #    2.1 The "dynamic" determination means one of below cases:\r

-#      a) The PCD setting value is produced by someone driver and consumed by \r
+#      a) The PCD setting value is produced by someone driver and consumed by\r

 #         other driver in execution time.\r
 #      b) The PCD setting value is set/get by user from FrontPage.\r
 #      c) The PCD setting value is produced by platform OEM vendor in specified area.\r
 #         other driver in execution time.\r
 #      b) The PCD setting value is set/get by user from FrontPage.\r
 #      c) The PCD setting value is produced by platform OEM vendor in specified area.\r

-#    \r
+#\r

 #    2.2 According to module distribution way, dynamic PCD could be classfied as:\r
 #      a) Dynamic:\r
 #    2.2 According to module distribution way, dynamic PCD could be classfied as:\r
 #      a) Dynamic:\r

-#         If module is released in source code and will be built with platform \r
+#         If module is released in source code and will be built with platform\r

 #         DSC, the dynamic PCD used by this module can be accessed as:\r
 #         DSC, the dynamic PCD used by this module can be accessed as:\r

-#                 PcdGetxx(PcdSampleDynamicPcd); \r
+#                 PcdGetxx(PcdSampleDynamicPcd);\r

 #         In building platform, build tools will translate PcdSampleDynamicPcd to\r
 #         In building platform, build tools will translate PcdSampleDynamicPcd to\r

-#         pair of {Token Space Guid: Token Number} for this PCD. \r
+#         pair of {Token Space Guid: Token Number} for this PCD.\r

 #      b) DynamicEx:\r
 #         If module is release as binary and will not pariticpate platform building,\r
 #         the dynamic PCD used by this module need be accessed as:\r
 #               PcdGetxxEx(gEfiMyTokenspaceGuid, PcdSampleDynamicPcd)\r
 #         Developer need explicity gives {Token Space Guid:Token Number} as parameter\r
 #         in writting source code.\r
 #      b) DynamicEx:\r
 #         If module is release as binary and will not pariticpate platform building,\r
 #         the dynamic PCD used by this module need be accessed as:\r
 #               PcdGetxxEx(gEfiMyTokenspaceGuid, PcdSampleDynamicPcd)\r
 #         Developer need explicity gives {Token Space Guid:Token Number} as parameter\r
 #         in writting source code.\r

-#         \r
+#\r

 #    2.3 According to PCD value's storage method, dynamic PCD could be classfied as:\r
 #    2.3 According to PCD value's storage method, dynamic PCD could be classfied as:\r

-#      a) Default Storage: \r
-#         - The PCD value is stored in PCD database maintained by PCD driver in boot \r
+#      a) Default Storage:\r
+#         - The PCD value is stored in PCD database maintained by PCD driver in boot\r

 #           time memory.\r
 #           time memory.\r

-#         - This type is used for communication between PEIM/DXE driver, DXE/DXE \r
-#           driver. But all set/get value will be losted after boot-time memory \r
+#         - This type is used for communication between PEIM/DXE driver, DXE/DXE\r
+#           driver. But all set/get value will be losted after boot-time memory\r

 #           is turn off.\r
 #           is turn off.\r

-#         - [PcdsDynamicDefault] is used as section name for this type PCD in \r
+#         - [PcdsDynamicDefault] is used as section name for this type PCD in\r

 #           platform DSC file. [PcdsDynamicExDefault] is used for dynamicEx type PCD.\r
 #           platform DSC file. [PcdsDynamicExDefault] is used for dynamicEx type PCD.\r

-#         \r
-#      b) Variable Storage: \r
-#         - The PCD value is stored in variable area. \r
+#\r
+#      b) Variable Storage:\r
+#         - The PCD value is stored in variable area.\r

 #         - As default storage type, this type PCD could be used for PEI/DXE driver\r
 #         - As default storage type, this type PCD could be used for PEI/DXE driver\r

-#           communication. But beside it, this type PCD could also be used to store \r
+#           communication. But beside it, this type PCD could also be used to store\r

 #           the value associate with a HII setting via variable interface.\r
 #           the value associate with a HII setting via variable interface.\r

-#         - In PEI phase, the PCD value could only be got but can not be set due \r
+#         - In PEI phase, the PCD value could only be got but can not be set due\r

 #           to variable area is readonly.\r
 #           to variable area is readonly.\r

-#         - [PcdsDynamicHii] is used as section name for this type PCD in platform \r
+#         - [PcdsDynamicHii] is used as section name for this type PCD in platform\r

 #           DSC file. [PcdsDynamicExHii] is for dynamicEx type PCD.\r
 #           DSC file. [PcdsDynamicExHii] is for dynamicEx type PCD.\r

-#           \r
+#\r

 #      c) OEM specificed storage area:\r
 #      c) OEM specificed storage area:\r

-#         - The PCD value is stored in OEM specified area which base address is \r
+#         - The PCD value is stored in OEM specified area which base address is\r

 #           specified by a FixedAtBuild PCD setting - PcdVpdBaseAddress.\r
 #         - The area is read only for PEI and DXE phase.\r
 #           specified by a FixedAtBuild PCD setting - PcdVpdBaseAddress.\r
 #         - The area is read only for PEI and DXE phase.\r

-#         - [PcdsDynamicVpd] is used as section name for this type PCD in platform \r
+#         - [PcdsDynamicVpd] is used as section name for this type PCD in platform\r

 #           DSC file. [PcdsDynamicExVpd] is for dynamicex type PCD.\r
 #           DSC file. [PcdsDynamicExVpd] is for dynamicex type PCD.\r

-#      \r
+#\r

 #    2.4 When and how to use dynamic PCD\r
 #      Module developer do not care the used PCD is dynamic or static when writting\r
 #    2.4 When and how to use dynamic PCD\r
 #      Module developer do not care the used PCD is dynamic or static when writting\r

-#      source code/INF. Dynamic PCD and dynamic type is pointed by platform integrator \r
+#      source code/INF. Dynamic PCD and dynamic type is pointed by platform integrator\r

 #      in platform DSC file. Please ref section 2.3 to get matching between dynamic\r
 #      PCD type and section name in DSC file.\r
 #      in platform DSC file. Please ref section 2.3 to get matching between dynamic\r
 #      PCD type and section name in DSC file.\r

-#    \r
+#\r

 # 3, PCD database:\r
 # 3, PCD database:\r

-#    Although dynamic PCD could be in different storage type as above description, \r
+#    Although dynamic PCD could be in different storage type as above description,\r

 #    but the basic information and default value for all dynamic PCD is hold\r
 #    by PCD database maintained by PEI/DXE driver.\r
 #    but the basic information and default value for all dynamic PCD is hold\r
 #    by PCD database maintained by PEI/DXE driver.\r

-#    \r
+#\r

 #    As the whole EFI BIOS boot path is divided into PEI/DXE phase, the PCD database\r
 #    also is divided into Pei/Dxe database maintaied by PcdPeim/PcdDxe driver separatly.\r
 #    To make PcdPeim's driver image smaller, PEI PCD database only hold all dynamic\r
 #    PCD information used in PEI phase or use in both PEI/DXE phase. And DXE PCD\r
 #    database contains all PCDs used in PEI/DXE phase in memory.\r
 #    As the whole EFI BIOS boot path is divided into PEI/DXE phase, the PCD database\r
 #    also is divided into Pei/Dxe database maintaied by PcdPeim/PcdDxe driver separatly.\r
 #    To make PcdPeim's driver image smaller, PEI PCD database only hold all dynamic\r
 #    PCD information used in PEI phase or use in both PEI/DXE phase. And DXE PCD\r
 #    database contains all PCDs used in PEI/DXE phase in memory.\r

-#    \r
-#    Build tool will generate PCD database into the separate binary file for \r
-#    PEI/DXE PCD driver according to dynamic PCD section in platform DSC file. \r
-#    \r
+#\r
+#    Build tool will generate PCD database into the separate binary file for\r
+#    PEI/DXE PCD driver according to dynamic PCD section in platform DSC file.\r
+#\r

 #    3.1 PcdPeim and PcdDxe\r
 #      PEI PCD database is maintained by PcdPeim driver run from flash. PcdPeim driver\r
 #    3.1 PcdPeim and PcdDxe\r
 #      PEI PCD database is maintained by PcdPeim driver run from flash. PcdPeim driver\r

-#      build guid hob in temporary memory and copy the binary data base from flash \r
-#      to temporary memory for PEI PCD database. \r
+#      build guid hob in temporary memory and copy the binary data base from flash\r
+#      to temporary memory for PEI PCD database.\r

 #      DXE PCD database is maintained by PcdDxe driver.At entry point of PcdDxe driver,\r
 #      a new PCD database is allocated in boot-time memory which including all\r
 #      PEI PCD and DXE PCD entry.\r
 #      DXE PCD database is maintained by PcdDxe driver.At entry point of PcdDxe driver,\r
 #      a new PCD database is allocated in boot-time memory which including all\r
 #      PEI PCD and DXE PCD entry.\r

-#      \r
+#\r

 #      Pcd driver should run as early as possible before any other driver access\r
 #      dynamic PCD's value. PEI/DXE "Apriori File" mechanism make it possible by\r
 #      making PcdPeim/PcdDxe as first dispatching driver in PEI/DXE phase.\r
 #      Pcd driver should run as early as possible before any other driver access\r
 #      dynamic PCD's value. PEI/DXE "Apriori File" mechanism make it possible by\r
 #      making PcdPeim/PcdDxe as first dispatching driver in PEI/DXE phase.\r

-#      \r
+#\r

 #    3.2 Token space Guid/Token number, Platform token, Local token number\r
 #           Dynamic PCD\r
 #          +-----------+               +---------+\r
 #    3.2 Token space Guid/Token number, Platform token, Local token number\r
 #           Dynamic PCD\r
 #          +-----------+               +---------+\r


@@ -128,42 +128,42 @@
 #                               |  Token    |\r
 #                               |  Number   |\r
 #                               +-----------+\r
 #                               |  Token    |\r
 #                               |  Number   |\r
 #                               +-----------+\r

-#    \r
-#    \r
+#\r
+#\r

 #      3.2.1 Pair of Token space guid + Token number\r
 #        Any type PCD is identified by pair of "TokenSpaceGuid + TokeNumber". But it\r
 #      3.2.1 Pair of Token space guid + Token number\r
 #        Any type PCD is identified by pair of "TokenSpaceGuid + TokeNumber". But it\r

-#        is not easy maintained by PCD driver, and hashed token number will make \r
-#        searching slowly. \r
+#        is not easy maintained by PCD driver, and hashed token number will make\r
+#        searching slowly.\r

 #\r
 #      3.2.2 Platform Token Number\r
 #\r
 #      3.2.2 Platform Token Number\r

-#        "Platform token number" concept is introduced for mapping to a pair of \r
-#        "TokenSpaceGuid + TokenNumber". The platform token number is generated by \r
-#        build tool in autogen.h and all of them are continual in a platform scope \r
+#        "Platform token number" concept is introduced for mapping to a pair of\r
+#        "TokenSpaceGuid + TokenNumber". The platform token number is generated by\r
+#        build tool in autogen.h and all of them are continual in a platform scope\r

 #        started from 1.(0 meaning invalid internal token number)\r
 #        With auto-generated "platform token number", PcdGet(PcdSampleDynamicPcd)\r
 #        started from 1.(0 meaning invalid internal token number)\r
 #        With auto-generated "platform token number", PcdGet(PcdSampleDynamicPcd)\r

-#        in source code is translated to LibPcdGet(_PCD_TOKEN_PcdSampleDynamicPcd) \r
+#        in source code is translated to LibPcdGet(_PCD_TOKEN_PcdSampleDynamicPcd)\r

 #        in autogen.h.\r
 #        Notes: The mapping between pair of "tokenspace guid + token number" and\r
 #        "internal token number" need build tool establish, so "platform token number"\r
 #        mechanism is not suitable for binary module which use DynamicEx type PCD.\r
 #        To access a dynamicEx type PCD, pair of "token space guid/token number" all need\r
 #        to be specificed for PcdSet/PcdGet accessing macro.\r
 #        in autogen.h.\r
 #        Notes: The mapping between pair of "tokenspace guid + token number" and\r
 #        "internal token number" need build tool establish, so "platform token number"\r
 #        mechanism is not suitable for binary module which use DynamicEx type PCD.\r
 #        To access a dynamicEx type PCD, pair of "token space guid/token number" all need\r
 #        to be specificed for PcdSet/PcdGet accessing macro.\r

-#      \r
-#        Platform Token Number is started from 1, and inceased continuous. From whole \r
+#\r
+#        Platform Token Number is started from 1, and inceased continuous. From whole\r

 #        platform scope, there are two zones: PEI Zone and DXE Zone\r
 #                  |                      Platform Token Number\r
 #        ----------|----------------------------------------------------------------\r
 #        PEI Zone: |            1                 ~  PEI_LOCAL_TOKEN_NUMBER\r
 #        DXE Zone: | (PEI_LOCAL_TOKEN_NUMBER + 1) ~ (PEI_LOCAL_TOKEN_NUMBER + DXE_LOCAL_TOKEN_NUMBER)\r
 #        platform scope, there are two zones: PEI Zone and DXE Zone\r
 #                  |                      Platform Token Number\r
 #        ----------|----------------------------------------------------------------\r
 #        PEI Zone: |            1                 ~  PEI_LOCAL_TOKEN_NUMBER\r
 #        DXE Zone: | (PEI_LOCAL_TOKEN_NUMBER + 1) ~ (PEI_LOCAL_TOKEN_NUMBER + DXE_LOCAL_TOKEN_NUMBER)\r

-#        \r
+#\r

 #      3.2.3 Local Token Number\r
 #      3.2.3 Local Token Number\r

-#        To fast searching a PCD entry in PCD database, PCD driver translate \r
+#        To fast searching a PCD entry in PCD database, PCD driver translate\r

 #        platform token number to local token number via a mapping table.\r
 #        For binary DynamicEx type PCD, there is a another mapping table to translate\r
 #        "token space guid + token number" to local token number directly.\r
 #        Local token number is identifier for all internal interface in PCD PEI/DXE\r
 #        driver.\r
 #        platform token number to local token number via a mapping table.\r
 #        For binary DynamicEx type PCD, there is a another mapping table to translate\r
 #        "token space guid + token number" to local token number directly.\r
 #        Local token number is identifier for all internal interface in PCD PEI/DXE\r
 #        driver.\r

-#        \r
+#\r

 #        A local token number is a 32-bit value in following meaning:\r
 #         32 ------------- 28 ---------- 24 -------- 0\r
 #          | PCD type mask  | Datum Type  |  Offset  |\r
 #        A local token number is a 32-bit value in following meaning:\r
 #         32 ------------- 28 ---------- 24 -------- 0\r
 #          | PCD type mask  | Datum Type  |  Offset  |\r


@@ -183,13 +183,13 @@
 #          Offset      : indicate the related offset of PCD value in PCD database array.\r
 #       Based on local token number, PCD driver could fast determine PCD type, value\r
 #       type and get PCD entry from PCD database.\r
 #          Offset      : indicate the related offset of PCD value in PCD database array.\r
 #       Based on local token number, PCD driver could fast determine PCD type, value\r
 #       type and get PCD entry from PCD database.\r

-#       \r
+#\r

 #    3.3 PCD Database binary file\r
 #    3.3 PCD Database binary file\r

-#      PCD Database binary file will be created at build time as the standalone binary image. \r
-#      To understand the binary image layout, PCD Database C structure is still generated \r
+#      PCD Database binary file will be created at build time as the standalone binary image.\r
+#      To understand the binary image layout, PCD Database C structure is still generated\r

 #      as comments by build tools in PCD driver's autogen.h/\r
 #      autogen.c file. In generated C structure, following information is stored:\r
 #      as comments by build tools in PCD driver's autogen.h/\r
 #      autogen.c file. In generated C structure, following information is stored:\r

-#      - ExMapTable: This table is used translate a binary dynamicex type PCD's \r
+#      - ExMapTable: This table is used translate a binary dynamicex type PCD's\r

 #                    "tokenguid + token" to local token number.\r
 #      - LocalTokenNumberTable:\r
 #                    This table stores all local token number in array, use "Internal\r
 #                    "tokenguid + token" to local token number.\r
 #      - LocalTokenNumberTable:\r
 #                    This table stores all local token number in array, use "Internal\r


@@ -199,19 +199,19 @@
 #                    HII type PCD's variable GUID.\r
 #      - SkuIdTable: TBD\r
 #      - SystemSkuId: TBD\r
 #                    HII type PCD's variable GUID.\r
 #      - SkuIdTable: TBD\r
 #      - SystemSkuId: TBD\r

-#      - PCD value structure:  \r
+#      - PCD value structure:\r

 #                    Every PCD has a value record in PCD database. For different\r
 #                    Every PCD has a value record in PCD database. For different\r

-#                    datum type PCD has different record structure which will be \r
+#                    datum type PCD has different record structure which will be\r

 #                    introduced in 3.3.1\r
 #                    introduced in 3.3.1\r

-#      \r
-#      In a PCD database structure, there are two major area: Init and UnInit. \r
-#      Init area is use stored above PCD internal structure such as ExMapTable, \r
-#      LocalTokenNumberTable etc and the (default) value of PCD which has default \r
+#\r
+#      In a PCD database structure, there are two major area: Init and UnInit.\r
+#      Init area is use stored above PCD internal structure such as ExMapTable,\r
+#      LocalTokenNumberTable etc and the (default) value of PCD which has default\r

 #      value specified in platform DSC file.\r
 #      Unint area is used stored the value of PCD which has no default value in\r
 #      platform DSC file, the value of NULL, 0 specified in platform DSC file can\r
 #      be seemed as "no default value".\r
 #      value specified in platform DSC file.\r
 #      Unint area is used stored the value of PCD which has no default value in\r
 #      platform DSC file, the value of NULL, 0 specified in platform DSC file can\r
 #      be seemed as "no default value".\r

-#      \r
+#\r

 #      3.3.1 Simple Sample PCD Database C Structure\r
 #        A general sample of PCD database structue is as follows:\r
 #        typedef struct _PCD_DATABASE {\r
 #      3.3.1 Simple Sample PCD Database C Structure\r
 #        A general sample of PCD database structue is as follows:\r
 #        typedef struct _PCD_DATABASE {\r


@@ -223,7 +223,7 @@
 #            SIZE_INFO         SizeTable[PEI_SIZE_TABLE_SIZE];\r
 #            UINT8             SkuIdTable[PEI_SKUID_TABLE_SIZE];\r
 #            SKU_ID            SystemSkuId;\r
 #            SIZE_INFO         SizeTable[PEI_SIZE_TABLE_SIZE];\r
 #            UINT8             SkuIdTable[PEI_SKUID_TABLE_SIZE];\r
 #            SKU_ID            SystemSkuId;\r

-#            \r
+#\r

 #            //===== Following is value structure for PCD with default value\r
 #            ....\r
 #            ....\r
 #            //===== Following is value structure for PCD with default value\r
 #            ....\r
 #            ....\r


@@ -235,11 +235,11 @@
 #            ....\r
 #          } UnInit;\r
 #        }\r
 #            ....\r
 #          } UnInit;\r
 #        }\r

-#      \r
+#\r

 #      3.3.2 PCD value structure in PCD database C structure\r
 #        The value's structure is generated by build tool in PCD database C structure.\r
 #        The PCDs in different datum type has different value structure.\r
 #      3.3.2 PCD value structure in PCD database C structure\r
 #        The value's structure is generated by build tool in PCD database C structure.\r
 #        The PCDs in different datum type has different value structure.\r

-#        \r
+#\r

 #        3.3.2.1 UINT8/UINT16/UINT32/UINT64 datum type PCD\r
 #          The C structure for these datum type PCD is just a UINT8/UINT16/UINT32/UINT64\r
 #          data member in PCD database, For example:\r
 #        3.3.2.1 UINT8/UINT16/UINT32/UINT64 datum type PCD\r
 #          The C structure for these datum type PCD is just a UINT8/UINT16/UINT32/UINT64\r
 #          data member in PCD database, For example:\r


@@ -247,36 +247,36 @@
 #          Above structure is generated by build tool, the member name is "PcdCName_Guidvalue"\r
 #          Member type is UINT16 according to PcdHardwareErrorRecordLevel declaration\r
 #          in DEC file.\r
 #          Above structure is generated by build tool, the member name is "PcdCName_Guidvalue"\r
 #          Member type is UINT16 according to PcdHardwareErrorRecordLevel declaration\r
 #          in DEC file.\r

-#          \r
+#\r

 #        3.3.2.2 VOID* datum type PCD\r
 #          The value of VOID* datum type PCD is a UINT8/UINT16 array in PCD database.\r
 #        3.3.2.2 VOID* datum type PCD\r
 #          The value of VOID* datum type PCD is a UINT8/UINT16 array in PCD database.\r

-#          \r
+#\r

 #          3.3.2.2.1 VOID* - string type\r
 #          3.3.2.2.1 VOID* - string type\r

-#            If the default value for VOID* datum type PCD like L"xxx", the PCD is \r
-#            used for unicode string, and C structure of this datum type PCD is \r
+#            If the default value for VOID* datum type PCD like L"xxx", the PCD is\r
+#            used for unicode string, and C structure of this datum type PCD is\r

 #            UINT16 string array in PCD database, for example:\r
 #            UINT16 StringTable[29];\r
 #            The number of 29 in above sample is max size of a unicode string.\r
 #            UINT16 string array in PCD database, for example:\r
 #            UINT16 StringTable[29];\r
 #            The number of 29 in above sample is max size of a unicode string.\r

-#            \r
+#\r

 #            If the default value for VOID* datum type PCD like "xxx", the PCD is\r
 #            If the default value for VOID* datum type PCD like "xxx", the PCD is\r

-#            used for ascii string, and C structure of this datum type PCD is \r
+#            used for ascii string, and C structure of this datum type PCD is\r

 #            UINT8 string array in PCD database, for example:\r
 #            UINT8 StringTable[20];\r
 #            The number of 20 in above sample is max size of a ascii string.\r
 #            UINT8 string array in PCD database, for example:\r
 #            UINT8 StringTable[20];\r
 #            The number of 20 in above sample is max size of a ascii string.\r

-#            \r
+#\r

 #          3.3.2.2.2 VOID* - byte array\r
 #            If the default value of VOID* datum type PCD like {'0x29', '0x01', '0xf2'}\r
 #          3.3.2.2.2 VOID* - byte array\r
 #            If the default value of VOID* datum type PCD like {'0x29', '0x01', '0xf2'}\r

-#            the PCD is used for byte array. The generated structrue is same as \r
+#            the PCD is used for byte array. The generated structrue is same as\r

 #            above ascii string table,\r
 #            UINT8 StringTable[13];\r
 #            The number of 13 in above sample is max size of byte array.\r
 #            above ascii string table,\r
 #            UINT8 StringTable[13];\r
 #            The number of 13 in above sample is max size of byte array.\r

-#       \r
+#\r

 #      3.3.3 Some utility structures in PCD Database\r
 #        3.3.3.1 GuidTable\r
 #          GuidTable array is used to store all related GUID value in PCD database:\r
 #            - Variable GUID for HII type PCD\r
 #      3.3.3 Some utility structures in PCD Database\r
 #        3.3.3.1 GuidTable\r
 #          GuidTable array is used to store all related GUID value in PCD database:\r
 #            - Variable GUID for HII type PCD\r

-#            - Token space GUID for dynamicex type PCD \r
-#    \r
+#            - Token space GUID for dynamicex type PCD\r
+#\r

 #  Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r
 #\r
 #  This program and the accompanying materials\r
 #  Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r
 #\r
 #  This program and the accompanying materials\r


@@ -327,7 +327,7 @@
 [Guids]\r
   ## PRODUCES            ## HOB\r
   ## SOMETIMES_CONSUMES  ## HOB\r
 [Guids]\r
   ## PRODUCES            ## HOB\r
   ## SOMETIMES_CONSUMES  ## HOB\r

-  gPcdDataBaseHobGuid                           \r
+  gPcdDataBaseHobGuid\r

   gPcdDataBaseSignatureGuid                     ## CONSUMES  ## GUID  # PCD database signature GUID.\r
   gEfiMdeModulePkgTokenSpaceGuid                ## SOMETIMES_CONSUMES  ## GUID\r
 \r
   gPcdDataBaseSignatureGuid                     ## CONSUMES  ## GUID  # PCD database signature GUID.\r
   gEfiMdeModulePkgTokenSpaceGuid                ## SOMETIMES_CONSUMES  ## GUID\r
 \r

diff --git a/MdeModulePkg/Universal/PCD/Pei/PcdPeim.uni b/MdeModulePkg/Universal/PCD/Pei/PcdPeim.uni
index 3e7c5566f0727ed2622e52b980828b2ee34cc4fa..88cfe01f5bf90fbd4a88aa2c6f23261f4af05381 100644 (file)
--- a/MdeModulePkg/Universal/PCD/Pei/PcdPeim.uni
+++ b/MdeModulePkg/Universal/PCD/Pei/PcdPeim.uni
@@ -10,32 +10,32 @@
 // type Pcd.\r
 // For dynamicEx type PCD, it is compatible between PCD_PPI and EFI_PEI_PCD_PPI.\r
 // PCD PEIM driver will produce above two PPIs at same time.\r
 // type Pcd.\r
 // For dynamicEx type PCD, it is compatible between PCD_PPI and EFI_PEI_PCD_PPI.\r
 // PCD PEIM driver will produce above two PPIs at same time.\r

-// \r
+//\r

 // PCD database is generated as the separate binary image at build time. The binary image\r
 // will be intergrated into Firmware volume together with PCD driver.\r
 // PCD database is generated as the separate binary image at build time. The binary image\r
 // will be intergrated into Firmware volume together with PCD driver.\r

-// \r
+//\r

 // ////////////////////////////////////////////////////////////////////////////////\r
 // //                                                                            //\r
 // //                      Introduction of PCD database                          //\r
 // //                                                                            //\r
 // ////////////////////////////////////////////////////////////////////////////////\r
 // ////////////////////////////////////////////////////////////////////////////////\r
 // //                                                                            //\r
 // //                      Introduction of PCD database                          //\r
 // //                                                                            //\r
 // ////////////////////////////////////////////////////////////////////////////////\r

-// \r
+//\r

 // 1, Introduction\r
 // PCD database hold all dynamic type PCD information. The structure of PEI PCD\r
 // database is generated by build tools according to dynamic PCD usage for\r
 // specified platform.\r
 // 1, Introduction\r
 // PCD database hold all dynamic type PCD information. The structure of PEI PCD\r
 // database is generated by build tools according to dynamic PCD usage for\r
 // specified platform.\r

-// \r
+//\r

 // 2, Dynamic Type PCD\r
 // Dynamic type PCD is used for the configuration/setting which value is determined\r
 // dynamic. In contrast, the value of static type PCD (FeatureFlag, FixedPcd,\r
 // PatchablePcd) is fixed in final generated FD image in build time.\r
 // 2, Dynamic Type PCD\r
 // Dynamic type PCD is used for the configuration/setting which value is determined\r
 // dynamic. In contrast, the value of static type PCD (FeatureFlag, FixedPcd,\r
 // PatchablePcd) is fixed in final generated FD image in build time.\r

-// \r
+//\r

 // 2.1 The "dynamic" determination means one of below cases:\r
 // a) The PCD setting value is produced by someone driver and consumed by\r
 // other driver in execution time.\r
 // b) The PCD setting value is set/get by user from FrontPage.\r
 // c) The PCD setting value is produced by platform OEM vendor in specified area.\r
 // 2.1 The "dynamic" determination means one of below cases:\r
 // a) The PCD setting value is produced by someone driver and consumed by\r
 // other driver in execution time.\r
 // b) The PCD setting value is set/get by user from FrontPage.\r
 // c) The PCD setting value is produced by platform OEM vendor in specified area.\r

-// \r
+//\r

 // 2.2 According to module distribution way, dynamic PCD could be classfied as:\r
 // a) Dynamic:\r
 // If module is released in source code and will be built with platform\r
 // 2.2 According to module distribution way, dynamic PCD could be classfied as:\r
 // a) Dynamic:\r
 // If module is released in source code and will be built with platform\r


@@ -49,7 +49,7 @@
 // PcdGetxxEx(gEfiMyTokenspaceGuid, PcdSampleDynamicPcd)\r
 // Developer need explicity gives {Token Space Guid:Token Number} as parameter\r
 // in writting source code.\r
 // PcdGetxxEx(gEfiMyTokenspaceGuid, PcdSampleDynamicPcd)\r
 // Developer need explicity gives {Token Space Guid:Token Number} as parameter\r
 // in writting source code.\r

-// \r
+//\r

 // 2.3 According to PCD value's storage method, dynamic PCD could be classfied as:\r
 // a) Default Storage:\r
 // - The PCD value is stored in PCD database maintained by PCD driver in boot\r
 // 2.3 According to PCD value's storage method, dynamic PCD could be classfied as:\r
 // a) Default Storage:\r
 // - The PCD value is stored in PCD database maintained by PCD driver in boot\r


@@ -59,7 +59,7 @@
 // is turn off.\r
 // - [PcdsDynamicDefault] is used as section name for this type PCD in\r
 // platform DSC file. [PcdsDynamicExDefault] is used for dynamicEx type PCD.\r
 // is turn off.\r
 // - [PcdsDynamicDefault] is used as section name for this type PCD in\r
 // platform DSC file. [PcdsDynamicExDefault] is used for dynamicEx type PCD.\r

-// \r
+//\r

 // b) Variable Storage:\r
 // - The PCD value is stored in variable area.\r
 // - As default storage type, this type PCD could be used for PEI/DXE driver\r
 // b) Variable Storage:\r
 // - The PCD value is stored in variable area.\r
 // - As default storage type, this type PCD could be used for PEI/DXE driver\r


@@ -69,34 +69,34 @@
 // to variable area is readonly.\r
 // - [PcdsDynamicHii] is used as section name for this type PCD in platform\r
 // DSC file. [PcdsDynamicExHii] is for dynamicEx type PCD.\r
 // to variable area is readonly.\r
 // - [PcdsDynamicHii] is used as section name for this type PCD in platform\r
 // DSC file. [PcdsDynamicExHii] is for dynamicEx type PCD.\r

-// \r
+//\r

 // c) OEM specificed storage area:\r
 // - The PCD value is stored in OEM specified area which base address is\r
 // specified by a FixedAtBuild PCD setting - PcdVpdBaseAddress.\r
 // - The area is read only for PEI and DXE phase.\r
 // - [PcdsDynamicVpd] is used as section name for this type PCD in platform\r
 // DSC file. [PcdsDynamicExVpd] is for dynamicex type PCD.\r
 // c) OEM specificed storage area:\r
 // - The PCD value is stored in OEM specified area which base address is\r
 // specified by a FixedAtBuild PCD setting - PcdVpdBaseAddress.\r
 // - The area is read only for PEI and DXE phase.\r
 // - [PcdsDynamicVpd] is used as section name for this type PCD in platform\r
 // DSC file. [PcdsDynamicExVpd] is for dynamicex type PCD.\r

-// \r
+//\r

 // 2.4 When and how to use dynamic PCD\r
 // Module developer do not care the used PCD is dynamic or static when writting\r
 // source code/INF. Dynamic PCD and dynamic type is pointed by platform integrator\r
 // in platform DSC file. Please ref section 2.3 to get matching between dynamic\r
 // PCD type and section name in DSC file.\r
 // 2.4 When and how to use dynamic PCD\r
 // Module developer do not care the used PCD is dynamic or static when writting\r
 // source code/INF. Dynamic PCD and dynamic type is pointed by platform integrator\r
 // in platform DSC file. Please ref section 2.3 to get matching between dynamic\r
 // PCD type and section name in DSC file.\r

-// \r
+//\r

 // 3, PCD database:\r
 // Although dynamic PCD could be in different storage type as above description,\r
 // but the basic information and default value for all dynamic PCD is hold\r
 // by PCD database maintained by PEI/DXE driver.\r
 // 3, PCD database:\r
 // Although dynamic PCD could be in different storage type as above description,\r
 // but the basic information and default value for all dynamic PCD is hold\r
 // by PCD database maintained by PEI/DXE driver.\r

-// \r
+//\r

 // As the whole EFI BIOS boot path is divided into PEI/DXE phase, the PCD database\r
 // also is divided into Pei/Dxe database maintaied by PcdPeim/PcdDxe driver separatly.\r
 // To make PcdPeim's driver image smaller, PEI PCD database only hold all dynamic\r
 // PCD information used in PEI phase or use in both PEI/DXE phase. And DXE PCD\r
 // database contains all PCDs used in PEI/DXE phase in memory.\r
 // As the whole EFI BIOS boot path is divided into PEI/DXE phase, the PCD database\r
 // also is divided into Pei/Dxe database maintaied by PcdPeim/PcdDxe driver separatly.\r
 // To make PcdPeim's driver image smaller, PEI PCD database only hold all dynamic\r
 // PCD information used in PEI phase or use in both PEI/DXE phase. And DXE PCD\r
 // database contains all PCDs used in PEI/DXE phase in memory.\r

-// \r
+//\r

 // Build tool will generate PCD database into the separate binary file for\r
 // PEI/DXE PCD driver according to dynamic PCD section in platform DSC file.\r
 // Build tool will generate PCD database into the separate binary file for\r
 // PEI/DXE PCD driver according to dynamic PCD section in platform DSC file.\r

-// \r
+//\r

 // 3.1 PcdPeim and PcdDxe\r
 // PEI PCD database is maintained by PcdPeim driver run from flash. PcdPeim driver\r
 // build guid hob in temporary memory and copy the binary data base from flash\r
 // 3.1 PcdPeim and PcdDxe\r
 // PEI PCD database is maintained by PcdPeim driver run from flash. PcdPeim driver\r
 // build guid hob in temporary memory and copy the binary data base from flash\r


@@ -104,11 +104,11 @@
 // DXE PCD database is maintained by PcdDxe driver.At entry point of PcdDxe driver,\r
 // a new PCD database is allocated in boot-time memory which including all\r
 // PEI PCD and DXE PCD entry.\r
 // DXE PCD database is maintained by PcdDxe driver.At entry point of PcdDxe driver,\r
 // a new PCD database is allocated in boot-time memory which including all\r
 // PEI PCD and DXE PCD entry.\r

-// \r
+//\r

 // Pcd driver should run as early as possible before any other driver access\r
 // dynamic PCD's value. PEI/DXE "Apriori File" mechanism make it possible by\r
 // making PcdPeim/PcdDxe as first dispatching driver in PEI/DXE phase.\r
 // Pcd driver should run as early as possible before any other driver access\r
 // dynamic PCD's value. PEI/DXE "Apriori File" mechanism make it possible by\r
 // making PcdPeim/PcdDxe as first dispatching driver in PEI/DXE phase.\r

-// \r
+//\r

 // 3.2 Token space Guid/Token number, Platform token, Local token number\r
 // Dynamic PCD\r
 // +-----------+               +---------+\r
 // 3.2 Token space Guid/Token number, Platform token, Local token number\r
 // Dynamic PCD\r
 // +-----------+               +---------+\r


@@ -128,13 +128,13 @@
 // |  Token    |\r
 // |  Number   |\r
 // +-----------+\r
 // |  Token    |\r
 // |  Number   |\r
 // +-----------+\r

-// \r
-// \r
+//\r
+//\r

 // 3.2.1 Pair of Token space guid + Token number\r
 // Any type PCD is identified by pair of "TokenSpaceGuid + TokeNumber". But it\r
 // is not easy maintained by PCD driver, and hashed token number will make\r
 // searching slowly.\r
 // 3.2.1 Pair of Token space guid + Token number\r
 // Any type PCD is identified by pair of "TokenSpaceGuid + TokeNumber". But it\r
 // is not easy maintained by PCD driver, and hashed token number will make\r
 // searching slowly.\r

-// \r
+//\r

 // 3.2.2 Platform Token Number\r
 // "Platform token number" concept is introduced for mapping to a pair of\r
 // "TokenSpaceGuid + TokenNumber". The platform token number is generated by\r
 // 3.2.2 Platform Token Number\r
 // "Platform token number" concept is introduced for mapping to a pair of\r
 // "TokenSpaceGuid + TokenNumber". The platform token number is generated by\r


@@ -148,14 +148,14 @@
 // mechanism is not suitable for binary module which use DynamicEx type PCD.\r
 // To access a dynamicEx type PCD, pair of "token space guid/token number" all need\r
 // to be specificed for PcdSet/PcdGet accessing macro.\r
 // mechanism is not suitable for binary module which use DynamicEx type PCD.\r
 // To access a dynamicEx type PCD, pair of "token space guid/token number" all need\r
 // to be specificed for PcdSet/PcdGet accessing macro.\r

-// \r
+//\r

 // Platform Token Number is started from 1, and inceased continuous. From whole\r
 // platform scope, there are two zones: PEI Zone and DXE Zone\r
 // |                      Platform Token Number\r
 // ----------|----------------------------------------------------------------\r
 // PEI Zone: |            1                 ~  PEI_LOCAL_TOKEN_NUMBER\r
 // DXE Zone: | (PEI_LOCAL_TOKEN_NUMBER + 1) ~ (PEI_LOCAL_TOKEN_NUMBER + DXE_LOCAL_TOKEN_NUMBER)\r
 // Platform Token Number is started from 1, and inceased continuous. From whole\r
 // platform scope, there are two zones: PEI Zone and DXE Zone\r
 // |                      Platform Token Number\r
 // ----------|----------------------------------------------------------------\r
 // PEI Zone: |            1                 ~  PEI_LOCAL_TOKEN_NUMBER\r
 // DXE Zone: | (PEI_LOCAL_TOKEN_NUMBER + 1) ~ (PEI_LOCAL_TOKEN_NUMBER + DXE_LOCAL_TOKEN_NUMBER)\r

-// \r
+//\r

 // 3.2.3 Local Token Number\r
 // To fast searching a PCD entry in PCD database, PCD driver translate\r
 // platform token number to local token number via a mapping table.\r
 // 3.2.3 Local Token Number\r
 // To fast searching a PCD entry in PCD database, PCD driver translate\r
 // platform token number to local token number via a mapping table.\r


@@ -163,7 +163,7 @@
 // "token space guid + token number" to local token number directly.\r
 // Local token number is identifier for all internal interface in PCD PEI/DXE\r
 // driver.\r
 // "token space guid + token number" to local token number directly.\r
 // Local token number is identifier for all internal interface in PCD PEI/DXE\r
 // driver.\r

-// \r
+//\r

 // A local token number is a 32-bit value in following meaning:\r
 // 32 ------------- 28 ---------- 24 -------- 0\r
 // | PCD type mask  | Datum Type  |  Offset  |\r
 // A local token number is a 32-bit value in following meaning:\r
 // 32 ------------- 28 ---------- 24 -------- 0\r
 // | PCD type mask  | Datum Type  |  Offset  |\r


@@ -183,7 +183,7 @@
 // Offset      : indicate the related offset of PCD value in PCD database array.\r
 // Based on local token number, PCD driver could fast determine PCD type, value\r
 // type and get PCD entry from PCD database.\r
 // Offset      : indicate the related offset of PCD value in PCD database array.\r
 // Based on local token number, PCD driver could fast determine PCD type, value\r
 // type and get PCD entry from PCD database.\r

-// \r
+//\r

 // 3.3 PCD Database binary file\r
 // PCD Database binary file will be created at build time as the standalone binary image.\r
 // To understand the binary image layout, PCD Database C structure is still generated\r
 // 3.3 PCD Database binary file\r
 // PCD Database binary file will be created at build time as the standalone binary image.\r
 // To understand the binary image layout, PCD Database C structure is still generated\r


@@ -203,7 +203,7 @@
 // Every PCD has a value record in PCD database. For different\r
 // datum type PCD has different record structure which will be\r
 // introduced in 3.3.1\r
 // Every PCD has a value record in PCD database. For different\r
 // datum type PCD has different record structure which will be\r
 // introduced in 3.3.1\r

-// \r
+//\r

 // In a PCD database structure, there are two major area: Init and UnInit.\r
 // Init area is use stored above PCD internal structure such as ExMapTable,\r
 // LocalTokenNumberTable etc and the (default) value of PCD which has default\r
 // In a PCD database structure, there are two major area: Init and UnInit.\r
 // Init area is use stored above PCD internal structure such as ExMapTable,\r
 // LocalTokenNumberTable etc and the (default) value of PCD which has default\r


@@ -211,7 +211,7 @@
 // Unint area is used stored the value of PCD which has no default value in\r
 // platform DSC file, the value of NULL, 0 specified in platform DSC file can\r
 // be seemed as "no default value".\r
 // Unint area is used stored the value of PCD which has no default value in\r
 // platform DSC file, the value of NULL, 0 specified in platform DSC file can\r
 // be seemed as "no default value".\r

-// \r
+//\r

 // 3.3.1 Simple Sample PCD Database C Structure\r
 // A general sample of PCD database structue is as follows:\r
 // typedef struct _PCD_DATABASE {\r
 // 3.3.1 Simple Sample PCD Database C Structure\r
 // A general sample of PCD database structue is as follows:\r
 // typedef struct _PCD_DATABASE {\r


@@ -223,7 +223,7 @@
 // SIZE_INFO         SizeTable[PEI_SIZE_TABLE_SIZE];\r
 // UINT8             SkuIdTable[PEI_SKUID_TABLE_SIZE];\r
 // SKU_ID            SystemSkuId;\r
 // SIZE_INFO         SizeTable[PEI_SIZE_TABLE_SIZE];\r
 // UINT8             SkuIdTable[PEI_SKUID_TABLE_SIZE];\r
 // SKU_ID            SystemSkuId;\r

-// \r
+//\r

 // //===== Following is value structure for PCD with default value\r
 // ....\r
 // ....\r
 // //===== Following is value structure for PCD with default value\r
 // ....\r
 // ....\r


@@ -235,11 +235,11 @@
 // ....\r
 // } UnInit;\r
 // }\r
 // ....\r
 // } UnInit;\r
 // }\r

-// \r
+//\r

 // 3.3.2 PCD value structure in PCD database C structure\r
 // The value's structure is generated by build tool in PCD database C structure.\r
 // The PCDs in different datum type has different value structure.\r
 // 3.3.2 PCD value structure in PCD database C structure\r
 // The value's structure is generated by build tool in PCD database C structure.\r
 // The PCDs in different datum type has different value structure.\r

-// \r
+//\r

 // 3.3.2.1 UINT8/UINT16/UINT32/UINT64 datum type PCD\r
 // The C structure for these datum type PCD is just a UINT8/UINT16/UINT32/UINT64\r
 // data member in PCD database, For example:\r
 // 3.3.2.1 UINT8/UINT16/UINT32/UINT64 datum type PCD\r
 // The C structure for these datum type PCD is just a UINT8/UINT16/UINT32/UINT64\r
 // data member in PCD database, For example:\r


@@ -247,30 +247,30 @@
 // Above structure is generated by build tool, the member name is "PcdCName_Guidvalue"\r
 // Member type is UINT16 according to PcdHardwareErrorRecordLevel declaration\r
 // in DEC file.\r
 // Above structure is generated by build tool, the member name is "PcdCName_Guidvalue"\r
 // Member type is UINT16 according to PcdHardwareErrorRecordLevel declaration\r
 // in DEC file.\r

-// \r
+//\r

 // 3.3.2.2 VOID* datum type PCD\r
 // The value of VOID* datum type PCD is a UINT8/UINT16 array in PCD database.\r
 // 3.3.2.2 VOID* datum type PCD\r
 // The value of VOID* datum type PCD is a UINT8/UINT16 array in PCD database.\r

-// \r
+//\r

 // 3.3.2.2.1 VOID* - string type\r
 // If the default value for VOID* datum type PCD like L"xxx", the PCD is\r
 // used for unicode string, and C structure of this datum type PCD is\r
 // UINT16 string array in PCD database, for example:\r
 // UINT16 StringTable[29];\r
 // The number of 29 in above sample is max size of a unicode string.\r
 // 3.3.2.2.1 VOID* - string type\r
 // If the default value for VOID* datum type PCD like L"xxx", the PCD is\r
 // used for unicode string, and C structure of this datum type PCD is\r
 // UINT16 string array in PCD database, for example:\r
 // UINT16 StringTable[29];\r
 // The number of 29 in above sample is max size of a unicode string.\r

-// \r
+//\r

 // If the default value for VOID* datum type PCD like "xxx", the PCD is\r
 // used for ascii string, and C structure of this datum type PCD is\r
 // UINT8 string array in PCD database, for example:\r
 // UINT8 StringTable[20];\r
 // The number of 20 in above sample is max size of a ascii string.\r
 // If the default value for VOID* datum type PCD like "xxx", the PCD is\r
 // used for ascii string, and C structure of this datum type PCD is\r
 // UINT8 string array in PCD database, for example:\r
 // UINT8 StringTable[20];\r
 // The number of 20 in above sample is max size of a ascii string.\r

-// \r
+//\r

 // 3.3.2.2.2 VOID* - byte array\r
 // If the default value of VOID* datum type PCD like {'0x29', '0x01', '0xf2'}\r
 // the PCD is used for byte array. The generated structrue is same as\r
 // above ascii string table,\r
 // UINT8 StringTable[13];\r
 // The number of 13 in above sample is max size of byte array.\r
 // 3.3.2.2.2 VOID* - byte array\r
 // If the default value of VOID* datum type PCD like {'0x29', '0x01', '0xf2'}\r
 // the PCD is used for byte array. The generated structrue is same as\r
 // above ascii string table,\r
 // UINT8 StringTable[13];\r
 // The number of 13 in above sample is max size of byte array.\r

-// \r
+//\r

 // 3.3.3 Some utility structures in PCD Database\r
 // 3.3.3.1 GuidTable\r
 // GuidTable array is used to store all related GUID value in PCD database:\r
 // 3.3.3 Some utility structures in PCD Database\r
 // 3.3.3.1 GuidTable\r
 // GuidTable array is used to store all related GUID value in PCD database:\r

diff --git a/MdeModulePkg/Universal/PCD/Pei/PcdPeimExtra.uni b/MdeModulePkg/Universal/PCD/Pei/PcdPeimExtra.uni
index a618943612fa2cdf325d30f35fbf325a50116b2f..9cbf7c33f73263d40a6c182c45f073d0443233a0 100644 (file)
--- a/MdeModulePkg/Universal/PCD/Pei/PcdPeimExtra.uni
+++ b/MdeModulePkg/Universal/PCD/Pei/PcdPeimExtra.uni
@@ -1,7 +1,7 @@
 // /** @file\r
 // PcdPeim Localized Strings and Content\r
 //\r
 // /** @file\r
 // PcdPeim Localized Strings and Content\r
 //\r

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

 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r
 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r


@@ -12,8 +12,8 @@
 //\r
 // **/\r
 \r
 //\r
 // **/\r
 \r

-#string STR_PROPERTIES_MODULE_NAME \r
-#language en-US \r
+#string STR_PROPERTIES_MODULE_NAME\r
+#language en-US\r

 "Platform Configuration Database PEI Module"\r
 \r
 \r
 "Platform Configuration Database PEI Module"\r
 \r
 \r

diff --git a/MdeModulePkg/Universal/PCD/Pei/Service.c b/MdeModulePkg/Universal/PCD/Pei/Service.c
index e8a0b6ca10f90441e88f9e1bdafa2927610606c1..bb4b52baf374cd4e28c248d74177d5e4e6bc2cc7 100644 (file)
--- a/MdeModulePkg/Universal/PCD/Pei/Service.c
+++ b/MdeModulePkg/Universal/PCD/Pei/Service.c
@@ -2,7 +2,7 @@
   The driver internal functions are implmented here.\r
   They build Pei PCD database, and provide access service to PCD database.\r
 \r
   The driver internal functions are implmented here.\r
   They build Pei PCD database, and provide access service to PCD database.\r
 \r

-Copyright (c) 2006 - 2017, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r

 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r


@@ -101,7 +101,7 @@ GetPcdName (
   CHAR8             *Name;\r
 \r
   //\r
   CHAR8             *Name;\r
 \r
   //\r

-  // Return NULL when PCD name table is absent. \r
+  // Return NULL when PCD name table is absent.\r

   //\r
   if (Database->PcdNameTableOffset == 0) {\r
     return NULL;\r
   //\r
   if (Database->PcdNameTableOffset == 0) {\r
     return NULL;\r


@@ -140,7 +140,7 @@ GetPcdName (
     //\r
     AsciiStrCatS (Name, NameSize, TokenSpaceName);\r
     Name[AsciiStrSize (TokenSpaceName) - sizeof (CHAR8)] = '.';\r
     //\r
     AsciiStrCatS (Name, NameSize, TokenSpaceName);\r
     Name[AsciiStrSize (TokenSpaceName) - sizeof (CHAR8)] = '.';\r

-    AsciiStrCatS (Name, NameSize, PcdName);  \r
+    AsciiStrCatS (Name, NameSize, PcdName);\r

   }\r
 \r
   return Name;\r
   }\r
 \r
   return Name;\r


@@ -156,7 +156,7 @@ GetPcdName (
   @param[in]    Guid        The 128-bit unique value that designates the namespace from which to extract the value.\r
   @param[in]    TokenNumber The PCD token number.\r
   @param[out]   PcdInfo     The returned information associated with the requested TokenNumber.\r
   @param[in]    Guid        The 128-bit unique value that designates the namespace from which to extract the value.\r
   @param[in]    TokenNumber The PCD token number.\r
   @param[out]   PcdInfo     The returned information associated with the requested TokenNumber.\r

-                            The caller is responsible for freeing the buffer that is allocated by callee for PcdInfo->PcdName. \r
+                            The caller is responsible for freeing the buffer that is allocated by callee for PcdInfo->PcdName.\r

 \r
   @retval  EFI_SUCCESS      The PCD information was returned successfully\r
   @retval  EFI_NOT_FOUND    The PCD service could not find the requested token number.\r
 \r
   @retval  EFI_SUCCESS      The PCD information was returned successfully\r
   @retval  EFI_NOT_FOUND    The PCD service could not find the requested token number.\r


@@ -202,7 +202,7 @@ ExGetPcdInfo (
         PcdInfo->PcdSize = 0;\r
         //\r
         // Here use one representative in the token space to get the TokenSpaceCName.\r
         PcdInfo->PcdSize = 0;\r
         //\r
         // Here use one representative in the token space to get the TokenSpaceCName.\r

-        // \r
+        //\r

         PcdInfo->PcdName = GetPcdName (TRUE, Database, ExMapTable[Index].TokenNumber);\r
         return EFI_SUCCESS;\r
       } else if (ExMapTable[Index].ExTokenNumber == TokenNumber) {\r
         PcdInfo->PcdName = GetPcdName (TRUE, Database, ExMapTable[Index].TokenNumber);\r
         return EFI_SUCCESS;\r
       } else if (ExMapTable[Index].ExTokenNumber == TokenNumber) {\r


@@ -345,7 +345,7 @@ PeiRegisterCallBackWorker (
     //\r
     TokenNumber--;\r
     // EBC compiler is very choosy. It may report warning about comparison\r
     //\r
     TokenNumber--;\r
     // EBC compiler is very choosy. It may report warning about comparison\r

-    // between UINTN and 0 . So we add 1 in each size of the \r
+    // between UINTN and 0 . So we add 1 in each size of the\r

     // comparison.\r
     ASSERT ((TokenNumber + 1) < (LocalTokenCount + 1));\r
   }\r
     // comparison.\r
     ASSERT ((TokenNumber + 1) < (LocalTokenCount + 1));\r
   }\r


@@ -362,7 +362,7 @@ PeiRegisterCallBackWorker (
 \r
   GuidHob = GetFirstGuidHob (&gEfiCallerIdGuid);\r
   ASSERT (GuidHob != NULL);\r
 \r
   GuidHob = GetFirstGuidHob (&gEfiCallerIdGuid);\r
   ASSERT (GuidHob != NULL);\r

-  \r
+\r

   CallbackTable = GET_GUID_HOB_DATA (GuidHob);\r
   CallbackTable = CallbackTable + (TokenNumber * PcdGet32 (PcdMaxPeiPcdCallBackNumberPerPcdEntry));\r
 \r
   CallbackTable = GET_GUID_HOB_DATA (GuidHob);\r
   CallbackTable = CallbackTable + (TokenNumber * PcdGet32 (PcdMaxPeiPcdCallBackNumberPerPcdEntry));\r
 \r


@@ -383,7 +383,7 @@ PeiRegisterCallBackWorker (
 \r
 \r
 /**\r
 \r
 \r
 /**\r

-  Find the Pcd database. \r
+  Find the Pcd database.\r

 \r
   @param  FileHandle  Handle of the file the external PCD database binary located.\r
 \r
 \r
   @param  FileHandle  Handle of the file the external PCD database binary located.\r
 \r


@@ -452,7 +452,7 @@ BuildPcdDatabase (
   SizeOfCallbackFnTable = Database->LocalTokenCount * sizeof (PCD_PPI_CALLBACK) * PcdGet32 (PcdMaxPeiPcdCallBackNumberPerPcdEntry);\r
 \r
   CallbackFnTable = BuildGuidHob (&gEfiCallerIdGuid, SizeOfCallbackFnTable);\r
   SizeOfCallbackFnTable = Database->LocalTokenCount * sizeof (PCD_PPI_CALLBACK) * PcdGet32 (PcdMaxPeiPcdCallBackNumberPerPcdEntry);\r
 \r
   CallbackFnTable = BuildGuidHob (&gEfiCallerIdGuid, SizeOfCallbackFnTable);\r

-  \r
+\r

   ZeroMem (CallbackFnTable, SizeOfCallbackFnTable);\r
 \r
   return Database;\r
   ZeroMem (CallbackFnTable, SizeOfCallbackFnTable);\r
 \r
   return Database;\r


@@ -520,7 +520,7 @@ GetHiiVariable (
 }\r
 \r
 /**\r
 }\r
 \r
 /**\r

-  Invoke the callback function when dynamic PCD entry was set, if this PCD entry \r
+  Invoke the callback function when dynamic PCD entry was set, if this PCD entry\r

   has registered callback function.\r
 \r
   @param ExTokenNumber   DynamicEx PCD's token number, if this PCD entry is dyanmicEx\r
   has registered callback function.\r
 \r
   @param ExTokenNumber   DynamicEx PCD's token number, if this PCD entry is dyanmicEx\r


@@ -559,14 +559,14 @@ InvokeCallbackOnSet (
 \r
   if (Guid == NULL) {\r
     // EBC compiler is very choosy. It may report warning about comparison\r
 \r
   if (Guid == NULL) {\r
     // EBC compiler is very choosy. It may report warning about comparison\r

-    // between UINTN and 0 . So we add 1 in each size of the \r
+    // between UINTN and 0 . So we add 1 in each size of the\r

     // comparison.\r
     ASSERT (TokenNumber + 1 < (LocalTokenCount + 1));\r
   }\r
 \r
   GuidHob = GetFirstGuidHob (&gEfiCallerIdGuid);\r
   ASSERT (GuidHob != NULL);\r
     // comparison.\r
     ASSERT (TokenNumber + 1 < (LocalTokenCount + 1));\r
   }\r
 \r
   GuidHob = GetFirstGuidHob (&gEfiCallerIdGuid);\r
   ASSERT (GuidHob != NULL);\r

-  \r
+\r

   CallbackTable = GET_GUID_HOB_DATA (GuidHob);\r
 \r
   CallbackTable += (TokenNumber * PcdGet32 (PcdMaxPeiPcdCallBackNumberPerPcdEntry));\r
   CallbackTable = GET_GUID_HOB_DATA (GuidHob);\r
 \r
   CallbackTable += (TokenNumber * PcdGet32 (PcdMaxPeiPcdCallBackNumberPerPcdEntry));\r


@@ -616,7 +616,7 @@ SetValueWorker (
   @retval EFI_INVALID_PARAMETER  If Size of non-Ptr type PCD does not match the size information in PCD database.\r
   @retval EFI_NOT_FOUND          If value type of PCD entry is intergrate, but not in\r
                                  range of UINT8, UINT16, UINT32, UINT64\r
   @retval EFI_INVALID_PARAMETER  If Size of non-Ptr type PCD does not match the size information in PCD database.\r
   @retval EFI_NOT_FOUND          If value type of PCD entry is intergrate, but not in\r
                                  range of UINT8, UINT16, UINT32, UINT64\r

-  @retval EFI_NOT_FOUND          Can not find the PCD type according to token number.                                \r
+  @retval EFI_NOT_FOUND          Can not find the PCD type according to token number.\r

 **/\r
 EFI_STATUS\r
 SetWorker (\r
 **/\r
 EFI_STATUS\r
 SetWorker (\r


@@ -638,7 +638,7 @@ SetWorker (
   if (!FeaturePcdGet(PcdPeiFullPcdDatabaseEnable)) {\r
     return EFI_UNSUPPORTED;\r
   }\r
   if (!FeaturePcdGet(PcdPeiFullPcdDatabaseEnable)) {\r
     return EFI_UNSUPPORTED;\r
   }\r

-  \r
+\r

   //\r
   // TokenNumber Zero is reserved as PCD_INVALID_TOKEN_NUMBER.\r
   // We have to decrement TokenNumber by 1 to make it usable\r
   //\r
   // TokenNumber Zero is reserved as PCD_INVALID_TOKEN_NUMBER.\r
   // We have to decrement TokenNumber by 1 to make it usable\r


@@ -649,7 +649,7 @@ SetWorker (
   LocalTokenCount = PeiPcdDb->LocalTokenCount;\r
 \r
   // EBC compiler is very choosy. It may report warning about comparison\r
   LocalTokenCount = PeiPcdDb->LocalTokenCount;\r
 \r
   // EBC compiler is very choosy. It may report warning about comparison\r

-  // between UINTN and 0 . So we add 1 in each size of the \r
+  // between UINTN and 0 . So we add 1 in each size of the\r

   // comparison.\r
   ASSERT (TokenNumber + 1 < (LocalTokenCount + 1));\r
 \r
   // comparison.\r
   ASSERT (TokenNumber + 1 < (LocalTokenCount + 1));\r
 \r


@@ -682,7 +682,7 @@ SetWorker (
 \r
   Offset          = LocalTokenNumber & PCD_DATABASE_OFFSET_MASK;\r
   InternalData    = (VOID *) ((UINT8 *) PeiPcdDb + Offset);\r
 \r
   Offset          = LocalTokenNumber & PCD_DATABASE_OFFSET_MASK;\r
   InternalData    = (VOID *) ((UINT8 *) PeiPcdDb + Offset);\r

-  \r
+\r

   switch (LocalTokenNumber & PCD_TYPE_ALL_SET) {\r
     case PCD_TYPE_VPD:\r
     case PCD_TYPE_HII:\r
   switch (LocalTokenNumber & PCD_TYPE_ALL_SET) {\r
     case PCD_TYPE_VPD:\r
     case PCD_TYPE_HII:\r


@@ -734,7 +734,7 @@ SetWorker (
           return EFI_NOT_FOUND;\r
       }\r
     }\r
           return EFI_NOT_FOUND;\r
       }\r
     }\r

-      \r
+\r

   }\r
 \r
   ASSERT (FALSE);\r
   }\r
 \r
   ASSERT (FALSE);\r


@@ -766,12 +766,12 @@ ExSetValueWorker (
 \r
 /**\r
   Set value for a dynamic-ex PCD entry.\r
 \r
 /**\r
   Set value for a dynamic-ex PCD entry.\r

-  \r
-  This routine find the local token number according to dynamic-ex PCD's token \r
+\r
+  This routine find the local token number according to dynamic-ex PCD's token\r

   space guid and token number firstly, and invoke callback function if this PCD\r
   entry registered callback function. Finally, invoken general SetWorker to set\r
   PCD value.\r
   space guid and token number firstly, and invoke callback function if this PCD\r
   entry registered callback function. Finally, invoken general SetWorker to set\r
   PCD value.\r

-  \r
+\r

   @param ExTokenNumber   Dynamic-ex PCD token number.\r
   @param Guid            Token space guid for dynamic-ex PCD.\r
   @param Data            PCD value want to be set\r
   @param ExTokenNumber   Dynamic-ex PCD token number.\r
   @param Guid            Token space guid for dynamic-ex PCD.\r
   @param Data            PCD value want to be set\r


@@ -801,7 +801,7 @@ ExSetWorker (
   if (TokenNumber == PCD_INVALID_TOKEN_NUMBER) {\r
     return EFI_NOT_FOUND;\r
   }\r
   if (TokenNumber == PCD_INVALID_TOKEN_NUMBER) {\r
     return EFI_NOT_FOUND;\r
   }\r

-  \r
+\r

   InvokeCallbackOnSet (ExTokenNumber, Guid, TokenNumber, Data, *Size);\r
 \r
   return SetWorker (TokenNumber, Data, Size, PtrType);\r
   InvokeCallbackOnSet (ExTokenNumber, Guid, TokenNumber, Data, *Size);\r
 \r
   return SetWorker (TokenNumber, Data, Size, PtrType);\r


@@ -824,16 +824,16 @@ ExGetWorker (
   IN UINTN            ExTokenNumber,\r
   IN UINTN            GetSize\r
   )\r
   IN UINTN            ExTokenNumber,\r
   IN UINTN            GetSize\r
   )\r

-{ \r
+{\r

   return GetWorker (GetExPcdTokenNumber (Guid, ExTokenNumber), GetSize);\r
 }\r
 \r
 /**\r
   Get the PCD entry pointer in PCD database.\r
   return GetWorker (GetExPcdTokenNumber (Guid, ExTokenNumber), GetSize);\r
 }\r
 \r
 /**\r
   Get the PCD entry pointer in PCD database.\r

-  \r
+\r

   This routine will visit PCD database to find the PCD entry according to given\r
   This routine will visit PCD database to find the PCD entry according to given\r

-  token number. The given token number is autogened by build tools and it will be \r
-  translated to local token number. Local token number contains PCD's type and \r
+  token number. The given token number is autogened by build tools and it will be\r
+  translated to local token number. Local token number contains PCD's type and\r

   offset of PCD entry in PCD database.\r
 \r
   @param TokenNumber     Token's number, it is autogened by build tools\r
   offset of PCD entry in PCD database.\r
 \r
   @param TokenNumber     Token's number, it is autogened by build tools\r


@@ -873,7 +873,7 @@ GetWorker (
   LocalTokenCount = PeiPcdDb->LocalTokenCount;\r
 \r
   // EBC compiler is very choosy. It may report warning about comparison\r
   LocalTokenCount = PeiPcdDb->LocalTokenCount;\r
 \r
   // EBC compiler is very choosy. It may report warning about comparison\r

-  // between UINTN and 0 . So we add 1 in each size of the \r
+  // between UINTN and 0 . So we add 1 in each size of the\r

   // comparison.\r
   ASSERT (TokenNumber + 1 < (LocalTokenCount + 1));\r
 \r
   // comparison.\r
   ASSERT (TokenNumber + 1 < (LocalTokenCount + 1));\r
 \r


@@ -891,21 +891,21 @@ GetWorker (
       VpdHead = (VPD_HEAD *) ((UINT8 *)PeiPcdDb + Offset);\r
       return (VOID *) ((UINTN) PcdGet32 (PcdVpdBaseAddress) + VpdHead->Offset);\r
     }\r
       VpdHead = (VPD_HEAD *) ((UINT8 *)PeiPcdDb + Offset);\r
       return (VOID *) ((UINTN) PcdGet32 (PcdVpdBaseAddress) + VpdHead->Offset);\r
     }\r

-      \r
+\r

     case PCD_TYPE_HII|PCD_TYPE_STRING:\r
     case PCD_TYPE_HII:\r
     {\r
       VariableHead = (VARIABLE_HEAD *) ((UINT8 *)PeiPcdDb + Offset);\r
     case PCD_TYPE_HII|PCD_TYPE_STRING:\r
     case PCD_TYPE_HII:\r
     {\r
       VariableHead = (VARIABLE_HEAD *) ((UINT8 *)PeiPcdDb + Offset);\r

-      \r
+\r

       Guid = (EFI_GUID *) ((UINT8 *)PeiPcdDb + PeiPcdDb->GuidTableOffset) + VariableHead->GuidTableIndex;\r
       Name = (UINT16*)&StringTable[VariableHead->StringIndex];\r
 \r
       if ((LocalTokenNumber & PCD_TYPE_ALL_SET) == (PCD_TYPE_HII|PCD_TYPE_STRING)) {\r
         //\r
       Guid = (EFI_GUID *) ((UINT8 *)PeiPcdDb + PeiPcdDb->GuidTableOffset) + VariableHead->GuidTableIndex;\r
       Name = (UINT16*)&StringTable[VariableHead->StringIndex];\r
 \r
       if ((LocalTokenNumber & PCD_TYPE_ALL_SET) == (PCD_TYPE_HII|PCD_TYPE_STRING)) {\r
         //\r

-        // If a HII type PCD's datum type is VOID*, the DefaultValueOffset is the index of \r
+        // If a HII type PCD's datum type is VOID*, the DefaultValueOffset is the index of\r

         // string array in string table.\r
         //\r
         // string array in string table.\r
         //\r

-        VaraiableDefaultBuffer = (UINT8 *) &StringTable[*(STRING_HEAD*)((UINT8*) PeiPcdDb + VariableHead->DefaultValueOffset)];   \r
+        VaraiableDefaultBuffer = (UINT8 *) &StringTable[*(STRING_HEAD*)((UINT8*) PeiPcdDb + VariableHead->DefaultValueOffset)];\r

       } else {\r
         VaraiableDefaultBuffer = (UINT8 *) PeiPcdDb + VariableHead->DefaultValueOffset;\r
       }\r
       } else {\r
         VaraiableDefaultBuffer = (UINT8 *) PeiPcdDb + VariableHead->DefaultValueOffset;\r
       }\r


@@ -943,13 +943,13 @@ GetWorker (
     default:\r
       ASSERT (FALSE);\r
       break;\r
     default:\r
       ASSERT (FALSE);\r
       break;\r

-      \r
+\r

   }\r
 \r
   ASSERT (FALSE);\r
   }\r
 \r
   ASSERT (FALSE);\r

-      \r
+\r

   return NULL;\r
   return NULL;\r

-  \r
+\r

 }\r
 \r
 /**\r
 }\r
 \r
 /**\r


@@ -958,14 +958,14 @@ GetWorker (
   A dynamic-ex type PCD, developer must provide pair of token space guid: token number\r
   in DEC file. PCD database maintain a mapping table that translate pair of {token\r
   space guid: token number} to Token Number.\r
   A dynamic-ex type PCD, developer must provide pair of token space guid: token number\r
   in DEC file. PCD database maintain a mapping table that translate pair of {token\r
   space guid: token number} to Token Number.\r

-  \r
+\r

   @param Guid            Token space guid for dynamic-ex PCD entry.\r
   @param ExTokenNumber   Dynamic-ex PCD token number.\r
 \r
   @return Token Number for dynamic-ex PCD.\r
 \r
 **/\r
   @param Guid            Token space guid for dynamic-ex PCD entry.\r
   @param ExTokenNumber   Dynamic-ex PCD token number.\r
 \r
   @return Token Number for dynamic-ex PCD.\r
 \r
 **/\r

-UINTN           \r
+UINTN\r

 GetExPcdTokenNumber (\r
   IN CONST EFI_GUID             *Guid,\r
   IN UINTN                      ExTokenNumber\r
 GetExPcdTokenNumber (\r
   IN CONST EFI_GUID             *Guid,\r
   IN UINTN                      ExTokenNumber\r


@@ -989,16 +989,16 @@ GetExPcdTokenNumber (
   // error in the BUILD system.\r
   //\r
   ASSERT (MatchGuid != NULL);\r
   // error in the BUILD system.\r
   //\r
   ASSERT (MatchGuid != NULL);\r

-  \r
+\r

   MatchGuidIdx = MatchGuid - GuidTable;\r
   MatchGuidIdx = MatchGuid - GuidTable;\r

-  \r
+\r

   for (Index = 0; Index < PeiPcdDb->ExTokenCount; Index++) {\r
   for (Index = 0; Index < PeiPcdDb->ExTokenCount; Index++) {\r

-    if ((ExTokenNumber == ExMap[Index].ExTokenNumber) && \r
+    if ((ExTokenNumber == ExMap[Index].ExTokenNumber) &&\r

         (MatchGuidIdx == ExMap[Index].ExGuidIndex)) {\r
       return ExMap[Index].TokenNumber;\r
     }\r
   }\r
         (MatchGuidIdx == ExMap[Index].ExGuidIndex)) {\r
       return ExMap[Index].TokenNumber;\r
     }\r
   }\r

-  \r
+\r

   return PCD_INVALID_TOKEN_NUMBER;\r
 }\r
 \r
   return PCD_INVALID_TOKEN_NUMBER;\r
 }\r
 \r


@@ -1017,7 +1017,7 @@ GetPcdDatabase (
 \r
   GuidHob = GetFirstGuidHob (&gPcdDataBaseHobGuid);\r
   ASSERT (GuidHob != NULL);\r
 \r
   GuidHob = GetFirstGuidHob (&gPcdDataBaseHobGuid);\r
   ASSERT (GuidHob != NULL);\r

-  \r
+\r

   return (PEI_PCD_DATABASE *) GET_GUID_HOB_DATA (GuidHob);\r
 }\r
 \r
   return (PEI_PCD_DATABASE *) GET_GUID_HOB_DATA (GuidHob);\r
 }\r
 \r


@@ -1047,7 +1047,7 @@ GetSizeTableIndex (
 \r
     if ((LocalTokenNumber & PCD_DATUM_TYPE_ALL_SET) == PCD_DATUM_TYPE_POINTER) {\r
       //\r
 \r
     if ((LocalTokenNumber & PCD_DATUM_TYPE_ALL_SET) == PCD_DATUM_TYPE_POINTER) {\r
       //\r

-      // SizeTable only contain record for PCD_DATUM_TYPE_POINTER type \r
+      // SizeTable only contain record for PCD_DATUM_TYPE_POINTER type\r

       // PCD entry.\r
       //\r
       if ((LocalTokenNumber & PCD_TYPE_VPD) != 0) {\r
       // PCD entry.\r
       //\r
       if ((LocalTokenNumber & PCD_TYPE_VPD) != 0) {\r

diff --git a/MdeModulePkg/Universal/PCD/Pei/Service.h b/MdeModulePkg/Universal/PCD/Pei/Service.h
index 3a7910a900c8261ccbc2bf428b953e516acf8865..a8299ccb7d9f65a6a138a8803ef4b5d77b41558f 100644 (file)
--- a/MdeModulePkg/Universal/PCD/Pei/Service.h
+++ b/MdeModulePkg/Universal/PCD/Pei/Service.h
@@ -1,7 +1,7 @@
 /** @file\r
   The internal header file declares the private functions used by PeiPcd driver.\r
 \r
 /** @file\r
   The internal header file declares the private functions used by PeiPcd driver.\r
 \r

-Copyright (c) 2006 - 2016, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r

 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r


@@ -108,21 +108,21 @@ PeiGetPcdInfoGetSku (
 /**\r
   Sets the SKU value for subsequent calls to set or get PCD token values.\r
 \r
 /**\r
   Sets the SKU value for subsequent calls to set or get PCD token values.\r
 \r

-  SetSku() sets the SKU Id to be used for subsequent calls to set or get PCD values. \r
+  SetSku() sets the SKU Id to be used for subsequent calls to set or get PCD values.\r

   SetSku() is normally called only once by the system.\r
 \r
   SetSku() is normally called only once by the system.\r
 \r

-  For each item (token), the database can hold a single value that applies to all SKUs, \r
-  or multiple values, where each value is associated with a specific SKU Id. Items with multiple, \r
-  SKU-specific values are called SKU enabled. \r
-  \r
-  The SKU Id of zero is reserved as a default. The valid SkuId range is 1 to 255.  \r
-  For tokens that are not SKU enabled, the system ignores any set SKU Id and works with the \r
-  single value for that token. For SKU-enabled tokens, the system will use the SKU Id set by the \r
-  last call to SetSku(). If no SKU Id is set or the currently set SKU Id isn't valid for the specified token, \r
-  the system uses the default SKU Id. If the system attempts to use the default SKU Id and no value has been \r
+  For each item (token), the database can hold a single value that applies to all SKUs,\r
+  or multiple values, where each value is associated with a specific SKU Id. Items with multiple,\r
+  SKU-specific values are called SKU enabled.\r
+\r
+  The SKU Id of zero is reserved as a default. The valid SkuId range is 1 to 255.\r
+  For tokens that are not SKU enabled, the system ignores any set SKU Id and works with the\r
+  single value for that token. For SKU-enabled tokens, the system will use the SKU Id set by the\r
+  last call to SetSku(). If no SKU Id is set or the currently set SKU Id isn't valid for the specified token,\r
+  the system uses the default SKU Id. If the system attempts to use the default SKU Id and no value has been\r

   set for that Id, the results are unpredictable.\r
 \r
   set for that Id, the results are unpredictable.\r
 \r

-  @param[in]  SkuId The SKU value that will be used when the PCD service will retrieve and \r
+  @param[in]  SkuId The SKU value that will be used when the PCD service will retrieve and\r

               set values associated with a PCD token.\r
 \r
 **/\r
               set values associated with a PCD token.\r
 \r
 **/\r


@@ -135,13 +135,13 @@ PeiPcdSetSku (
 /**\r
   Retrieves an 8-bit value for a given PCD token.\r
 \r
 /**\r
   Retrieves an 8-bit value for a given PCD token.\r
 \r

-  Retrieves the current byte-sized value for a PCD token number.  \r
+  Retrieves the current byte-sized value for a PCD token number.\r

   If the TokenNumber is invalid, the results are unpredictable.\r
   If the TokenNumber is invalid, the results are unpredictable.\r

-  \r
-  @param[in]  TokenNumber The PCD token number. \r
+\r
+  @param[in]  TokenNumber The PCD token number.\r

 \r
   @return The UINT8 value.\r
 \r
   @return The UINT8 value.\r

-  \r
+\r

 **/\r
 UINT8\r
 EFIAPI\r
 **/\r
 UINT8\r
 EFIAPI\r


@@ -152,13 +152,13 @@ PeiPcdGet8 (
 /**\r
   Retrieves an 16-bit value for a given PCD token.\r
 \r
 /**\r
   Retrieves an 16-bit value for a given PCD token.\r
 \r

-  Retrieves the current 16-bits value for a PCD token number.  \r
+  Retrieves the current 16-bits value for a PCD token number.\r

   If the TokenNumber is invalid, the results are unpredictable.\r
   If the TokenNumber is invalid, the results are unpredictable.\r

-  \r
-  @param[in]  TokenNumber The PCD token number. \r
+\r
+  @param[in]  TokenNumber The PCD token number.\r

 \r
   @return The UINT16 value.\r
 \r
   @return The UINT16 value.\r

-  \r
+\r

 **/\r
 UINT16\r
 EFIAPI\r
 **/\r
 UINT16\r
 EFIAPI\r


@@ -169,13 +169,13 @@ PeiPcdGet16 (
 /**\r
   Retrieves an 32-bit value for a given PCD token.\r
 \r
 /**\r
   Retrieves an 32-bit value for a given PCD token.\r
 \r

-  Retrieves the current 32-bits value for a PCD token number.  \r
+  Retrieves the current 32-bits value for a PCD token number.\r

   If the TokenNumber is invalid, the results are unpredictable.\r
   If the TokenNumber is invalid, the results are unpredictable.\r

-  \r
-  @param[in]  TokenNumber The PCD token number. \r
+\r
+  @param[in]  TokenNumber The PCD token number.\r

 \r
   @return The UINT32 value.\r
 \r
   @return The UINT32 value.\r

-  \r
+\r

 **/\r
 UINT32\r
 EFIAPI\r
 **/\r
 UINT32\r
 EFIAPI\r


@@ -186,13 +186,13 @@ PeiPcdGet32 (
 /**\r
   Retrieves an 64-bit value for a given PCD token.\r
 \r
 /**\r
   Retrieves an 64-bit value for a given PCD token.\r
 \r

-  Retrieves the current 64-bits value for a PCD token number.  \r
+  Retrieves the current 64-bits value for a PCD token number.\r

   If the TokenNumber is invalid, the results are unpredictable.\r
   If the TokenNumber is invalid, the results are unpredictable.\r

-  \r
-  @param[in]  TokenNumber The PCD token number. \r
+\r
+  @param[in]  TokenNumber The PCD token number.\r

 \r
   @return The UINT64 value.\r
 \r
   @return The UINT64 value.\r

-  \r
+\r

 **/\r
 UINT64\r
 EFIAPI\r
 **/\r
 UINT64\r
 EFIAPI\r


@@ -203,15 +203,15 @@ PeiPcdGet64 (
 /**\r
   Retrieves a pointer to a value for a given PCD token.\r
 \r
 /**\r
   Retrieves a pointer to a value for a given PCD token.\r
 \r

-  Retrieves the current pointer to the buffer for a PCD token number.  \r
-  Do not make any assumptions about the alignment of the pointer that \r
-  is returned by this function call.  If the TokenNumber is invalid, \r
+  Retrieves the current pointer to the buffer for a PCD token number.\r
+  Do not make any assumptions about the alignment of the pointer that\r
+  is returned by this function call.  If the TokenNumber is invalid,\r

   the results are unpredictable.\r
 \r
   the results are unpredictable.\r
 \r

-  @param[in]  TokenNumber The PCD token number. \r
+  @param[in]  TokenNumber The PCD token number.\r

 \r
   @return The pointer to the buffer to be retrived.\r
 \r
   @return The pointer to the buffer to be retrived.\r

-  \r
+\r

 **/\r
 VOID *\r
 EFIAPI\r
 **/\r
 VOID *\r
 EFIAPI\r


@@ -222,15 +222,15 @@ PeiPcdGetPtr (
 /**\r
   Retrieves a Boolean value for a given PCD token.\r
 \r
 /**\r
   Retrieves a Boolean value for a given PCD token.\r
 \r

-  Retrieves the current boolean value for a PCD token number.  \r
-  Do not make any assumptions about the alignment of the pointer that \r
-  is returned by this function call.  If the TokenNumber is invalid, \r
+  Retrieves the current boolean value for a PCD token number.\r
+  Do not make any assumptions about the alignment of the pointer that\r
+  is returned by this function call.  If the TokenNumber is invalid,\r

   the results are unpredictable.\r
 \r
   the results are unpredictable.\r
 \r

-  @param[in]  TokenNumber The PCD token number. \r
+  @param[in]  TokenNumber The PCD token number.\r

 \r
   @return The Boolean value.\r
 \r
   @return The Boolean value.\r

-  \r
+\r

 **/\r
 BOOLEAN\r
 EFIAPI\r
 **/\r
 BOOLEAN\r
 EFIAPI\r


@@ -241,13 +241,13 @@ PeiPcdGetBool (
 /**\r
   Retrieves the size of the value for a given PCD token.\r
 \r
 /**\r
   Retrieves the size of the value for a given PCD token.\r
 \r

-  Retrieves the current size of a particular PCD token.  \r
+  Retrieves the current size of a particular PCD token.\r

   If the TokenNumber is invalid, the results are unpredictable.\r
 \r
   If the TokenNumber is invalid, the results are unpredictable.\r
 \r

-  @param[in]  TokenNumber The PCD token number. \r
+  @param[in]  TokenNumber The PCD token number.\r

 \r
   @return The size of the value for the PCD token.\r
 \r
   @return The size of the value for the PCD token.\r

-  \r
+\r

 **/\r
 UINTN\r
 EFIAPI\r
 **/\r
 UINTN\r
 EFIAPI\r


@@ -258,16 +258,16 @@ PeiPcdGetSize (
 /**\r
   Retrieves an 8-bit value for a given PCD token.\r
 \r
 /**\r
   Retrieves an 8-bit value for a given PCD token.\r
 \r

-  Retrieves the 8-bit value of a particular PCD token.  \r
+  Retrieves the 8-bit value of a particular PCD token.\r

   If the TokenNumber is invalid or the token space\r
   If the TokenNumber is invalid or the token space\r

-  specified by Guid does not exist, the results are \r
+  specified by Guid does not exist, the results are\r

   unpredictable.\r
 \r
   @param[in]  Guid The token space for the token number.\r
   unpredictable.\r
 \r
   @param[in]  Guid The token space for the token number.\r

-  @param[in]  TokenNumber The PCD token number. \r
+  @param[in]  TokenNumber The PCD token number.\r

 \r
   @return The size 8-bit value for the PCD token.\r
 \r
   @return The size 8-bit value for the PCD token.\r

-  \r
+\r

 **/\r
 UINT8\r
 EFIAPI\r
 **/\r
 UINT8\r
 EFIAPI\r


@@ -279,16 +279,16 @@ PeiPcdGet8Ex (
 /**\r
   Retrieves an 16-bit value for a given PCD token.\r
 \r
 /**\r
   Retrieves an 16-bit value for a given PCD token.\r
 \r

-  Retrieves the 16-bit value of a particular PCD token.  \r
+  Retrieves the 16-bit value of a particular PCD token.\r

   If the TokenNumber is invalid or the token space\r
   If the TokenNumber is invalid or the token space\r

-  specified by Guid does not exist, the results are \r
+  specified by Guid does not exist, the results are\r

   unpredictable.\r
 \r
   @param[in]  Guid The token space for the token number.\r
   unpredictable.\r
 \r
   @param[in]  Guid The token space for the token number.\r

-  @param[in]  TokenNumber The PCD token number. \r
+  @param[in]  TokenNumber The PCD token number.\r

 \r
   @return The size 16-bit value for the PCD token.\r
 \r
   @return The size 16-bit value for the PCD token.\r

-  \r
+\r

 **/\r
 UINT16\r
 EFIAPI\r
 **/\r
 UINT16\r
 EFIAPI\r


@@ -300,16 +300,16 @@ PeiPcdGet16Ex (
 /**\r
   Retrieves an 32-bit value for a given PCD token.\r
 \r
 /**\r
   Retrieves an 32-bit value for a given PCD token.\r
 \r

-  Retrieves the 32-bit value of a particular PCD token.  \r
+  Retrieves the 32-bit value of a particular PCD token.\r

   If the TokenNumber is invalid or the token space\r
   If the TokenNumber is invalid or the token space\r

-  specified by Guid does not exist, the results are \r
+  specified by Guid does not exist, the results are\r

   unpredictable.\r
 \r
   @param[in]  Guid The token space for the token number.\r
   unpredictable.\r
 \r
   @param[in]  Guid The token space for the token number.\r

-  @param[in]  TokenNumber The PCD token number. \r
+  @param[in]  TokenNumber The PCD token number.\r

 \r
   @return The size 32-bit value for the PCD token.\r
 \r
   @return The size 32-bit value for the PCD token.\r

-  \r
+\r

 **/\r
 UINT32\r
 EFIAPI\r
 **/\r
 UINT32\r
 EFIAPI\r


@@ -321,16 +321,16 @@ PeiPcdGet32Ex (
 /**\r
   Retrieves an 64-bit value for a given PCD token.\r
 \r
 /**\r
   Retrieves an 64-bit value for a given PCD token.\r
 \r

-  Retrieves the 64-bit value of a particular PCD token.  \r
+  Retrieves the 64-bit value of a particular PCD token.\r

   If the TokenNumber is invalid or the token space\r
   If the TokenNumber is invalid or the token space\r

-  specified by Guid does not exist, the results are \r
+  specified by Guid does not exist, the results are\r

   unpredictable.\r
 \r
   @param[in]  Guid The token space for the token number.\r
   unpredictable.\r
 \r
   @param[in]  Guid The token space for the token number.\r

-  @param[in]  TokenNumber The PCD token number. \r
+  @param[in]  TokenNumber The PCD token number.\r

 \r
   @return The size 64-bit value for the PCD token.\r
 \r
   @return The size 64-bit value for the PCD token.\r

-  \r
+\r

 **/\r
 UINT64\r
 EFIAPI\r
 **/\r
 UINT64\r
 EFIAPI\r


@@ -342,16 +342,16 @@ PeiPcdGet64Ex (
 /**\r
   Retrieves a pointer to a value for a given PCD token.\r
 \r
 /**\r
   Retrieves a pointer to a value for a given PCD token.\r
 \r

-  Retrieves the current pointer to the buffer for a PCD token number.  \r
-  Do not make any assumptions about the alignment of the pointer that \r
-  is returned by this function call.  If the TokenNumber is invalid, \r
+  Retrieves the current pointer to the buffer for a PCD token number.\r
+  Do not make any assumptions about the alignment of the pointer that\r
+  is returned by this function call.  If the TokenNumber is invalid,\r

   the results are unpredictable.\r
 \r
   @param[in]  Guid The token space for the token number.\r
   the results are unpredictable.\r
 \r
   @param[in]  Guid The token space for the token number.\r

-  @param[in]  TokenNumber The PCD token number. \r
+  @param[in]  TokenNumber The PCD token number.\r

 \r
   @return The pointer to the buffer to be retrived.\r
 \r
   @return The pointer to the buffer to be retrived.\r

-  \r
+\r

 **/\r
 VOID *\r
 EFIAPI\r
 **/\r
 VOID *\r
 EFIAPI\r


@@ -363,16 +363,16 @@ PeiPcdGetPtrEx (
 /**\r
   Retrieves an Boolean value for a given PCD token.\r
 \r
 /**\r
   Retrieves an Boolean value for a given PCD token.\r
 \r

-  Retrieves the Boolean value of a particular PCD token.  \r
+  Retrieves the Boolean value of a particular PCD token.\r

   If the TokenNumber is invalid or the token space\r
   If the TokenNumber is invalid or the token space\r

-  specified by Guid does not exist, the results are \r
+  specified by Guid does not exist, the results are\r

   unpredictable.\r
 \r
   @param[in]  Guid The token space for the token number.\r
   unpredictable.\r
 \r
   @param[in]  Guid The token space for the token number.\r

-  @param[in]  TokenNumber The PCD token number. \r
+  @param[in]  TokenNumber The PCD token number.\r

 \r
   @return The size Boolean value for the PCD token.\r
 \r
   @return The size Boolean value for the PCD token.\r

-  \r
+\r

 **/\r
 BOOLEAN\r
 EFIAPI\r
 **/\r
 BOOLEAN\r
 EFIAPI\r


@@ -384,14 +384,14 @@ PeiPcdGetBoolEx (
 /**\r
   Retrieves the size of the value for a given PCD token.\r
 \r
 /**\r
   Retrieves the size of the value for a given PCD token.\r
 \r

-  Retrieves the current size of a particular PCD token.  \r
+  Retrieves the current size of a particular PCD token.\r

   If the TokenNumber is invalid, the results are unpredictable.\r
 \r
   @param[in]  Guid The token space for the token number.\r
   If the TokenNumber is invalid, the results are unpredictable.\r
 \r
   @param[in]  Guid The token space for the token number.\r

-  @param[in]  TokenNumber The PCD token number. \r
+  @param[in]  TokenNumber The PCD token number.\r

 \r
   @return The size of the value for the PCD token.\r
 \r
   @return The size of the value for the PCD token.\r

-  \r
+\r

 **/\r
 UINTN\r
 EFIAPI\r
 **/\r
 UINTN\r
 EFIAPI\r


@@ -403,19 +403,19 @@ PeiPcdGetSizeEx (
 /**\r
   Sets an 8-bit value for a given PCD token.\r
 \r
 /**\r
   Sets an 8-bit value for a given PCD token.\r
 \r

-  When the PCD service sets a value, it will check to ensure that the \r
-  size of the value being set is compatible with the Token's existing definition.  \r
+  When the PCD service sets a value, it will check to ensure that the\r
+  size of the value being set is compatible with the Token's existing definition.\r

   If it is not, an error will be returned.\r
 \r
   If it is not, an error will be returned.\r
 \r

-  @param[in]  TokenNumber The PCD token number. \r
+  @param[in]  TokenNumber The PCD token number.\r

   @param[in]  Value The value to set for the PCD token.\r
 \r
   @retval EFI_SUCCESS  Procedure returned successfully.\r
   @param[in]  Value The value to set for the PCD token.\r
 \r
   @retval EFI_SUCCESS  Procedure returned successfully.\r

-  @retval EFI_INVALID_PARAMETER The PCD service determined that the size of the data \r
-                                  being set was incompatible with a call to this function.  \r
+  @retval EFI_INVALID_PARAMETER The PCD service determined that the size of the data\r
+                                  being set was incompatible with a call to this function.\r

                                   Use GetSize() to retrieve the size of the target data.\r
   @retval EFI_NOT_FOUND The PCD service could not find the requested token number.\r
                                   Use GetSize() to retrieve the size of the target data.\r
   @retval EFI_NOT_FOUND The PCD service could not find the requested token number.\r

-  \r
+\r

 **/\r
 EFI_STATUS\r
 EFIAPI\r
 **/\r
 EFI_STATUS\r
 EFIAPI\r


@@ -427,19 +427,19 @@ PeiPcdSet8 (
 /**\r
   Sets an 16-bit value for a given PCD token.\r
 \r
 /**\r
   Sets an 16-bit value for a given PCD token.\r
 \r

-  When the PCD service sets a value, it will check to ensure that the \r
-  size of the value being set is compatible with the Token's existing definition.  \r
+  When the PCD service sets a value, it will check to ensure that the\r
+  size of the value being set is compatible with the Token's existing definition.\r

   If it is not, an error will be returned.\r
 \r
   If it is not, an error will be returned.\r
 \r

-  @param[in]  TokenNumber The PCD token number. \r
+  @param[in]  TokenNumber The PCD token number.\r

   @param[in]  Value The value to set for the PCD token.\r
 \r
   @retval EFI_SUCCESS  Procedure returned successfully.\r
   @param[in]  Value The value to set for the PCD token.\r
 \r
   @retval EFI_SUCCESS  Procedure returned successfully.\r

-  @retval EFI_INVALID_PARAMETER The PCD service determined that the size of the data \r
-                                  being set was incompatible with a call to this function.  \r
+  @retval EFI_INVALID_PARAMETER The PCD service determined that the size of the data\r
+                                  being set was incompatible with a call to this function.\r

                                   Use GetSize() to retrieve the size of the target data.\r
   @retval EFI_NOT_FOUND The PCD service could not find the requested token number.\r
                                   Use GetSize() to retrieve the size of the target data.\r
   @retval EFI_NOT_FOUND The PCD service could not find the requested token number.\r

-  \r
+\r

 **/\r
 EFI_STATUS\r
 EFIAPI\r
 **/\r
 EFI_STATUS\r
 EFIAPI\r


@@ -451,19 +451,19 @@ PeiPcdSet16 (
 /**\r
   Sets an 32-bit value for a given PCD token.\r
 \r
 /**\r
   Sets an 32-bit value for a given PCD token.\r
 \r

-  When the PCD service sets a value, it will check to ensure that the \r
-  size of the value being set is compatible with the Token's existing definition.  \r
+  When the PCD service sets a value, it will check to ensure that the\r
+  size of the value being set is compatible with the Token's existing definition.\r

   If it is not, an error will be returned.\r
 \r
   If it is not, an error will be returned.\r
 \r

-  @param[in]  TokenNumber The PCD token number. \r
+  @param[in]  TokenNumber The PCD token number.\r

   @param[in]  Value The value to set for the PCD token.\r
 \r
   @retval EFI_SUCCESS  Procedure returned successfully.\r
   @param[in]  Value The value to set for the PCD token.\r
 \r
   @retval EFI_SUCCESS  Procedure returned successfully.\r

-  @retval EFI_INVALID_PARAMETER The PCD service determined that the size of the data \r
-                                  being set was incompatible with a call to this function.  \r
+  @retval EFI_INVALID_PARAMETER The PCD service determined that the size of the data\r
+                                  being set was incompatible with a call to this function.\r

                                   Use GetSize() to retrieve the size of the target data.\r
   @retval EFI_NOT_FOUND The PCD service could not find the requested token number.\r
                                   Use GetSize() to retrieve the size of the target data.\r
   @retval EFI_NOT_FOUND The PCD service could not find the requested token number.\r

-  \r
+\r

 **/\r
 EFI_STATUS\r
 EFIAPI\r
 **/\r
 EFI_STATUS\r
 EFIAPI\r


@@ -475,19 +475,19 @@ PeiPcdSet32 (
 /**\r
   Sets an 64-bit value for a given PCD token.\r
 \r
 /**\r
   Sets an 64-bit value for a given PCD token.\r
 \r

-  When the PCD service sets a value, it will check to ensure that the \r
-  size of the value being set is compatible with the Token's existing definition.  \r
+  When the PCD service sets a value, it will check to ensure that the\r
+  size of the value being set is compatible with the Token's existing definition.\r

   If it is not, an error will be returned.\r
 \r
   If it is not, an error will be returned.\r
 \r

-  @param[in]  TokenNumber The PCD token number. \r
+  @param[in]  TokenNumber The PCD token number.\r

   @param[in]  Value The value to set for the PCD token.\r
 \r
   @retval EFI_SUCCESS  Procedure returned successfully.\r
   @param[in]  Value The value to set for the PCD token.\r
 \r
   @retval EFI_SUCCESS  Procedure returned successfully.\r

-  @retval EFI_INVALID_PARAMETER The PCD service determined that the size of the data \r
-                                  being set was incompatible with a call to this function.  \r
+  @retval EFI_INVALID_PARAMETER The PCD service determined that the size of the data\r
+                                  being set was incompatible with a call to this function.\r

                                   Use GetSize() to retrieve the size of the target data.\r
   @retval EFI_NOT_FOUND The PCD service could not find the requested token number.\r
                                   Use GetSize() to retrieve the size of the target data.\r
   @retval EFI_NOT_FOUND The PCD service could not find the requested token number.\r

-  \r
+\r

 **/\r
 EFI_STATUS\r
 EFIAPI\r
 **/\r
 EFI_STATUS\r
 EFIAPI\r


@@ -499,23 +499,23 @@ PeiPcdSet64 (
 /**\r
   Sets a value of a specified size for a given PCD token.\r
 \r
 /**\r
   Sets a value of a specified size for a given PCD token.\r
 \r

-  When the PCD service sets a value, it will check to ensure that the \r
-  size of the value being set is compatible with the Token's existing definition.  \r
+  When the PCD service sets a value, it will check to ensure that the\r
+  size of the value being set is compatible with the Token's existing definition.\r

   If it is not, an error will be returned.\r
 \r
   If it is not, an error will be returned.\r
 \r

-  @param[in]  TokenNumber The PCD token number. \r
-  @param[in, out] SizeOfBuffer A pointer to the length of the value being set for the PCD token.  \r
-                              On input, if the SizeOfValue is greater than the maximum size supported \r
-                              for this TokenNumber then the output value of SizeOfValue will reflect \r
+  @param[in]  TokenNumber The PCD token number.\r
+  @param[in, out] SizeOfBuffer A pointer to the length of the value being set for the PCD token.\r
+                              On input, if the SizeOfValue is greater than the maximum size supported\r
+                              for this TokenNumber then the output value of SizeOfValue will reflect\r

                               the maximum size supported for this TokenNumber.\r
   @param[in]  Buffer The buffer to set for the PCD token.\r
 \r
   @retval EFI_SUCCESS  Procedure returned successfully.\r
                               the maximum size supported for this TokenNumber.\r
   @param[in]  Buffer The buffer to set for the PCD token.\r
 \r
   @retval EFI_SUCCESS  Procedure returned successfully.\r

-  @retval EFI_INVALID_PARAMETER The PCD service determined that the size of the data \r
-                                  being set was incompatible with a call to this function.  \r
+  @retval EFI_INVALID_PARAMETER The PCD service determined that the size of the data\r
+                                  being set was incompatible with a call to this function.\r

                                   Use GetSize() to retrieve the size of the target data.\r
   @retval EFI_NOT_FOUND The PCD service could not find the requested token number.\r
                                   Use GetSize() to retrieve the size of the target data.\r
   @retval EFI_NOT_FOUND The PCD service could not find the requested token number.\r

-  \r
+\r

 **/\r
 EFI_STATUS\r
 EFIAPI\r
 **/\r
 EFI_STATUS\r
 EFIAPI\r


@@ -528,19 +528,19 @@ PeiPcdSetPtr (
 /**\r
   Sets an Boolean value for a given PCD token.\r
 \r
 /**\r
   Sets an Boolean value for a given PCD token.\r
 \r

-  When the PCD service sets a value, it will check to ensure that the \r
-  size of the value being set is compatible with the Token's existing definition.  \r
+  When the PCD service sets a value, it will check to ensure that the\r
+  size of the value being set is compatible with the Token's existing definition.\r

   If it is not, an error will be returned.\r
 \r
   If it is not, an error will be returned.\r
 \r

-  @param[in]  TokenNumber The PCD token number. \r
+  @param[in]  TokenNumber The PCD token number.\r

   @param[in]  Value The value to set for the PCD token.\r
 \r
   @retval EFI_SUCCESS  Procedure returned successfully.\r
   @param[in]  Value The value to set for the PCD token.\r
 \r
   @retval EFI_SUCCESS  Procedure returned successfully.\r

-  @retval EFI_INVALID_PARAMETER The PCD service determined that the size of the data \r
-                                  being set was incompatible with a call to this function.  \r
+  @retval EFI_INVALID_PARAMETER The PCD service determined that the size of the data\r
+                                  being set was incompatible with a call to this function.\r

                                   Use GetSize() to retrieve the size of the target data.\r
   @retval EFI_NOT_FOUND The PCD service could not find the requested token number.\r
                                   Use GetSize() to retrieve the size of the target data.\r
   @retval EFI_NOT_FOUND The PCD service could not find the requested token number.\r

-  \r
+\r

 **/\r
 EFI_STATUS\r
 EFIAPI\r
 **/\r
 EFI_STATUS\r
 EFIAPI\r


@@ -552,20 +552,20 @@ PeiPcdSetBool (
 /**\r
   Sets an 8-bit value for a given PCD token.\r
 \r
 /**\r
   Sets an 8-bit value for a given PCD token.\r
 \r

-  When the PCD service sets a value, it will check to ensure that the \r
-  size of the value being set is compatible with the Token's existing definition.  \r
+  When the PCD service sets a value, it will check to ensure that the\r
+  size of the value being set is compatible with the Token's existing definition.\r

   If it is not, an error will be returned.\r
 \r
   @param[in]  Guid The 128-bit unique value that designates the namespace from which to extract the value.\r
   If it is not, an error will be returned.\r
 \r
   @param[in]  Guid The 128-bit unique value that designates the namespace from which to extract the value.\r

-  @param[in]  TokenNumber The PCD token number. \r
+  @param[in]  TokenNumber The PCD token number.\r

   @param[in]  Value The value to set for the PCD token.\r
 \r
   @retval EFI_SUCCESS  Procedure returned successfully.\r
   @param[in]  Value The value to set for the PCD token.\r
 \r
   @retval EFI_SUCCESS  Procedure returned successfully.\r

-  @retval EFI_INVALID_PARAMETER The PCD service determined that the size of the data \r
-                                  being set was incompatible with a call to this function.  \r
+  @retval EFI_INVALID_PARAMETER The PCD service determined that the size of the data\r
+                                  being set was incompatible with a call to this function.\r

                                   Use GetSize() to retrieve the size of the target data.\r
   @retval EFI_NOT_FOUND The PCD service could not find the requested token number.\r
                                   Use GetSize() to retrieve the size of the target data.\r
   @retval EFI_NOT_FOUND The PCD service could not find the requested token number.\r

-  \r
+\r

 **/\r
 EFI_STATUS\r
 EFIAPI\r
 **/\r
 EFI_STATUS\r
 EFIAPI\r


@@ -578,20 +578,20 @@ PeiPcdSet8Ex (
 /**\r
   Sets an 16-bit value for a given PCD token.\r
 \r
 /**\r
   Sets an 16-bit value for a given PCD token.\r
 \r

-  When the PCD service sets a value, it will check to ensure that the \r
-  size of the value being set is compatible with the Token's existing definition.  \r
+  When the PCD service sets a value, it will check to ensure that the\r
+  size of the value being set is compatible with the Token's existing definition.\r

   If it is not, an error will be returned.\r
 \r
   @param[in]  Guid The 128-bit unique value that designates the namespace from which to extract the value.\r
   If it is not, an error will be returned.\r
 \r
   @param[in]  Guid The 128-bit unique value that designates the namespace from which to extract the value.\r

-  @param[in]  TokenNumber The PCD token number. \r
+  @param[in]  TokenNumber The PCD token number.\r

   @param[in]  Value The value to set for the PCD token.\r
 \r
   @retval EFI_SUCCESS  Procedure returned successfully.\r
   @param[in]  Value The value to set for the PCD token.\r
 \r
   @retval EFI_SUCCESS  Procedure returned successfully.\r

-  @retval EFI_INVALID_PARAMETER The PCD service determined that the size of the data \r
-                                  being set was incompatible with a call to this function.  \r
+  @retval EFI_INVALID_PARAMETER The PCD service determined that the size of the data\r
+                                  being set was incompatible with a call to this function.\r

                                   Use GetSize() to retrieve the size of the target data.\r
   @retval EFI_NOT_FOUND The PCD service could not find the requested token number.\r
                                   Use GetSize() to retrieve the size of the target data.\r
   @retval EFI_NOT_FOUND The PCD service could not find the requested token number.\r

-  \r
+\r

 **/\r
 EFI_STATUS\r
 EFIAPI\r
 **/\r
 EFI_STATUS\r
 EFIAPI\r


@@ -604,20 +604,20 @@ PeiPcdSet16Ex (
 /**\r
   Sets an 32-bit value for a given PCD token.\r
 \r
 /**\r
   Sets an 32-bit value for a given PCD token.\r
 \r

-  When the PCD service sets a value, it will check to ensure that the \r
-  size of the value being set is compatible with the Token's existing definition.  \r
+  When the PCD service sets a value, it will check to ensure that the\r
+  size of the value being set is compatible with the Token's existing definition.\r

   If it is not, an error will be returned.\r
 \r
   @param[in]  Guid The 128-bit unique value that designates the namespace from which to extract the value.\r
   If it is not, an error will be returned.\r
 \r
   @param[in]  Guid The 128-bit unique value that designates the namespace from which to extract the value.\r

-  @param[in]  TokenNumber The PCD token number. \r
+  @param[in]  TokenNumber The PCD token number.\r

   @param[in]  Value The value to set for the PCD token.\r
 \r
   @retval EFI_SUCCESS  Procedure returned successfully.\r
   @param[in]  Value The value to set for the PCD token.\r
 \r
   @retval EFI_SUCCESS  Procedure returned successfully.\r

-  @retval EFI_INVALID_PARAMETER The PCD service determined that the size of the data \r
-                                  being set was incompatible with a call to this function.  \r
+  @retval EFI_INVALID_PARAMETER The PCD service determined that the size of the data\r
+                                  being set was incompatible with a call to this function.\r

                                   Use GetSize() to retrieve the size of the target data.\r
   @retval EFI_NOT_FOUND The PCD service could not find the requested token number.\r
                                   Use GetSize() to retrieve the size of the target data.\r
   @retval EFI_NOT_FOUND The PCD service could not find the requested token number.\r

-  \r
+\r

 **/\r
 EFI_STATUS\r
 EFIAPI\r
 **/\r
 EFI_STATUS\r
 EFIAPI\r


@@ -630,20 +630,20 @@ PeiPcdSet32Ex (
 /**\r
   Sets an 64-bit value for a given PCD token.\r
 \r
 /**\r
   Sets an 64-bit value for a given PCD token.\r
 \r

-  When the PCD service sets a value, it will check to ensure that the \r
-  size of the value being set is compatible with the Token's existing definition.  \r
+  When the PCD service sets a value, it will check to ensure that the\r
+  size of the value being set is compatible with the Token's existing definition.\r

   If it is not, an error will be returned.\r
 \r
   @param[in]  Guid The 128-bit unique value that designates the namespace from which to extract the value.\r
   If it is not, an error will be returned.\r
 \r
   @param[in]  Guid The 128-bit unique value that designates the namespace from which to extract the value.\r

-  @param[in]  TokenNumber The PCD token number. \r
+  @param[in]  TokenNumber The PCD token number.\r

   @param[in]  Value The value to set for the PCD token.\r
 \r
   @retval EFI_SUCCESS  Procedure returned successfully.\r
   @param[in]  Value The value to set for the PCD token.\r
 \r
   @retval EFI_SUCCESS  Procedure returned successfully.\r

-  @retval EFI_INVALID_PARAMETER The PCD service determined that the size of the data \r
-                                  being set was incompatible with a call to this function.  \r
+  @retval EFI_INVALID_PARAMETER The PCD service determined that the size of the data\r
+                                  being set was incompatible with a call to this function.\r

                                   Use GetSize() to retrieve the size of the target data.\r
   @retval EFI_NOT_FOUND The PCD service could not find the requested token number.\r
                                   Use GetSize() to retrieve the size of the target data.\r
   @retval EFI_NOT_FOUND The PCD service could not find the requested token number.\r

-  \r
+\r

 **/\r
 EFI_STATUS\r
 EFIAPI\r
 **/\r
 EFI_STATUS\r
 EFIAPI\r


@@ -656,24 +656,24 @@ PeiPcdSet64Ex (
 /**\r
   Sets a value of a specified size for a given PCD token.\r
 \r
 /**\r
   Sets a value of a specified size for a given PCD token.\r
 \r

-  When the PCD service sets a value, it will check to ensure that the \r
-  size of the value being set is compatible with the Token's existing definition.  \r
+  When the PCD service sets a value, it will check to ensure that the\r
+  size of the value being set is compatible with the Token's existing definition.\r

   If it is not, an error will be returned.\r
 \r
   @param[in]  Guid The 128-bit unique value that designates the namespace from which to extract the value.\r
   If it is not, an error will be returned.\r
 \r
   @param[in]  Guid The 128-bit unique value that designates the namespace from which to extract the value.\r

-  @param[in]  TokenNumber The PCD token number. \r
-  @param[in, out] SizeOfBuffer A pointer to the length of the value being set for the PCD token.  \r
-                              On input, if the SizeOfValue is greater than the maximum size supported \r
-                              for this TokenNumber then the output value of SizeOfValue will reflect \r
+  @param[in]  TokenNumber The PCD token number.\r
+  @param[in, out] SizeOfBuffer A pointer to the length of the value being set for the PCD token.\r
+                              On input, if the SizeOfValue is greater than the maximum size supported\r
+                              for this TokenNumber then the output value of SizeOfValue will reflect\r

                               the maximum size supported for this TokenNumber.\r
   @param[in]  Buffer The buffer to set for the PCD token.\r
 \r
   @retval EFI_SUCCESS  Procedure returned successfully.\r
                               the maximum size supported for this TokenNumber.\r
   @param[in]  Buffer The buffer to set for the PCD token.\r
 \r
   @retval EFI_SUCCESS  Procedure returned successfully.\r

-  @retval EFI_INVALID_PARAMETER The PCD service determined that the size of the data \r
-                                  being set was incompatible with a call to this function.  \r
+  @retval EFI_INVALID_PARAMETER The PCD service determined that the size of the data\r
+                                  being set was incompatible with a call to this function.\r

                                   Use GetSize() to retrieve the size of the target data.\r
   @retval EFI_NOT_FOUND The PCD service could not find the requested token number.\r
                                   Use GetSize() to retrieve the size of the target data.\r
   @retval EFI_NOT_FOUND The PCD service could not find the requested token number.\r

-  \r
+\r

 **/\r
 EFI_STATUS\r
 EFIAPI\r
 **/\r
 EFI_STATUS\r
 EFIAPI\r


@@ -687,20 +687,20 @@ PeiPcdSetPtrEx (
 /**\r
   Sets an Boolean value for a given PCD token.\r
 \r
 /**\r
   Sets an Boolean value for a given PCD token.\r
 \r

-  When the PCD service sets a value, it will check to ensure that the \r
-  size of the value being set is compatible with the Token's existing definition.  \r
+  When the PCD service sets a value, it will check to ensure that the\r
+  size of the value being set is compatible with the Token's existing definition.\r

   If it is not, an error will be returned.\r
 \r
   @param[in]  Guid The 128-bit unique value that designates the namespace from which to extract the value.\r
   If it is not, an error will be returned.\r
 \r
   @param[in]  Guid The 128-bit unique value that designates the namespace from which to extract the value.\r

-  @param[in]  TokenNumber The PCD token number. \r
+  @param[in]  TokenNumber The PCD token number.\r

   @param[in]  Value The value to set for the PCD token.\r
 \r
   @retval EFI_SUCCESS  Procedure returned successfully.\r
   @param[in]  Value The value to set for the PCD token.\r
 \r
   @retval EFI_SUCCESS  Procedure returned successfully.\r

-  @retval EFI_INVALID_PARAMETER The PCD service determined that the size of the data \r
-                                  being set was incompatible with a call to this function.  \r
+  @retval EFI_INVALID_PARAMETER The PCD service determined that the size of the data\r
+                                  being set was incompatible with a call to this function.\r

                                   Use GetSize() to retrieve the size of the target data.\r
   @retval EFI_NOT_FOUND The PCD service could not find the requested token number.\r
                                   Use GetSize() to retrieve the size of the target data.\r
   @retval EFI_NOT_FOUND The PCD service could not find the requested token number.\r

-  \r
+\r

 **/\r
 EFI_STATUS\r
 EFIAPI\r
 **/\r
 EFI_STATUS\r
 EFIAPI\r


@@ -714,10 +714,10 @@ PeiPcdSetBoolEx (
   Specifies a function to be called anytime the value of a designated token is changed.\r
 \r
   @param[in]  Guid The 128-bit unique value that designates the namespace from which to extract the value.\r
   Specifies a function to be called anytime the value of a designated token is changed.\r
 \r
   @param[in]  Guid The 128-bit unique value that designates the namespace from which to extract the value.\r

-  @param[in]  TokenNumber The PCD token number. \r
-  @param[in]  CallBackFunction The function prototype called when the value associated with the CallBackToken is set.  \r
+  @param[in]  TokenNumber The PCD token number.\r
+  @param[in]  CallBackFunction The function prototype called when the value associated with the CallBackToken is set.\r

 \r
 \r

-  @retval EFI_SUCCESS  The PCD service has successfully established a call event \r
+  @retval EFI_SUCCESS  The PCD service has successfully established a call event\r

                         for the CallBackToken requested.\r
   @retval EFI_NOT_FOUND The PCD service could not find the referenced token number.\r
 \r
                         for the CallBackToken requested.\r
   @retval EFI_NOT_FOUND The PCD service could not find the referenced token number.\r
 \r


@@ -734,10 +734,10 @@ PeiRegisterCallBackOnSet (
   Cancels a previously set callback function for a particular PCD token number.\r
 \r
   @param [in]  Guid The 128-bit unique value that designates the namespace from which to extract the value.\r
   Cancels a previously set callback function for a particular PCD token number.\r
 \r
   @param [in]  Guid The 128-bit unique value that designates the namespace from which to extract the value.\r

-  @param [in]  TokenNumber The PCD token number. \r
-  @param [in]  CallBackFunction The function prototype called when the value associated with the CallBackToken is set.  \r
+  @param [in]  TokenNumber The PCD token number.\r
+  @param [in]  CallBackFunction The function prototype called when the value associated with the CallBackToken is set.\r

 \r
 \r

-  @retval EFI_SUCCESS  The PCD service has successfully established a call event \r
+  @retval EFI_SUCCESS  The PCD service has successfully established a call event\r

                         for the CallBackToken requested.\r
   @retval EFI_NOT_FOUND The PCD service could not find the referenced token number.\r
 \r
                         for the CallBackToken requested.\r
   @retval EFI_NOT_FOUND The PCD service could not find the referenced token number.\r
 \r


@@ -751,28 +751,28 @@ PcdUnRegisterCallBackOnSet (
   );\r
 \r
 /**\r
   );\r
 \r
 /**\r

-  Retrieves the next valid token number in a given namespace.  \r
-  \r
-  This is useful since the PCD infrastructure contains a sparse list of token numbers, \r
-  and one cannot a priori know what token numbers are valid in the database. \r
-  \r
-  If TokenNumber is 0 and Guid is not NULL, then the first token from the token space specified by Guid is returned.  \r
-  If TokenNumber is not 0 and Guid is not NULL, then the next token in the token space specified by Guid is returned.  \r
-  If TokenNumber is 0 and Guid is NULL, then the first token in the default token space is returned.  \r
-  If TokenNumber is not 0 and Guid is NULL, then the next token in the default token space is returned.  \r
-  The token numbers in the default token space may not be related to token numbers in token spaces that are named by Guid.  \r
-  If the next token number can be retrieved, then it is returned in TokenNumber, and EFI_SUCCESS is returned.  \r
-  If TokenNumber represents the last token number in the token space specified by Guid, then EFI_NOT_FOUND is returned.  \r
+  Retrieves the next valid token number in a given namespace.\r
+\r
+  This is useful since the PCD infrastructure contains a sparse list of token numbers,\r
+  and one cannot a priori know what token numbers are valid in the database.\r
+\r
+  If TokenNumber is 0 and Guid is not NULL, then the first token from the token space specified by Guid is returned.\r
+  If TokenNumber is not 0 and Guid is not NULL, then the next token in the token space specified by Guid is returned.\r
+  If TokenNumber is 0 and Guid is NULL, then the first token in the default token space is returned.\r
+  If TokenNumber is not 0 and Guid is NULL, then the next token in the default token space is returned.\r
+  The token numbers in the default token space may not be related to token numbers in token spaces that are named by Guid.\r
+  If the next token number can be retrieved, then it is returned in TokenNumber, and EFI_SUCCESS is returned.\r
+  If TokenNumber represents the last token number in the token space specified by Guid, then EFI_NOT_FOUND is returned.\r

   If TokenNumber is not present in the token space specified by Guid, then EFI_NOT_FOUND is returned.\r
 \r
 \r
   If TokenNumber is not present in the token space specified by Guid, then EFI_NOT_FOUND is returned.\r
 \r
 \r

-  @param[in]       Guid        The 128-bit unique value that designates the namespace from which to extract the value.  \r
-                               This is an optional parameter that may be NULL.  If this parameter is NULL, then a request \r
+  @param[in]       Guid        The 128-bit unique value that designates the namespace from which to extract the value.\r
+                               This is an optional parameter that may be NULL.  If this parameter is NULL, then a request\r

                                is being made to retrieve tokens from the default token space.\r
   @param[in, out]  TokenNumber A pointer to the PCD token number to use to find the subsequent token number.\r
                                is being made to retrieve tokens from the default token space.\r
   @param[in, out]  TokenNumber A pointer to the PCD token number to use to find the subsequent token number.\r

-                   \r
-  @retval EFI_SUCCESS   The PCD service has retrieved the next valid token number. \r
-                        Or the input token number is already the last valid token number in the PCD database. \r
+\r
+  @retval EFI_SUCCESS   The PCD service has retrieved the next valid token number.\r
+                        Or the input token number is already the last valid token number in the PCD database.\r

                         In the later case, *TokenNumber is updated with the value of 0.\r
   @retval EFI_NOT_FOUND If this input token number and token namespace does not exist on the platform.\r
 \r
                         In the later case, *TokenNumber is updated with the value of 0.\r
   @retval EFI_NOT_FOUND If this input token number and token namespace does not exist on the platform.\r
 \r


@@ -787,20 +787,20 @@ PeiPcdGetNextToken (
 /**\r
   Retrieves the next valid PCD token namespace for a given namespace.\r
 \r
 /**\r
   Retrieves the next valid PCD token namespace for a given namespace.\r
 \r

-  @param[in, out]  Guid An indirect pointer to EFI_GUID.  On input it designates \r
-                    a known token namespace from which the search will start. On output, \r
-                    it designates the next valid token namespace on the platform. If the input \r
-                    token namespace does not exist on the platform, an error is returned and \r
-                    the value of *Guid is undefined. If *Guid is NULL, then the GUID of the \r
-                    first token space of the current platform is assigned to *Guid the function \r
-                    return EFI_SUCCESS. If  *Guid is NULL  and there is no namespace exist in \r
-                    the platform other than the default (NULL) tokennamespace, *Guid is unchanged \r
-                    and the function return EFI_SUCCESS. If this input token namespace is the last \r
-                    namespace on the platform, *Guid will be assigned to NULL and the function return \r
-                    EFI_SUCCESS. \r
-\r
-  @retval EFI_SUCCESS  The PCD service retrieved the next valid token space Guid. \r
-                        Or the input token space Guid is already the last valid token space Guid \r
+  @param[in, out]  Guid An indirect pointer to EFI_GUID.  On input it designates\r
+                    a known token namespace from which the search will start. On output,\r
+                    it designates the next valid token namespace on the platform. If the input\r
+                    token namespace does not exist on the platform, an error is returned and\r
+                    the value of *Guid is undefined. If *Guid is NULL, then the GUID of the\r
+                    first token space of the current platform is assigned to *Guid the function\r
+                    return EFI_SUCCESS. If  *Guid is NULL  and there is no namespace exist in\r
+                    the platform other than the default (NULL) tokennamespace, *Guid is unchanged\r
+                    and the function return EFI_SUCCESS. If this input token namespace is the last\r
+                    namespace on the platform, *Guid will be assigned to NULL and the function return\r
+                    EFI_SUCCESS.\r
+\r
+  @retval EFI_SUCCESS  The PCD service retrieved the next valid token space Guid.\r
+                        Or the input token space Guid is already the last valid token space Guid\r

                         in the PCD database. In the later case, *Guid is updated with the value of NULL.\r
   @retval EFI_NOT_FOUND If the input token namespace does not exist on the platform.\r
 \r
                         in the PCD database. In the later case, *Guid is updated with the value of NULL.\r
   @retval EFI_NOT_FOUND If the input token namespace does not exist on the platform.\r
 \r


@@ -820,7 +820,7 @@ PeiPcdGetNextTokenSpace (
   @param[in]    Guid        The 128-bit unique value that designates the namespace from which to extract the value.\r
   @param[in]    TokenNumber The PCD token number.\r
   @param[out]   PcdInfo     The returned information associated with the requested TokenNumber.\r
   @param[in]    Guid        The 128-bit unique value that designates the namespace from which to extract the value.\r
   @param[in]    TokenNumber The PCD token number.\r
   @param[out]   PcdInfo     The returned information associated with the requested TokenNumber.\r

-                            The caller is responsible for freeing the buffer that is allocated by callee for PcdInfo->PcdName. \r
+                            The caller is responsible for freeing the buffer that is allocated by callee for PcdInfo->PcdName.\r

 \r
   @retval  EFI_SUCCESS      The PCD information was returned successfully\r
   @retval  EFI_NOT_FOUND    The PCD service could not find the requested token number.\r
 \r
   @retval  EFI_SUCCESS      The PCD information was returned successfully\r
   @retval  EFI_NOT_FOUND    The PCD service could not find the requested token number.\r


@@ -875,7 +875,7 @@ SetValueWorker (
   @retval EFI_INVALID_PARAMETER  If Size of non-Ptr type PCD does not match the size information in PCD database.\r
   @retval EFI_NOT_FOUND          If value type of PCD entry is intergrate, but not in\r
                                  range of UINT8, UINT16, UINT32, UINT64\r
   @retval EFI_INVALID_PARAMETER  If Size of non-Ptr type PCD does not match the size information in PCD database.\r
   @retval EFI_NOT_FOUND          If value type of PCD entry is intergrate, but not in\r
                                  range of UINT8, UINT16, UINT32, UINT64\r

-  @retval EFI_NOT_FOUND          Can not find the PCD type according to token number.                                \r
+  @retval EFI_NOT_FOUND          Can not find the PCD type according to token number.\r

 **/\r
 EFI_STATUS\r
 SetWorker (\r
 **/\r
 EFI_STATUS\r
 SetWorker (\r


@@ -906,12 +906,12 @@ ExSetValueWorker (
 \r
 /**\r
   Set value for a dynamic PCD entry.\r
 \r
 /**\r
   Set value for a dynamic PCD entry.\r

-  \r
-  This routine find the local token number according to dynamic-ex PCD's token \r
+\r
+  This routine find the local token number according to dynamic-ex PCD's token\r

   space guid and token number firstly, and invoke callback function if this PCD\r
   entry registered callback function. Finally, invoken general SetWorker to set\r
   PCD value.\r
   space guid and token number firstly, and invoke callback function if this PCD\r
   entry registered callback function. Finally, invoken general SetWorker to set\r
   PCD value.\r

-  \r
+\r

   @param ExTokenNumber   Dynamic-ex PCD token number.\r
   @param Guid            Token space guid for dynamic-ex PCD.\r
   @param Data            PCD value want to be set\r
   @param ExTokenNumber   Dynamic-ex PCD token number.\r
   @param Guid            Token space guid for dynamic-ex PCD.\r
   @param Data            PCD value want to be set\r


@@ -933,10 +933,10 @@ ExSetWorker (
 \r
 /**\r
   Get the PCD entry pointer in PCD database.\r
 \r
 /**\r
   Get the PCD entry pointer in PCD database.\r

-  \r
+\r

   This routine will visit PCD database to find the PCD entry according to given\r
   This routine will visit PCD database to find the PCD entry according to given\r

-  token number. The given token number is autogened by build tools and it will be \r
-  translated to local token number. Local token number contains PCD's type and \r
+  token number. The given token number is autogened by build tools and it will be\r
+  translated to local token number. Local token number contains PCD's type and\r

   offset of PCD entry in PCD database.\r
 \r
   @param TokenNumber     Token's number, it is autogened by build tools\r
   offset of PCD entry in PCD database.\r
 \r
   @param TokenNumber     Token's number, it is autogened by build tools\r


@@ -980,7 +980,7 @@ typedef struct {
   A dynamic-ex type PCD, developer must provide pair of token space guid: token number\r
   in DEC file. PCD database maintain a mapping table that translate pair of {token\r
   space guid: token number} to Token Number.\r
   A dynamic-ex type PCD, developer must provide pair of token space guid: token number\r
   in DEC file. PCD database maintain a mapping table that translate pair of {token\r
   space guid: token number} to Token Number.\r

-  \r
+\r

   @param Guid            Token space guid for dynamic-ex PCD entry.\r
   @param ExTokenNumber   Token number for dynamic-ex PCD.\r
 \r
   @param Guid            Token space guid for dynamic-ex PCD entry.\r
   @param ExTokenNumber   Token number for dynamic-ex PCD.\r
 \r


@@ -1045,7 +1045,7 @@ GetSizeTableIndex (
 \r
 /**\r
   Get PCD value's size for POINTER type PCD.\r
 \r
 /**\r
   Get PCD value's size for POINTER type PCD.\r

-  \r
+\r

   The POINTER type PCD's value will be stored into a buffer in specificed size.\r
   The max size of this PCD's value is described in PCD's definition in DEC file.\r
 \r
   The POINTER type PCD's value will be stored into a buffer in specificed size.\r
   The max size of this PCD's value is described in PCD's definition in DEC file.\r
 \r


@@ -1065,7 +1065,7 @@ GetPtrTypeSize (
 \r
 /**\r
   Set PCD value's size for POINTER type PCD.\r
 \r
 /**\r
   Set PCD value's size for POINTER type PCD.\r

-  \r
+\r

   The POINTER type PCD's value will be stored into a buffer in specificed size.\r
   The max size of this PCD's value is described in PCD's definition in DEC file.\r
 \r
   The POINTER type PCD's value will be stored into a buffer in specificed size.\r
   The max size of this PCD's value is described in PCD's definition in DEC file.\r
 \r

diff --git a/MdeModulePkg/Universal/PcatSingleSegmentPciCfg2Pei/PcatSingleSegmentPciCfg2PeiExtra.uni b/MdeModulePkg/Universal/PcatSingleSegmentPciCfg2Pei/PcatSingleSegmentPciCfg2PeiExtra.uni
index d19af9277829ae945b368a3afad7edd781776658..855ec0e877570e4a919252e28e463f638d4edf28 100644 (file)
--- a/MdeModulePkg/Universal/PcatSingleSegmentPciCfg2Pei/PcatSingleSegmentPciCfg2PeiExtra.uni
+++ b/MdeModulePkg/Universal/PcatSingleSegmentPciCfg2Pei/PcatSingleSegmentPciCfg2PeiExtra.uni
@@ -1,7 +1,7 @@
 // /** @file\r
 // PcatSingleSegmentPciCfg2Pei Localized Strings and Content\r
 //\r
 // /** @file\r
 // PcatSingleSegmentPciCfg2Pei Localized Strings and Content\r
 //\r

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

 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r
 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r


@@ -12,8 +12,8 @@
 //\r
 // **/\r
 \r
 //\r
 // **/\r
 \r

-#string STR_PROPERTIES_MODULE_NAME \r
-#language en-US \r
+#string STR_PROPERTIES_MODULE_NAME\r
+#language en-US\r

 "Single Segment PCI Configuration PEI Module"\r
 \r
 \r
 "Single Segment PCI Configuration PEI Module"\r
 \r
 \r

diff --git a/MdeModulePkg/Universal/PcatSingleSegmentPciCfg2Pei/PciCfg2.c b/MdeModulePkg/Universal/PcatSingleSegmentPciCfg2Pei/PciCfg2.c
index ed53e126992fd35039cc5caf6a65c497a7e305e7..4b9efe298b78be1edbb3fa480ccc6a90b6cc18ec 100644 (file)
--- a/MdeModulePkg/Universal/PcatSingleSegmentPciCfg2Pei/PciCfg2.c
+++ b/MdeModulePkg/Universal/PcatSingleSegmentPciCfg2Pei/PciCfg2.c
@@ -1,9 +1,9 @@
 /** @file\r
 /** @file\r

-  This driver installs Single Segment Pci Configuration 2 PPI \r
-  to provide read, write and modify access to Pci configuration space in PEI phase. \r
+  This driver installs Single Segment Pci Configuration 2 PPI\r
+  to provide read, write and modify access to Pci configuration space in PEI phase.\r

   To follow PI specification, these services also support access to the unaligned Pci address.\r
 \r
   To follow PI specification, these services also support access to the unaligned Pci address.\r
 \r

-  Copyright (c) 2006 - 2010, Intel Corporation. All rights reserved.<BR>\r
+  Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r

   This program and the accompanying materials\r
   are licensed and made available under the terms and conditions of the BSD License\r
   which accompanies this distribution.  The full text of the license may be found at\r
   This program and the accompanying materials\r
   are licensed and made available under the terms and conditions of the BSD License\r
   which accompanies this distribution.  The full text of the license may be found at\r


@@ -56,7 +56,7 @@ PciCfgAddressConvert (
 \r
   @retval EFI_SUCCESS           The function completed successfully.\r
   @retval EFI_INVALID_PARAMETER The invalid access width.\r
 \r
   @retval EFI_SUCCESS           The function completed successfully.\r
   @retval EFI_INVALID_PARAMETER The invalid access width.\r

-  \r
+\r

 **/\r
 EFI_STATUS\r
 EFIAPI\r
 **/\r
 EFI_STATUS\r
 EFIAPI\r


@@ -157,7 +157,7 @@ PciCfg2Write (
       // Unaligned Pci address access, break up the request into byte by byte.\r
       //\r
       PciWrite8 (PciLibAddress, *((UINT8 *) Buffer));\r
       // Unaligned Pci address access, break up the request into byte by byte.\r
       //\r
       PciWrite8 (PciLibAddress, *((UINT8 *) Buffer));\r

-      PciWrite8 (PciLibAddress + 1, *((UINT8 *) Buffer + 1)); \r
+      PciWrite8 (PciLibAddress + 1, *((UINT8 *) Buffer + 1));\r

     }\r
   } else if (Width == EfiPeiPciCfgWidthUint32) {\r
     if ((PciLibAddress & 0x03) == 0) {\r
     }\r
   } else if (Width == EfiPeiPciCfgWidthUint32) {\r
     if ((PciLibAddress & 0x03) == 0) {\r


@@ -176,9 +176,9 @@ PciCfg2Write (
       // Unaligned Pci address access, break up the request into byte by byte.\r
       //\r
       PciWrite8 (PciLibAddress, *((UINT8 *) Buffer));\r
       // Unaligned Pci address access, break up the request into byte by byte.\r
       //\r
       PciWrite8 (PciLibAddress, *((UINT8 *) Buffer));\r

-      PciWrite8 (PciLibAddress + 1, *((UINT8 *) Buffer + 1)); \r
-      PciWrite8 (PciLibAddress + 2, *((UINT8 *) Buffer + 2)); \r
-      PciWrite8 (PciLibAddress + 3, *((UINT8 *) Buffer + 3)); \r
+      PciWrite8 (PciLibAddress + 1, *((UINT8 *) Buffer + 1));\r
+      PciWrite8 (PciLibAddress + 2, *((UINT8 *) Buffer + 2));\r
+      PciWrite8 (PciLibAddress + 3, *((UINT8 *) Buffer + 3));\r

     }\r
   } else {\r
     return EFI_INVALID_PARAMETER;\r
     }\r
   } else {\r
     return EFI_INVALID_PARAMETER;\r


@@ -292,9 +292,9 @@ EFI_PEI_PPI_DESCRIPTOR gPciCfg2PpiList = {
 };\r
 \r
 /**\r
 };\r
 \r
 /**\r

-  Module's entry function. \r
+  Module's entry function.\r

   This routine will install EFI_PEI_PCI_CFG2_PPI.\r
   This routine will install EFI_PEI_PCI_CFG2_PPI.\r

-  \r
+\r

   @param  FileHandle  Handle of the file being invoked.\r
   @param  PeiServices Describes the list of possible PEI Services.\r
 \r
   @param  FileHandle  Handle of the file being invoked.\r
   @param  PeiServices Describes the list of possible PEI Services.\r
 \r

diff --git a/MdeModulePkg/Universal/PlatformDriOverrideDxe/InternalPlatDriOverrideDxe.h b/MdeModulePkg/Universal/PlatformDriOverrideDxe/InternalPlatDriOverrideDxe.h
index 75af7635226ae09cb826f2da180b040d87b2d76b..a9354c6cf45445a057cd8708cf95e65aee53ae02 100644 (file)
--- a/MdeModulePkg/Universal/PlatformDriOverrideDxe/InternalPlatDriOverrideDxe.h
+++ b/MdeModulePkg/Universal/PlatformDriOverrideDxe/InternalPlatDriOverrideDxe.h
@@ -2,7 +2,7 @@
   Ihe internal heder file includes the required Protocol/Guid/Library\r
   and the shared function APIs.\r
 \r
   Ihe internal heder file includes the required Protocol/Guid/Library\r
   and the shared function APIs.\r
 \r

-Copyright (c) 2007 - 2013, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2007 - 2018, Intel Corporation. All rights reserved.<BR>\r

 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r


@@ -146,8 +146,8 @@ GetDriverFromMapping (
 \r
   @retval EFI_INVALID_PARAMETER    ControllerDevicePath or MappingDataBase is NULL.\r
   @retval EFI_NOT_FOUND            ControllerDevicePath is not found in MappingDataBase or\r
 \r
   @retval EFI_INVALID_PARAMETER    ControllerDevicePath or MappingDataBase is NULL.\r
   @retval EFI_NOT_FOUND            ControllerDevicePath is not found in MappingDataBase or\r

-                                   DriverImageDevicePath is not found in the found DriverImage Info list. \r
-  @retval EFI_SUCCESS              The controller's total override driver number and \r
+                                   DriverImageDevicePath is not found in the found DriverImage Info list.\r
+  @retval EFI_SUCCESS              The controller's total override driver number and\r

                                    input DriverImage's order number is correctly return.\r
 **/\r
 EFI_STATUS\r
                                    input DriverImage's order number is correctly return.\r
 **/\r
 EFI_STATUS\r


@@ -169,14 +169,14 @@ CheckMapping (
                                    override driver image item\r
   @param  DriverImageDevicePath    The driver image device path need to be insert\r
   @param  MappingDataBase          Mapping database list entry pointer\r
                                    override driver image item\r
   @param  DriverImageDevicePath    The driver image device path need to be insert\r
   @param  MappingDataBase          Mapping database list entry pointer\r

-  @param  DriverImageNO            The inserted order number. If this number is taken, \r
+  @param  DriverImageNO            The inserted order number. If this number is taken,\r

                                    the larger available number will be used.\r
 \r
   @retval EFI_INVALID_PARAMETER    ControllerDevicePath is NULL, or DriverImageDevicePath is NULL\r
                                    or MappingDataBase is NULL\r
                                    the larger available number will be used.\r
 \r
   @retval EFI_INVALID_PARAMETER    ControllerDevicePath is NULL, or DriverImageDevicePath is NULL\r
                                    or MappingDataBase is NULL\r

-  @retval EFI_ALREADY_STARTED      The input Controller to input DriverImage has been \r
+  @retval EFI_ALREADY_STARTED      The input Controller to input DriverImage has been\r

                                    recorded into the mapping database.\r
                                    recorded into the mapping database.\r

-  @retval EFI_SUCCESS              The Controller and DriverImage are inserted into \r
+  @retval EFI_SUCCESS              The Controller and DriverImage are inserted into\r

                                    the mapping database successfully.\r
 \r
 **/\r
                                    the mapping database successfully.\r
 \r
 **/\r


@@ -193,7 +193,7 @@ InsertDriverImage (
 /**\r
   Delete a controller's override driver from the mapping database.\r
 \r
 /**\r
   Delete a controller's override driver from the mapping database.\r
 \r

-  @param  ControllerDevicePath     The controller device path will be deleted \r
+  @param  ControllerDevicePath     The controller device path will be deleted\r

                                    when all drivers images on it are removed.\r
   @param  DriverImageDevicePath    The driver image device path will be delete.\r
                                    If NULL, all driver image will be delete.\r
                                    when all drivers images on it are removed.\r
   @param  DriverImageDevicePath    The driver image device path will be delete.\r
                                    If NULL, all driver image will be delete.\r


@@ -201,7 +201,7 @@ InsertDriverImage (
 \r
   @retval EFI_INVALID_PARAMETER    ControllerDevicePath is NULL, or MappingDataBase is NULL\r
   @retval EFI_NOT_FOUND            ControllerDevicePath is not found in MappingDataBase or\r
 \r
   @retval EFI_INVALID_PARAMETER    ControllerDevicePath is NULL, or MappingDataBase is NULL\r
   @retval EFI_NOT_FOUND            ControllerDevicePath is not found in MappingDataBase or\r

-                                   DriverImageDevicePath is not found in the found DriverImage Info list. \r
+                                   DriverImageDevicePath is not found in the found DriverImage Info list.\r

   @retval EFI_SUCCESS              Delete the specified driver successfully.\r
 \r
 **/\r
   @retval EFI_SUCCESS              Delete the specified driver successfully.\r
 \r
 **/\r

diff --git a/MdeModulePkg/Universal/PlatformDriOverrideDxe/PlatDriOverrideDxe.c b/MdeModulePkg/Universal/PlatformDriOverrideDxe/PlatDriOverrideDxe.c
index 76c240b73d0ce49b437a1c14e4c57c4c1485eaf4..b2ddf1020b3cb8be09cd5ba9412aeac0433b82bf 100644 (file)
--- a/MdeModulePkg/Universal/PlatformDriOverrideDxe/PlatDriOverrideDxe.c
+++ b/MdeModulePkg/Universal/PlatformDriOverrideDxe/PlatDriOverrideDxe.c
@@ -1,6 +1,6 @@
 /** @file\r
   This file also installs UEFI PLATFORM_DRIVER_OVERRIDE_PROTOCOL.\r
 /** @file\r
   This file also installs UEFI PLATFORM_DRIVER_OVERRIDE_PROTOCOL.\r

-  \r
+\r

   The main code offers a UI interface in device manager to let user configure\r
   platform override protocol to override the default algorithm for matching\r
   drivers to controllers.\r
   The main code offers a UI interface in device manager to let user configure\r
   platform override protocol to override the default algorithm for matching\r
   drivers to controllers.\r


@@ -13,7 +13,7 @@
   4. It save all the mapping info in NV variables which will be consumed\r
      by platform override protocol driver to publish the platform override protocol.\r
 \r
   4. It save all the mapping info in NV variables which will be consumed\r
      by platform override protocol driver to publish the platform override protocol.\r
 \r

-Copyright (c) 2007 - 2017, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2007 - 2018, Intel Corporation. All rights reserved.<BR>\r

 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r


@@ -96,7 +96,7 @@ HII_VENDOR_DEVICE_PATH  mHiiVendorDevicePath = {
   {\r
     END_DEVICE_PATH_TYPE,\r
     END_ENTIRE_DEVICE_PATH_SUBTYPE,\r
   {\r
     END_DEVICE_PATH_TYPE,\r
     END_ENTIRE_DEVICE_PATH_SUBTYPE,\r

-    { \r
+    {\r

       (UINT8) (END_DEVICE_PATH_LENGTH),\r
       (UINT8) ((END_DEVICE_PATH_LENGTH) >> 8)\r
     }\r
       (UINT8) (END_DEVICE_PATH_LENGTH),\r
       (UINT8) ((END_DEVICE_PATH_LENGTH) >> 8)\r
     }\r


@@ -107,7 +107,7 @@ HII_VENDOR_DEVICE_PATH  mHiiVendorDevicePath = {
   Converting a given device to an unicode string.\r
 \r
   @param    DevPath     Given device path instance\r
   Converting a given device to an unicode string.\r
 \r
   @param    DevPath     Given device path instance\r

-  \r
+\r

   @return   Converted string from given device path.\r
   @retval   L"?" Converting failed.\r
 **/\r
   @return   Converted string from given device path.\r
   @retval   L"?" Converting failed.\r
 **/\r


@@ -131,7 +131,7 @@ DevicePathToStr (
 }\r
 \r
 /**\r
 }\r
 \r
 /**\r

-  Worker function to get the driver name by ComponentName or ComponentName2 protocol \r
+  Worker function to get the driver name by ComponentName or ComponentName2 protocol\r

   according to the driver binding handle.\r
 \r
   @param  DriverBindingHandle  The Handle of DriverBinding.\r
   according to the driver binding handle.\r
 \r
   @param  DriverBindingHandle  The Handle of DriverBinding.\r


@@ -197,7 +197,7 @@ GetComponentNameWorker (
 \r
 \r
 /**\r
 \r
 \r
 /**\r

-  Get the driver name by ComponentName or ComponentName2 protocol \r
+  Get the driver name by ComponentName or ComponentName2 protocol\r

   according to the driver binding handle\r
 \r
   @param DriverBindingHandle  The Handle of DriverBinding.\r
   according to the driver binding handle\r
 \r
   @param DriverBindingHandle  The Handle of DriverBinding.\r


@@ -219,7 +219,7 @@ GetComponentName (
   DriverName = GetComponentNameWorker (DriverBindingHandle, &gEfiComponentName2ProtocolGuid, L"PlatformLang");\r
   if (DriverName == NULL) {\r
     //\r
   DriverName = GetComponentNameWorker (DriverBindingHandle, &gEfiComponentName2ProtocolGuid, L"PlatformLang");\r
   if (DriverName == NULL) {\r
     //\r

-    // If we can not get driver name from Component Name 2 protocol, we can try ISO 639-2 Component Name protocol. \r
+    // If we can not get driver name from Component Name 2 protocol, we can try ISO 639-2 Component Name protocol.\r

     //\r
     DriverName = GetComponentNameWorker (DriverBindingHandle, &gEfiComponentNameProtocolGuid, L"Lang");\r
   }\r
     //\r
     DriverName = GetComponentNameWorker (DriverBindingHandle, &gEfiComponentNameProtocolGuid, L"Lang");\r
   }\r


@@ -266,7 +266,7 @@ GetImageName (
     // Make sure device path node is aligned when accessing it's FV Name Guid field.\r
     //\r
     AlignedDevPathNode = AllocateCopyPool (DevicePathNodeLength(DevPathNode), DevPathNode);\r
     // Make sure device path node is aligned when accessing it's FV Name Guid field.\r
     //\r
     AlignedDevPathNode = AllocateCopyPool (DevicePathNodeLength(DevPathNode), DevPathNode);\r

-    \r
+\r

     //\r
     // Find the Fv File path\r
     //\r
     //\r
     // Find the Fv File path\r
     //\r


@@ -298,9 +298,9 @@ GetImageName (
         Buffer = NULL;\r
       }\r
     }\r
         Buffer = NULL;\r
       }\r
     }\r

-    \r
+\r

     FreePool (AlignedDevPathNode);\r
     FreePool (AlignedDevPathNode);\r

-    \r
+\r

     //\r
     // Next device path node\r
     //\r
     //\r
     // Next device path node\r
     //\r


@@ -344,13 +344,13 @@ UpdateDeviceSelectPage (
   VOID                                      *StartOpCodeHandle;\r
   VOID                                      *EndOpCodeHandle;\r
   EFI_IFR_GUID_LABEL                        *StartLabel;\r
   VOID                                      *StartOpCodeHandle;\r
   VOID                                      *EndOpCodeHandle;\r
   EFI_IFR_GUID_LABEL                        *StartLabel;\r

-  EFI_IFR_GUID_LABEL                        *EndLabel;  \r
+  EFI_IFR_GUID_LABEL                        *EndLabel;\r

 \r
   //\r
   // Set current page form ID.\r
   //\r
 \r
   //\r
   // Set current page form ID.\r
   //\r

-  mCurrentPage = FORM_ID_DEVICE;  \r
-  \r
+  mCurrentPage = FORM_ID_DEVICE;\r
+\r

   //\r
   // Initial the mapping database in memory\r
   //\r
   //\r
   // Initial the mapping database in memory\r
   //\r


@@ -507,7 +507,7 @@ UpdateDeviceSelectPage (
     // Save the device path string toke for next access use\r
     //\r
     mControllerToken[Index] = NewStringToken;\r
     // Save the device path string toke for next access use\r
     //\r
     mControllerToken[Index] = NewStringToken;\r

-      \r
+\r

     HiiCreateGotoOpCode (\r
       StartOpCodeHandle,\r
       FORM_ID_DRIVER,\r
     HiiCreateGotoOpCode (\r
       StartOpCodeHandle,\r
       FORM_ID_DRIVER,\r


@@ -575,7 +575,7 @@ GetDriverBindingHandleFromImageHandle (
   if (EFI_ERROR (Status) || (DriverBindingHandleCount == 0)) {\r
     return NULL;\r
   }\r
   if (EFI_ERROR (Status) || (DriverBindingHandleCount == 0)) {\r
     return NULL;\r
   }\r

-  \r
+\r

   //\r
   // Get the first Driver Binding handle which has the specific image handle.\r
   //\r
   //\r
   // Get the first Driver Binding handle which has the specific image handle.\r
   //\r


@@ -819,7 +819,7 @@ UpdateBindingDriverSelectPage (
     //\r
     NewStrSize = StrSize (DriverName);\r
     NewString = AllocateZeroPool (NewStrSize);\r
     //\r
     NewStrSize = StrSize (DriverName);\r
     NewString = AllocateZeroPool (NewStrSize);\r

-    ASSERT (NewString != NULL); \r
+    ASSERT (NewString != NULL);\r

     if (EFI_ERROR (CheckMapping (mControllerDevicePathProtocol[mSelectedCtrIndex], LoadedImageDevicePath, &mMappingDataBase, NULL, NULL))) {\r
       mDriSelection[Index] = FALSE;\r
     } else {\r
     if (EFI_ERROR (CheckMapping (mControllerDevicePathProtocol[mSelectedCtrIndex], LoadedImageDevicePath, &mMappingDataBase, NULL, NULL))) {\r
       mDriSelection[Index] = FALSE;\r
     } else {\r


@@ -842,7 +842,7 @@ UpdateBindingDriverSelectPage (
 \r
     NewStrSize = StrSize (DriverName);\r
     NewString = AllocateZeroPool (NewStrSize);\r
 \r
     NewStrSize = StrSize (DriverName);\r
     NewString = AllocateZeroPool (NewStrSize);\r

-    ASSERT (NewString != NULL); \r
+    ASSERT (NewString != NULL);\r

     StrCatS (NewString, NewStrSize/sizeof(CHAR16), DriverName);\r
     NewStringHelpToken = HiiSetString (Private->RegisteredHandle, DriverImageFilePathToken[Index], NewString, NULL);\r
     ASSERT (NewStringHelpToken != 0);\r
     StrCatS (NewString, NewStrSize/sizeof(CHAR16), DriverName);\r
     NewStringHelpToken = HiiSetString (Private->RegisteredHandle, DriverImageFilePathToken[Index], NewString, NULL);\r
     ASSERT (NewStringHelpToken != 0);\r


@@ -1058,7 +1058,7 @@ UpdatePrioritySelectPage (
     FakeNvData->DriOrder[Index] = (UINT8) OrderNO[MinNO];\r
     TempNO[MinNO] = MAX_CHOICE_NUM + 1;\r
   }\r
     FakeNvData->DriOrder[Index] = (UINT8) OrderNO[MinNO];\r
     TempNO[MinNO] = MAX_CHOICE_NUM + 1;\r
   }\r

-  \r
+\r

   //\r
   // Create Order List OpCode\r
   //\r
   //\r
   // Create Order List OpCode\r
   //\r


@@ -1289,7 +1289,7 @@ PlatOverMngrRouteConfig (
   if (!HiiIsConfigHdrMatch (Configuration, &gPlatformOverridesManagerGuid, mVariableName)) {\r
     return EFI_NOT_FOUND;\r
   }\r
   if (!HiiIsConfigHdrMatch (Configuration, &gPlatformOverridesManagerGuid, mVariableName)) {\r
     return EFI_NOT_FOUND;\r
   }\r

-  \r
+\r

   *Progress = Configuration + StrLen (Configuration);\r
   Private    = EFI_CALLBACK_INFO_FROM_THIS (This);\r
   FakeNvData = &Private->FakeNvData;\r
   *Progress = Configuration + StrLen (Configuration);\r
   Private    = EFI_CALLBACK_INFO_FROM_THIS (This);\r
   FakeNvData = &Private->FakeNvData;\r


@@ -1365,7 +1365,7 @@ PlatOverMngrCallback (
     if (Value == NULL) {\r
       return EFI_INVALID_PARAMETER;\r
     }\r
     if (Value == NULL) {\r
       return EFI_INVALID_PARAMETER;\r
     }\r

-    \r
+\r

     if (KeyValue == KEY_VALUE_DRIVER_GOTO_PREVIOUS) {\r
       UpdateDeviceSelectPage (Private, KeyValue, FakeNvData);\r
       //\r
     if (KeyValue == KEY_VALUE_DRIVER_GOTO_PREVIOUS) {\r
       UpdateDeviceSelectPage (Private, KeyValue, FakeNvData);\r
       //\r


@@ -1426,7 +1426,7 @@ PlatOverMngrCallback (
           ASSERT (FALSE);\r
         }\r
       break;\r
           ASSERT (FALSE);\r
         }\r
       break;\r

-      \r
+\r

       case KEY_VALUE_ORDER_SAVE_AND_EXIT:\r
         Status = CommitChanges (Private, KeyValue, FakeNvData);\r
         *ActionRequest = EFI_BROWSER_ACTION_REQUEST_SUBMIT;\r
       case KEY_VALUE_ORDER_SAVE_AND_EXIT:\r
         Status = CommitChanges (Private, KeyValue, FakeNvData);\r
         *ActionRequest = EFI_BROWSER_ACTION_REQUEST_SUBMIT;\r


@@ -1526,14 +1526,14 @@ GetDriver (
   This driver doesn't support this API.\r
 \r
   @param  This                  A pointer to the EFI_PLATFORM_DRIVER_OVERRIDE_\r
   This driver doesn't support this API.\r
 \r
   @param  This                  A pointer to the EFI_PLATFORM_DRIVER_OVERRIDE_\r

-                                PROTOCOL instance.                            \r
+                                PROTOCOL instance.\r

   @param  ControllerHandle      The device handle of the controller to check if a driver override\r
   @param  ControllerHandle      The device handle of the controller to check if a driver override\r

-                                exists.                                                          \r
+                                exists.\r

   @param  DriverImagePath       On input, a pointer to the previous driver device path returned by\r
                                 GetDriverPath(). On output, a pointer to the next driver\r
                                 device path. Passing in a pointer to NULL, will return the first\r
                                 driver device path for ControllerHandle.\r
   @param  DriverImagePath       On input, a pointer to the previous driver device path returned by\r
                                 GetDriverPath(). On output, a pointer to the next driver\r
                                 device path. Passing in a pointer to NULL, will return the first\r
                                 driver device path for ControllerHandle.\r

-  \r
+\r

   @retval EFI_UNSUPPORTED\r
 **/\r
 EFI_STATUS\r
   @retval EFI_UNSUPPORTED\r
 **/\r
 EFI_STATUS\r


@@ -1550,18 +1550,18 @@ GetDriverPath (
 \r
 /**\r
   Used to associate a driver image handle with a device path that was returned on a prior call to the\r
 \r
 /**\r
   Used to associate a driver image handle with a device path that was returned on a prior call to the\r

-  GetDriverPath() service. This driver image handle will then be available through the               \r
+  GetDriverPath() service. This driver image handle will then be available through the\r

   GetDriver() service. This driver doesn't support this API.\r
 \r
   @param  This                  A pointer to the EFI_PLATFORM_DRIVER_OVERRIDE_\r
   GetDriver() service. This driver doesn't support this API.\r
 \r
   @param  This                  A pointer to the EFI_PLATFORM_DRIVER_OVERRIDE_\r

-                                PROTOCOL instance.                            \r
-  @param  ControllerHandle      The device handle of the controller.                                                             \r
+                                PROTOCOL instance.\r
+  @param  ControllerHandle      The device handle of the controller.\r

   @param  DriverImagePath       A pointer to the driver device path that was returned in a prior\r
   @param  DriverImagePath       A pointer to the driver device path that was returned in a prior\r

-                                call to GetDriverPath().                                                                        \r
+                                call to GetDriverPath().\r

   @param  DriverImageHandle     The driver image handle that was returned by LoadImage()\r
   @param  DriverImageHandle     The driver image handle that was returned by LoadImage()\r

-                                when the driver specified by DriverImagePath was loaded \r
-                                into memory. \r
-  \r
+                                when the driver specified by DriverImagePath was loaded\r
+                                into memory.\r
+\r

   @retval EFI_UNSUPPORTED\r
 **/\r
 EFI_STATUS\r
   @retval EFI_UNSUPPORTED\r
 **/\r
 EFI_STATUS\r


@@ -1597,7 +1597,7 @@ PlatDriOverrideDxeInit (
   EFI_STATUS                  Status;\r
   EFI_FORM_BROWSER2_PROTOCOL  *FormBrowser2;\r
   VOID                        *Instance;\r
   EFI_STATUS                  Status;\r
   EFI_FORM_BROWSER2_PROTOCOL  *FormBrowser2;\r
   VOID                        *Instance;\r

-  \r
+\r

   //\r
   // There should only be one Form Configuration protocol\r
   //\r
   //\r
   // There should only be one Form Configuration protocol\r
   //\r


@@ -1626,7 +1626,7 @@ PlatDriOverrideDxeInit (
   if (!EFI_ERROR (Status)) {\r
     return EFI_ALREADY_STARTED;\r
   }\r
   if (!EFI_ERROR (Status)) {\r
     return EFI_ALREADY_STARTED;\r
   }\r

-  \r
+\r

   mCallerImageHandle = ImageHandle;\r
   mCallbackInfo = AllocateZeroPool (sizeof (EFI_CALLBACK_INFO));\r
   if (mCallbackInfo == NULL) {\r
   mCallerImageHandle = ImageHandle;\r
   mCallbackInfo = AllocateZeroPool (sizeof (EFI_CALLBACK_INFO));\r
   if (mCallbackInfo == NULL) {\r


@@ -1691,7 +1691,7 @@ PlatDriOverrideDxeInit (
   //\r
   mDriverImageHandleCount = 0;\r
   mCurrentPage = 0;\r
   //\r
   mDriverImageHandleCount = 0;\r
   mCurrentPage = 0;\r

-  \r
+\r

   return EFI_SUCCESS;\r
 \r
 Finish:\r
   return EFI_SUCCESS;\r
 \r
 Finish:\r

diff --git a/MdeModulePkg/Universal/PlatformDriOverrideDxe/PlatDriOverrideDxe.uni b/MdeModulePkg/Universal/PlatformDriOverrideDxe/PlatDriOverrideDxe.uni
index 22d33d313fc8ca7eb424b63ae968a60e0534956b..ef9e890c3d8ed50e5349360ed5ea2ff1d0f97d1d 100644 (file)
--- a/MdeModulePkg/Universal/PlatformDriOverrideDxe/PlatDriOverrideDxe.uni
+++ b/MdeModulePkg/Universal/PlatformDriOverrideDxe/PlatDriOverrideDxe.uni
@@ -4,11 +4,11 @@
 // It doesn't install again if this protocol exists.\r
 // It only implements one interface GetDriver of PLATFORM_DRIVER_OVERRIDE_PROTOCOL protocol\r
 // and doesn't support other two interfaces GetDriverPath, DriverLoaded.\r
 // It doesn't install again if this protocol exists.\r
 // It only implements one interface GetDriver of PLATFORM_DRIVER_OVERRIDE_PROTOCOL protocol\r
 // and doesn't support other two interfaces GetDriverPath, DriverLoaded.\r

-// \r
+//\r

 // This driver also offers an UI interface in device manager to let user configure\r
 // platform override protocol to override the default algorithm for matching\r
 // drivers to controllers.\r
 // This driver also offers an UI interface in device manager to let user configure\r
 // platform override protocol to override the default algorithm for matching\r
 // drivers to controllers.\r

-// \r
+//\r

 // The main flow:\r
 // 1. It dynamicly locate all controller device path.\r
 // 2. It dynamicly locate all drivers which support binding protocol.\r
 // The main flow:\r
 // 1. It dynamicly locate all controller device path.\r
 // 2. It dynamicly locate all drivers which support binding protocol.\r


@@ -16,16 +16,16 @@
 // mapping between drivers to controllers.\r
 // 4. It save all the mapping info in NV variables for the following boot,\r
 // which will be consumed by GetDriver API of the produced the platform override protocol.\r
 // mapping between drivers to controllers.\r
 // 4. It save all the mapping info in NV variables for the following boot,\r
 // which will be consumed by GetDriver API of the produced the platform override protocol.\r

-// \r
+//\r

 // Caution: This module is a sample implementation for the test purpose.\r
 //\r
 // Caution: This module is a sample implementation for the test purpose.\r
 //\r

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

 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r
 // which accompanies this distribution. The full text of the license may be found at\r
 // http://opensource.org/licenses/bsd-license.php\r
 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r
 // which accompanies this distribution. The full text of the license may be found at\r
 // http://opensource.org/licenses/bsd-license.php\r

-// \r
+//\r

 // THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 // WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 //\r
 // THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 // WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 //\r

diff --git a/MdeModulePkg/Universal/PlatformDriOverrideDxe/PlatDriOverrideDxeExtra.uni b/MdeModulePkg/Universal/PlatformDriOverrideDxe/PlatDriOverrideDxeExtra.uni
index 0648a02afd3387a43d8bfeb39c9100d46686e08f..5226fd6556575fe00ec0035f268eb5828a8df4f7 100644 (file)
--- a/MdeModulePkg/Universal/PlatformDriOverrideDxe/PlatDriOverrideDxeExtra.uni
+++ b/MdeModulePkg/Universal/PlatformDriOverrideDxe/PlatDriOverrideDxeExtra.uni
@@ -1,7 +1,7 @@
 // /** @file\r
 // PlatDriOverrideDxe Localized Strings and Content\r
 //\r
 // /** @file\r
 // PlatDriOverrideDxe Localized Strings and Content\r
 //\r

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

 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r
 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r


@@ -13,8 +13,8 @@
 //\r
 // **/\r
 \r
 //\r
 // **/\r
 \r

-#string STR_PROPERTIES_MODULE_NAME \r
-#language en-US \r
+#string STR_PROPERTIES_MODULE_NAME\r
+#language en-US\r

 "Platform Driver Override DXE Driver"\r
 \r
 \r
 "Platform Driver Override DXE Driver"\r
 \r
 \r

diff --git a/MdeModulePkg/Universal/PlatformDriOverrideDxe/PlatDriOverrideLib.c b/MdeModulePkg/Universal/PlatformDriOverrideDxe/PlatDriOverrideLib.c
index 86c34be88d0f1338dfd5a1828ba593d3b2692569..d49f6c9953f5f8afc4a1cd8c36bbd4a67f1a3588 100644 (file)
--- a/MdeModulePkg/Universal/PlatformDriOverrideDxe/PlatDriOverrideLib.c
+++ b/MdeModulePkg/Universal/PlatformDriOverrideDxe/PlatDriOverrideLib.c
@@ -1,7 +1,7 @@
 /** @file\r
   Implementation of the shared functions to do the platform driver vverride mapping.\r
 \r
 /** @file\r
   Implementation of the shared functions to do the platform driver vverride mapping.\r
 \r

-  Copyright (c) 2007 - 2015, Intel Corporation. All rights reserved.<BR>\r
+  Copyright (c) 2007 - 2018, Intel Corporation. All rights reserved.<BR>\r

   This program and the accompanying materials\r
   are licensed and made available under the terms and conditions of the BSD License\r
   which accompanies this distribution.  The full text of the license may be found at\r
   This program and the accompanying materials\r
   are licensed and made available under the terms and conditions of the BSD License\r
   which accompanies this distribution.  The full text of the license may be found at\r


@@ -751,7 +751,7 @@ InitOverridesMapping (
       //\r
       // Check buffer overflow.\r
       //\r
       //\r
       // Check buffer overflow.\r
       //\r

-      if ((OverrideItem->ControllerDevicePath == NULL) || (VariableIndex < (UINT8 *) ControllerDevicePath) || \r
+      if ((OverrideItem->ControllerDevicePath == NULL) || (VariableIndex < (UINT8 *) ControllerDevicePath) ||\r

           (VariableIndex > (UINT8 *) VariableBuffer + BufferSize)) {\r
         Corrupted = TRUE;\r
         break;\r
           (VariableIndex > (UINT8 *) VariableBuffer + BufferSize)) {\r
         Corrupted = TRUE;\r
         break;\r


@@ -781,7 +781,7 @@ InitOverridesMapping (
         //\r
         // Check buffer overflow\r
         //\r
         //\r
         // Check buffer overflow\r
         //\r

-        if ((DriverImageInfo->DriverImagePath == NULL) || (VariableIndex < (UINT8 *) DriverDevicePath) || \r
+        if ((DriverImageInfo->DriverImagePath == NULL) || (VariableIndex < (UINT8 *) DriverDevicePath) ||\r

             (VariableIndex < (UINT8 *) VariableBuffer + BufferSize)) {\r
           Corrupted = TRUE;\r
           break;\r
             (VariableIndex < (UINT8 *) VariableBuffer + BufferSize)) {\r
           Corrupted = TRUE;\r
           break;\r


@@ -1094,7 +1094,7 @@ SaveOverridesMapping (
     if (EFI_ERROR (Status)) {\r
       if (NumIndex > 0) {\r
         //\r
     if (EFI_ERROR (Status)) {\r
       if (NumIndex > 0) {\r
         //\r

-        // Delete all PlatDriOver variables when full mapping can't be set.  \r
+        // Delete all PlatDriOver variables when full mapping can't be set.\r

         //\r
         DeleteOverridesVariables ();\r
       }\r
         //\r
         DeleteOverridesVariables ();\r
       }\r


@@ -1112,7 +1112,7 @@ SaveOverridesMapping (
 \r
   @param  ImageHandle          The Image handle\r
   @param  BindingHandle        The BindingHandle of the found Driver Binding protocol.\r
 \r
   @param  ImageHandle          The Image handle\r
   @param  BindingHandle        The BindingHandle of the found Driver Binding protocol.\r

-                               If Binding protocol is not found, it is set to NULL. \r
+                               If Binding protocol is not found, it is set to NULL.\r

 \r
   @return                      Pointer into the Binding Protocol interface\r
   @retval NULL                 The parameter is not valid or the binding protocol is not found.\r
 \r
   @return                      Pointer into the Binding Protocol interface\r
   @retval NULL                 The parameter is not valid or the binding protocol is not found.\r


@@ -1551,8 +1551,8 @@ GetDriverFromMapping (
 \r
   @retval EFI_INVALID_PARAMETER    ControllerDevicePath or MappingDataBase is NULL.\r
   @retval EFI_NOT_FOUND            ControllerDevicePath is not found in MappingDataBase or\r
 \r
   @retval EFI_INVALID_PARAMETER    ControllerDevicePath or MappingDataBase is NULL.\r
   @retval EFI_NOT_FOUND            ControllerDevicePath is not found in MappingDataBase or\r

-                                   DriverImageDevicePath is not found in the found DriverImage Info list. \r
-  @retval EFI_SUCCESS              The controller's total override driver number and \r
+                                   DriverImageDevicePath is not found in the found DriverImage Info list.\r
+  @retval EFI_SUCCESS              The controller's total override driver number and\r

                                    input DriverImage's order number is correctly return.\r
 **/\r
 EFI_STATUS\r
                                    input DriverImage's order number is correctly return.\r
 **/\r
 EFI_STATUS\r


@@ -1668,14 +1668,14 @@ CheckMapping (
                                    override driver image item\r
   @param  DriverImageDevicePath    The driver image device path need to be insert\r
   @param  MappingDataBase          Mapping database list entry pointer\r
                                    override driver image item\r
   @param  DriverImageDevicePath    The driver image device path need to be insert\r
   @param  MappingDataBase          Mapping database list entry pointer\r

-  @param  DriverImageNO            The inserted order number. If this number is taken, \r
+  @param  DriverImageNO            The inserted order number. If this number is taken,\r

                                    the larger available number will be used.\r
 \r
   @retval EFI_INVALID_PARAMETER    ControllerDevicePath is NULL, or DriverImageDevicePath is NULL\r
                                    or MappingDataBase is NULL\r
                                    the larger available number will be used.\r
 \r
   @retval EFI_INVALID_PARAMETER    ControllerDevicePath is NULL, or DriverImageDevicePath is NULL\r
                                    or MappingDataBase is NULL\r

-  @retval EFI_ALREADY_STARTED      The input Controller to input DriverImage has been \r
+  @retval EFI_ALREADY_STARTED      The input Controller to input DriverImage has been\r

                                    recorded into the mapping database.\r
                                    recorded into the mapping database.\r

-  @retval EFI_SUCCESS              The Controller and DriverImage are inserted into \r
+  @retval EFI_SUCCESS              The Controller and DriverImage are inserted into\r

                                    the mapping database successfully.\r
 \r
 **/\r
                                    the mapping database successfully.\r
 \r
 **/\r


@@ -1799,7 +1799,7 @@ InsertDriverImage (
 /**\r
   Delete a controller's override driver from the mapping database.\r
 \r
 /**\r
   Delete a controller's override driver from the mapping database.\r
 \r

-  @param  ControllerDevicePath     The controller device path will be deleted \r
+  @param  ControllerDevicePath     The controller device path will be deleted\r

                                    when all drivers images on it are removed.\r
   @param  DriverImageDevicePath    The driver image device path will be delete.\r
                                    If NULL, all driver image will be delete.\r
                                    when all drivers images on it are removed.\r
   @param  DriverImageDevicePath    The driver image device path will be delete.\r
                                    If NULL, all driver image will be delete.\r


@@ -1807,7 +1807,7 @@ InsertDriverImage (
 \r
   @retval EFI_INVALID_PARAMETER    ControllerDevicePath is NULL, or MappingDataBase is NULL\r
   @retval EFI_NOT_FOUND            ControllerDevicePath is not found in MappingDataBase or\r
 \r
   @retval EFI_INVALID_PARAMETER    ControllerDevicePath is NULL, or MappingDataBase is NULL\r
   @retval EFI_NOT_FOUND            ControllerDevicePath is not found in MappingDataBase or\r

-                                   DriverImageDevicePath is not found in the found DriverImage Info list. \r
+                                   DriverImageDevicePath is not found in the found DriverImage Info list.\r

   @retval EFI_SUCCESS              Delete the specified driver successfully.\r
 \r
 **/\r
   @retval EFI_SUCCESS              Delete the specified driver successfully.\r
 \r
 **/\r

diff --git a/MdeModulePkg/Universal/PlatformDriOverrideDxe/PlatOverMngr.h b/MdeModulePkg/Universal/PlatformDriOverrideDxe/PlatOverMngr.h
index ca2094551d74562ab6e181d416ea32dcb09a7ef4..86d9a2bb966b08c75b77c72f7c876c0e9b45564c 100644 (file)
--- a/MdeModulePkg/Universal/PlatformDriOverrideDxe/PlatOverMngr.h
+++ b/MdeModulePkg/Universal/PlatformDriOverrideDxe/PlatOverMngr.h
@@ -1,9 +1,9 @@
 /** @file\r
 /** @file\r

-  \r
+\r

   The defintions are required both by Source code and Vfr file.\r
   The defintions are required both by Source code and Vfr file.\r

-  The PLAT_OVER_MNGR_DATA structure, form guid and Ifr question ID are defined. \r
+  The PLAT_OVER_MNGR_DATA structure, form guid and Ifr question ID are defined.\r

 \r
 \r

-Copyright (c) 2007 - 2014, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2007 - 2018, Intel Corporation. All rights reserved.<BR>\r

 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r

diff --git a/MdeModulePkg/Universal/PlatformDriOverrideDxe/PlatformDriOverrideDxe.inf b/MdeModulePkg/Universal/PlatformDriOverrideDxe/PlatformDriOverrideDxe.inf
index 4225fb92c339bf682d22ba59bb9ae057c3275423..5bd9e44edd73f4df89a07a822d4b600f99af9bc3 100644 (file)
--- a/MdeModulePkg/Universal/PlatformDriOverrideDxe/PlatformDriOverrideDxe.inf
+++ b/MdeModulePkg/Universal/PlatformDriOverrideDxe/PlatformDriOverrideDxe.inf
@@ -1,9 +1,9 @@
 ## @file\r
 #  This driver produces UEFI PLATFORM_DRIVER_OVERRIDE_PROTOCOL if this protocol doesn't exist.\r
 #  It doesn't install again if this protocol exists.\r
 ## @file\r
 #  This driver produces UEFI PLATFORM_DRIVER_OVERRIDE_PROTOCOL if this protocol doesn't exist.\r
 #  It doesn't install again if this protocol exists.\r

-#  It only implements one interface GetDriver of PLATFORM_DRIVER_OVERRIDE_PROTOCOL protocol \r
-#  and doesn't support other two interfaces GetDriverPath, DriverLoaded. \r
-# \r
+#  It only implements one interface GetDriver of PLATFORM_DRIVER_OVERRIDE_PROTOCOL protocol\r
+#  and doesn't support other two interfaces GetDriverPath, DriverLoaded.\r
+#\r

 #  This driver also offers an UI interface in device manager to let user configure\r
 #  platform override protocol to override the default algorithm for matching\r
 #  drivers to controllers.\r
 #  This driver also offers an UI interface in device manager to let user configure\r
 #  platform override protocol to override the default algorithm for matching\r
 #  drivers to controllers.\r


@@ -13,12 +13,12 @@
 #  2. It dynamicly locate all drivers which support binding protocol.\r
 #  3. It export and dynamicly update two menu to let user select the\r
 #     mapping between drivers to controllers.\r
 #  2. It dynamicly locate all drivers which support binding protocol.\r
 #  3. It export and dynamicly update two menu to let user select the\r
 #     mapping between drivers to controllers.\r

-#  4. It save all the mapping info in NV variables for the following boot, \r
+#  4. It save all the mapping info in NV variables for the following boot,\r

 #     which will be consumed by GetDriver API of the produced the platform override protocol.\r
 #\r
 # Caution: This module is a sample implementation for the test purpose.\r
 #\r
 #     which will be consumed by GetDriver API of the produced the platform override protocol.\r
 #\r
 # Caution: This module is a sample implementation for the test purpose.\r
 #\r

-# Copyright (c) 2007 - 2014, Intel Corporation. All rights reserved.<BR>\r
+# Copyright (c) 2007 - 2018, Intel Corporation. All rights reserved.<BR>\r

 #\r
 #  This program and the accompanying materials\r
 #  are licensed and made available under the terms and conditions of the BSD License\r
 #\r
 #  This program and the accompanying materials\r
 #  are licensed and made available under the terms and conditions of the BSD License\r


@@ -70,8 +70,8 @@
   DevicePathLib\r
   DxeServicesTableLib\r
   UefiRuntimeServicesTableLib\r
   DevicePathLib\r
   DxeServicesTableLib\r
   UefiRuntimeServicesTableLib\r

-  PrintLib \r
-   \r
+  PrintLib\r
+\r

 [Guids]\r
   #\r
   # This GUID C Name is not required for build since it is from UefiLib and not directly used by this module source.\r
 [Guids]\r
   #\r
   # This GUID C Name is not required for build since it is from UefiLib and not directly used by this module source.\r

diff --git a/MdeModulePkg/Universal/PrintDxe/PrintDxe.uni b/MdeModulePkg/Universal/PrintDxe/PrintDxe.uni
index 10f0ff81c580f93e5e6b824c31777ebd7d5121f0..e0a3317e6ea72d18ba3b09bf89a940043f74fab2 100644 (file)
--- a/MdeModulePkg/Universal/PrintDxe/PrintDxe.uni
+++ b/MdeModulePkg/Universal/PrintDxe/PrintDxe.uni
@@ -3,13 +3,13 @@
 //\r
 // This driver produces Print2 protocols layered on top of the PrintLib from the MdePkg.\r
 //\r
 //\r
 // This driver produces Print2 protocols layered on top of the PrintLib from the MdePkg.\r
 //\r

-// Copyright (c) 2009 - 2017, Intel Corporation. All rights reserved.<BR>\r
+// Copyright (c) 2009 - 2018, Intel Corporation. All rights reserved.<BR>\r

 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r
 // which accompanies this distribution.  The full text of the license may be found at\r
 // http://opensource.org/licenses/bsd-license.php\r
 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r
 // which accompanies this distribution.  The full text of the license may be found at\r
 // http://opensource.org/licenses/bsd-license.php\r

-// \r
+//\r

 // THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 // WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 //\r
 // THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 // WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 //\r

diff --git a/MdeModulePkg/Universal/PrintDxe/PrintDxeExtra.uni b/MdeModulePkg/Universal/PrintDxe/PrintDxeExtra.uni
index 339fac2a5cb9404b9a24cf65eeb874aeaf3febc8..3e0402b99419d91b94cab623f9d02f8730198957 100644 (file)
--- a/MdeModulePkg/Universal/PrintDxe/PrintDxeExtra.uni
+++ b/MdeModulePkg/Universal/PrintDxe/PrintDxeExtra.uni
@@ -1,7 +1,7 @@
 // /** @file\r
 // PrintDxe Localized Strings and Content\r
 //\r
 // /** @file\r
 // PrintDxe Localized Strings and Content\r
 //\r

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

 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r
 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r


@@ -13,8 +13,8 @@
 //\r
 // **/\r
 \r
 //\r
 // **/\r
 \r

-#string STR_PROPERTIES_MODULE_NAME \r
-#language en-US \r
+#string STR_PROPERTIES_MODULE_NAME\r
+#language en-US\r

 "Formatted String DXE Driver"\r
 \r
 \r
 "Formatted String DXE Driver"\r
 \r
 \r

diff --git a/MdeModulePkg/Universal/PropertiesTableAttributesDxe/PropertiesTableAttributesDxe.c b/MdeModulePkg/Universal/PropertiesTableAttributesDxe/PropertiesTableAttributesDxe.c
index 718c56734625c12ff8a08f275ca9b97f1796dbd1..4d1a46f64cb4e921c14dca76fee4db5f20d61a16 100644 (file)
--- a/MdeModulePkg/Universal/PropertiesTableAttributesDxe/PropertiesTableAttributesDxe.c
+++ b/MdeModulePkg/Universal/PropertiesTableAttributesDxe/PropertiesTableAttributesDxe.c
@@ -4,7 +4,7 @@
   This module sets EFI_MEMORY_XP for attributes of EfiACPIMemoryNVS and EfiReservedMemoryType\r
   in UEFI memory map, if and only of PropertiesTable is published and has BIT0 set.\r
 \r
   This module sets EFI_MEMORY_XP for attributes of EfiACPIMemoryNVS and EfiReservedMemoryType\r
   in UEFI memory map, if and only of PropertiesTable is published and has BIT0 set.\r
 \r

-Copyright (c) 2015, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2015 - 2018, Intel Corporation. All rights reserved.<BR>\r

 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r


@@ -130,7 +130,7 @@ UpdateMemoryAttributesDefault (
   if (EFI_ERROR (Status)) {\r
     goto Done;\r
   }\r
   if (EFI_ERROR (Status)) {\r
     goto Done;\r
   }\r

-  \r
+\r

   ASSERT (PropertiesTable != NULL);\r
 \r
   DEBUG ((EFI_D_INFO, "MemoryProtectionAttribute - 0x%016lx\n", PropertiesTable->MemoryProtectionAttribute));\r
   ASSERT (PropertiesTable != NULL);\r
 \r
   DEBUG ((EFI_D_INFO, "MemoryProtectionAttribute - 0x%016lx\n", PropertiesTable->MemoryProtectionAttribute));\r

diff --git a/MdeModulePkg/Universal/RegularExpressionDxe/RegularExpressionDxe.h b/MdeModulePkg/Universal/RegularExpressionDxe/RegularExpressionDxe.h
index 0defa56e810cf477760d89e0e1b4ec1d480fb72b..6e699ff8ac0753b1ff6b5841be11c3c1f26d9df1 100644 (file)
--- a/MdeModulePkg/Universal/RegularExpressionDxe/RegularExpressionDxe.h
+++ b/MdeModulePkg/Universal/RegularExpressionDxe/RegularExpressionDxe.h
@@ -2,7 +2,7 @@
   EFI_REGULAR_EXPRESSION_PROTOCOL Header File.\r
 \r
   (C) Copyright 2015 Hewlett Packard Enterprise Development LP<BR>\r
   EFI_REGULAR_EXPRESSION_PROTOCOL Header File.\r
 \r
   (C) Copyright 2015 Hewlett Packard Enterprise Development LP<BR>\r

-  \r
+\r

   This program and the accompanying materials are licensed and made available\r
   under the terms and conditions of the BSD License that accompanies this\r
   distribution.  The full text of the license may be found at\r
   This program and the accompanying materials are licensed and made available\r
   under the terms and conditions of the BSD License that accompanies this\r
   distribution.  The full text of the license may be found at\r

diff --git a/MdeModulePkg/Universal/RegularExpressionDxe/RegularExpressionDxe.inf b/MdeModulePkg/Universal/RegularExpressionDxe/RegularExpressionDxe.inf
index d4d9a8399282faea01d86ee32053d7927bc3f660..d8a14900210749e8697ab1148346efe3e719fc6b 100644 (file)
--- a/MdeModulePkg/Universal/RegularExpressionDxe/RegularExpressionDxe.inf
+++ b/MdeModulePkg/Universal/RegularExpressionDxe/RegularExpressionDxe.inf
@@ -70,16 +70,16 @@
   gEfiRegexSyntaxTypePerlGuid             ## CONSUMES  ## GUID\r
 \r
 [Protocols]\r
   gEfiRegexSyntaxTypePerlGuid             ## CONSUMES  ## GUID\r
 \r
 [Protocols]\r

-  gEfiRegularExpressionProtocolGuid       ## PRODUCES  \r
+  gEfiRegularExpressionProtocolGuid       ## PRODUCES\r

 \r
 [BuildOptions]\r
   # Override MSFT build option to remove /Oi and /GL\r
 \r
 [BuildOptions]\r
   # Override MSFT build option to remove /Oi and /GL\r

-  MSFT:DEBUG_*_IA32_CC_FLAGS   == /nologo /c /WX /GS- /W4 /Gs32768 /D UNICODE /O1b2  /FIAutoGen.h /EHs-c- /GR- /GF /Gy /Zi /Gm \r
-  MSFT:RELEASE_*_IA32_CC_FLAGS == /nologo /c /WX /GS- /W4 /Gs32768 /D UNICODE /O1b2  /FIAutoGen.h /EHs-c- /GR- /GF \r
-  MSFT:DEBUG_*_X64_CC_FLAGS    == /nologo /c /WX /GS- /W4 /Gs32768 /D UNICODE /O1b2s /FIAutoGen.h /EHs-c- /GR- /GF /Gy /Zi /Gm /X \r
-  MSFT:RELEASE_*_X64_CC_FLAGS  == /nologo /c /WX /GS- /W4 /Gs32768 /D UNICODE /O1b2s /FIAutoGen.h /EHs-c- /GR- /GF /Gy /X \r
-  MSFT:DEBUG_*_IPF_CC_FLAGS    == /nologo /c /WX /GS- /W4 /EHs-c- /GR- /Gy /Os /FIAutoGen.h /QIPF_fr32 /Zi /X \r
-  MSFT:RELEASE_*_IPF_CC_FLAGS  == /nologo /c /WX /GS- /W4 /EHs-c- /GR- /Gy /Os /FIAutoGen.h /QIPF_fr32 /X \r
+  MSFT:DEBUG_*_IA32_CC_FLAGS   == /nologo /c /WX /GS- /W4 /Gs32768 /D UNICODE /O1b2  /FIAutoGen.h /EHs-c- /GR- /GF /Gy /Zi /Gm\r
+  MSFT:RELEASE_*_IA32_CC_FLAGS == /nologo /c /WX /GS- /W4 /Gs32768 /D UNICODE /O1b2  /FIAutoGen.h /EHs-c- /GR- /GF\r
+  MSFT:DEBUG_*_X64_CC_FLAGS    == /nologo /c /WX /GS- /W4 /Gs32768 /D UNICODE /O1b2s /FIAutoGen.h /EHs-c- /GR- /GF /Gy /Zi /Gm /X\r
+  MSFT:RELEASE_*_X64_CC_FLAGS  == /nologo /c /WX /GS- /W4 /Gs32768 /D UNICODE /O1b2s /FIAutoGen.h /EHs-c- /GR- /GF /Gy /X\r
+  MSFT:DEBUG_*_IPF_CC_FLAGS    == /nologo /c /WX /GS- /W4 /EHs-c- /GR- /Gy /Os /FIAutoGen.h /QIPF_fr32 /Zi /X\r
+  MSFT:RELEASE_*_IPF_CC_FLAGS  == /nologo /c /WX /GS- /W4 /EHs-c- /GR- /Gy /Os /FIAutoGen.h /QIPF_fr32 /X\r

   INTEL:*_*_*_CC_FLAGS         =  /Oi-\r
 \r
   # Oniguruma: potentially uninitialized local variable used\r
   INTEL:*_*_*_CC_FLAGS         =  /Oi-\r
 \r
   # Oniguruma: potentially uninitialized local variable used\r


@@ -91,6 +91,6 @@
   # Oniguruma: old style declaration in st.c\r
   MSFT:*_*_*_CC_FLAGS = /wd4131\r
 \r
   # Oniguruma: old style declaration in st.c\r
   MSFT:*_*_*_CC_FLAGS = /wd4131\r
 \r

-  # Oniguruma: 'type cast' : truncation from 'OnigUChar *' to 'unsigned int' \r
+  # Oniguruma: 'type cast' : truncation from 'OnigUChar *' to 'unsigned int'\r

   MSFT:*_*_*_CC_FLAGS = /wd4305 /wd4306\r
 \r
   MSFT:*_*_*_CC_FLAGS = /wd4305 /wd4306\r
 \r

diff --git a/MdeModulePkg/Universal/ReportStatusCodeRouter/Pei/ReportStatusCodeRouterPei.c b/MdeModulePkg/Universal/ReportStatusCodeRouter/Pei/ReportStatusCodeRouterPei.c
index 8a2dc8a9bdc5ebbaa759518c00c32651743234f3..3871418b604aa3d969c5474e0d5111dfe4748aa0 100644 (file)
--- a/MdeModulePkg/Universal/ReportStatusCodeRouter/Pei/ReportStatusCodeRouterPei.c
+++ b/MdeModulePkg/Universal/ReportStatusCodeRouter/Pei/ReportStatusCodeRouterPei.c
@@ -1,7 +1,7 @@
 /** @file\r
   Report Status Code Router PEIM which produces Report Stataus Code Handler PPI and Status Code PPI.\r
 \r
 /** @file\r
   Report Status Code Router PEIM which produces Report Stataus Code Handler PPI and Status Code PPI.\r
 \r

-  Copyright (c) 2009 - 2011, Intel Corporation. All rights reserved.<BR>\r
+  Copyright (c) 2009 - 2018, Intel Corporation. All rights reserved.<BR>\r

   This program and the accompanying materials\r
   are licensed and made available under the terms and conditions of the BSD License\r
   which accompanies this distribution.  The full text of the license may be found at\r
   This program and the accompanying materials\r
   are licensed and made available under the terms and conditions of the BSD License\r
   which accompanies this distribution.  The full text of the license may be found at\r


@@ -71,19 +71,19 @@ CreateRscHandlerCallbackPacket (
 \r
 /**\r
   Register the callback function for ReportStatusCode() notification.\r
 \r
 /**\r
   Register the callback function for ReportStatusCode() notification.\r

-  \r
+\r

   When this function is called the function pointer is added to an internal list and any future calls to\r
   ReportStatusCode() will be forwarded to the Callback function.\r
 \r
   @param[in] Callback           A pointer to a function of type EFI_PEI_RSC_HANDLER_CALLBACK that is called\r
                                 when a call to ReportStatusCode() occurs.\r
   When this function is called the function pointer is added to an internal list and any future calls to\r
   ReportStatusCode() will be forwarded to the Callback function.\r
 \r
   @param[in] Callback           A pointer to a function of type EFI_PEI_RSC_HANDLER_CALLBACK that is called\r
                                 when a call to ReportStatusCode() occurs.\r

-                        \r
+\r

   @retval EFI_SUCCESS           Function was successfully registered.\r
   @retval EFI_INVALID_PARAMETER The callback function was NULL.\r
   @retval EFI_OUT_OF_RESOURCES  The internal buffer ran out of space. No more functions can be\r
                                 registered.\r
   @retval EFI_ALREADY_STARTED   The function was already registered. It can't be registered again.\r
   @retval EFI_SUCCESS           Function was successfully registered.\r
   @retval EFI_INVALID_PARAMETER The callback function was NULL.\r
   @retval EFI_OUT_OF_RESOURCES  The internal buffer ran out of space. No more functions can be\r
                                 registered.\r
   @retval EFI_ALREADY_STARTED   The function was already registered. It can't be registered again.\r

-  \r
+\r

 **/\r
 EFI_STATUS\r
 EFIAPI\r
 **/\r
 EFI_STATUS\r
 EFIAPI\r


@@ -127,7 +127,7 @@ Register (
         //\r
         // If the total number of handlers in current packet is max value 64,\r
         // search an entry with NULL pointer and fill new handler into this entry.\r
         //\r
         // If the total number of handlers in current packet is max value 64,\r
         // search an entry with NULL pointer and fill new handler into this entry.\r

-        //  \r
+        //\r

         FreePacket = NumberOfEntries;\r
         FreeEntryIndex = Index;\r
       }\r
         FreePacket = NumberOfEntries;\r
         FreeEntryIndex = Index;\r
       }\r


@@ -142,7 +142,7 @@ Register (
 \r
   CallbackEntry = (EFI_PEI_RSC_HANDLER_CALLBACK *) (FreePacket + 1);\r
   CallbackEntry[FreeEntryIndex] = Callback;\r
 \r
   CallbackEntry = (EFI_PEI_RSC_HANDLER_CALLBACK *) (FreePacket + 1);\r
   CallbackEntry[FreeEntryIndex] = Callback;\r

-  \r
+\r

   if (*FreePacket == FreeEntryIndex) {\r
     //\r
     // If new registered callback is added as a new entry in the packet,\r
   if (*FreePacket == FreeEntryIndex) {\r
     //\r
     // If new registered callback is added as a new entry in the packet,\r


@@ -156,16 +156,16 @@ Register (
 \r
 /**\r
   Remove a previously registered callback function from the notification list.\r
 \r
 /**\r
   Remove a previously registered callback function from the notification list.\r

-  \r
+\r

   ReportStatusCode() messages will no longer be forwarded to the Callback function.\r
   ReportStatusCode() messages will no longer be forwarded to the Callback function.\r

-  \r
+\r

   @param[in] Callback           A pointer to a function of type EFI_PEI_RSC_HANDLER_CALLBACK that is to be\r
                                 unregistered.\r
 \r
   @retval EFI_SUCCESS           The function was successfully unregistered.\r
   @retval EFI_INVALID_PARAMETER The callback function was NULL.\r
   @retval EFI_NOT_FOUND         The callback function was not found to be unregistered.\r
   @param[in] Callback           A pointer to a function of type EFI_PEI_RSC_HANDLER_CALLBACK that is to be\r
                                 unregistered.\r
 \r
   @retval EFI_SUCCESS           The function was successfully unregistered.\r
   @retval EFI_INVALID_PARAMETER The callback function was NULL.\r
   @retval EFI_NOT_FOUND         The callback function was not found to be unregistered.\r

-                        \r
+\r

 **/\r
 EFI_STATUS\r
 EFIAPI\r
 **/\r
 EFI_STATUS\r
 EFIAPI\r


@@ -269,7 +269,7 @@ ReportDispatcher (
 \r
 /**\r
   Entry point of Status Code PEIM.\r
 \r
 /**\r
   Entry point of Status Code PEIM.\r

-  \r
+\r

   This function is the entry point of this Status Code Router PEIM.\r
   It produces Report Stataus Code Handler PPI and Status Code PPI.\r
 \r
   This function is the entry point of this Status Code Router PEIM.\r
   It produces Report Stataus Code Handler PPI and Status Code PPI.\r
 \r

diff --git a/MdeModulePkg/Universal/ReportStatusCodeRouter/Pei/ReportStatusCodeRouterPei.h b/MdeModulePkg/Universal/ReportStatusCodeRouter/Pei/ReportStatusCodeRouterPei.h
index 318a3f5af17d5ac653e671e04a0ac39b9e72fcd4..c660f37ee8e9c2f1e53a71fac42d822429de3641 100644 (file)
--- a/MdeModulePkg/Universal/ReportStatusCodeRouter/Pei/ReportStatusCodeRouterPei.h
+++ b/MdeModulePkg/Universal/ReportStatusCodeRouter/Pei/ReportStatusCodeRouterPei.h
@@ -1,7 +1,7 @@
 /** @file\r
   Internal include file for Report Status Code Router PEIM.\r
 \r
 /** @file\r
   Internal include file for Report Status Code Router PEIM.\r
 \r

-  Copyright (c) 2009, Intel Corporation. All rights reserved.<BR>\r
+  Copyright (c) 2009 - 2018, Intel Corporation. All rights reserved.<BR>\r

   This program and the accompanying materials\r
   are licensed and made available under the terms and conditions of the BSD License\r
   which accompanies this distribution.  The full text of the license may be found at\r
   This program and the accompanying materials\r
   are licensed and made available under the terms and conditions of the BSD License\r
   which accompanies this distribution.  The full text of the license may be found at\r


@@ -28,13 +28,13 @@
 \r
 /**\r
   Register the callback function for ReportStatusCode() notification.\r
 \r
 /**\r
   Register the callback function for ReportStatusCode() notification.\r

-  \r
+\r

   When this function is called the function pointer is added to an internal list and any future calls to\r
   ReportStatusCode() will be forwarded to the Callback function.\r
 \r
   @param[in] Callback           A pointer to a function of type EFI_PEI_RSC_HANDLER_CALLBACK that is called\r
                                 when a call to ReportStatusCode() occurs.\r
   When this function is called the function pointer is added to an internal list and any future calls to\r
   ReportStatusCode() will be forwarded to the Callback function.\r
 \r
   @param[in] Callback           A pointer to a function of type EFI_PEI_RSC_HANDLER_CALLBACK that is called\r
                                 when a call to ReportStatusCode() occurs.\r

-                        \r
+\r

   @retval EFI_SUCCESS           Function was successfully registered.\r
   @retval EFI_INVALID_PARAMETER The callback function was NULL.\r
   @retval EFI_OUT_OF_RESOURCES  The internal buffer ran out of space. No more functions can be\r
   @retval EFI_SUCCESS           Function was successfully registered.\r
   @retval EFI_INVALID_PARAMETER The callback function was NULL.\r
   @retval EFI_OUT_OF_RESOURCES  The internal buffer ran out of space. No more functions can be\r


@@ -50,16 +50,16 @@ Register (
 \r
 /**\r
   Remove a previously registered callback function from the notification list.\r
 \r
 /**\r
   Remove a previously registered callback function from the notification list.\r

-  \r
+\r

   ReportStatusCode() messages will no longer be forwarded to the Callback function.\r
   ReportStatusCode() messages will no longer be forwarded to the Callback function.\r

-  \r
+\r

   @param[in] Callback           A pointer to a function of type EFI_PEI_RSC_HANDLER_CALLBACK that is to be\r
                                 unregistered.\r
 \r
   @retval EFI_SUCCESS           The function was successfully unregistered.\r
   @retval EFI_INVALID_PARAMETER The callback function was NULL.\r
   @retval EFI_NOT_FOUND         The callback function was not found to be unregistered.\r
   @param[in] Callback           A pointer to a function of type EFI_PEI_RSC_HANDLER_CALLBACK that is to be\r
                                 unregistered.\r
 \r
   @retval EFI_SUCCESS           The function was successfully unregistered.\r
   @retval EFI_INVALID_PARAMETER The callback function was NULL.\r
   @retval EFI_NOT_FOUND         The callback function was not found to be unregistered.\r

-                        \r
+\r

 **/\r
 EFI_STATUS\r
 EFIAPI\r
 **/\r
 EFI_STATUS\r
 EFIAPI\r

diff --git a/MdeModulePkg/Universal/ReportStatusCodeRouter/Pei/ReportStatusCodeRouterPeiExtra.uni b/MdeModulePkg/Universal/ReportStatusCodeRouter/Pei/ReportStatusCodeRouterPeiExtra.uni
index f4cca9a5f548f162bc3208ba67575867221ab381..44bbfb7e0903434383400b4a7cbbd80469b9264b 100644 (file)
--- a/MdeModulePkg/Universal/ReportStatusCodeRouter/Pei/ReportStatusCodeRouterPeiExtra.uni
+++ b/MdeModulePkg/Universal/ReportStatusCodeRouter/Pei/ReportStatusCodeRouterPeiExtra.uni
@@ -1,7 +1,7 @@
 // /** @file\r
 // ReportStatusCodeRouterPei Localized Strings and Content\r
 //\r
 // /** @file\r
 // ReportStatusCodeRouterPei Localized Strings and Content\r
 //\r

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

 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r
 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r


@@ -12,8 +12,8 @@
 //\r
 // **/\r
 \r
 //\r
 // **/\r
 \r

-#string STR_PROPERTIES_MODULE_NAME \r
-#language en-US \r
+#string STR_PROPERTIES_MODULE_NAME\r
+#language en-US\r

 "Status Code Routing PEI Module"\r
 \r
 \r
 "Status Code Routing PEI Module"\r
 \r
 \r

diff --git a/MdeModulePkg/Universal/ReportStatusCodeRouter/RuntimeDxe/ReportStatusCodeRouterRuntimeDxe.c b/MdeModulePkg/Universal/ReportStatusCodeRouter/RuntimeDxe/ReportStatusCodeRouterRuntimeDxe.c
index f859075da658b49fefa6dc73b623e62ff519e6d9..1aa1204f46a62d5ad766eb217ae5b0577b53670c 100644 (file)
--- a/MdeModulePkg/Universal/ReportStatusCodeRouter/RuntimeDxe/ReportStatusCodeRouterRuntimeDxe.c
+++ b/MdeModulePkg/Universal/ReportStatusCodeRouter/RuntimeDxe/ReportStatusCodeRouterRuntimeDxe.c
@@ -2,7 +2,7 @@
   Report Status Code Router Driver which produces Report Stataus Code Handler Protocol\r
   and Status Code Runtime Protocol.\r
 \r
   Report Status Code Router Driver which produces Report Stataus Code Handler Protocol\r
   and Status Code Runtime Protocol.\r
 \r

-  Copyright (c) 2009 - 2011, Intel Corporation. All rights reserved.<BR>\r
+  Copyright (c) 2009 - 2018, Intel Corporation. All rights reserved.<BR>\r

   This program and the accompanying materials\r
   are licensed and made available under the terms and conditions of the BSD License\r
   which accompanies this distribution.  The full text of the license may be found at\r
   This program and the accompanying materials\r
   are licensed and made available under the terms and conditions of the BSD License\r
   which accompanies this distribution.  The full text of the license may be found at\r


@@ -79,7 +79,7 @@ RscHandlerNotification (
 \r
 /**\r
   Register the callback function for ReportStatusCode() notification.\r
 \r
 /**\r
   Register the callback function for ReportStatusCode() notification.\r

-  \r
+\r

   When this function is called the function pointer is added to an internal list and any future calls to\r
   ReportStatusCode() will be forwarded to the Callback function. During the bootservices,\r
   this is the callback for which this service can be invoked. The report status code router\r
   When this function is called the function pointer is added to an internal list and any future calls to\r
   ReportStatusCode() will be forwarded to the Callback function. During the bootservices,\r
   this is the callback for which this service can be invoked. The report status code router\r


@@ -93,11 +93,11 @@ RscHandlerNotification (
   2. not unregister at exit boot services so that the router will still have its callback address\r
   3. the caller must be self-contained (eg. Not call out into any boot-service interfaces) and be\r
   runtime safe, in general.\r
   2. not unregister at exit boot services so that the router will still have its callback address\r
   3. the caller must be self-contained (eg. Not call out into any boot-service interfaces) and be\r
   runtime safe, in general.\r

-  \r
+\r

   @param[in] Callback   A pointer to a function of type EFI_RSC_HANDLER_CALLBACK that is called when\r
                         a call to ReportStatusCode() occurs.\r
   @param[in] Callback   A pointer to a function of type EFI_RSC_HANDLER_CALLBACK that is called when\r
                         a call to ReportStatusCode() occurs.\r

-  @param[in] Tpl        TPL at which callback can be safely invoked.   \r
-  \r
+  @param[in] Tpl        TPL at which callback can be safely invoked.\r
+\r

   @retval  EFI_SUCCESS              Function was successfully registered.\r
   @retval  EFI_INVALID_PARAMETER    The callback function was NULL.\r
   @retval  EFI_OUT_OF_RESOURCES     The internal buffer ran out of space. No more functions can be\r
   @retval  EFI_SUCCESS              Function was successfully registered.\r
   @retval  EFI_INVALID_PARAMETER    The callback function was NULL.\r
   @retval  EFI_OUT_OF_RESOURCES     The internal buffer ran out of space. No more functions can be\r


@@ -166,13 +166,13 @@ Register (
 \r
 /**\r
   Remove a previously registered callback function from the notification list.\r
 \r
 /**\r
   Remove a previously registered callback function from the notification list.\r

-  \r
+\r

   A callback function must be unregistered before it is deallocated. It is important that any registered\r
   callbacks that are not runtime complaint be unregistered when ExitBootServices() is called.\r
   A callback function must be unregistered before it is deallocated. It is important that any registered\r
   callbacks that are not runtime complaint be unregistered when ExitBootServices() is called.\r

-  \r
+\r

   @param[in]  Callback  A pointer to a function of type EFI_RSC_HANDLER_CALLBACK that is to be\r
                         unregistered.\r
   @param[in]  Callback  A pointer to a function of type EFI_RSC_HANDLER_CALLBACK that is to be\r
                         unregistered.\r

-                        \r
+\r

   @retval EFI_SUCCESS           The function was successfully unregistered.\r
   @retval EFI_INVALID_PARAMETER The callback function was NULL.\r
   @retval EFI_NOT_FOUND         The callback function was not found to be unregistered.\r
   @retval EFI_SUCCESS           The function was successfully unregistered.\r
   @retval EFI_INVALID_PARAMETER The callback function was NULL.\r
   @retval EFI_NOT_FOUND         The callback function was not found to be unregistered.\r


@@ -343,7 +343,7 @@ VirtualAddressChangeCallBack (
   IN VOID             *Context\r
   )\r
 {\r
   IN VOID             *Context\r
   )\r
 {\r

-  EFI_STATUS                                   Status;\r
+  EFI_STATUS          Status;\r

   LIST_ENTRY                    *Link;\r
   RSC_HANDLER_CALLBACK_ENTRY    *CallbackEntry;\r
 \r
   LIST_ENTRY                    *Link;\r
   RSC_HANDLER_CALLBACK_ENTRY    *CallbackEntry;\r
 \r


@@ -369,7 +369,7 @@ VirtualAddressChangeCallBack (
 \r
   @param  ImageHandle       The firmware allocated handle for the EFI image.\r
   @param  SystemTable       A pointer to the EFI System Table.\r
 \r
   @param  ImageHandle       The firmware allocated handle for the EFI image.\r
   @param  SystemTable       A pointer to the EFI System Table.\r

-  \r
+\r

   @retval EFI_SUCCESS       The entry point is executed successfully.\r
 \r
 **/\r
   @retval EFI_SUCCESS       The entry point is executed successfully.\r
 \r
 **/\r

diff --git a/MdeModulePkg/Universal/ReportStatusCodeRouter/RuntimeDxe/ReportStatusCodeRouterRuntimeDxe.h b/MdeModulePkg/Universal/ReportStatusCodeRouter/RuntimeDxe/ReportStatusCodeRouterRuntimeDxe.h
index c82f296f8d207067aae6885e8c37e07d30784903..8d6f8d096e9db58437d88c5d92c02b2ab6500a91 100644 (file)
--- a/MdeModulePkg/Universal/ReportStatusCodeRouter/RuntimeDxe/ReportStatusCodeRouterRuntimeDxe.h
+++ b/MdeModulePkg/Universal/ReportStatusCodeRouter/RuntimeDxe/ReportStatusCodeRouterRuntimeDxe.h
@@ -1,7 +1,7 @@
 /** @file\r
   Internal include file for Report Status Code Router Driver.\r
 \r
 /** @file\r
   Internal include file for Report Status Code Router Driver.\r
 \r

-  Copyright (c) 2009, Intel Corporation. All rights reserved.<BR>\r
+  Copyright (c) 2009 - 2018, Intel Corporation. All rights reserved.<BR>\r

   This program and the accompanying materials\r
   are licensed and made available under the terms and conditions of the BSD License\r
   which accompanies this distribution.  The full text of the license may be found at\r
   This program and the accompanying materials\r
   are licensed and made available under the terms and conditions of the BSD License\r
   which accompanies this distribution.  The full text of the license may be found at\r


@@ -56,7 +56,7 @@ typedef struct {
 \r
 /**\r
   Register the callback function for ReportStatusCode() notification.\r
 \r
 /**\r
   Register the callback function for ReportStatusCode() notification.\r

-  \r
+\r

   When this function is called the function pointer is added to an internal list and any future calls to\r
   ReportStatusCode() will be forwarded to the Callback function. During the bootservices,\r
   this is the callback for which this service can be invoked. The report status code router\r
   When this function is called the function pointer is added to an internal list and any future calls to\r
   ReportStatusCode() will be forwarded to the Callback function. During the bootservices,\r
   this is the callback for which this service can be invoked. The report status code router\r


@@ -70,11 +70,11 @@ typedef struct {
   2. not unregister at exit boot services so that the router will still have its callback address\r
   3. the caller must be self-contained (eg. Not call out into any boot-service interfaces) and be\r
   runtime safe, in general.\r
   2. not unregister at exit boot services so that the router will still have its callback address\r
   3. the caller must be self-contained (eg. Not call out into any boot-service interfaces) and be\r
   runtime safe, in general.\r

-  \r
+\r

   @param[in] Callback   A pointer to a function of type EFI_RSC_HANDLER_CALLBACK that is called when\r
                         a call to ReportStatusCode() occurs.\r
   @param[in] Callback   A pointer to a function of type EFI_RSC_HANDLER_CALLBACK that is called when\r
                         a call to ReportStatusCode() occurs.\r

-  @param[in] Tpl        TPL at which callback can be safely invoked.   \r
-  \r
+  @param[in] Tpl        TPL at which callback can be safely invoked.\r
+\r

   @retval  EFI_SUCCESS              Function was successfully registered.\r
   @retval  EFI_INVALID_PARAMETER    The callback function was NULL.\r
   @retval  EFI_OUT_OF_RESOURCES     The internal buffer ran out of space. No more functions can be\r
   @retval  EFI_SUCCESS              Function was successfully registered.\r
   @retval  EFI_INVALID_PARAMETER    The callback function was NULL.\r
   @retval  EFI_OUT_OF_RESOURCES     The internal buffer ran out of space. No more functions can be\r


@@ -91,13 +91,13 @@ Register (
 \r
 /**\r
   Remove a previously registered callback function from the notification list.\r
 \r
 /**\r
   Remove a previously registered callback function from the notification list.\r

-  \r
+\r

   A callback function must be unregistered before it is deallocated. It is important that any registered\r
   callbacks that are not runtime complaint be unregistered when ExitBootServices() is called.\r
   A callback function must be unregistered before it is deallocated. It is important that any registered\r
   callbacks that are not runtime complaint be unregistered when ExitBootServices() is called.\r

-  \r
+\r

   @param[in]  Callback  A pointer to a function of type EFI_RSC_HANDLER_CALLBACK that is to be\r
                         unregistered.\r
   @param[in]  Callback  A pointer to a function of type EFI_RSC_HANDLER_CALLBACK that is to be\r
                         unregistered.\r

-                        \r
+\r

   @retval EFI_SUCCESS           The function was successfully unregistered.\r
   @retval EFI_INVALID_PARAMETER The callback function was NULL.\r
   @retval EFI_NOT_FOUND         The callback function was not found to be unregistered.\r
   @retval EFI_SUCCESS           The function was successfully unregistered.\r
   @retval EFI_INVALID_PARAMETER The callback function was NULL.\r
   @retval EFI_NOT_FOUND         The callback function was not found to be unregistered.\r

diff --git a/MdeModulePkg/Universal/ReportStatusCodeRouter/RuntimeDxe/ReportStatusCodeRouterRuntimeDxe.inf b/MdeModulePkg/Universal/ReportStatusCodeRouter/RuntimeDxe/ReportStatusCodeRouterRuntimeDxe.inf
index 0445d94340eb2d9954bf262c5993f9c2ca4cbfa3..955626008270348fa0be4df66c4ae921dde3af2a 100644 (file)
--- a/MdeModulePkg/Universal/ReportStatusCodeRouter/RuntimeDxe/ReportStatusCodeRouterRuntimeDxe.inf
+++ b/MdeModulePkg/Universal/ReportStatusCodeRouter/RuntimeDxe/ReportStatusCodeRouterRuntimeDxe.inf
@@ -1,7 +1,7 @@
 ## @file\r
 #  Report Status Code Router Driver which produces Report Stataus Code Handler Protocol and Status Code Runtime Protocol.\r
 #\r
 ## @file\r
 #  Report Status Code Router Driver which produces Report Stataus Code Handler Protocol and Status Code Runtime Protocol.\r
 #\r

-#  Copyright (c) 2009 - 2014, Intel Corporation. All rights reserved.<BR>\r
+#  Copyright (c) 2009 - 2018, Intel Corporation. All rights reserved.<BR>\r

 #\r
 #  This program and the accompanying materials\r
 #  are licensed and made available under the terms and conditions of the BSD License\r
 #\r
 #  This program and the accompanying materials\r
 #  are licensed and made available under the terms and conditions of the BSD License\r


@@ -19,7 +19,7 @@
   MODULE_UNI_FILE                = ReportStatusCodeRouterRuntimeDxe.uni\r
   FILE_GUID                      = D93CE3D8-A7EB-4730-8C8E-CC466A9ECC3C\r
   MODULE_TYPE                    = DXE_RUNTIME_DRIVER\r
   MODULE_UNI_FILE                = ReportStatusCodeRouterRuntimeDxe.uni\r
   FILE_GUID                      = D93CE3D8-A7EB-4730-8C8E-CC466A9ECC3C\r
   MODULE_TYPE                    = DXE_RUNTIME_DRIVER\r

-  VERSION_STRING                 = 1.0  \r
+  VERSION_STRING                 = 1.0\r

   ENTRY_POINT                    = GenericStatusCodeRuntimeDxeEntry\r
 \r
 #\r
   ENTRY_POINT                    = GenericStatusCodeRuntimeDxeEntry\r
 \r
 #\r

diff --git a/MdeModulePkg/Universal/ReportStatusCodeRouter/RuntimeDxe/ReportStatusCodeRouterRuntimeDxeExtra.uni b/MdeModulePkg/Universal/ReportStatusCodeRouter/RuntimeDxe/ReportStatusCodeRouterRuntimeDxeExtra.uni
index d16c2494122678af2afd96d22644eca24a4bb882..679dae28539ac1cf49ccfd5959a4b5673647c84e 100644 (file)
--- a/MdeModulePkg/Universal/ReportStatusCodeRouter/RuntimeDxe/ReportStatusCodeRouterRuntimeDxeExtra.uni
+++ b/MdeModulePkg/Universal/ReportStatusCodeRouter/RuntimeDxe/ReportStatusCodeRouterRuntimeDxeExtra.uni
@@ -1,7 +1,7 @@
 // /** @file\r
 // ReportStatusCodeRouterRuntimeDxe Localized Strings and Content\r
 //\r
 // /** @file\r
 // ReportStatusCodeRouterRuntimeDxe Localized Strings and Content\r
 //\r

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

 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r
 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r


@@ -12,8 +12,8 @@
 //\r
 // **/\r
 \r
 //\r
 // **/\r
 \r

-#string STR_PROPERTIES_MODULE_NAME \r
-#language en-US \r
+#string STR_PROPERTIES_MODULE_NAME\r
+#language en-US\r

 "Status Code Routing DXE Driver"\r
 \r
 \r
 "Status Code Routing DXE Driver"\r
 \r
 \r

diff --git a/MdeModulePkg/Universal/ReportStatusCodeRouter/Smm/ReportStatusCodeRouterSmm.c b/MdeModulePkg/Universal/ReportStatusCodeRouter/Smm/ReportStatusCodeRouterSmm.c
index 79c8d1e36f95ae27538d5b23dfee02d48b43fc96..f8fef59875df2f4070cb485c74876b7a3cf26342 100644 (file)
--- a/MdeModulePkg/Universal/ReportStatusCodeRouter/Smm/ReportStatusCodeRouterSmm.c
+++ b/MdeModulePkg/Universal/ReportStatusCodeRouter/Smm/ReportStatusCodeRouterSmm.c
@@ -2,7 +2,7 @@
   Report Status Code Router Driver which produces SMM Report Stataus Code Handler Protocol\r
   and SMM Status Code Protocol.\r
 \r
   Report Status Code Router Driver which produces SMM Report Stataus Code Handler Protocol\r
   and SMM Status Code Protocol.\r
 \r

-  Copyright (c) 2009 - 2011, Intel Corporation. All rights reserved.<BR>\r
+  Copyright (c) 2009 - 2018, Intel Corporation. All rights reserved.<BR>\r

   This program and the accompanying materials\r
   are licensed and made available under the terms and conditions of the BSD License\r
   which accompanies this distribution.  The full text of the license may be found at\r
   This program and the accompanying materials\r
   are licensed and made available under the terms and conditions of the BSD License\r
   which accompanies this distribution.  The full text of the license may be found at\r


@@ -34,19 +34,19 @@ EFI_SMM_RSC_HANDLER_PROTOCOL  mSmmRscHandlerProtocol = {
 \r
 /**\r
   Register the callback function for ReportStatusCode() notification.\r
 \r
 /**\r
   Register the callback function for ReportStatusCode() notification.\r

-  \r
+\r

   When this function is called the function pointer is added to an internal list and any future calls to\r
   ReportStatusCode() will be forwarded to the Callback function.\r
 \r
   @param[in] Callback           A pointer to a function of type EFI_PEI_RSC_HANDLER_CALLBACK that is called\r
                                 when a call to ReportStatusCode() occurs.\r
   When this function is called the function pointer is added to an internal list and any future calls to\r
   ReportStatusCode() will be forwarded to the Callback function.\r
 \r
   @param[in] Callback           A pointer to a function of type EFI_PEI_RSC_HANDLER_CALLBACK that is called\r
                                 when a call to ReportStatusCode() occurs.\r

-                        \r
+\r

   @retval EFI_SUCCESS           Function was successfully registered.\r
   @retval EFI_INVALID_PARAMETER The callback function was NULL.\r
   @retval EFI_OUT_OF_RESOURCES  The internal buffer ran out of space. No more functions can be\r
                                 registered.\r
   @retval EFI_ALREADY_STARTED   The function was already registered. It can't be registered again.\r
   @retval EFI_SUCCESS           Function was successfully registered.\r
   @retval EFI_INVALID_PARAMETER The callback function was NULL.\r
   @retval EFI_OUT_OF_RESOURCES  The internal buffer ran out of space. No more functions can be\r
                                 registered.\r
   @retval EFI_ALREADY_STARTED   The function was already registered. It can't be registered again.\r

-  \r
+\r

 **/\r
 EFI_STATUS\r
 EFIAPI\r
 **/\r
 EFI_STATUS\r
 EFIAPI\r


@@ -84,16 +84,16 @@ Register (
 \r
 /**\r
   Remove a previously registered callback function from the notification list.\r
 \r
 /**\r
   Remove a previously registered callback function from the notification list.\r

-  \r
+\r

   ReportStatusCode() messages will no longer be forwarded to the Callback function.\r
   ReportStatusCode() messages will no longer be forwarded to the Callback function.\r

-  \r
+\r

   @param[in] Callback           A pointer to a function of type EFI_PEI_RSC_HANDLER_CALLBACK that is to be\r
                                 unregistered.\r
 \r
   @retval EFI_SUCCESS           The function was successfully unregistered.\r
   @retval EFI_INVALID_PARAMETER The callback function was NULL.\r
   @retval EFI_NOT_FOUND         The callback function was not found to be unregistered.\r
   @param[in] Callback           A pointer to a function of type EFI_PEI_RSC_HANDLER_CALLBACK that is to be\r
                                 unregistered.\r
 \r
   @retval EFI_SUCCESS           The function was successfully unregistered.\r
   @retval EFI_INVALID_PARAMETER The callback function was NULL.\r
   @retval EFI_NOT_FOUND         The callback function was not found to be unregistered.\r

-                        \r
+\r

 **/\r
 EFI_STATUS\r
 EFIAPI\r
 **/\r
 EFI_STATUS\r
 EFIAPI\r


@@ -197,7 +197,7 @@ ReportDispatcher (
 \r
   @param  ImageHandle       The firmware allocated handle for the EFI image.\r
   @param  SystemTable       A pointer to the EFI System Table.\r
 \r
   @param  ImageHandle       The firmware allocated handle for the EFI image.\r
   @param  SystemTable       A pointer to the EFI System Table.\r

-  \r
+\r

   @retval EFI_SUCCESS       The entry point is executed successfully.\r
 \r
 **/\r
   @retval EFI_SUCCESS       The entry point is executed successfully.\r
 \r
 **/\r


@@ -212,7 +212,7 @@ GenericStatusCodeSmmEntry (
   EFI_HANDLE     Handle;\r
 \r
   Handle     = NULL;\r
   EFI_HANDLE     Handle;\r
 \r
   Handle     = NULL;\r

-  \r
+\r

   //\r
   // Install SmmRscHandler Protocol\r
   //\r
   //\r
   // Install SmmRscHandler Protocol\r
   //\r

diff --git a/MdeModulePkg/Universal/ReportStatusCodeRouter/Smm/ReportStatusCodeRouterSmm.h b/MdeModulePkg/Universal/ReportStatusCodeRouter/Smm/ReportStatusCodeRouterSmm.h
index 83f1bed0034c26cd5d068730fa0d9b74c5288335..cdf4d08f26fbc3c7eade7f6cb4c995952d62fdb1 100644 (file)
--- a/MdeModulePkg/Universal/ReportStatusCodeRouter/Smm/ReportStatusCodeRouterSmm.h
+++ b/MdeModulePkg/Universal/ReportStatusCodeRouter/Smm/ReportStatusCodeRouterSmm.h
@@ -1,7 +1,7 @@
 /** @file\r
   Internal include file for Report Status Code Router Driver.\r
 \r
 /** @file\r
   Internal include file for Report Status Code Router Driver.\r
 \r

-  Copyright (c) 2009 - 2010, Intel Corporation. All rights reserved.<BR>\r
+  Copyright (c) 2009 - 2018, Intel Corporation. All rights reserved.<BR>\r

   This program and the accompanying materials\r
   are licensed and made available under the terms and conditions of the BSD License\r
   which accompanies this distribution.  The full text of the license may be found at\r
   This program and the accompanying materials\r
   are licensed and made available under the terms and conditions of the BSD License\r
   which accompanies this distribution.  The full text of the license may be found at\r


@@ -37,19 +37,19 @@ typedef struct {
 \r
 /**\r
   Register the callback function for ReportStatusCode() notification.\r
 \r
 /**\r
   Register the callback function for ReportStatusCode() notification.\r

-  \r
+\r

   When this function is called the function pointer is added to an internal list and any future calls to\r
   ReportStatusCode() will be forwarded to the Callback function.\r
 \r
   @param[in] Callback           A pointer to a function of type EFI_PEI_RSC_HANDLER_CALLBACK that is called\r
                                 when a call to ReportStatusCode() occurs.\r
   When this function is called the function pointer is added to an internal list and any future calls to\r
   ReportStatusCode() will be forwarded to the Callback function.\r
 \r
   @param[in] Callback           A pointer to a function of type EFI_PEI_RSC_HANDLER_CALLBACK that is called\r
                                 when a call to ReportStatusCode() occurs.\r

-                        \r
+\r

   @retval EFI_SUCCESS           Function was successfully registered.\r
   @retval EFI_INVALID_PARAMETER The callback function was NULL.\r
   @retval EFI_OUT_OF_RESOURCES  The internal buffer ran out of space. No more functions can be\r
                                 registered.\r
   @retval EFI_ALREADY_STARTED   The function was already registered. It can't be registered again.\r
   @retval EFI_SUCCESS           Function was successfully registered.\r
   @retval EFI_INVALID_PARAMETER The callback function was NULL.\r
   @retval EFI_OUT_OF_RESOURCES  The internal buffer ran out of space. No more functions can be\r
                                 registered.\r
   @retval EFI_ALREADY_STARTED   The function was already registered. It can't be registered again.\r

-  \r
+\r

 **/\r
 EFI_STATUS\r
 EFIAPI\r
 **/\r
 EFI_STATUS\r
 EFIAPI\r


@@ -59,16 +59,16 @@ Register (
 \r
 /**\r
   Remove a previously registered callback function from the notification list.\r
 \r
 /**\r
   Remove a previously registered callback function from the notification list.\r

-  \r
+\r

   ReportStatusCode() messages will no longer be forwarded to the Callback function.\r
   ReportStatusCode() messages will no longer be forwarded to the Callback function.\r

-  \r
+\r

   @param[in] Callback           A pointer to a function of type EFI_PEI_RSC_HANDLER_CALLBACK that is to be\r
                                 unregistered.\r
 \r
   @retval EFI_SUCCESS           The function was successfully unregistered.\r
   @retval EFI_INVALID_PARAMETER The callback function was NULL.\r
   @retval EFI_NOT_FOUND         The callback function was not found to be unregistered.\r
   @param[in] Callback           A pointer to a function of type EFI_PEI_RSC_HANDLER_CALLBACK that is to be\r
                                 unregistered.\r
 \r
   @retval EFI_SUCCESS           The function was successfully unregistered.\r
   @retval EFI_INVALID_PARAMETER The callback function was NULL.\r
   @retval EFI_NOT_FOUND         The callback function was not found to be unregistered.\r

-                        \r
+\r

 **/\r
 EFI_STATUS\r
 EFIAPI\r
 **/\r
 EFI_STATUS\r
 EFIAPI\r

diff --git a/MdeModulePkg/Universal/ReportStatusCodeRouter/Smm/ReportStatusCodeRouterSmm.inf b/MdeModulePkg/Universal/ReportStatusCodeRouter/Smm/ReportStatusCodeRouterSmm.inf
index 36c97ef57ac70dccfed7b239bb39c4501992a153..3e845ca162a14184fd377d9d106abfa25088efc3 100644 (file)
--- a/MdeModulePkg/Universal/ReportStatusCodeRouter/Smm/ReportStatusCodeRouterSmm.inf
+++ b/MdeModulePkg/Universal/ReportStatusCodeRouter/Smm/ReportStatusCodeRouterSmm.inf
@@ -1,7 +1,7 @@
 ## @file\r
 #  Report Status Code Router Driver which produces SMM Report Stataus Code Handler Protocol and SMM Status Code Protocol.\r
 #\r
 ## @file\r
 #  Report Status Code Router Driver which produces SMM Report Stataus Code Handler Protocol and SMM Status Code Protocol.\r
 #\r

-#  Copyright (c) 2009 - 2014, Intel Corporation. All rights reserved.<BR>\r
+#  Copyright (c) 2009 - 2018, Intel Corporation. All rights reserved.<BR>\r

 #\r
 #  This program and the accompanying materials\r
 #  are licensed and made available under the terms and conditions of the BSD License\r
 #\r
 #  This program and the accompanying materials\r
 #  are licensed and made available under the terms and conditions of the BSD License\r


@@ -20,7 +20,7 @@
   FILE_GUID                      = A6885402-D022-4b0e-A509-4711B90F2A39\r
   MODULE_TYPE                    = DXE_SMM_DRIVER\r
   PI_SPECIFICATION_VERSION       = 0x0001000A\r
   FILE_GUID                      = A6885402-D022-4b0e-A509-4711B90F2A39\r
   MODULE_TYPE                    = DXE_SMM_DRIVER\r
   PI_SPECIFICATION_VERSION       = 0x0001000A\r

-  VERSION_STRING                 = 1.0  \r
+  VERSION_STRING                 = 1.0\r

   ENTRY_POINT                    = GenericStatusCodeSmmEntry\r
 \r
 #\r
   ENTRY_POINT                    = GenericStatusCodeSmmEntry\r
 \r
 #\r

diff --git a/MdeModulePkg/Universal/ReportStatusCodeRouter/Smm/ReportStatusCodeRouterSmmExtra.uni b/MdeModulePkg/Universal/ReportStatusCodeRouter/Smm/ReportStatusCodeRouterSmmExtra.uni
index af3dc755230ffb104dc02e584bbfe2862127280c..afe4ff5501bd225d0c4eeff8eb00f4a8037ab4dc 100644 (file)
--- a/MdeModulePkg/Universal/ReportStatusCodeRouter/Smm/ReportStatusCodeRouterSmmExtra.uni
+++ b/MdeModulePkg/Universal/ReportStatusCodeRouter/Smm/ReportStatusCodeRouterSmmExtra.uni
@@ -1,7 +1,7 @@
 // /** @file\r
 // ReportStatusCodeRouterSmm Localized Strings and Content\r
 //\r
 // /** @file\r
 // ReportStatusCodeRouterSmm Localized Strings and Content\r
 //\r

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

 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r
 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r


@@ -12,8 +12,8 @@
 //\r
 // **/\r
 \r
 //\r
 // **/\r
 \r

-#string STR_PROPERTIES_MODULE_NAME \r
-#language en-US \r
+#string STR_PROPERTIES_MODULE_NAME\r
+#language en-US\r

 "Status Code Routing SMM Driver"\r
 \r
 \r
 "Status Code Routing SMM Driver"\r
 \r
 \r

diff --git a/MdeModulePkg/Universal/ResetSystemPei/ResetSystem.c b/MdeModulePkg/Universal/ResetSystemPei/ResetSystem.c
index 2c9b8a1bae018702a19ce5bcff84f55c93df9bcf..6236184e9d3c24b8a34e3abb77d9bbe6a0763d6a 100644 (file)
--- a/MdeModulePkg/Universal/ResetSystemPei/ResetSystem.c
+++ b/MdeModulePkg/Universal/ResetSystemPei/ResetSystem.c
@@ -235,7 +235,7 @@ UnregisterResetNotify (
 \r
   @param[in] FileHandle  Handle of the file being invoked.\r
   @param[in] PeiServices Describes the list of possible PEI Services.\r
 \r
   @param[in] FileHandle  Handle of the file being invoked.\r
   @param[in] PeiServices Describes the list of possible PEI Services.\r

-  \r
+\r

   @retval EFI_SUCCESS         The entry point is executed successfully.\r
   @retval EFI_ALREADY_STARTED The Reset2 PPI was already installed.\r
   @retval others              Status code returned from PeiServicesInstallPpi().\r
   @retval EFI_SUCCESS         The entry point is executed successfully.\r
   @retval EFI_ALREADY_STARTED The Reset2 PPI was already installed.\r
   @retval others              Status code returned from PeiServicesInstallPpi().\r

diff --git a/MdeModulePkg/Universal/ResetSystemPei/ResetSystemPei.uni b/MdeModulePkg/Universal/ResetSystemPei/ResetSystemPei.uni
index 6d2d650c374510f4100f8321a645be415e419cac..46c69013e50b35947f80f856ace06fdb0481b938 100644 (file)
--- a/MdeModulePkg/Universal/ResetSystemPei/ResetSystemPei.uni
+++ b/MdeModulePkg/Universal/ResetSystemPei/ResetSystemPei.uni
@@ -1,13 +1,13 @@
 // /** @file\r
 // This driver implements Reset2, ResetFilter and ResetHandler PPIs.\r
 //\r
 // /** @file\r
 // This driver implements Reset2, ResetFilter and ResetHandler PPIs.\r
 //\r

-// Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>\r
+// Copyright (c) 2017 - 2018, Intel Corporation. All rights reserved.<BR>\r

 //\r
 // This program and the accompanying materials are\r
 // licensed and made available under the terms and conditions of the BSD License\r
 // which accompanies this distribution.  The full text of the license may be found at\r
 // http://opensource.org/licenses/bsd-license.php\r
 //\r
 // This program and the accompanying materials are\r
 // licensed and made available under the terms and conditions of the BSD License\r
 // which accompanies this distribution.  The full text of the license may be found at\r
 // http://opensource.org/licenses/bsd-license.php\r

-// \r
+//\r

 // THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 // WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 //\r
 // THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 // WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 //\r

diff --git a/MdeModulePkg/Universal/ResetSystemPei/ResetSystemPeiExtra.uni b/MdeModulePkg/Universal/ResetSystemPei/ResetSystemPeiExtra.uni
index 2681afc70791c1e436c02ebef4eba3e910e86bb0..c43860aff66f6ad027c09f5c1107fffb72b28954 100644 (file)
--- a/MdeModulePkg/Universal/ResetSystemPei/ResetSystemPeiExtra.uni
+++ b/MdeModulePkg/Universal/ResetSystemPei/ResetSystemPeiExtra.uni
@@ -1,7 +1,7 @@
 // /** @file\r
 // ResetSystemPei Localized Strings and Content\r
 //\r
 // /** @file\r
 // ResetSystemPei Localized Strings and Content\r
 //\r

-// Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>\r
+// Copyright (c) 2017 - 2018, Intel Corporation. All rights reserved.<BR>\r

 //\r
 // This program and the accompanying materials are\r
 // licensed and made available under the terms and conditions of the BSD License\r
 //\r
 // This program and the accompanying materials are\r
 // licensed and made available under the terms and conditions of the BSD License\r


@@ -13,8 +13,8 @@
 //\r
 // **/\r
 \r
 //\r
 // **/\r
 \r

-#string STR_PROPERTIES_MODULE_NAME \r
-#language en-US \r
+#string STR_PROPERTIES_MODULE_NAME\r
+#language en-US\r

 "Reset System PEIM"\r
 \r
 \r
 "Reset System PEIM"\r
 \r
 \r

diff --git a/MdeModulePkg/Universal/ResetSystemRuntimeDxe/ResetSystem.c b/MdeModulePkg/Universal/ResetSystemRuntimeDxe/ResetSystem.c
index 2c795426f51475348199e5763a45f0892986ba22..f23b5e86f9e2e8cc8ce7cf682f4204feae1701ca 100644 (file)
--- a/MdeModulePkg/Universal/ResetSystemRuntimeDxe/ResetSystem.c
+++ b/MdeModulePkg/Universal/ResetSystemRuntimeDxe/ResetSystem.c
@@ -1,7 +1,7 @@
 /** @file\r
   Reset Architectural and Reset Notification protocols implementation.\r
 \r
 /** @file\r
   Reset Architectural and Reset Notification protocols implementation.\r
 \r

-  Copyright (c) 2006 - 2017, Intel Corporation. All rights reserved.<BR>\r
+  Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r

 \r
   This program and the accompanying materials\r
   are licensed and made available under the terms and conditions of the BSD License\r
 \r
   This program and the accompanying materials\r
   are licensed and made available under the terms and conditions of the BSD License\r


@@ -162,9 +162,9 @@ RESET_NOTIFICATION_INSTANCE mPlatformSpecificResetHandler = {
 \r
   It initializes the Reset Architectural Protocol.\r
 \r
 \r
   It initializes the Reset Architectural Protocol.\r
 \r

-  @param[in] ImageHandle  The firmware allocated handle for the EFI image.  \r
+  @param[in] ImageHandle  The firmware allocated handle for the EFI image.\r

   @param[in] SystemTable  A pointer to the EFI System Table.\r
   @param[in] SystemTable  A pointer to the EFI System Table.\r

-  \r
+\r

   @retval EFI_SUCCESS     The entry point is executed successfully.\r
   @retval other           Cannot install ResetArch protocol.\r
 \r
   @retval EFI_SUCCESS     The entry point is executed successfully.\r
   @retval other           Cannot install ResetArch protocol.\r
 \r


@@ -207,7 +207,7 @@ InitializeResetSystem (
 }\r
 \r
 /**\r
 }\r
 \r
 /**\r

-  Put the system into S3 power state.                            \r
+  Put the system into S3 power state.\r

 **/\r
 VOID\r
 DoS3 (\r
 **/\r
 VOID\r
 DoS3 (\r


@@ -293,7 +293,7 @@ ResetSystem (
         Entry->ResetNotify (ResetType, ResetStatus, DataSize, ResetData);\r
       }\r
       //\r
         Entry->ResetNotify (ResetType, ResetStatus, DataSize, ResetData);\r
       }\r
       //\r

-      // call reset notification functions registered through the \r
+      // call reset notification functions registered through the\r

       // EDKII_PLATFORM_SPECIFIC_RESET_HANDLER_PROTOCOL.\r
       //\r
       for ( Link = GetFirstNode (&mPlatformSpecificResetHandler.ResetNotifies)\r
       // EDKII_PLATFORM_SPECIFIC_RESET_HANDLER_PROTOCOL.\r
       //\r
       for ( Link = GetFirstNode (&mPlatformSpecificResetHandler.ResetNotifies)\r

diff --git a/MdeModulePkg/Universal/ResetSystemRuntimeDxe/ResetSystem.h b/MdeModulePkg/Universal/ResetSystemRuntimeDxe/ResetSystem.h
index ea5660274b643ab836afde3fbb6903a6b9b2395f..1848a92872d7a08743ec37dc9769166cf2e90b75 100644 (file)
--- a/MdeModulePkg/Universal/ResetSystemRuntimeDxe/ResetSystem.h
+++ b/MdeModulePkg/Universal/ResetSystemRuntimeDxe/ResetSystem.h
@@ -1,6 +1,6 @@
 /** @file\r
 \r
 /** @file\r
 \r

-  Copyright (c) 2006 - 2017, Intel Corporation. All rights reserved.<BR>\r
+  Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r

 \r
   This program and the accompanying materials\r
   are licensed and made available under the terms and conditions of the BSD License\r
 \r
   This program and the accompanying materials\r
   are licensed and made available under the terms and conditions of the BSD License\r


@@ -63,9 +63,9 @@ typedef struct {
 \r
   It initializes the Reset Architectural Protocol.\r
 \r
 \r
   It initializes the Reset Architectural Protocol.\r
 \r

-  @param[in] ImageHandle  The firmware allocated handle for the EFI image.  \r
+  @param[in] ImageHandle  The firmware allocated handle for the EFI image.\r

   @param[in] SystemTable  A pointer to the EFI System Table.\r
   @param[in] SystemTable  A pointer to the EFI System Table.\r

-  \r
+\r

   @retval EFI_SUCCESS     The entry point is executed successfully.\r
   @retval other           Cannot install ResetArch protocol.\r
 \r
   @retval EFI_SUCCESS     The entry point is executed successfully.\r
   @retval other           Cannot install ResetArch protocol.\r
 \r

diff --git a/MdeModulePkg/Universal/ResetSystemRuntimeDxe/ResetSystemRuntimeDxe.uni b/MdeModulePkg/Universal/ResetSystemRuntimeDxe/ResetSystemRuntimeDxe.uni
index 3e1e12da33b3c6e995ee9a683803e793ed93c999..d10c86d23f25d5310db6899303a1a5b33029cb5e 100644 (file)
--- a/MdeModulePkg/Universal/ResetSystemRuntimeDxe/ResetSystemRuntimeDxe.uni
+++ b/MdeModulePkg/Universal/ResetSystemRuntimeDxe/ResetSystemRuntimeDxe.uni
@@ -1,13 +1,13 @@
 // /** @file\r
 // This driver implements Reset Architectural and Reset Notification protocols.\r
 //\r
 // /** @file\r
 // This driver implements Reset Architectural and Reset Notification protocols.\r
 //\r

-// Copyright (c) 2006 - 2017, Intel Corporation. All rights reserved.<BR>\r
+// Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r

 //\r
 // This program and the accompanying materials are\r
 // licensed and made available under the terms and conditions of the BSD License\r
 // which accompanies this distribution.  The full text of the license may be found at\r
 // http://opensource.org/licenses/bsd-license.php\r
 //\r
 // This program and the accompanying materials are\r
 // licensed and made available under the terms and conditions of the BSD License\r
 // which accompanies this distribution.  The full text of the license may be found at\r
 // http://opensource.org/licenses/bsd-license.php\r

-// \r
+//\r

 // THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 // WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 //\r
 // THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 // WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 //\r

diff --git a/MdeModulePkg/Universal/ResetSystemRuntimeDxe/ResetSystemRuntimeDxeExtra.uni b/MdeModulePkg/Universal/ResetSystemRuntimeDxe/ResetSystemRuntimeDxeExtra.uni
index 32448f24ecbd22f62518e944b67b2201f6a97618..a437a61e87f64dd8ffd6ed5031a82b6b3458a676 100644 (file)
--- a/MdeModulePkg/Universal/ResetSystemRuntimeDxe/ResetSystemRuntimeDxeExtra.uni
+++ b/MdeModulePkg/Universal/ResetSystemRuntimeDxe/ResetSystemRuntimeDxeExtra.uni
@@ -1,7 +1,7 @@
 // /** @file\r
 // ResetSystemRuntimeDxe Localized Strings and Content\r
 //\r
 // /** @file\r
 // ResetSystemRuntimeDxe Localized Strings and Content\r
 //\r

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

 //\r
 // This program and the accompanying materials are\r
 // licensed and made available under the terms and conditions of the BSD License\r
 //\r
 // This program and the accompanying materials are\r
 // licensed and made available under the terms and conditions of the BSD License\r


@@ -13,8 +13,8 @@
 //\r
 // **/\r
 \r
 //\r
 // **/\r
 \r

-#string STR_PROPERTIES_MODULE_NAME \r
-#language en-US \r
+#string STR_PROPERTIES_MODULE_NAME\r
+#language en-US\r

 "Reset System DXE Driver"\r
 \r
 \r
 "Reset System DXE Driver"\r
 \r
 \r

diff --git a/MdeModulePkg/Universal/SectionExtractionDxe/SectionExtractionDxe.c b/MdeModulePkg/Universal/SectionExtractionDxe/SectionExtractionDxe.c
index b100883be69ab2259134dc047143bb37a560766a..096a497f5addcfdda170363d68eed0e6dd8541c4 100644 (file)
--- a/MdeModulePkg/Universal/SectionExtractionDxe/SectionExtractionDxe.c
+++ b/MdeModulePkg/Universal/SectionExtractionDxe/SectionExtractionDxe.c
@@ -1,14 +1,14 @@
 /** @file\r
  Section Extraction DXE Driver\r
 \r
 /** @file\r
  Section Extraction DXE Driver\r
 \r

-Copyright (c) 2013 - 2014, Intel Corporation. All rights reserved.<BR>\r
-This program and the accompanying materials                          \r
-are licensed and made available under the terms and conditions of the BSD License         \r
-which accompanies this distribution.  The full text of the license may be found at        \r
-http://opensource.org/licenses/bsd-license.php                                            \r
-                                                                                          \r
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     \r
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             \r
+Copyright (c) 2013 - 2018, Intel Corporation. All rights reserved.<BR>\r
+This program and the accompanying materials\r
+are licensed and made available under the terms and conditions of the BSD License\r
+which accompanies this distribution.  The full text of the license may be found at\r
+http://opensource.org/licenses/bsd-license.php\r
+\r
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r

 \r
 **/\r
 \r
 \r
 **/\r
 \r


@@ -318,12 +318,12 @@ CustomGuidedSectionExtract (
 /**\r
   Main entry for the Section Extraction DXE module.\r
 \r
 /**\r
   Main entry for the Section Extraction DXE module.\r
 \r

-  This routine registers the Section Extraction Protocols that have been registered \r
+  This routine registers the Section Extraction Protocols that have been registered\r

   with the Section Extraction Library.\r
   with the Section Extraction Library.\r

-  \r
+\r

   @param[in] ImageHandle    The firmware allocated handle for the EFI image.\r
   @param[in] SystemTable    A pointer to the EFI System Table.\r
   @param[in] ImageHandle    The firmware allocated handle for the EFI image.\r
   @param[in] SystemTable    A pointer to the EFI System Table.\r

-  \r
+\r

   @retval EFI_SUCCESS       The entry point is executed successfully.\r
   @retval other             Some error occurs when executing this entry point.\r
 \r
   @retval EFI_SUCCESS       The entry point is executed successfully.\r
   @retval other             Some error occurs when executing this entry point.\r
 \r

diff --git a/MdeModulePkg/Universal/SectionExtractionDxe/SectionExtractionDxeExtra.uni b/MdeModulePkg/Universal/SectionExtractionDxe/SectionExtractionDxeExtra.uni
index 21aa52a6a0e08ef966dcd12dc17e8021404a2583..33c9a89d4555934da3cef39ed20dd218439b408f 100644 (file)
--- a/MdeModulePkg/Universal/SectionExtractionDxe/SectionExtractionDxeExtra.uni
+++ b/MdeModulePkg/Universal/SectionExtractionDxe/SectionExtractionDxeExtra.uni
@@ -1,7 +1,7 @@
 // /** @file\r
 // Section Extraction DXE Module Localized Strings and Content\r
 //\r
 // /** @file\r
 // Section Extraction DXE Module Localized Strings and Content\r
 //\r

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

 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r
 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r


@@ -12,6 +12,6 @@
 //\r
 // **/\r
 \r
 //\r
 // **/\r
 \r

-#string STR_PROPERTIES_MODULE_NAME \r
-#language en-US \r
+#string STR_PROPERTIES_MODULE_NAME\r
+#language en-US\r

 "Section Extraction DXE"\r
 "Section Extraction DXE"\r

diff --git a/MdeModulePkg/Universal/SectionExtractionPei/SectionExtractionPei.c b/MdeModulePkg/Universal/SectionExtractionPei/SectionExtractionPei.c
index 63fc94cb5146232839efbe20670088487f7fb1d4..97e321d551de2e822f1a0153a53514d3c031f974 100644 (file)
--- a/MdeModulePkg/Universal/SectionExtractionPei/SectionExtractionPei.c
+++ b/MdeModulePkg/Universal/SectionExtractionPei/SectionExtractionPei.c
@@ -2,13 +2,13 @@
  Section Extraction PEIM\r
 \r
 Copyright (c) 2013 - 2018, Intel Corporation. All rights reserved.<BR>\r
  Section Extraction PEIM\r
 \r
 Copyright (c) 2013 - 2018, Intel Corporation. All rights reserved.<BR>\r

-This program and the accompanying materials                          \r
-are licensed and made available under the terms and conditions of the BSD License         \r
-which accompanies this distribution.  The full text of the license may be found at        \r
-http://opensource.org/licenses/bsd-license.php                                            \r
-                                                                                          \r
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     \r
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             \r
+This program and the accompanying materials\r
+are licensed and made available under the terms and conditions of the BSD License\r
+which accompanies this distribution.  The full text of the license may be found at\r
+http://opensource.org/licenses/bsd-license.php\r
+\r
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r

 \r
 **/\r
 \r
 \r
 **/\r
 \r


@@ -50,7 +50,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
                                 output buffer. If the input\r
                                 section's GuidedSectionHeader.\r
                                 Attributes field has the\r
                                 output buffer. If the input\r
                                 section's GuidedSectionHeader.\r
                                 Attributes field has the\r

-                                EFI_GUIDED_SECTION_AUTH_STATUS_VALID \r
+                                EFI_GUIDED_SECTION_AUTH_STATUS_VALID\r

                                 bit as clear,\r
                                 AuthenticationStatus must return\r
                                 zero. These bits reflect the\r
                                 bit as clear,\r
                                 AuthenticationStatus must return\r
                                 zero. These bits reflect the\r


@@ -60,14 +60,14 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
                                 EFI_SUCCESS, the value of\r
                                 AuthenticationStatus is\r
                                 undefined.\r
                                 EFI_SUCCESS, the value of\r
                                 AuthenticationStatus is\r
                                 undefined.\r

-  \r
+\r

   @retval EFI_SUCCESS           The InputSection was\r
                                 successfully processed and the\r
                                 section contents were returned.\r
   @retval EFI_SUCCESS           The InputSection was\r
                                 successfully processed and the\r
                                 section contents were returned.\r

-  \r
+\r

   @retval EFI_OUT_OF_RESOURCES  The system has insufficient\r
                                 resources to process the request.\r
   @retval EFI_OUT_OF_RESOURCES  The system has insufficient\r
                                 resources to process the request.\r

-  \r
+\r

   @retval EFI_INVALID_PARAMETER The GUID in InputSection does\r
                                 not match this instance of the\r
                                 GUIDed Section Extraction PPI.\r
   @retval EFI_INVALID_PARAMETER The GUID in InputSection does\r
                                 not match this instance of the\r
                                 GUIDed Section Extraction PPI.\r


@@ -121,7 +121,7 @@ CONST EFI_PEI_GUIDED_SECTION_EXTRACTION_PPI mCustomGuidedSectionExtractionPpi =
                                 output buffer. If the input\r
                                 section's GuidedSectionHeader.\r
                                 Attributes field has the\r
                                 output buffer. If the input\r
                                 section's GuidedSectionHeader.\r
                                 Attributes field has the\r

-                                EFI_GUIDED_SECTION_AUTH_STATUS_VALID \r
+                                EFI_GUIDED_SECTION_AUTH_STATUS_VALID\r

                                 bit as clear,\r
                                 AuthenticationStatus must return\r
                                 zero. These bits reflect the\r
                                 bit as clear,\r
                                 AuthenticationStatus must return\r
                                 zero. These bits reflect the\r


@@ -131,14 +131,14 @@ CONST EFI_PEI_GUIDED_SECTION_EXTRACTION_PPI mCustomGuidedSectionExtractionPpi =
                                 EFI_SUCCESS, the value of\r
                                 AuthenticationStatus is\r
                                 undefined.\r
                                 EFI_SUCCESS, the value of\r
                                 AuthenticationStatus is\r
                                 undefined.\r

-  \r
+\r

   @retval EFI_SUCCESS           The InputSection was\r
                                 successfully processed and the\r
                                 section contents were returned.\r
   @retval EFI_SUCCESS           The InputSection was\r
                                 successfully processed and the\r
                                 section contents were returned.\r

-  \r
+\r

   @retval EFI_OUT_OF_RESOURCES  The system has insufficient\r
                                 resources to process the request.\r
   @retval EFI_OUT_OF_RESOURCES  The system has insufficient\r
                                 resources to process the request.\r

-  \r
+\r

   @retval EFI_INVALID_PARAMETER The GUID in InputSection does\r
                                 not match this instance of the\r
                                 GUIDed Section Extraction PPI.\r
   @retval EFI_INVALID_PARAMETER The GUID in InputSection does\r
                                 not match this instance of the\r
                                 GUIDed Section Extraction PPI.\r


@@ -159,7 +159,7 @@ CustomGuidedSectionExtract (
   UINT32          ScratchBufferSize;\r
   UINT32          OutputBufferSize;\r
   UINT16          SectionAttribute;\r
   UINT32          ScratchBufferSize;\r
   UINT32          OutputBufferSize;\r
   UINT16          SectionAttribute;\r

-  \r
+\r

   //\r
   // Init local variable\r
   //\r
   //\r
   // Init local variable\r
   //\r


@@ -174,12 +174,12 @@ CustomGuidedSectionExtract (
              &ScratchBufferSize,\r
              &SectionAttribute\r
              );\r
              &ScratchBufferSize,\r
              &SectionAttribute\r
              );\r

-  \r
+\r

   if (EFI_ERROR (Status)) {\r
     DEBUG ((DEBUG_ERROR, "GetInfo from guided section Failed - %r\n", Status));\r
     return Status;\r
   }\r
   if (EFI_ERROR (Status)) {\r
     DEBUG ((DEBUG_ERROR, "GetInfo from guided section Failed - %r\n", Status));\r
     return Status;\r
   }\r

-  \r
+\r

   if (ScratchBufferSize != 0) {\r
     //\r
     // Allocate scratch buffer\r
   if (ScratchBufferSize != 0) {\r
     //\r
     // Allocate scratch buffer\r


@@ -190,7 +190,7 @@ CustomGuidedSectionExtract (
     }\r
   }\r
 \r
     }\r
   }\r
 \r

-  if (((SectionAttribute & EFI_GUIDED_SECTION_PROCESSING_REQUIRED) != 0) && OutputBufferSize > 0) {  \r
+  if (((SectionAttribute & EFI_GUIDED_SECTION_PROCESSING_REQUIRED) != 0) && OutputBufferSize > 0) {\r

     //\r
     // Allocate output buffer\r
     //\r
     //\r
     // Allocate output buffer\r
     //\r


@@ -200,9 +200,9 @@ CustomGuidedSectionExtract (
     }\r
     DEBUG ((DEBUG_INFO, "Customized Guided section Memory Size required is 0x%x and address is 0x%p\n", OutputBufferSize, *OutputBuffer));\r
   }\r
     }\r
     DEBUG ((DEBUG_INFO, "Customized Guided section Memory Size required is 0x%x and address is 0x%p\n", OutputBufferSize, *OutputBuffer));\r
   }\r

-  \r
+\r

   Status = ExtractGuidedSectionDecode (\r
   Status = ExtractGuidedSectionDecode (\r

-             InputSection, \r
+             InputSection,\r

              OutputBuffer,\r
              ScratchBuffer,\r
              AuthenticationStatus\r
              OutputBuffer,\r
              ScratchBuffer,\r
              AuthenticationStatus\r


@@ -214,16 +214,16 @@ CustomGuidedSectionExtract (
     DEBUG ((DEBUG_ERROR, "Extract guided section Failed - %r\n", Status));\r
     return Status;\r
   }\r
     DEBUG ((DEBUG_ERROR, "Extract guided section Failed - %r\n", Status));\r
     return Status;\r
   }\r

-  \r
+\r

   *OutputSize = (UINTN) OutputBufferSize;\r
   *OutputSize = (UINTN) OutputBufferSize;\r

-  \r
+\r

   return EFI_SUCCESS;\r
 }\r
 \r
 /**\r
   Main entry for Section Extraction PEIM driver.\r
   return EFI_SUCCESS;\r
 }\r
 \r
 /**\r
   Main entry for Section Extraction PEIM driver.\r

-  \r
-  This routine registers the Section Extraction PPIs that have been registered \r
+\r
+  This routine registers the Section Extraction PPIs that have been registered\r

   with the Section Extraction Library.\r
 \r
   @param  FileHandle  Handle of the file being invoked.\r
   with the Section Extraction Library.\r
 \r
   @param  FileHandle  Handle of the file being invoked.\r


@@ -238,7 +238,7 @@ EFIAPI
 SectionExtractionPeiEntry (\r
   IN       EFI_PEI_FILE_HANDLE  FileHandle,\r
   IN CONST EFI_PEI_SERVICES     **PeiServices\r
 SectionExtractionPeiEntry (\r
   IN       EFI_PEI_FILE_HANDLE  FileHandle,\r
   IN CONST EFI_PEI_SERVICES     **PeiServices\r

-  ) \r
+  )\r

 {\r
   EFI_STATUS              Status;\r
   EFI_GUID                *ExtractHandlerGuidTable;\r
 {\r
   EFI_STATUS              Status;\r
   EFI_GUID                *ExtractHandlerGuidTable;\r


@@ -246,10 +246,10 @@ SectionExtractionPeiEntry (
   EFI_PEI_PPI_DESCRIPTOR  *GuidPpi;\r
 \r
   //\r
   EFI_PEI_PPI_DESCRIPTOR  *GuidPpi;\r
 \r
   //\r

-  // Get custom extract guided section method guid list \r
+  // Get custom extract guided section method guid list\r

   //\r
   ExtractHandlerNumber = ExtractGuidedSectionGetGuidList (&ExtractHandlerGuidTable);\r
   //\r
   ExtractHandlerNumber = ExtractGuidedSectionGetGuidList (&ExtractHandlerGuidTable);\r

-  \r
+\r

   //\r
   // Install custom extraction guid PPI\r
   //\r
   //\r
   // Install custom extraction guid PPI\r
   //\r


@@ -264,6 +264,6 @@ SectionExtractionPeiEntry (
       ASSERT_EFI_ERROR (Status);\r
     }\r
   }\r
       ASSERT_EFI_ERROR (Status);\r
     }\r
   }\r

-  \r
+\r

   return EFI_SUCCESS;\r
 }\r
   return EFI_SUCCESS;\r
 }\r

diff --git a/MdeModulePkg/Universal/SectionExtractionPei/SectionExtractionPei.inf b/MdeModulePkg/Universal/SectionExtractionPei/SectionExtractionPei.inf
index 912031a27b9b19a4dc6d93cd14be8b5ce7e7e7ab..91800cec01275b54293afb8a28a7d00926a2f8b7 100644 (file)
--- a/MdeModulePkg/Universal/SectionExtractionPei/SectionExtractionPei.inf
+++ b/MdeModulePkg/Universal/SectionExtractionPei/SectionExtractionPei.inf
@@ -3,7 +3,7 @@
 #\r
 # Produce one or more Section Extraction PPIs.\r
 #\r
 #\r
 # Produce one or more Section Extraction PPIs.\r
 #\r

-# Copyright (c) 2013 - 2014, Intel Corporation. All rights reserved.<BR>\r
+# Copyright (c) 2013 - 2018, Intel Corporation. All rights reserved.<BR>\r

 #\r
 #  This program and the accompanying materials\r
 #  are licensed and made available under the terms and conditions of the BSD License\r
 #\r
 #  This program and the accompanying materials\r
 #  are licensed and made available under the terms and conditions of the BSD License\r


@@ -41,7 +41,7 @@
   DebugLib\r
   MemoryAllocationLib\r
   PeiServicesLib\r
   DebugLib\r
   MemoryAllocationLib\r
   PeiServicesLib\r

-  \r
+\r

 [Depex]\r
   gEfiPeiMemoryDiscoveredPpiGuid\r
 \r
 [Depex]\r
   gEfiPeiMemoryDiscoveredPpiGuid\r
 \r

diff --git a/MdeModulePkg/Universal/SectionExtractionPei/SectionExtractionPeiExtra.uni b/MdeModulePkg/Universal/SectionExtractionPei/SectionExtractionPeiExtra.uni
index 0c0a944000a0e8eacd2060a567a942ea07051e02..cb58f933012e3a86bcba26046b06eb09dd5549f1 100644 (file)
--- a/MdeModulePkg/Universal/SectionExtractionPei/SectionExtractionPeiExtra.uni
+++ b/MdeModulePkg/Universal/SectionExtractionPei/SectionExtractionPeiExtra.uni
@@ -1,7 +1,7 @@
 // /** @file\r
 // Section Extraction PEIM Localized Strings and Content\r
 //\r
 // /** @file\r
 // Section Extraction PEIM Localized Strings and Content\r
 //\r

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

 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r
 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r


@@ -12,6 +12,6 @@
 //\r
 // **/\r
 \r
 //\r
 // **/\r
 \r

-#string STR_PROPERTIES_MODULE_NAME \r
-#language en-US \r
+#string STR_PROPERTIES_MODULE_NAME\r
+#language en-US\r

 "Section Extraction PEI"\r
 "Section Extraction PEI"\r

diff --git a/MdeModulePkg/Universal/SecurityStubDxe/SecurityStub.c b/MdeModulePkg/Universal/SecurityStubDxe/SecurityStub.c
index a75d8dc223e1490faac98c1f4fb1f3f345aa9a4a..86dfeb5478b99926f4ed592255d1864d2c89e41b 100644 (file)
--- a/MdeModulePkg/Universal/SecurityStubDxe/SecurityStub.c
+++ b/MdeModulePkg/Universal/SecurityStubDxe/SecurityStub.c
@@ -1,14 +1,14 @@
 /** @file\r
   This driver produces Security2 and Security architectural protocol based on SecurityManagementLib.\r
 /** @file\r
   This driver produces Security2 and Security architectural protocol based on SecurityManagementLib.\r

- \r
-  Copyright (c) 2006 - 2016, Intel Corporation. All rights reserved.<BR>\r
-  This program and the accompanying materials                          \r
-  are licensed and made available under the terms and conditions of the BSD License         \r
-  which accompanies this distribution.  The full text of the license may be found at        \r
-  http://opensource.org/licenses/bsd-license.php                                            \r

 \r
 \r

-  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     \r
-  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             \r
+  Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r
+  This program and the accompanying materials\r
+  are licensed and made available under the terms and conditions of the BSD License\r
+  which accompanies this distribution.  The full text of the license may be found at\r
+  http://opensource.org/licenses/bsd-license.php\r
+\r
+  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
+  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r

 \r
 **/\r
 \r
 \r
 **/\r
 \r


@@ -28,31 +28,31 @@
 EFI_HANDLE                  mSecurityArchProtocolHandle = NULL;\r
 \r
 /**\r
 EFI_HANDLE                  mSecurityArchProtocolHandle = NULL;\r
 \r
 /**\r

-  The EFI_SECURITY_ARCH_PROTOCOL (SAP) is used to abstract platform-specific \r
-  policy from the DXE core response to an attempt to use a file that returns a \r
-  given status for the authentication check from the section extraction protocol.  \r
+  The EFI_SECURITY_ARCH_PROTOCOL (SAP) is used to abstract platform-specific\r
+  policy from the DXE core response to an attempt to use a file that returns a\r
+  given status for the authentication check from the section extraction protocol.\r

 \r
 \r

-  The possible responses in a given SAP implementation may include locking \r
-  flash upon failure to authenticate, attestation logging for all signed drivers, \r
-  and other exception operations.  The File parameter allows for possible logging \r
+  The possible responses in a given SAP implementation may include locking\r
+  flash upon failure to authenticate, attestation logging for all signed drivers,\r
+  and other exception operations.  The File parameter allows for possible logging\r

   within the SAP of the driver.\r
 \r
   If File is NULL, then EFI_INVALID_PARAMETER is returned.\r
 \r
   within the SAP of the driver.\r
 \r
   If File is NULL, then EFI_INVALID_PARAMETER is returned.\r
 \r

-  If the file specified by File with an authentication status specified by \r
+  If the file specified by File with an authentication status specified by\r

   AuthenticationStatus is safe for the DXE Core to use, then EFI_SUCCESS is returned.\r
 \r
   AuthenticationStatus is safe for the DXE Core to use, then EFI_SUCCESS is returned.\r
 \r

-  If the file specified by File with an authentication status specified by \r
-  AuthenticationStatus is not safe for the DXE Core to use under any circumstances, \r
+  If the file specified by File with an authentication status specified by\r
+  AuthenticationStatus is not safe for the DXE Core to use under any circumstances,\r

   then EFI_ACCESS_DENIED is returned.\r
 \r
   then EFI_ACCESS_DENIED is returned.\r
 \r

-  If the file specified by File with an authentication status specified by \r
-  AuthenticationStatus is not safe for the DXE Core to use right now, but it \r
-  might be possible to use it at a future time, then EFI_SECURITY_VIOLATION is \r
+  If the file specified by File with an authentication status specified by\r
+  AuthenticationStatus is not safe for the DXE Core to use right now, but it\r
+  might be possible to use it at a future time, then EFI_SECURITY_VIOLATION is\r

   returned.\r
 \r
   @param  This             The EFI_SECURITY_ARCH_PROTOCOL instance.\r
   returned.\r
 \r
   @param  This             The EFI_SECURITY_ARCH_PROTOCOL instance.\r

-  @param  AuthenticationStatus \r
+  @param  AuthenticationStatus\r

                            This is the authentication type returned from the Section\r
                            Extraction protocol. See the Section Extraction Protocol\r
                            Specification for details on this type.\r
                            This is the authentication type returned from the Section\r
                            Extraction protocol. See the Section Extraction Protocol\r
                            Specification for details on this type.\r


@@ -71,18 +71,18 @@ SecurityStubAuthenticateState (
   )\r
 {\r
   EFI_STATUS Status;\r
   )\r
 {\r
   EFI_STATUS Status;\r

-  \r
-  Status = ExecuteSecurity2Handlers (EFI_AUTH_OPERATION_AUTHENTICATION_STATE, \r
-                                   AuthenticationStatus, \r
+\r
+  Status = ExecuteSecurity2Handlers (EFI_AUTH_OPERATION_AUTHENTICATION_STATE,\r
+                                   AuthenticationStatus,\r

                                    File,\r
                                    File,\r

-                                   NULL, \r
-                                   0, \r
+                                   NULL,\r
+                                   0,\r

                                    FALSE\r
                                    );\r
   if (Status == EFI_SUCCESS) {\r
     Status = ExecuteSecurityHandlers (AuthenticationStatus, File);\r
   }\r
                                    FALSE\r
                                    );\r
   if (Status == EFI_SUCCESS) {\r
     Status = ExecuteSecurityHandlers (AuthenticationStatus, File);\r
   }\r

-  \r
+\r

   return Status;\r
 }\r
 \r
   return Status;\r
 }\r
 \r


@@ -98,7 +98,7 @@ SecurityStubAuthenticateState (
   these cases.\r
   If the FileBuffer is NULL, the interface will determine if the DevicePath can be connected\r
   in order to support the User Identification policy.\r
   these cases.\r
   If the FileBuffer is NULL, the interface will determine if the DevicePath can be connected\r
   in order to support the User Identification policy.\r

-  \r
+\r

   @param  This             The EFI_SECURITY2_ARCH_PROTOCOL instance.\r
   @param  File             A pointer to the device path of the file that is\r
                            being dispatched. This will optionally be used for logging.\r
   @param  This             The EFI_SECURITY2_ARCH_PROTOCOL instance.\r
   @param  File             A pointer to the device path of the file that is\r
                            being dispatched. This will optionally be used for logging.\r


@@ -107,7 +107,7 @@ SecurityStubAuthenticateState (
   @param  BootPolicy       A boot policy that was used to call LoadImage() UEFI service. If\r
                            FileAuthentication() is invoked not from the LoadImage(),\r
                            BootPolicy must be set to FALSE.\r
   @param  BootPolicy       A boot policy that was used to call LoadImage() UEFI service. If\r
                            FileAuthentication() is invoked not from the LoadImage(),\r
                            BootPolicy must be set to FALSE.\r

-  \r
+\r

   @retval EFI_SUCCESS             The file specified by DevicePath and non-NULL\r
                                   FileBuffer did authenticate, and the platform policy dictates\r
                                   that the DXE Foundation may use the file.\r
   @retval EFI_SUCCESS             The file specified by DevicePath and non-NULL\r
                                   FileBuffer did authenticate, and the platform policy dictates\r
                                   that the DXE Foundation may use the file.\r


@@ -150,14 +150,14 @@ Security2StubAuthenticate (
     }\r
   }\r
 \r
     }\r
   }\r
 \r

-  return ExecuteSecurity2Handlers (EFI_AUTH_OPERATION_VERIFY_IMAGE | \r
-                                   EFI_AUTH_OPERATION_DEFER_IMAGE_LOAD | \r
+  return ExecuteSecurity2Handlers (EFI_AUTH_OPERATION_VERIFY_IMAGE |\r
+                                   EFI_AUTH_OPERATION_DEFER_IMAGE_LOAD |\r

                                    EFI_AUTH_OPERATION_MEASURE_IMAGE |\r
                                    EFI_AUTH_OPERATION_MEASURE_IMAGE |\r

-                                   EFI_AUTH_OPERATION_CONNECT_POLICY, \r
-                                   0, \r
+                                   EFI_AUTH_OPERATION_CONNECT_POLICY,\r
+                                   0,\r

                                    File,\r
                                    File,\r

-                                   FileBuffer, \r
-                                   FileSize, \r
+                                   FileBuffer,\r
+                                   FileSize,\r

                                    BootPolicy\r
                                    );\r
 }\r
                                    BootPolicy\r
                                    );\r
 }\r


@@ -165,12 +165,12 @@ Security2StubAuthenticate (
 //\r
 // Security2 and Security Architectural Protocol instance produced by this driver\r
 //\r
 //\r
 // Security2 and Security Architectural Protocol instance produced by this driver\r
 //\r

-EFI_SECURITY_ARCH_PROTOCOL  mSecurityStub = { \r
-  SecurityStubAuthenticateState \r
+EFI_SECURITY_ARCH_PROTOCOL  mSecurityStub = {\r
+  SecurityStubAuthenticateState\r

 };\r
 \r
 };\r
 \r

-EFI_SECURITY2_ARCH_PROTOCOL mSecurity2Stub = { \r
-  Security2StubAuthenticate \r
+EFI_SECURITY2_ARCH_PROTOCOL mSecurity2Stub = {\r
+  Security2StubAuthenticate\r

 };\r
 \r
 /**\r
 };\r
 \r
 /**\r


@@ -178,7 +178,7 @@ EFI_SECURITY2_ARCH_PROTOCOL mSecurity2Stub = {
 \r
   @param  ImageHandle  The image handle of this driver.\r
   @param  SystemTable  A pointer to the EFI System Table.\r
 \r
   @param  ImageHandle  The image handle of this driver.\r
   @param  SystemTable  A pointer to the EFI System Table.\r

-  \r
+\r

   @retval EFI_SUCCESS   Install the sample Security Architectural Protocol successfully.\r
 \r
 **/\r
   @retval EFI_SUCCESS   Install the sample Security Architectural Protocol successfully.\r
 \r
 **/\r

diff --git a/MdeModulePkg/Universal/SecurityStubDxe/SecurityStubDxe.uni b/MdeModulePkg/Universal/SecurityStubDxe/SecurityStubDxe.uni
index 2050dd6b347d82df522df3154f9dab71b0a78697..5264da1733fad0089035cdf7490139c2defb2ea6 100644 (file)
--- a/MdeModulePkg/Universal/SecurityStubDxe/SecurityStubDxe.uni
+++ b/MdeModulePkg/Universal/SecurityStubDxe/SecurityStubDxe.uni
@@ -3,13 +3,13 @@
 //\r
 // This driver produces security2 and security architectural protocol based on SecurityManagementLib.\r
 //\r
 //\r
 // This driver produces security2 and security architectural protocol based on SecurityManagementLib.\r
 //\r

-// Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.<BR>\r
+// Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r

 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r
 // which accompanies this distribution. The full text of the license may be found at\r
 // http://opensource.org/licenses/bsd-license.php\r
 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r
 // which accompanies this distribution. The full text of the license may be found at\r
 // http://opensource.org/licenses/bsd-license.php\r

-// \r
+//\r

 // THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 // WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 //\r
 // THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 // WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 //\r

diff --git a/MdeModulePkg/Universal/SecurityStubDxe/SecurityStubDxeExtra.uni b/MdeModulePkg/Universal/SecurityStubDxe/SecurityStubDxeExtra.uni
index dfc807b29ba876bbc8843a3ab2fb8e7eaaa6b889..f6b665e77b5f71f7cb1e10f2ef95279fb53191f8 100644 (file)
--- a/MdeModulePkg/Universal/SecurityStubDxe/SecurityStubDxeExtra.uni
+++ b/MdeModulePkg/Universal/SecurityStubDxe/SecurityStubDxeExtra.uni
@@ -1,7 +1,7 @@
 // /** @file\r
 // SecurityStubDxe Localized Strings and Content\r
 //\r
 // /** @file\r
 // SecurityStubDxe Localized Strings and Content\r
 //\r

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

 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r
 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r


@@ -13,8 +13,8 @@
 //\r
 // **/\r
 \r
 //\r
 // **/\r
 \r

-#string STR_PROPERTIES_MODULE_NAME \r
-#language en-US \r
+#string STR_PROPERTIES_MODULE_NAME\r
+#language en-US\r

 "Security Stub DXE Driver"\r
 \r
 \r
 "Security Stub DXE Driver"\r
 \r
 \r

diff --git a/MdeModulePkg/Universal/SerialDxe/SerialDxeExtra.uni b/MdeModulePkg/Universal/SerialDxe/SerialDxeExtra.uni
index 3790487cefae3094cd39096e4a583a211ca3be8d..e10da15ec32c0a49753c4151dbeb96c868e56d40 100644 (file)
--- a/MdeModulePkg/Universal/SerialDxe/SerialDxeExtra.uni
+++ b/MdeModulePkg/Universal/SerialDxe/SerialDxeExtra.uni
@@ -1,7 +1,7 @@
 // /** @file\r
 // SerialDxe Localized Strings and Content\r
 //\r
 // /** @file\r
 // SerialDxe Localized Strings and Content\r
 //\r

-// Copyright (c) 2008 - 2015, Intel Corporation. All rights reserved.<BR>\r
+// Copyright (c) 2008 - 2018, Intel Corporation. All rights reserved.<BR>\r

 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r
 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r


@@ -12,8 +12,8 @@
 //\r
 // **/\r
 \r
 //\r
 // **/\r
 \r

-#string STR_PROPERTIES_MODULE_NAME \r
-#language en-US \r
+#string STR_PROPERTIES_MODULE_NAME\r
+#language en-US\r

 "SerialDxe Driver"\r
 \r
 \r
 "SerialDxe Driver"\r
 \r
 \r

diff --git a/MdeModulePkg/Universal/SetupBrowserDxe/Expression.c b/MdeModulePkg/Universal/SetupBrowserDxe/Expression.c
index 297741c0fe9df9d031bd064e5f94e6472c7af8b3..17a13c95623ab161aceea71525c0690540f61e75 100644 (file)
--- a/MdeModulePkg/Universal/SetupBrowserDxe/Expression.c
+++ b/MdeModulePkg/Universal/SetupBrowserDxe/Expression.c
@@ -1,7 +1,7 @@
 /** @file\r
 Utility functions for expression evaluation.\r
 \r
 /** @file\r
 Utility functions for expression evaluation.\r
 \r

-Copyright (c) 2007 - 2017, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2007 - 2018, Intel Corporation. All rights reserved.<BR>\r

 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r


@@ -157,7 +157,7 @@ PushStack (
     (*StackPtr)->Buffer = AllocateCopyPool(Data->BufferLen, Data->Buffer);\r
     ASSERT ((*StackPtr)->Buffer != NULL);\r
   }\r
     (*StackPtr)->Buffer = AllocateCopyPool(Data->BufferLen, Data->Buffer);\r
     ASSERT ((*StackPtr)->Buffer != NULL);\r
   }\r

-  \r
+\r

   *StackPtr = *StackPtr + 1;\r
 \r
   return EFI_SUCCESS;\r
   *StackPtr = *StackPtr + 1;\r
 \r
   return EFI_SUCCESS;\r


@@ -210,7 +210,7 @@ ResetCurrentExpressionStack (
   mCurrentExpressionPointer   = mCurrentExpressionStack;\r
   mFormExpressionPointer      = mFormExpressionStack;\r
   mStatementExpressionPointer = mStatementExpressionStack;\r
   mCurrentExpressionPointer   = mCurrentExpressionStack;\r
   mFormExpressionPointer      = mFormExpressionStack;\r
   mStatementExpressionPointer = mStatementExpressionStack;\r

-  mOptionExpressionPointer    = mOptionExpressionStack;  \r
+  mOptionExpressionPointer    = mOptionExpressionStack;\r

 }\r
 \r
 \r
 }\r
 \r
 \r


@@ -293,7 +293,7 @@ ResetMapExpressionListStack (
                                  pointer\r
   @param  StackEnd               On input: old stack end; On output: new stack end\r
   @param  MemberSize             The stack member size.\r
                                  pointer\r
   @param  StackEnd               On input: old stack end; On output: new stack end\r
   @param  MemberSize             The stack member size.\r

-  \r
+\r

   @retval EFI_SUCCESS            Grow stack success.\r
   @retval EFI_OUT_OF_RESOURCES   No enough memory for stack space.\r
 \r
   @retval EFI_SUCCESS            Grow stack success.\r
   @retval EFI_OUT_OF_RESOURCES   No enough memory for stack space.\r
 \r


@@ -383,7 +383,7 @@ PushConditionalStack (
   //\r
   // Push the item onto the stack\r
   //\r
   //\r
   // Push the item onto the stack\r
   //\r

-  CopyMem (*StackPtr, Data, sizeof (FORM_EXPRESSION *)); \r
+  CopyMem (*StackPtr, Data, sizeof (FORM_EXPRESSION *));\r

   *StackPtr = *StackPtr + 1;\r
 \r
   return EFI_SUCCESS;\r
   *StackPtr = *StackPtr + 1;\r
 \r
   return EFI_SUCCESS;\r


@@ -426,15 +426,15 @@ PopConditionalStack (
 \r
 /**\r
   Get the expression list count.\r
 \r
 /**\r
   Get the expression list count.\r

-  \r
-  @param  Level                  Which type this expression belong to. Form, \r
+\r
+  @param  Level                  Which type this expression belong to. Form,\r

                                  statement or option?\r
 \r
   @retval >=0                    The expression count\r
   @retval -1                     Input parameter error.\r
 \r
 **/\r
                                  statement or option?\r
 \r
   @retval >=0                    The expression count\r
   @retval -1                     Input parameter error.\r
 \r
 **/\r

-INTN \r
+INTN\r

 GetConditionalExpressionCount (\r
   IN EXPRESS_LEVEL       Level\r
   )\r
 GetConditionalExpressionCount (\r
   IN EXPRESS_LEVEL       Level\r
   )\r


@@ -449,13 +449,13 @@ GetConditionalExpressionCount (
     default:\r
       ASSERT (FALSE);\r
       return -1;\r
     default:\r
       ASSERT (FALSE);\r
       return -1;\r

-  } \r
+  }\r

 }\r
 \r
 /**\r
   Get the expression Buffer pointer.\r
 }\r
 \r
 /**\r
   Get the expression Buffer pointer.\r

-  \r
-  @param  Level                  Which type this expression belong to. Form, \r
+\r
+  @param  Level                  Which type this expression belong to. Form,\r

                                  statement or option?\r
 \r
   @retval  The start pointer of the expression buffer or NULL.\r
                                  statement or option?\r
 \r
   @retval  The start pointer of the expression buffer or NULL.\r


@@ -476,7 +476,7 @@ GetConditionalExpressionList (
     default:\r
       ASSERT (FALSE);\r
       return NULL;\r
     default:\r
       ASSERT (FALSE);\r
       return NULL;\r

-  } \r
+  }\r

 }\r
 \r
 \r
 }\r
 \r
 \r


@@ -484,7 +484,7 @@ GetConditionalExpressionList (
   Push the expression options onto the Stack.\r
 \r
   @param  Pointer                Pointer to the current expression.\r
   Push the expression options onto the Stack.\r
 \r
   @param  Pointer                Pointer to the current expression.\r

-  @param  Level                  Which type this expression belong to. Form, \r
+  @param  Level                  Which type this expression belong to. Form,\r

                                  statement or option?\r
 \r
   @retval EFI_SUCCESS            The value was pushed onto the stack.\r
                                  statement or option?\r
 \r
   @retval EFI_SUCCESS            The value was pushed onto the stack.\r


@@ -528,7 +528,7 @@ PushConditionalExpression (
 /**\r
   Pop the expression options from the Stack\r
 \r
 /**\r
   Pop the expression options from the Stack\r
 \r

-  @param  Level                  Which type this expression belong to. Form, \r
+  @param  Level                  Which type this expression belong to. Form,\r

                                  statement or option?\r
 \r
   @retval EFI_SUCCESS            The value was pushed onto the stack.\r
                                  statement or option?\r
 \r
   @retval EFI_SUCCESS            The value was pushed onto the stack.\r


@@ -992,7 +992,7 @@ IfrStrToUpper (
 /**\r
   Check whether this value type can be transfer to EFI_IFR_TYPE_BUFFER type.\r
 \r
 /**\r
   Check whether this value type can be transfer to EFI_IFR_TYPE_BUFFER type.\r
 \r

-  EFI_IFR_TYPE_REF, EFI_IFR_TYPE_DATE and EFI_IFR_TYPE_TIME are converted to \r
+  EFI_IFR_TYPE_REF, EFI_IFR_TYPE_DATE and EFI_IFR_TYPE_TIME are converted to\r

   EFI_IFR_TYPE_BUFFER when do the value compare.\r
 \r
   @param  Value                  Expression value to compare on.\r
   EFI_IFR_TYPE_BUFFER when do the value compare.\r
 \r
   @param  Value                  Expression value to compare on.\r


@@ -1048,11 +1048,11 @@ IsTypeInUINT64 (
 /**\r
   Return the buffer length for this value.\r
 \r
 /**\r
   Return the buffer length for this value.\r
 \r

-  EFI_IFR_TYPE_REF, EFI_IFR_TYPE_DATE and EFI_IFR_TYPE_TIME are converted to \r
+  EFI_IFR_TYPE_REF, EFI_IFR_TYPE_DATE and EFI_IFR_TYPE_TIME are converted to\r

   EFI_IFR_TYPE_BUFFER when do the value compare.\r
 \r
   @param   Value                  Expression value to compare on.\r
   EFI_IFR_TYPE_BUFFER when do the value compare.\r
 \r
   @param   Value                  Expression value to compare on.\r

-  \r
+\r

   @retval  BufLen                 Return the buffer length.\r
 \r
 **/\r
   @retval  BufLen                 Return the buffer length.\r
 \r
 **/\r


@@ -1082,7 +1082,7 @@ GetLengthForValue (
 /**\r
   Return the buffer pointer for this value.\r
 \r
 /**\r
   Return the buffer pointer for this value.\r
 \r

-  EFI_IFR_TYPE_REF, EFI_IFR_TYPE_DATE and EFI_IFR_TYPE_TIME are converted to \r
+  EFI_IFR_TYPE_REF, EFI_IFR_TYPE_DATE and EFI_IFR_TYPE_TIME are converted to\r

   EFI_IFR_TYPE_BUFFER when do the value compare.\r
 \r
   @param  Value                  Expression value to compare on.\r
   EFI_IFR_TYPE_BUFFER when do the value compare.\r
 \r
   @param  Value                  Expression value to compare on.\r


@@ -1181,13 +1181,13 @@ IfrToString (
   case EFI_IFR_TYPE_BOOLEAN:\r
     String = (Value.Value.b) ? L"True" : L"False";\r
     break;\r
   case EFI_IFR_TYPE_BOOLEAN:\r
     String = (Value.Value.b) ? L"True" : L"False";\r
     break;\r

-    \r
+\r

   case EFI_IFR_TYPE_BUFFER:\r
   case EFI_IFR_TYPE_DATE:\r
   case EFI_IFR_TYPE_TIME:\r
   case EFI_IFR_TYPE_REF:\r
     //\r
   case EFI_IFR_TYPE_BUFFER:\r
   case EFI_IFR_TYPE_DATE:\r
   case EFI_IFR_TYPE_TIME:\r
   case EFI_IFR_TYPE_REF:\r
     //\r

-    // + 3 is base on the unicode format, the length may be odd number, \r
+    // + 3 is base on the unicode format, the length may be odd number,\r

     // so need 1 byte to align, also need 2 bytes for L'\0'.\r
     //\r
     if (Value.Type == EFI_IFR_TYPE_BUFFER) {\r
     // so need 1 byte to align, also need 2 bytes for L'\0'.\r
     //\r
     if (Value.Type == EFI_IFR_TYPE_BUFFER) {\r


@@ -1202,20 +1202,20 @@ IfrToString (
     ASSERT (TmpBuf != NULL);\r
     if (Format == EFI_IFR_STRING_ASCII) {\r
       CopyMem (TmpBuf, SrcBuf, SrcLen);\r
     ASSERT (TmpBuf != NULL);\r
     if (Format == EFI_IFR_STRING_ASCII) {\r
       CopyMem (TmpBuf, SrcBuf, SrcLen);\r

-      PrintFormat = L"%a"; \r
+      PrintFormat = L"%a";\r

     } else {\r
       // Format == EFI_IFR_STRING_UNICODE\r
       CopyMem (TmpBuf, SrcBuf, SrcLen * sizeof (CHAR16));\r
     } else {\r
       // Format == EFI_IFR_STRING_UNICODE\r
       CopyMem (TmpBuf, SrcBuf, SrcLen * sizeof (CHAR16));\r

-      PrintFormat = L"%s";  \r
+      PrintFormat = L"%s";\r

     }\r
     UnicodeSPrint (Buffer, sizeof (Buffer), PrintFormat, TmpBuf);\r
     }\r
     UnicodeSPrint (Buffer, sizeof (Buffer), PrintFormat, TmpBuf);\r

-    String = Buffer; \r
+    String = Buffer;\r

     FreePool (TmpBuf);\r
     if (Value.Type == EFI_IFR_TYPE_BUFFER) {\r
       FreePool (Value.Buffer);\r
     }\r
     break;\r
     FreePool (TmpBuf);\r
     if (Value.Type == EFI_IFR_TYPE_BUFFER) {\r
       FreePool (Value.Buffer);\r
     }\r
     break;\r

-    \r
+\r

   default:\r
     Result->Type = EFI_IFR_TYPE_UNDEFINED;\r
     return EFI_SUCCESS;\r
   default:\r
     Result->Type = EFI_IFR_TYPE_UNDEFINED;\r
     return EFI_SUCCESS;\r


@@ -1587,8 +1587,8 @@ IfrMatch2 (
     RegExSyntaxTypeList = NULL;\r
 \r
     Status = RegularExpressionProtocol->GetInfo (\r
     RegExSyntaxTypeList = NULL;\r
 \r
     Status = RegularExpressionProtocol->GetInfo (\r

-                                          RegularExpressionProtocol, \r
-                                          &RegExSyntaxTypeListSize, \r
+                                          RegularExpressionProtocol,\r
+                                          &RegExSyntaxTypeListSize,\r

                                           RegExSyntaxTypeList\r
                                           );\r
     if (Status == EFI_BUFFER_TOO_SMALL) {\r
                                           RegExSyntaxTypeList\r
                                           );\r
     if (Status == EFI_BUFFER_TOO_SMALL) {\r


@@ -1598,8 +1598,8 @@ IfrMatch2 (
         goto Done;\r
       }\r
       Status = RegularExpressionProtocol->GetInfo (\r
         goto Done;\r
       }\r
       Status = RegularExpressionProtocol->GetInfo (\r

-                                            RegularExpressionProtocol, \r
-                                            &RegExSyntaxTypeListSize, \r
+                                            RegularExpressionProtocol,\r
+                                            &RegExSyntaxTypeListSize,\r

                                             RegExSyntaxTypeList\r
                                             );\r
     } else if (EFI_ERROR (Status)) {\r
                                             RegExSyntaxTypeList\r
                                             );\r
     } else if (EFI_ERROR (Status)) {\r


@@ -1613,7 +1613,7 @@ IfrMatch2 (
         //\r
         Result->Type = EFI_IFR_TYPE_BOOLEAN;\r
         Status = RegularExpressionProtocol->MatchString (\r
         //\r
         Result->Type = EFI_IFR_TYPE_BOOLEAN;\r
         Status = RegularExpressionProtocol->MatchString (\r

-                                              RegularExpressionProtocol, \r
+                                              RegularExpressionProtocol,\r

                                               String[0],\r
                                               String[1],\r
                                               SyntaxType,\r
                                               String[0],\r
                                               String[1],\r
                                               SyntaxType,\r


@@ -1631,7 +1631,7 @@ IfrMatch2 (
   }\r
 \r
   //\r
   }\r
 \r
   //\r

-  // Type specified by SyntaxType is not supported \r
+  // Type specified by SyntaxType is not supported\r

   // in any of the EFI_REGULAR_EXPRESSION_PROTOCOL instances.\r
   //\r
   Result->Type = EFI_IFR_TYPE_UNDEFINED;\r
   // in any of the EFI_REGULAR_EXPRESSION_PROTOCOL instances.\r
   //\r
   Result->Type = EFI_IFR_TYPE_UNDEFINED;\r


@@ -1697,7 +1697,7 @@ IfrFind (
   Status = PopExpression (&Value[2]);\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   Status = PopExpression (&Value[2]);\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r

-  }  \r
+  }\r

 \r
   if (Value[0].Type > EFI_IFR_TYPE_NUM_SIZE_64) {\r
     Result->Type = EFI_IFR_TYPE_UNDEFINED;\r
 \r
   if (Value[0].Type > EFI_IFR_TYPE_NUM_SIZE_64) {\r
     Result->Type = EFI_IFR_TYPE_UNDEFINED;\r


@@ -1792,7 +1792,7 @@ IfrMid (
   Status = PopExpression (&Value[2]);\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   Status = PopExpression (&Value[2]);\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r

-  } \r
+  }\r

 \r
   if (Value[0].Type > EFI_IFR_TYPE_NUM_SIZE_64) {\r
     Result->Type = EFI_IFR_TYPE_UNDEFINED;\r
 \r
   if (Value[0].Type > EFI_IFR_TYPE_NUM_SIZE_64) {\r
     Result->Type = EFI_IFR_TYPE_UNDEFINED;\r


@@ -1838,7 +1838,7 @@ IfrMid (
       Result->BufferLen = 0;\r
       Result->Buffer = NULL;\r
     } else {\r
       Result->BufferLen = 0;\r
       Result->Buffer = NULL;\r
     } else {\r

-      Result->BufferLen = (UINT16)((BufferLen - Base) < Length ? (BufferLen - Base) : Length);    \r
+      Result->BufferLen = (UINT16)((BufferLen - Base) < Length ? (BufferLen - Base) : Length);\r

       Result->Buffer = AllocateZeroPool (Result->BufferLen);\r
       ASSERT (Result->Buffer != NULL);\r
       CopyMem (Result->Buffer, &Buffer[Base], Result->BufferLen);\r
       Result->Buffer = AllocateZeroPool (Result->BufferLen);\r
       ASSERT (Result->Buffer != NULL);\r
       CopyMem (Result->Buffer, &Buffer[Base], Result->BufferLen);\r


@@ -1848,7 +1848,7 @@ IfrMid (
       FreePool (Value[2].Buffer);\r
     }\r
   }\r
       FreePool (Value[2].Buffer);\r
     }\r
   }\r

-  \r
+\r

   return Status;\r
 }\r
 \r
   return Status;\r
 }\r
 \r


@@ -1893,9 +1893,9 @@ IfrToken (
   Status = PopExpression (&Value[2]);\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   Status = PopExpression (&Value[2]);\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r

-  } \r
+  }\r

 \r
 \r

-  if (Value[0].Type > EFI_IFR_TYPE_NUM_SIZE_64) { \r
+  if (Value[0].Type > EFI_IFR_TYPE_NUM_SIZE_64) {\r

     Result->Type = EFI_IFR_TYPE_UNDEFINED;\r
     return EFI_SUCCESS;\r
   }\r
     Result->Type = EFI_IFR_TYPE_UNDEFINED;\r
     return EFI_SUCCESS;\r
   }\r


@@ -1910,7 +1910,7 @@ IfrToken (
   for (Index = 0; Index < 2; Index++) {\r
     if (Value[Index + 1].Type != EFI_IFR_TYPE_STRING) {\r
       Result->Type = EFI_IFR_TYPE_UNDEFINED;\r
   for (Index = 0; Index < 2; Index++) {\r
     if (Value[Index + 1].Type != EFI_IFR_TYPE_STRING) {\r
       Result->Type = EFI_IFR_TYPE_UNDEFINED;\r

-      Status = EFI_SUCCESS;   \r
+      Status = EFI_SUCCESS;\r

       goto Done;\r
     }\r
 \r
       goto Done;\r
     }\r
 \r


@@ -2008,7 +2008,7 @@ IfrSpan (
   Status = PopExpression (&Value[2]);\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   Status = PopExpression (&Value[2]);\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r

-  } \r
+  }\r

 \r
   if (Value[0].Type > EFI_IFR_TYPE_NUM_SIZE_64) {\r
     Result->Type = EFI_IFR_TYPE_UNDEFINED;\r
 \r
   if (Value[0].Type > EFI_IFR_TYPE_NUM_SIZE_64) {\r
     Result->Type = EFI_IFR_TYPE_UNDEFINED;\r


@@ -2256,7 +2256,7 @@ CompareHiiValue (
     Buf1Len = GetLengthForValue(Value1);\r
     Buf2    = GetBufferForValue(Value2);\r
     Buf2Len = GetLengthForValue(Value2);\r
     Buf1Len = GetLengthForValue(Value1);\r
     Buf2    = GetBufferForValue(Value2);\r
     Buf2Len = GetLengthForValue(Value2);\r

-    \r
+\r

     Len = Buf1Len > Buf2Len ? Buf2Len : Buf1Len;\r
     *Result = CompareMem (Buf1, Buf2, Len);\r
     if ((*Result == 0) && (Buf1Len != Buf2Len)) {\r
     Len = Buf1Len > Buf2Len ? Buf2Len : Buf1Len;\r
     *Result = CompareMem (Buf1, Buf2, Len);\r
     if ((*Result == 0) && (Buf1Len != Buf2Len)) {\r


@@ -2267,7 +2267,7 @@ CompareHiiValue (
       *Result = Buf1Len > Buf2Len ? 1 : -1;\r
     }\r
     return EFI_SUCCESS;\r
       *Result = Buf1Len > Buf2Len ? 1 : -1;\r
     }\r
     return EFI_SUCCESS;\r

-  }  \r
+  }\r

 \r
   //\r
   // Take types(integer, boolean) as integer\r
 \r
   //\r
   // Take types(integer, boolean) as integer\r


@@ -2334,7 +2334,7 @@ CheckUserPrivilege (
   /// Enumerate all user information of the current user profile\r
   /// to look for any EFI_USER_INFO_ACCESS_SETUP record.\r
   ///\r
   /// Enumerate all user information of the current user profile\r
   /// to look for any EFI_USER_INFO_ACCESS_SETUP record.\r
   ///\r

-  \r
+\r

   for (UserInfoHandle = NULL;;) {\r
     Status = mUserManager->GetNextInfo (mUserManager, UserProfileHandle, &UserInfoHandle);\r
     if (EFI_ERROR (Status)) {\r
   for (UserInfoHandle = NULL;;) {\r
     Status = mUserManager->GetNextInfo (mUserManager, UserProfileHandle, &UserInfoHandle);\r
     if (EFI_ERROR (Status)) {\r


@@ -2399,11 +2399,11 @@ CheckUserPrivilege (
   @param  FormSetGuid            The formset guid which include the question.\r
   @param  QuestionId             The question id which need to get value from.\r
   @param  Value                  The return data about question's value.\r
   @param  FormSetGuid            The formset guid which include the question.\r
   @param  QuestionId             The question id which need to get value from.\r
   @param  Value                  The return data about question's value.\r

-  \r
+\r

   @retval TRUE                   Get the question value success.\r
   @retval FALSE                  Get the question value failed.\r
 **/\r
   @retval TRUE                   Get the question value success.\r
   @retval FALSE                  Get the question value failed.\r
 **/\r

-BOOLEAN \r
+BOOLEAN\r

 GetQuestionValueFromForm (\r
   IN EFI_DEVICE_PATH_PROTOCOL  *DevicePath,\r
   IN EFI_HII_HANDLE            InputHiiHandle,\r
 GetQuestionValueFromForm (\r
   IN EFI_DEVICE_PATH_PROTOCOL  *DevicePath,\r
   IN EFI_HII_HANDLE            InputHiiHandle,\r


@@ -2420,10 +2420,10 @@ GetQuestionValueFromForm (
   BOOLEAN                      GetTheVal;\r
   LIST_ENTRY                   *Link;\r
 \r
   BOOLEAN                      GetTheVal;\r
   LIST_ENTRY                   *Link;\r
 \r

-  // \r
-  // The input parameter DevicePath or InputHiiHandle must have one valid input. \r

   //\r
   //\r

-  ASSERT ((DevicePath != NULL && InputHiiHandle == NULL) || \r
+  // The input parameter DevicePath or InputHiiHandle must have one valid input.\r
+  //\r
+  ASSERT ((DevicePath != NULL && InputHiiHandle == NULL) ||\r

           (DevicePath == NULL && InputHiiHandle != NULL) );\r
 \r
   GetTheVal    = TRUE;\r
           (DevicePath == NULL && InputHiiHandle != NULL) );\r
 \r
   GetTheVal    = TRUE;\r


@@ -2441,7 +2441,7 @@ GetQuestionValueFromForm (
     }\r
   } else {\r
     HiiHandle = InputHiiHandle;\r
     }\r
   } else {\r
     HiiHandle = InputHiiHandle;\r

-  } \r
+  }\r

   ASSERT (HiiHandle != NULL);\r
 \r
   //\r
   ASSERT (HiiHandle != NULL);\r
 \r
   //\r


@@ -2457,7 +2457,7 @@ GetQuestionValueFromForm (
 \r
   //\r
   // Base on the Question Id to get the question info.\r
 \r
   //\r
   // Base on the Question Id to get the question info.\r

-  //  \r
+  //\r

   Question = IdToQuestion(FormSet, NULL, QuestionId);\r
   if (Question == NULL) {\r
     GetTheVal = FALSE;\r
   Question = IdToQuestion(FormSet, NULL, QuestionId);\r
   if (Question == NULL) {\r
     GetTheVal = FALSE;\r


@@ -2480,7 +2480,7 @@ GetQuestionValueFromForm (
     Form = NULL;\r
   }\r
   ASSERT (Form != NULL);\r
     Form = NULL;\r
   }\r
   ASSERT (Form != NULL);\r

-  \r
+\r

   //\r
   // Get the question value.\r
   //\r
   //\r
   // Get the question value.\r
   //\r


@@ -2491,7 +2491,7 @@ GetQuestionValueFromForm (
   }\r
 \r
   CopyMem (Value, &Question->HiiValue, sizeof (EFI_HII_VALUE));\r
   }\r
 \r
   CopyMem (Value, &Question->HiiValue, sizeof (EFI_HII_VALUE));\r

-  \r
+\r

 Done:\r
   //\r
   // Clean the formset structure and restore the global parameter.\r
 Done:\r
   //\r
   // Clean the formset structure and restore the global parameter.\r


@@ -2499,7 +2499,7 @@ Done:
   if (FormSet != NULL) {\r
     DestroyFormSet (FormSet);\r
   }\r
   if (FormSet != NULL) {\r
     DestroyFormSet (FormSet);\r
   }\r

-  \r
+\r

   return GetTheVal;\r
 }\r
 \r
   return GetTheVal;\r
 }\r
 \r


@@ -2705,7 +2705,7 @@ EvaluateExpression (
                     TempBuffer [Index/2] = (UINT8) ((DigitUint8 << 4) + TempBuffer [Index/2]);\r
                   }\r
                 }\r
                     TempBuffer [Index/2] = (UINT8) ((DigitUint8 << 4) + TempBuffer [Index/2]);\r
                   }\r
                 }\r

-              }                \r
+              }\r

             }\r
           }\r
           break;\r
             }\r
           }\r
           break;\r


@@ -2804,7 +2804,7 @@ EvaluateExpression (
       if (EFI_ERROR (Status)) {\r
         goto Done;\r
       }\r
       if (EFI_ERROR (Status)) {\r
         goto Done;\r
       }\r

-    \r
+\r

       //\r
       // Validate the expression value\r
       //\r
       //\r
       // Validate the expression value\r
       //\r


@@ -3017,14 +3017,14 @@ EvaluateExpression (
         //\r
         // When converting from a string, if case-insensitive compare\r
         // with "true" is True, then push True. If a case-insensitive compare\r
         //\r
         // When converting from a string, if case-insensitive compare\r
         // with "true" is True, then push True. If a case-insensitive compare\r

-        // with "false" is True, then push False. Otherwise, push Undefined. \r
+        // with "false" is True, then push False. Otherwise, push Undefined.\r

         //\r
         StrPtr = GetToken (Value->Value.string, FormSet->HiiHandle);\r
         if (StrPtr == NULL) {\r
           Status = EFI_INVALID_PARAMETER;\r
           goto Done;\r
         }\r
         //\r
         StrPtr = GetToken (Value->Value.string, FormSet->HiiHandle);\r
         if (StrPtr == NULL) {\r
           Status = EFI_INVALID_PARAMETER;\r
           goto Done;\r
         }\r

-        \r
+\r

         IfrStrToUpper (StrPtr);\r
         if (StrCmp (StrPtr, L"TRUE") == 0){\r
           Value->Value.b = TRUE;\r
         IfrStrToUpper (StrPtr);\r
         if (StrCmp (StrPtr, L"TRUE") == 0){\r
           Value->Value.b = TRUE;\r


@@ -3038,11 +3038,11 @@ EvaluateExpression (
         FreePool (StrPtr);\r
       } else if (Value->Type == EFI_IFR_TYPE_BUFFER) {\r
         //\r
         FreePool (StrPtr);\r
       } else if (Value->Type == EFI_IFR_TYPE_BUFFER) {\r
         //\r

-        // When converting from a buffer, if the buffer is all zeroes, \r
-        // then push False. Otherwise push True. \r
+        // When converting from a buffer, if the buffer is all zeroes,\r
+        // then push False. Otherwise push True.\r

         //\r
         for (Index =0; Index < Value->BufferLen; Index ++) {\r
         //\r
         for (Index =0; Index < Value->BufferLen; Index ++) {\r

-          if (Value->Buffer[Index] != 0) {            \r
+          if (Value->Buffer[Index] != 0) {\r

             break;\r
           }\r
         }\r
             break;\r
           }\r
         }\r


@@ -3379,15 +3379,15 @@ EvaluateExpression (
         goto Done;\r
       }\r
 \r
         goto Done;\r
       }\r
 \r

-      if (Data2.Type > EFI_IFR_TYPE_BOOLEAN && \r
-          Data2.Type != EFI_IFR_TYPE_STRING && \r
+      if (Data2.Type > EFI_IFR_TYPE_BOOLEAN &&\r
+          Data2.Type != EFI_IFR_TYPE_STRING &&\r

           !IsTypeInBuffer(&Data2)) {\r
         Value->Type = EFI_IFR_TYPE_UNDEFINED;\r
         break;\r
       }\r
 \r
           !IsTypeInBuffer(&Data2)) {\r
         Value->Type = EFI_IFR_TYPE_UNDEFINED;\r
         break;\r
       }\r
 \r

-      if (Data1.Type > EFI_IFR_TYPE_BOOLEAN && \r
-          Data1.Type != EFI_IFR_TYPE_STRING && \r
+      if (Data1.Type > EFI_IFR_TYPE_BOOLEAN &&\r
+          Data1.Type != EFI_IFR_TYPE_STRING &&\r

           !IsTypeInBuffer(&Data1)) {\r
         Value->Type = EFI_IFR_TYPE_UNDEFINED;\r
         break;\r
           !IsTypeInBuffer(&Data1)) {\r
         Value->Type = EFI_IFR_TYPE_UNDEFINED;\r
         break;\r


@@ -3400,7 +3400,7 @@ EvaluateExpression (
       if (Data2.Type == EFI_IFR_TYPE_BUFFER) {\r
         FreePool (Data2.Buffer);\r
       }\r
       if (Data2.Type == EFI_IFR_TYPE_BUFFER) {\r
         FreePool (Data2.Buffer);\r
       }\r

-      \r
+\r

       if (Status == EFI_UNSUPPORTED) {\r
         Value->Type = EFI_IFR_TYPE_UNDEFINED;\r
         Status = EFI_SUCCESS;\r
       if (Status == EFI_UNSUPPORTED) {\r
         Value->Type = EFI_IFR_TYPE_UNDEFINED;\r
         Status = EFI_SUCCESS;\r


@@ -3446,7 +3446,7 @@ EvaluateExpression (
       if (EFI_ERROR (Status)) {\r
         goto Done;\r
       }\r
       if (EFI_ERROR (Status)) {\r
         goto Done;\r
       }\r

-     \r
+\r

       Status = IfrMatch (FormSet, Value);\r
       break;\r
 \r
       Status = IfrMatch (FormSet, Value);\r
       break;\r
 \r


@@ -3624,7 +3624,7 @@ Done:
 \r
 /**\r
   Check whether the result is TRUE or FALSE.\r
 \r
 /**\r
   Check whether the result is TRUE or FALSE.\r

-  \r
+\r

   For the EFI_HII_VALUE value type is numeric, return TRUE if the\r
   value is not 0.\r
 \r
   For the EFI_HII_VALUE value type is numeric, return TRUE if the\r
   value is not 0.\r
 \r


@@ -3661,20 +3661,20 @@ IsTrue (
 }\r
 \r
 /**\r
 }\r
 \r
 /**\r

-  Return the result of the expression list. Check the expression list and \r
-  return the highest priority express result.  \r
+  Return the result of the expression list. Check the expression list and\r
+  return the highest priority express result.\r

   Priority: DisableIf > SuppressIf > GrayOutIf > FALSE\r
 \r
   @param  ExpList             The input expression list.\r
   @param  Evaluate            Whether need to evaluate the expression first.\r
   @param  FormSet             FormSet associated with this expression.\r
   Priority: DisableIf > SuppressIf > GrayOutIf > FALSE\r
 \r
   @param  ExpList             The input expression list.\r
   @param  Evaluate            Whether need to evaluate the expression first.\r
   @param  FormSet             FormSet associated with this expression.\r

-  @param  Form                Form associated with this expression.  \r
+  @param  Form                Form associated with this expression.\r

 \r
 \r

-  @retval EXPRESS_RESULT      Return the higher priority express result. \r
+  @retval EXPRESS_RESULT      Return the higher priority express result.\r

                               DisableIf > SuppressIf > GrayOutIf > FALSE\r
 \r
 **/\r
                               DisableIf > SuppressIf > GrayOutIf > FALSE\r
 \r
 **/\r

-EXPRESS_RESULT \r
+EXPRESS_RESULT\r

 EvaluateExpressionList (\r
   IN FORM_EXPRESSION_LIST *ExpList,\r
   IN BOOLEAN              Evaluate,\r
 EvaluateExpressionList (\r
   IN FORM_EXPRESSION_LIST *ExpList,\r
   IN BOOLEAN              Evaluate,\r


@@ -3697,7 +3697,7 @@ EvaluateExpressionList (
   //\r
   // Check whether need to evaluate the expression first.\r
   //\r
   //\r
   // Check whether need to evaluate the expression first.\r
   //\r

-  if (Evaluate) {  \r
+  if (Evaluate) {\r

     while (ExpList->Count > Index) {\r
       Status = EvaluateExpression (FormSet, Form, ExpList->Expression[Index++]);\r
       if (EFI_ERROR (Status)) {\r
     while (ExpList->Count > Index) {\r
       Status = EvaluateExpression (FormSet, Form, ExpList->Expression[Index++]);\r
       if (EFI_ERROR (Status)) {\r


@@ -3726,12 +3726,12 @@ EvaluateExpressionList (
           break;\r
 \r
         default:\r
           break;\r
 \r
         default:\r

-          return ExpressFalse; \r
+          return ExpressFalse;\r

       }\r
 \r
       ReturnVal = ReturnVal < CompareOne ? CompareOne : ReturnVal;\r
     }\r
   }\r
       }\r
 \r
       ReturnVal = ReturnVal < CompareOne ? CompareOne : ReturnVal;\r
     }\r
   }\r

-  \r
+\r

   return ReturnVal;\r
 }\r
   return ReturnVal;\r
 }\r

diff --git a/MdeModulePkg/Universal/SetupBrowserDxe/Expression.h b/MdeModulePkg/Universal/SetupBrowserDxe/Expression.h
index 5660a997b8f8936f660e36d95c7e6c0cbcead57f..6968a5b7c649434c7cf373a48ecd6fd0c5217ab2 100644 (file)
--- a/MdeModulePkg/Universal/SetupBrowserDxe/Expression.h
+++ b/MdeModulePkg/Universal/SetupBrowserDxe/Expression.h
@@ -1,7 +1,7 @@
 /** @file\r
 Private structure, MACRO and function definitions for User Interface related functionalities.\r
 \r
 /** @file\r
 Private structure, MACRO and function definitions for User Interface related functionalities.\r
 \r

-Copyright (c) 2004 - 2013, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2004 - 2018, Intel Corporation. All rights reserved.<BR>\r

 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r


@@ -17,15 +17,15 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 \r
 /**\r
   Get the expression list count.\r
 \r
 /**\r
   Get the expression list count.\r

-  \r
-  @param  Level                  Which type this expression belong to. Form, \r
+\r
+  @param  Level                  Which type this expression belong to. Form,\r

                                  statement or option?\r
 \r
   @retval >=0                    The expression count\r
   @retval -1                     Input parameter error.\r
 \r
 **/\r
                                  statement or option?\r
 \r
   @retval >=0                    The expression count\r
   @retval -1                     Input parameter error.\r
 \r
 **/\r

-INTN \r
+INTN\r

 GetConditionalExpressionCount (\r
   IN EXPRESS_LEVEL       Level\r
   );\r
 GetConditionalExpressionCount (\r
   IN EXPRESS_LEVEL       Level\r
   );\r


@@ -74,8 +74,8 @@ PushScope (
 \r
 /**\r
   Get the expression Buffer pointer.\r
 \r
 /**\r
   Get the expression Buffer pointer.\r

-  \r
-  @param  Level                  Which type this expression belong to. Form, \r
+\r
+  @param  Level                  Which type this expression belong to. Form,\r

                                  statement or option?\r
 \r
   @retval  The start pointer of the expression buffer or NULL.\r
                                  statement or option?\r
 \r
   @retval  The start pointer of the expression buffer or NULL.\r


@@ -144,7 +144,7 @@ ExtendValueToU64 (
   Push the expression options onto the Stack.\r
 \r
   @param  Pointer                Pointer to the current expression.\r
   Push the expression options onto the Stack.\r
 \r
   @param  Pointer                Pointer to the current expression.\r

-  @param  Level                  Which type this expression belong to. Form, \r
+  @param  Level                  Which type this expression belong to. Form,\r

                                  statement or option?\r
 \r
   @retval EFI_SUCCESS            The value was pushed onto the stack.\r
                                  statement or option?\r
 \r
   @retval EFI_SUCCESS            The value was pushed onto the stack.\r


@@ -160,7 +160,7 @@ PushConditionalExpression (
 /**\r
   Pop the expression options from the Stack\r
 \r
 /**\r
   Pop the expression options from the Stack\r
 \r

-  @param  Level                  Which type this expression belong to. Form, \r
+  @param  Level                  Which type this expression belong to. Form,\r

                                  statement or option?\r
 \r
   @retval EFI_SUCCESS            The value was pushed onto the stack.\r
                                  statement or option?\r
 \r
   @retval EFI_SUCCESS            The value was pushed onto the stack.\r


@@ -225,20 +225,20 @@ EvaluateExpression (
   IN OUT FORM_EXPRESSION   *Expression\r
   );\r
 /**\r
   IN OUT FORM_EXPRESSION   *Expression\r
   );\r
 /**\r

-  Return the result of the expression list. Check the expression list and \r
-  return the highest priority express result.  \r
+  Return the result of the expression list. Check the expression list and\r
+  return the highest priority express result.\r

   Priority: DisableIf > SuppressIf > GrayOutIf > FALSE\r
 \r
   @param  ExpList             The input expression list.\r
   @param  Evaluate            Whether need to evaluate the expression first.\r
   @param  FormSet             FormSet associated with this expression.\r
   Priority: DisableIf > SuppressIf > GrayOutIf > FALSE\r
 \r
   @param  ExpList             The input expression list.\r
   @param  Evaluate            Whether need to evaluate the expression first.\r
   @param  FormSet             FormSet associated with this expression.\r

-  @param  Form                Form associated with this expression.  \r
+  @param  Form                Form associated with this expression.\r

 \r
 \r

-  @retval EXPRESS_RESULT      Return the higher priority express result. \r
+  @retval EXPRESS_RESULT      Return the higher priority express result.\r

                               DisableIf > SuppressIf > GrayOutIf > FALSE\r
 \r
 **/\r
                               DisableIf > SuppressIf > GrayOutIf > FALSE\r
 \r
 **/\r

-EXPRESS_RESULT \r
+EXPRESS_RESULT\r

 EvaluateExpressionList (\r
   IN FORM_EXPRESSION_LIST *ExpList,\r
   IN BOOLEAN              Evaluate,\r
 EvaluateExpressionList (\r
   IN FORM_EXPRESSION_LIST *ExpList,\r
   IN BOOLEAN              Evaluate,\r

diff --git a/MdeModulePkg/Universal/SetupBrowserDxe/IfrParse.c b/MdeModulePkg/Universal/SetupBrowserDxe/IfrParse.c
index 9bda482a4ac3301a5a867cf03d11b798302a9d85..3d28e7aa50b47f5a57d38db7cb3a72959d8f9a3b 100644 (file)
--- a/MdeModulePkg/Universal/SetupBrowserDxe/IfrParse.c
+++ b/MdeModulePkg/Universal/SetupBrowserDxe/IfrParse.c
@@ -1,7 +1,7 @@
 /** @file\r
 Parser for IFR binary encoding.\r
 \r
 /** @file\r
 Parser for IFR binary encoding.\r
 \r

-Copyright (c) 2007 - 2017, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2007 - 2018, Intel Corporation. All rights reserved.<BR>\r

 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r


@@ -37,7 +37,7 @@ CreateStatement (
 {\r
   FORM_BROWSER_STATEMENT    *Statement;\r
   EFI_IFR_STATEMENT_HEADER  *StatementHdr;\r
 {\r
   FORM_BROWSER_STATEMENT    *Statement;\r
   EFI_IFR_STATEMENT_HEADER  *StatementHdr;\r

-  INTN                      ConditionalExprCount; \r
+  INTN                      ConditionalExprCount;\r

 \r
   if (Form == NULL) {\r
     //\r
 \r
   if (Form == NULL) {\r
     //\r


@@ -70,8 +70,8 @@ CreateStatement (
     //\r
     // Form is inside of suppressif\r
     //\r
     //\r
     // Form is inside of suppressif\r
     //\r

-    \r
-    Statement->Expression = (FORM_EXPRESSION_LIST *) AllocatePool( \r
+\r
+    Statement->Expression = (FORM_EXPRESSION_LIST *) AllocatePool(\r

                                              (UINTN) (sizeof(FORM_EXPRESSION_LIST) + ((ConditionalExprCount -1) * sizeof(FORM_EXPRESSION *))));\r
     ASSERT (Statement->Expression != NULL);\r
     Statement->Expression->Count     = (UINTN) ConditionalExprCount;\r
                                              (UINTN) (sizeof(FORM_EXPRESSION_LIST) + ((ConditionalExprCount -1) * sizeof(FORM_EXPRESSION *))));\r
     ASSERT (Statement->Expression != NULL);\r
     Statement->Expression->Count     = (UINTN) ConditionalExprCount;\r


@@ -246,7 +246,7 @@ CreateQuestion (
       // Check whether old string node already exist.\r
       //\r
       Find = FALSE;\r
       // Check whether old string node already exist.\r
       //\r
       Find = FALSE;\r

-      if (!IsListEmpty(&Statement->Storage->NameValueListHead)) {  \r
+      if (!IsListEmpty(&Statement->Storage->NameValueListHead)) {\r

         Link = GetFirstNode (&Statement->Storage->NameValueListHead);\r
         while (!IsNull (&Statement->Storage->NameValueListHead, Link)) {\r
           NameValueNode = NAME_VALUE_NODE_FROM_LINK (Link);\r
         Link = GetFirstNode (&Statement->Storage->NameValueListHead);\r
         while (!IsNull (&Statement->Storage->NameValueListHead, Link)) {\r
           NameValueNode = NAME_VALUE_NODE_FROM_LINK (Link);\r


@@ -326,7 +326,7 @@ InitializeConfigHdr (
 {\r
   CHAR16      *Name;\r
 \r
 {\r
   CHAR16      *Name;\r
 \r

-  if (Storage->BrowserStorage->Type == EFI_HII_VARSTORE_BUFFER || \r
+  if (Storage->BrowserStorage->Type == EFI_HII_VARSTORE_BUFFER ||\r

       Storage->BrowserStorage->Type == EFI_HII_VARSTORE_EFI_VARIABLE_BUFFER) {\r
     Name = Storage->BrowserStorage->Name;\r
   } else {\r
       Storage->BrowserStorage->Type == EFI_HII_VARSTORE_EFI_VARIABLE_BUFFER) {\r
     Name = Storage->BrowserStorage->Name;\r
   } else {\r


@@ -621,7 +621,7 @@ GetFstStgFromVarId (
   @param  Storage              browser storage info.\r
 \r
   @return Pointer to a FORMSET_STORAGE data structure.\r
   @param  Storage              browser storage info.\r
 \r
   @return Pointer to a FORMSET_STORAGE data structure.\r

-  \r
+\r

 \r
 **/\r
 FORMSET_STORAGE *\r
 \r
 **/\r
 FORMSET_STORAGE *\r


@@ -707,7 +707,7 @@ InitializeRequestElement (
   //\r
   // Prepare <RequestElement>\r
   //\r
   //\r
   // Prepare <RequestElement>\r
   //\r

-  if (Storage->Type == EFI_HII_VARSTORE_BUFFER || \r
+  if (Storage->Type == EFI_HII_VARSTORE_BUFFER ||\r

       Storage->Type == EFI_HII_VARSTORE_EFI_VARIABLE_BUFFER) {\r
     StrLen = UnicodeSPrint (\r
                RequestElement,\r
       Storage->Type == EFI_HII_VARSTORE_EFI_VARIABLE_BUFFER) {\r
     StrLen = UnicodeSPrint (\r
                RequestElement,\r


@@ -1522,7 +1522,7 @@ ParseOpCodes (
         ExpressionOpCode->ValueType = ((EFI_IFR_GET *) OpCodeData)->VarStoreType;\r
         switch (ExpressionOpCode->ValueType) {\r
         case EFI_IFR_TYPE_BOOLEAN:\r
         ExpressionOpCode->ValueType = ((EFI_IFR_GET *) OpCodeData)->VarStoreType;\r
         switch (ExpressionOpCode->ValueType) {\r
         case EFI_IFR_TYPE_BOOLEAN:\r

-        case EFI_IFR_TYPE_NUM_SIZE_8: \r
+        case EFI_IFR_TYPE_NUM_SIZE_8:\r

           ExpressionOpCode->ValueWidth = 1;\r
           break;\r
 \r
           ExpressionOpCode->ValueWidth = 1;\r
           break;\r
 \r


@@ -1563,8 +1563,8 @@ ParseOpCodes (
         }\r
         CopyMem (&ExpressionOpCode->VarStoreInfo.VarName,   &((EFI_IFR_GET *) OpCodeData)->VarStoreInfo.VarName,   sizeof (EFI_STRING_ID));\r
         CopyMem (&ExpressionOpCode->VarStoreInfo.VarOffset, &((EFI_IFR_GET *) OpCodeData)->VarStoreInfo.VarOffset, sizeof (UINT16));\r
         }\r
         CopyMem (&ExpressionOpCode->VarStoreInfo.VarName,   &((EFI_IFR_GET *) OpCodeData)->VarStoreInfo.VarName,   sizeof (EFI_STRING_ID));\r
         CopyMem (&ExpressionOpCode->VarStoreInfo.VarOffset, &((EFI_IFR_GET *) OpCodeData)->VarStoreInfo.VarOffset, sizeof (UINT16));\r

-        if ((ExpressionOpCode->VarStorage != NULL) && \r
-            (ExpressionOpCode->VarStorage->Type == EFI_HII_VARSTORE_NAME_VALUE || \r
+        if ((ExpressionOpCode->VarStorage != NULL) &&\r
+            (ExpressionOpCode->VarStorage->Type == EFI_HII_VARSTORE_NAME_VALUE ||\r

              ExpressionOpCode->VarStorage->Type == EFI_HII_VARSTORE_EFI_VARIABLE)) {\r
           ExpressionOpCode->ValueName = GetToken (ExpressionOpCode->VarStoreInfo.VarName, FormSet->HiiHandle);\r
           if (ExpressionOpCode->ValueName == NULL) {\r
              ExpressionOpCode->VarStorage->Type == EFI_HII_VARSTORE_EFI_VARIABLE)) {\r
           ExpressionOpCode->ValueName = GetToken (ExpressionOpCode->VarStoreInfo.VarName, FormSet->HiiHandle);\r
           if (ExpressionOpCode->ValueName == NULL) {\r


@@ -1754,7 +1754,7 @@ ParseOpCodes (
         //\r
         // Form is inside of suppressif\r
         //\r
         //\r
         // Form is inside of suppressif\r
         //\r

-        CurrentForm->SuppressExpression = (FORM_EXPRESSION_LIST *) AllocatePool( \r
+        CurrentForm->SuppressExpression = (FORM_EXPRESSION_LIST *) AllocatePool(\r

                                                  (UINTN) (sizeof(FORM_EXPRESSION_LIST) + ((ConditionalExprCount -1) * sizeof(FORM_EXPRESSION *))));\r
         ASSERT (CurrentForm->SuppressExpression != NULL);\r
         CurrentForm->SuppressExpression->Count     = (UINTN) ConditionalExprCount;\r
                                                  (UINTN) (sizeof(FORM_EXPRESSION_LIST) + ((ConditionalExprCount -1) * sizeof(FORM_EXPRESSION *))));\r
         ASSERT (CurrentForm->SuppressExpression != NULL);\r
         CurrentForm->SuppressExpression->Count     = (UINTN) ConditionalExprCount;\r


@@ -1820,7 +1820,7 @@ ParseOpCodes (
         //\r
         // Form is inside of suppressif\r
         //\r
         //\r
         // Form is inside of suppressif\r
         //\r

-        CurrentForm->SuppressExpression = (FORM_EXPRESSION_LIST *) AllocatePool( \r
+        CurrentForm->SuppressExpression = (FORM_EXPRESSION_LIST *) AllocatePool(\r

                                                  (UINTN) (sizeof(FORM_EXPRESSION_LIST) + ((ConditionalExprCount -1) * sizeof(FORM_EXPRESSION *))));\r
         ASSERT (CurrentForm->SuppressExpression != NULL);\r
         CurrentForm->SuppressExpression->Count     = (UINTN) ConditionalExprCount;\r
                                                  (UINTN) (sizeof(FORM_EXPRESSION_LIST) + ((ConditionalExprCount -1) * sizeof(FORM_EXPRESSION *))));\r
         ASSERT (CurrentForm->SuppressExpression != NULL);\r
         CurrentForm->SuppressExpression->Count     = (UINTN) ConditionalExprCount;\r


@@ -1972,7 +1972,7 @@ ParseOpCodes (
           }\r
         }\r
       }\r
           }\r
         }\r
       }\r

-      CurrentStatement->StorageWidth = (UINT16) sizeof (EFI_HII_REF);        \r
+      CurrentStatement->StorageWidth = (UINT16) sizeof (EFI_HII_REF);\r

       InitializeRequestElement (FormSet, CurrentStatement, CurrentForm);\r
       break;\r
 \r
       InitializeRequestElement (FormSet, CurrentStatement, CurrentForm);\r
       break;\r
 \r


@@ -2282,7 +2282,7 @@ ParseOpCodes (
         //\r
         // Form is inside of suppressif\r
         //\r
         //\r
         // Form is inside of suppressif\r
         //\r

-        CurrentOption->SuppressExpression = (FORM_EXPRESSION_LIST *) AllocatePool( \r
+        CurrentOption->SuppressExpression = (FORM_EXPRESSION_LIST *) AllocatePool(\r

                                                  (UINTN) (sizeof(FORM_EXPRESSION_LIST) + ((ConditionalExprCount -1) * sizeof(FORM_EXPRESSION *))));\r
         ASSERT (CurrentOption->SuppressExpression != NULL);\r
         CurrentOption->SuppressExpression->Count     = (UINTN) ConditionalExprCount;\r
                                                  (UINTN) (sizeof(FORM_EXPRESSION_LIST) + ((ConditionalExprCount -1) * sizeof(FORM_EXPRESSION *))));\r
         ASSERT (CurrentOption->SuppressExpression != NULL);\r
         CurrentOption->SuppressExpression->Count     = (UINTN) ConditionalExprCount;\r


@@ -2396,11 +2396,11 @@ ParseOpCodes (
       }\r
 \r
       if (SuppressForOption) {\r
       }\r
 \r
       if (SuppressForOption) {\r

-        PushConditionalExpression(CurrentExpression, ExpressOption);       \r
+        PushConditionalExpression(CurrentExpression, ExpressOption);\r

       } else if (SuppressForQuestion) {\r
       } else if (SuppressForQuestion) {\r

-        PushConditionalExpression(CurrentExpression, ExpressStatement);  \r
+        PushConditionalExpression(CurrentExpression, ExpressStatement);\r

       } else {\r
       } else {\r

-        PushConditionalExpression(CurrentExpression, ExpressForm);  \r
+        PushConditionalExpression(CurrentExpression, ExpressForm);\r

       }\r
 \r
       //\r
       }\r
 \r
       //\r


@@ -2655,7 +2655,7 @@ ParseOpCodes (
       default:\r
         ASSERT (ParentStatement != NULL);\r
         ParentStatement->Locked = TRUE;\r
       default:\r
         ASSERT (ParentStatement != NULL);\r
         ParentStatement->Locked = TRUE;\r

-      }      \r
+      }\r

       break;\r
 \r
     //\r
       break;\r
 \r
     //\r


@@ -2679,7 +2679,7 @@ ParseOpCodes (
         ResetScopeStack ();\r
         return Status;\r
       }\r
         ResetScopeStack ();\r
         return Status;\r
       }\r

-      \r
+\r

       //\r
       // Parent statement end tag found, update ParentStatement info.\r
       //\r
       //\r
       // Parent statement end tag found, update ParentStatement info.\r
       //\r


@@ -2722,7 +2722,7 @@ ParseOpCodes (
 \r
       case EFI_IFR_SUPPRESS_IF_OP:\r
         if (SuppressForOption) {\r
 \r
       case EFI_IFR_SUPPRESS_IF_OP:\r
         if (SuppressForOption) {\r

-          PopConditionalExpression(ExpressOption);      \r
+          PopConditionalExpression(ExpressOption);\r

         } else if (SuppressForQuestion) {\r
           PopConditionalExpression(ExpressStatement);\r
         } else {\r
         } else if (SuppressForQuestion) {\r
           PopConditionalExpression(ExpressStatement);\r
         } else {\r

diff --git a/MdeModulePkg/Universal/SetupBrowserDxe/Presentation.c b/MdeModulePkg/Universal/SetupBrowserDxe/Presentation.c
index 97713ebb603910dc20e612f97dc324be5e9fb854..ded1c7ad1159011d893e51eeeb61e9902e36ded2 100644 (file)
--- a/MdeModulePkg/Universal/SetupBrowserDxe/Presentation.c
+++ b/MdeModulePkg/Universal/SetupBrowserDxe/Presentation.c
@@ -1,7 +1,7 @@
 /** @file\r
 Utility functions for UI presentation.\r
 \r
 /** @file\r
 Utility functions for UI presentation.\r
 \r

-Copyright (c) 2004 - 2017, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2004 - 2018, Intel Corporation. All rights reserved.<BR>\r

 (C) Copyright 2015 Hewlett Packard Enterprise Development LP<BR>\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 (C) Copyright 2015 Hewlett Packard Enterprise Development LP<BR>\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r


@@ -74,7 +74,7 @@ EvaluateFormExpressions (
   Base on the opcode buffer info to get the display statement.\r
 \r
   @param OpCode    The input opcode buffer for this statement.\r
   Base on the opcode buffer info to get the display statement.\r
 \r
   @param OpCode    The input opcode buffer for this statement.\r

-  \r
+\r

   @retval Statement  The statement use this opcode buffer.\r
 \r
 **/\r
   @retval Statement  The statement use this opcode buffer.\r
 \r
 **/\r


@@ -103,7 +103,7 @@ GetDisplayStatement (
   Free the refresh event list.\r
 \r
 **/\r
   Free the refresh event list.\r
 \r
 **/\r

-VOID \r
+VOID\r

 FreeRefreshEvent (\r
   VOID\r
   )\r
 FreeRefreshEvent (\r
   VOID\r
   )\r


@@ -123,7 +123,7 @@ FreeRefreshEvent (
 }\r
 \r
 /**\r
 }\r
 \r
 /**\r

-  Check whether this statement value is changed. If yes, update the statement value and return TRUE; \r
+  Check whether this statement value is changed. If yes, update the statement value and return TRUE;\r

   else return FALSE.\r
 \r
   @param Statement           The statement need to check.\r
   else return FALSE.\r
 \r
   @param Statement           The statement need to check.\r


@@ -145,7 +145,7 @@ UpdateStatement (
   // Question value may be changed, need invoke its Callback()\r
   //\r
   ProcessCallBackFunction (gCurrentSelection, gCurrentSelection->FormSet, gCurrentSelection->Form, Statement, EFI_BROWSER_ACTION_RETRIEVE, FALSE);\r
   // Question value may be changed, need invoke its Callback()\r
   //\r
   ProcessCallBackFunction (gCurrentSelection, gCurrentSelection->FormSet, gCurrentSelection->Form, Statement, EFI_BROWSER_ACTION_RETRIEVE, FALSE);\r

-  \r
+\r

   if (mHiiPackageListUpdated) {\r
     //\r
     // Package list is updated, force to reparse IFR binary of target Formset\r
   if (mHiiPackageListUpdated) {\r
     //\r
     // Package list is updated, force to reparse IFR binary of target Formset\r


@@ -157,8 +157,8 @@ UpdateStatement (
 \r
 /**\r
   Refresh the question which has refresh guid event attribute.\r
 \r
 /**\r
   Refresh the question which has refresh guid event attribute.\r

-  \r
-  @param Event    The event which has this function related.     \r
+\r
+  @param Event    The event which has this function related.\r

   @param Context  The input context info related to this event or the status code return to the caller.\r
 **/\r
 VOID\r
   @param Context  The input context info related to this event or the status code return to the caller.\r
 **/\r
 VOID\r


@@ -177,7 +177,7 @@ RefreshEventNotifyForStatement(
 \r
 /**\r
   Refresh the questions within this form.\r
 \r
 /**\r
   Refresh the questions within this form.\r

-  \r
+\r

   @param Event    The event which has this function related.\r
   @param Context  The input context info related to this event or the status code return to the caller.\r
 **/\r
   @param Event    The event which has this function related.\r
   @param Context  The input context info related to this event or the status code return to the caller.\r
 **/\r


@@ -450,11 +450,11 @@ UpdateHotkeyList (
 \r
   @param    QuestionId    The question id for this request question.\r
 \r
 \r
   @param    QuestionId    The question id for this request question.\r
 \r

-  @retval   The attribute for this question or NULL if not found this \r
+  @retval   The attribute for this question or NULL if not found this\r

             question in the list.\r
 \r
 **/\r
             question in the list.\r
 \r
 **/\r

-UINT32 \r
+UINT32\r

 ProcessQuestionExtraAttr (\r
   IN   EFI_QUESTION_ID  QuestionId\r
   )\r
 ProcessQuestionExtraAttr (\r
   IN   EFI_QUESTION_ID  QuestionId\r
   )\r


@@ -588,7 +588,7 @@ AddStatementToDisplayForm (
     //\r
     // Get the minimal refresh interval value for later use.\r
     //\r
     //\r
     // Get the minimal refresh interval value for later use.\r
     //\r

-    if ((Statement->RefreshInterval != 0) && \r
+    if ((Statement->RefreshInterval != 0) &&\r

       (MinRefreshInterval == 0 || Statement->RefreshInterval < MinRefreshInterval)) {\r
       MinRefreshInterval = Statement->RefreshInterval;\r
     }\r
       (MinRefreshInterval == 0 || Statement->RefreshInterval < MinRefreshInterval)) {\r
       MinRefreshInterval = Statement->RefreshInterval;\r
     }\r


@@ -649,7 +649,7 @@ UpdateDataChangedFlag (
 \r
   //\r
   // Base on the system level to check whether need to show the NV flag.\r
 \r
   //\r
   // Base on the system level to check whether need to show the NV flag.\r

-  // \r
+  //\r

   switch (gBrowserSettingScope) {\r
   case SystemLevel:\r
     //\r
   switch (gBrowserSettingScope) {\r
   case SystemLevel:\r
     //\r


@@ -700,13 +700,13 @@ InitializeDisplayFormData (
   InitializeListHead (&gDisplayFormData.HotKeyListHead);\r
 \r
   Status = gBS->CreateEvent (\r
   InitializeListHead (&gDisplayFormData.HotKeyListHead);\r
 \r
   Status = gBS->CreateEvent (\r

-        EVT_NOTIFY_WAIT, \r
+        EVT_NOTIFY_WAIT,\r

         TPL_CALLBACK,\r
         EfiEventEmptyFunction,\r
         NULL,\r
         &mValueChangedEvent\r
         );\r
         TPL_CALLBACK,\r
         EfiEventEmptyFunction,\r
         NULL,\r
         &mValueChangedEvent\r
         );\r

-  ASSERT_EFI_ERROR (Status); \r
+  ASSERT_EFI_ERROR (Status);\r

 }\r
 \r
 /**\r
 }\r
 \r
 /**\r


@@ -863,7 +863,7 @@ GetBrowserStatement (
   @param  Form                   Form data structure.\r
 \r
 **/\r
   @param  Form                   Form data structure.\r
 \r
 **/\r

-VOID \r
+VOID\r

 UpdateStatementStatusForForm (\r
   IN FORM_BROWSER_FORMSET             *FormSet,\r
   IN FORM_BROWSER_FORM                *Form\r
 UpdateStatementStatusForForm (\r
   IN FORM_BROWSER_FORMSET             *FormSet,\r
   IN FORM_BROWSER_FORM                *Form\r


@@ -894,7 +894,7 @@ UpdateStatementStatusForForm (
   @param  FormSet                FormSet data structure.\r
 \r
 **/\r
   @param  FormSet                FormSet data structure.\r
 \r
 **/\r

-VOID \r
+VOID\r

 UpdateStatementStatusForFormSet (\r
   IN FORM_BROWSER_FORMSET                *FormSet\r
   )\r
 UpdateStatementStatusForFormSet (\r
   IN FORM_BROWSER_FORMSET                *FormSet\r
   )\r


@@ -919,10 +919,10 @@ UpdateStatementStatusForFormSet (
   @param  SettingScope           Setting Scope for Default action.\r
 \r
 **/\r
   @param  SettingScope           Setting Scope for Default action.\r
 \r
 **/\r

-VOID \r
+VOID\r

 UpdateStatementStatus (\r
   IN FORM_BROWSER_FORMSET             *FormSet,\r
 UpdateStatementStatus (\r
   IN FORM_BROWSER_FORMSET             *FormSet,\r

-  IN FORM_BROWSER_FORM                *Form, \r
+  IN FORM_BROWSER_FORM                *Form,\r

   IN BROWSER_SETTING_SCOPE            SettingScope\r
   )\r
 {\r
   IN BROWSER_SETTING_SCOPE            SettingScope\r
   )\r
 {\r


@@ -966,7 +966,7 @@ UpdateStatementStatus (
   @retval EFI_SUCESSS            This function always return successfully for now.\r
 \r
 **/\r
   @retval EFI_SUCESSS            This function always return successfully for now.\r
 \r
 **/\r

-EFI_STATUS \r
+EFI_STATUS\r

 ProcessAction (\r
   IN UINT32        Action,\r
   IN UINT16        DefaultId\r
 ProcessAction (\r
   IN UINT32        Action,\r
   IN UINT16        DefaultId\r


@@ -1051,7 +1051,7 @@ GetFormsetGuidFromHiiHandle (
   BufferSize     = 0;\r
   HiiPackageList = NULL;\r
   FindGuid       = FALSE;\r
   BufferSize     = 0;\r
   HiiPackageList = NULL;\r
   FindGuid       = FALSE;\r

-  \r
+\r

   Status = mHiiDatabase->ExportPackageLists (mHiiDatabase, HiiHandle, &BufferSize, HiiPackageList);\r
   if (Status == EFI_BUFFER_TOO_SMALL) {\r
     HiiPackageList = AllocatePool (BufferSize);\r
   Status = mHiiDatabase->ExportPackageLists (mHiiDatabase, HiiHandle, &BufferSize, HiiPackageList);\r
   if (Status == EFI_BUFFER_TOO_SMALL) {\r
     HiiPackageList = AllocatePool (BufferSize);\r


@@ -1068,7 +1068,7 @@ GetFormsetGuidFromHiiHandle (
   //\r
   Offset = sizeof (EFI_HII_PACKAGE_LIST_HEADER);\r
   Offset2 = 0;\r
   //\r
   Offset = sizeof (EFI_HII_PACKAGE_LIST_HEADER);\r
   Offset2 = 0;\r

-  CopyMem (&PackageListLength, &HiiPackageList->PackageLength, sizeof (UINT32)); \r
+  CopyMem (&PackageListLength, &HiiPackageList->PackageLength, sizeof (UINT32));\r

 \r
   while (Offset < PackageListLength) {\r
     Package = ((UINT8 *) HiiPackageList) + Offset;\r
 \r
   while (Offset < PackageListLength) {\r
     Package = ((UINT8 *) HiiPackageList) + Offset;\r


@@ -1257,7 +1257,7 @@ ProcessChangedData (
     case BROWSER_ACTION_DISCARD:\r
       DiscardForm (Selection->FormSet, Selection->Form, Scope);\r
       break;\r
     case BROWSER_ACTION_DISCARD:\r
       DiscardForm (Selection->FormSet, Selection->Form, Scope);\r
       break;\r

-  \r
+\r

     case BROWSER_ACTION_SUBMIT:\r
       Status = SubmitForm (Selection->FormSet, Selection->Form, Scope);\r
       if (EFI_ERROR (Status)) {\r
     case BROWSER_ACTION_SUBMIT:\r
       Status = SubmitForm (Selection->FormSet, Selection->Form, Scope);\r
       if (EFI_ERROR (Status)) {\r


@@ -1331,7 +1331,7 @@ ProcessGotoOpCode (
   FORM_BROWSER_FORM               *RefForm;\r
   EFI_STATUS                      Status;\r
   EFI_HII_HANDLE                  HiiHandle;\r
   FORM_BROWSER_FORM               *RefForm;\r
   EFI_STATUS                      Status;\r
   EFI_HII_HANDLE                  HiiHandle;\r

-  \r
+\r

   Status    = EFI_SUCCESS;\r
   StringPtr = NULL;\r
   HiiHandle = NULL;\r
   Status    = EFI_SUCCESS;\r
   StringPtr = NULL;\r
   HiiHandle = NULL;\r


@@ -1440,7 +1440,7 @@ ProcessGotoOpCode (
     if ((RefForm != NULL) && (RefForm->SuppressExpression != NULL)) {\r
       if (EvaluateExpressionList(RefForm->SuppressExpression, TRUE, Selection->FormSet, RefForm) != ExpressFalse) {\r
         //\r
     if ((RefForm != NULL) && (RefForm->SuppressExpression != NULL)) {\r
       if (EvaluateExpressionList(RefForm->SuppressExpression, TRUE, Selection->FormSet, RefForm) != ExpressFalse) {\r
         //\r

-        // Form is suppressed. \r
+        // Form is suppressed.\r

         //\r
         PopupErrorMessage(BROWSER_FORM_SUPPRESS, NULL, NULL, NULL);\r
         return EFI_SUCCESS;\r
         //\r
         PopupErrorMessage(BROWSER_FORM_SUPPRESS, NULL, NULL, NULL);\r
         return EFI_SUCCESS;\r


@@ -1565,14 +1565,14 @@ ProcessUserInput (
     case EFI_IFR_REF_OP:\r
       Status = ProcessGotoOpCode(Statement, gCurrentSelection);\r
       break;\r
     case EFI_IFR_REF_OP:\r
       Status = ProcessGotoOpCode(Statement, gCurrentSelection);\r
       break;\r

-    \r
+\r

     case EFI_IFR_ACTION_OP:\r
       //\r
       // Process the Config string <ConfigResp>\r
       //\r
       Status = ProcessQuestionConfig (gCurrentSelection, Statement);\r
       break;\r
     case EFI_IFR_ACTION_OP:\r
       //\r
       // Process the Config string <ConfigResp>\r
       //\r
       Status = ProcessQuestionConfig (gCurrentSelection, Statement);\r
       break;\r

-    \r
+\r

     case EFI_IFR_RESET_BUTTON_OP:\r
       //\r
       // Reset Question to default value specified by DefaultId\r
     case EFI_IFR_RESET_BUTTON_OP:\r
       //\r
       // Reset Question to default value specified by DefaultId\r


@@ -1812,9 +1812,9 @@ IsNvUpdateRequiredForForm (
                          about the Selection, form and formset to be displayed.\r
                          On output, Selection return the screen item that is selected\r
                          by user.\r
                          about the Selection, form and formset to be displayed.\r
                          On output, Selection return the screen item that is selected\r
                          by user.\r

-  @param SettingLevel    Input Settting level, if it is FormLevel, just exit current form. \r
+  @param SettingLevel    Input Settting level, if it is FormLevel, just exit current form.\r

                          else, we need to exit current formset.\r
                          else, we need to exit current formset.\r

-  \r
+\r

   @retval TRUE           Exit current form.\r
   @retval FALSE          User press ESC and keep in current form.\r
 **/\r
   @retval TRUE           Exit current form.\r
   @retval FALSE          User press ESC and keep in current form.\r
 **/\r


@@ -1827,7 +1827,7 @@ FindNextMenu (
   FORM_ENTRY_INFO            *CurrentMenu;\r
   FORM_ENTRY_INFO            *ParentMenu;\r
   BROWSER_SETTING_SCOPE      Scope;\r
   FORM_ENTRY_INFO            *CurrentMenu;\r
   FORM_ENTRY_INFO            *ParentMenu;\r
   BROWSER_SETTING_SCOPE      Scope;\r

-  \r
+\r

   CurrentMenu = Selection->CurrentMenu;\r
   Scope       = FormSetLevel;\r
 \r
   CurrentMenu = Selection->CurrentMenu;\r
   Scope       = FormSetLevel;\r
 \r


@@ -1893,7 +1893,7 @@ FindNextMenu (
 \r
   @retval   TRUE     do the reconnect behavior success.\r
   @retval   FALSE    do the reconnect behavior failed.\r
 \r
   @retval   TRUE     do the reconnect behavior success.\r
   @retval   FALSE    do the reconnect behavior failed.\r

-  \r
+\r

 **/\r
 BOOLEAN\r
 ReconnectController (\r
 **/\r
 BOOLEAN\r
 ReconnectController (\r


@@ -1926,7 +1926,7 @@ ReconnectController (
   @retval EFI_SUCCESS          The call back function executes successfully.\r
   @return Other value if the call back function failed to execute.\r
 **/\r
   @retval EFI_SUCCESS          The call back function executes successfully.\r
   @return Other value if the call back function failed to execute.\r
 **/\r

-EFI_STATUS \r
+EFI_STATUS\r

 ProcessCallBackFunction (\r
   IN OUT UI_MENU_SELECTION               *Selection,\r
   IN     FORM_BROWSER_FORMSET            *FormSet,\r
 ProcessCallBackFunction (\r
   IN OUT UI_MENU_SELECTION               *Selection,\r
   IN     FORM_BROWSER_FORMSET            *FormSet,\r


@@ -1976,7 +1976,7 @@ ProcessCallBackFunction (
     if ((Question != NULL) && (Statement != Question)) {\r
       continue;\r
     }\r
     if ((Question != NULL) && (Statement != Question)) {\r
       continue;\r
     }\r

-    \r
+\r

     if ((Statement->QuestionFlags & EFI_IFR_FLAG_CALLBACK) != EFI_IFR_FLAG_CALLBACK) {\r
       continue;\r
     }\r
     if ((Statement->QuestionFlags & EFI_IFR_FLAG_CALLBACK) != EFI_IFR_FLAG_CALLBACK) {\r
       continue;\r
     }\r


@@ -2104,7 +2104,7 @@ ProcessCallBackFunction (
           //\r
           IsQuestionValueChanged(gCurrentSelection->FormSet, gCurrentSelection->Form, Statement, GetSetValueWithEditBuffer);\r
           //\r
           //\r
           IsQuestionValueChanged(gCurrentSelection->FormSet, gCurrentSelection->Form, Statement, GetSetValueWithEditBuffer);\r
           //\r

-          // According the spec, return value from call back of "changing" and \r
+          // According the spec, return value from call back of "changing" and\r

           // "retrieve" should update to the question's temp buffer.\r
           //\r
           SetQuestionValue(FormSet, Form, Statement, GetSetValueWithEditBuffer);\r
           // "retrieve" should update to the question's temp buffer.\r
           //\r
           SetQuestionValue(FormSet, Form, Statement, GetSetValueWithEditBuffer);\r


@@ -2113,7 +2113,7 @@ ProcessCallBackFunction (
 \r
       case EFI_BROWSER_ACTION_RETRIEVE:\r
         //\r
 \r
       case EFI_BROWSER_ACTION_RETRIEVE:\r
         //\r

-        // According the spec, return value from call back of "changing" and \r
+        // According the spec, return value from call back of "changing" and\r

         // "retrieve" should update to the question's temp buffer.\r
         //\r
         SetQuestionValue(FormSet, Form, Statement, GetSetValueWithEditBuffer);\r
         // "retrieve" should update to the question's temp buffer.\r
         //\r
         SetQuestionValue(FormSet, Form, Statement, GetSetValueWithEditBuffer);\r


@@ -2124,9 +2124,9 @@ ProcessCallBackFunction (
       }\r
     } else {\r
       //\r
       }\r
     } else {\r
       //\r

-      // If the callback returns EFI_UNSUPPORTED for EFI_BROWSER_ACTION_CHANGING, \r
-      // then the browser will use the value passed to Callback() and ignore the \r
-      // value returned by Callback(). \r
+      // If the callback returns EFI_UNSUPPORTED for EFI_BROWSER_ACTION_CHANGING,\r
+      // then the browser will use the value passed to Callback() and ignore the\r
+      // value returned by Callback().\r

       //\r
       if (Action  == EFI_BROWSER_ACTION_CHANGING && Status == EFI_UNSUPPORTED) {\r
         if (HiiValue->Type == EFI_IFR_TYPE_BUFFER) {\r
       //\r
       if (Action  == EFI_BROWSER_ACTION_CHANGING && Status == EFI_UNSUPPORTED) {\r
         if (HiiValue->Type == EFI_IFR_TYPE_BUFFER) {\r


@@ -2134,7 +2134,7 @@ ProcessCallBackFunction (
         } else {\r
           CopyMem (&HiiValue->Value, &BackUpValue, sizeof (EFI_IFR_TYPE_VALUE));\r
         }\r
         } else {\r
           CopyMem (&HiiValue->Value, &BackUpValue, sizeof (EFI_IFR_TYPE_VALUE));\r
         }\r

-        \r
+\r

         //\r
         // Do the question validation.\r
         //\r
         //\r
         // Do the question validation.\r
         //\r


@@ -2150,7 +2150,7 @@ ProcessCallBackFunction (
       }\r
 \r
       //\r
       }\r
 \r
       //\r

-      // According the spec, return fail from call back of "changing" and \r
+      // According the spec, return fail from call back of "changing" and\r

       // "retrieve", should restore the question's value.\r
       //\r
       if (Action == EFI_BROWSER_ACTION_CHANGING && Status != EFI_UNSUPPORTED) {\r
       // "retrieve", should restore the question's value.\r
       //\r
       if (Action == EFI_BROWSER_ACTION_CHANGING && Status != EFI_UNSUPPORTED) {\r


@@ -2226,8 +2226,8 @@ ProcessCallBackFunction (
 \r
 /**\r
   Call the retrieve type call back function for one question to get the initialize data.\r
 \r
 /**\r
   Call the retrieve type call back function for one question to get the initialize data.\r

-  \r
-  This function only used when in the initialize stage, because in this stage, the \r
+\r
+  This function only used when in the initialize stage, because in this stage, the\r

   Selection->Form is not ready. For other case, use the ProcessCallBackFunction instead.\r
 \r
   @param ConfigAccess          The config access protocol produced by the hii driver.\r
   Selection->Form is not ready. For other case, use the ProcessCallBackFunction instead.\r
 \r
   @param ConfigAccess          The config access protocol produced by the hii driver.\r


@@ -2237,7 +2237,7 @@ ProcessCallBackFunction (
   @retval EFI_SUCCESS          The call back function executes successfully.\r
   @return Other value if the call back function failed to execute.\r
 **/\r
   @retval EFI_SUCCESS          The call back function executes successfully.\r
   @return Other value if the call back function failed to execute.\r
 **/\r

-EFI_STATUS \r
+EFI_STATUS\r

 ProcessRetrieveForQuestion (\r
   IN     EFI_HII_CONFIG_ACCESS_PROTOCOL  *ConfigAccess,\r
   IN     FORM_BROWSER_STATEMENT          *Statement,\r
 ProcessRetrieveForQuestion (\r
   IN     EFI_HII_CONFIG_ACCESS_PROTOCOL  *ConfigAccess,\r
   IN     FORM_BROWSER_STATEMENT          *Statement,\r


@@ -2265,7 +2265,7 @@ ProcessRetrieveForQuestion (
     //\r
     TypeValue = (EFI_IFR_TYPE_VALUE *) Statement->BufferValue;\r
   }\r
     //\r
     TypeValue = (EFI_IFR_TYPE_VALUE *) Statement->BufferValue;\r
   }\r

-    \r
+\r

   ActionRequest = EFI_BROWSER_ACTION_REQUEST_NONE;\r
   Status = ConfigAccess->Callback (\r
                            ConfigAccess,\r
   ActionRequest = EFI_BROWSER_ACTION_REQUEST_NONE;\r
   Status = ConfigAccess->Callback (\r
                            ConfigAccess,\r


@@ -2357,7 +2357,7 @@ SetupBrowser (
 \r
     //\r
     // IFR is updated, force to reparse the IFR binary\r
 \r
     //\r
     // IFR is updated, force to reparse the IFR binary\r

-    // This check is shared by EFI_BROWSER_ACTION_FORM_CLOSE and \r
+    // This check is shared by EFI_BROWSER_ACTION_FORM_CLOSE and\r

     // EFI_BROWSER_ACTION_RETRIEVE, so code place here.\r
     //\r
     if (mHiiPackageListUpdated) {\r
     // EFI_BROWSER_ACTION_RETRIEVE, so code place here.\r
     //\r
     if (mHiiPackageListUpdated) {\r


@@ -2395,7 +2395,7 @@ SetupBrowser (
     if (Selection->Form->SuppressExpression != NULL) {\r
       if (EvaluateExpressionList(Selection->Form->SuppressExpression, TRUE, Selection->FormSet, Selection->Form) == ExpressSuppress) {\r
         //\r
     if (Selection->Form->SuppressExpression != NULL) {\r
       if (EvaluateExpressionList(Selection->Form->SuppressExpression, TRUE, Selection->FormSet, Selection->Form) == ExpressSuppress) {\r
         //\r

-        // Form is suppressed. \r
+        // Form is suppressed.\r

         //\r
         PopupErrorMessage(BROWSER_FORM_SUPPRESS, NULL, NULL, NULL);\r
         Status = EFI_NOT_FOUND;\r
         //\r
         PopupErrorMessage(BROWSER_FORM_SUPPRESS, NULL, NULL, NULL);\r
         Status = EFI_NOT_FOUND;\r


@@ -2484,8 +2484,8 @@ SetupBrowser (
     //\r
     Statement = Selection->Statement;\r
     if (Statement != NULL) {\r
     //\r
     Statement = Selection->Statement;\r
     if (Statement != NULL) {\r

-      if ((ConfigAccess != NULL) && \r
-          ((Statement->QuestionFlags & EFI_IFR_FLAG_CALLBACK) == EFI_IFR_FLAG_CALLBACK) && \r
+      if ((ConfigAccess != NULL) &&\r
+          ((Statement->QuestionFlags & EFI_IFR_FLAG_CALLBACK) == EFI_IFR_FLAG_CALLBACK) &&\r

           (Statement->Operand != EFI_IFR_PASSWORD_OP)) {\r
         Status = ProcessCallBackFunction(Selection, Selection->FormSet, Selection->Form, Statement, EFI_BROWSER_ACTION_CHANGING, FALSE);\r
         if (Statement->Operand == EFI_IFR_REF_OP) {\r
           (Statement->Operand != EFI_IFR_PASSWORD_OP)) {\r
         Status = ProcessCallBackFunction(Selection, Selection->FormSet, Selection->Form, Statement, EFI_BROWSER_ACTION_CHANGING, FALSE);\r
         if (Statement->Operand == EFI_IFR_REF_OP) {\r


@@ -2495,7 +2495,7 @@ SetupBrowser (
           if (!EFI_ERROR (Status)) {\r
             Status = ProcessGotoOpCode(Statement, Selection);\r
           }\r
           if (!EFI_ERROR (Status)) {\r
             Status = ProcessGotoOpCode(Statement, Selection);\r
           }\r

-          \r
+\r

           //\r
           // Callback return error status or status return from process goto opcode.\r
           //\r
           //\r
           // Callback return error status or status return from process goto opcode.\r
           //\r


@@ -2512,8 +2512,8 @@ SetupBrowser (
         }\r
 \r
 \r
         }\r
 \r
 \r

-        if (!EFI_ERROR (Status) && \r
-            (Statement->Operand != EFI_IFR_REF_OP) && \r
+        if (!EFI_ERROR (Status) &&\r
+            (Statement->Operand != EFI_IFR_REF_OP) &&\r

             ((Statement->Storage == NULL) || (Statement->Storage != NULL && Statement->ValueChanged))) {\r
           //\r
           // Only question value has been changed, browser will trig CHANGED callback.\r
             ((Statement->Storage == NULL) || (Statement->Storage != NULL && Statement->ValueChanged))) {\r
           //\r
           // Only question value has been changed, browser will trig CHANGED callback.\r


@@ -2540,11 +2540,11 @@ SetupBrowser (
       }\r
 \r
       //\r
       }\r
 \r
       //\r

-      // If question has EFI_IFR_FLAG_RESET_REQUIRED/EFI_IFR_FLAG_RECONNECT_REQUIRED flag and without storage \r
+      // If question has EFI_IFR_FLAG_RESET_REQUIRED/EFI_IFR_FLAG_RECONNECT_REQUIRED flag and without storage\r

       // and process question success till here, trig the gResetFlag/gFlagReconnect.\r
       //\r
       // and process question success till here, trig the gResetFlag/gFlagReconnect.\r
       //\r

-      if ((Status == EFI_SUCCESS) && \r
-          (Statement->Storage == NULL)) { \r
+      if ((Status == EFI_SUCCESS) &&\r
+          (Statement->Storage == NULL)) {\r

         if ((Statement->QuestionFlags & EFI_IFR_FLAG_RESET_REQUIRED) != 0) {\r
           gResetRequiredFormLevel = TRUE;\r
           gResetRequiredSystemLevel = TRUE;\r
         if ((Statement->QuestionFlags & EFI_IFR_FLAG_RESET_REQUIRED) != 0) {\r
           gResetRequiredFormLevel = TRUE;\r
           gResetRequiredSystemLevel = TRUE;\r


@@ -2581,8 +2581,8 @@ SetupBrowser (
     // Before exit the form, invoke ConfigAccess.Callback() with EFI_BROWSER_ACTION_FORM_CLOSE\r
     // for each question with callback flag.\r
     //\r
     // Before exit the form, invoke ConfigAccess.Callback() with EFI_BROWSER_ACTION_FORM_CLOSE\r
     // for each question with callback flag.\r
     //\r

-    if ((ConfigAccess != NULL) && \r
-        ((Selection->Action == UI_ACTION_EXIT) || \r
+    if ((ConfigAccess != NULL) &&\r
+        ((Selection->Action == UI_ACTION_EXIT) ||\r

          (Selection->Handle != mCurrentHiiHandle) ||\r
          (!CompareGuid (&Selection->FormSetGuid, &mCurrentFormSetGuid)) ||\r
          (Selection->FormId != mCurrentFormId))) {\r
          (Selection->Handle != mCurrentHiiHandle) ||\r
          (!CompareGuid (&Selection->FormSetGuid, &mCurrentFormSetGuid)) ||\r
          (Selection->FormId != mCurrentFormId))) {\r

diff --git a/MdeModulePkg/Universal/SetupBrowserDxe/Setup.c b/MdeModulePkg/Universal/SetupBrowserDxe/Setup.c
index c2cfa5c5c829c582f0bbc804d30e8f0f838f89ed..922219a58e4ed9917f0eb1b433e4f0d924a64dda 100644 (file)
--- a/MdeModulePkg/Universal/SetupBrowserDxe/Setup.c
+++ b/MdeModulePkg/Universal/SetupBrowserDxe/Setup.c
@@ -1,7 +1,7 @@
 /** @file\r
 Entry and initialization module for the browser.\r
 \r
 /** @file\r
 Entry and initialization module for the browser.\r
 \r

-Copyright (c) 2007 - 2017, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2007 - 2018, Intel Corporation. All rights reserved.<BR>\r

 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r


@@ -152,7 +152,7 @@ GetFirstFormId (
 **/\r
 FORM_ENTRY_INFO *\r
 UiFindMenuList (\r
 **/\r
 FORM_ENTRY_INFO *\r
 UiFindMenuList (\r

-  IN EFI_HII_HANDLE       HiiHandle, \r
+  IN EFI_HII_HANDLE       HiiHandle,\r

   IN EFI_GUID             *FormSetGuid,\r
   IN UINT16               FormId\r
   )\r
   IN EFI_GUID             *FormSetGuid,\r
   IN UINT16               FormId\r
   )\r


@@ -168,7 +168,7 @@ UiFindMenuList (
   while (!IsNull (&mPrivateData.FormBrowserEx2.FormViewHistoryHead, Link)) {\r
     MenuList = FORM_ENTRY_INFO_FROM_LINK (Link);\r
     Link = GetNextNode (&mPrivateData.FormBrowserEx2.FormViewHistoryHead, Link);\r
   while (!IsNull (&mPrivateData.FormBrowserEx2.FormViewHistoryHead, Link)) {\r
     MenuList = FORM_ENTRY_INFO_FROM_LINK (Link);\r
     Link = GetNextNode (&mPrivateData.FormBrowserEx2.FormViewHistoryHead, Link);\r

-    \r
+\r

     //\r
     // If already find the menu, free the menus behind it.\r
     //\r
     //\r
     // If already find the menu, free the menus behind it.\r
     //\r


@@ -208,7 +208,7 @@ UiFindMenuList (
 \r
   @param  CurrentMenu    Current Menu\r
   @param  SettingLevel   Whether find parent menu in Form Level or Formset level.\r
 \r
   @param  CurrentMenu    Current Menu\r
   @param  SettingLevel   Whether find parent menu in Form Level or Formset level.\r

-                         In form level, just find the parent menu; \r
+                         In form level, just find the parent menu;\r

                          In formset level, find the parent menu which has different\r
                          formset guid value.\r
 \r
                          In formset level, find the parent menu which has different\r
                          formset guid value.\r
 \r


@@ -228,7 +228,7 @@ UiFindParentMenu (
   if (CurrentMenu == NULL) {\r
     return NULL;\r
   }\r
   if (CurrentMenu == NULL) {\r
     return NULL;\r
   }\r

-  \r
+\r

   ParentMenu = NULL;\r
   Link       = &CurrentMenu->Link;\r
 \r
   ParentMenu = NULL;\r
   Link       = &CurrentMenu->Link;\r
 \r


@@ -285,7 +285,7 @@ UiFreeMenuList (
 \r
 /**\r
   Copy current Menu list to the new menu list.\r
 \r
 /**\r
   Copy current Menu list to the new menu list.\r

-  \r
+\r

   @param  NewMenuListHead        New create Menu list.\r
   @param  CurrentMenuListHead    Current Menu list.\r
 \r
   @param  NewMenuListHead        New create Menu list.\r
   @param  CurrentMenuListHead    Current Menu list.\r
 \r


@@ -622,7 +622,7 @@ SendForm (
                                  distribution.\r
 \r
 **/\r
                                  distribution.\r
 \r
 **/\r

-EFI_STATUS \r
+EFI_STATUS\r

 ProcessStorage (\r
   IN OUT UINTN                         *ResultsDataSize,\r
   IN OUT EFI_STRING                    *ResultsData,\r
 ProcessStorage (\r
   IN OUT UINTN                         *ResultsDataSize,\r
   IN OUT EFI_STRING                    *ResultsData,\r


@@ -696,8 +696,8 @@ ProcessStorage (
 }\r
 \r
 /**\r
 }\r
 \r
 /**\r

-  This routine called this service in the browser to retrieve or set certain uncommitted \r
-  state information that resides in the open formsets. \r
+  This routine called this service in the browser to retrieve or set certain uncommitted\r
+  state information that resides in the open formsets.\r

 \r
   @param  This                   A pointer to the EFI_FORM_BROWSER2_PROTOCOL\r
                                  instance.\r
 \r
   @param  This                   A pointer to the EFI_FORM_BROWSER2_PROTOCOL\r
                                  instance.\r


@@ -801,7 +801,7 @@ BrowserCallback (
       //\r
       // Different formsets may have same varstore, so here just set the flag\r
       // not exit the circle.\r
       //\r
       // Different formsets may have same varstore, so here just set the flag\r
       // not exit the circle.\r

-      // \r
+      //\r

       Found = TRUE;\r
       break;\r
     }\r
       Found = TRUE;\r
       break;\r
     }\r


@@ -826,7 +826,7 @@ BrowserCallback (
     }\r
 \r
     FormsetStorage = FORMSET_STORAGE_FROM_LINK (Link);\r
     }\r
 \r
     FormsetStorage = FORMSET_STORAGE_FROM_LINK (Link);\r

-    \r
+\r

     Status = ProcessStorage (&TotalSize, &ResultsData, RetrieveData, FormsetStorage->BrowserStorage);\r
     if (EFI_ERROR (Status)) {\r
       return Status;\r
     Status = ProcessStorage (&TotalSize, &ResultsData, RetrieveData, FormsetStorage->BrowserStorage);\r
     if (EFI_ERROR (Status)) {\r
       return Status;\r


@@ -837,7 +837,7 @@ BrowserCallback (
     Status = TotalSize <= *ResultsDataSize ? EFI_SUCCESS : EFI_BUFFER_TOO_SMALL;\r
     *ResultsDataSize = TotalSize;\r
   }\r
     Status = TotalSize <= *ResultsDataSize ? EFI_SUCCESS : EFI_BUFFER_TOO_SMALL;\r
     *ResultsDataSize = TotalSize;\r
   }\r

-   \r
+\r

   return Status;\r
 \r
 }\r
   return Status;\r
 \r
 }\r


@@ -936,7 +936,7 @@ InitializeSetup (
                   &mPrivateData.FormBrowserEx2\r
                   );\r
   ASSERT_EFI_ERROR (Status);\r
                   &mPrivateData.FormBrowserEx2\r
                   );\r
   ASSERT_EFI_ERROR (Status);\r

-  \r
+\r

   Status = gBS->InstallProtocolInterface (\r
                   &mPrivateData.Handle,\r
                   &gEdkiiFormBrowserExProtocolGuid,\r
   Status = gBS->InstallProtocolInterface (\r
                   &mPrivateData.Handle,\r
                   &gEdkiiFormBrowserExProtocolGuid,\r


@@ -962,7 +962,7 @@ InitializeSetup (
       &Registration\r
       );\r
   }\r
       &Registration\r
       );\r
   }\r

-  \r
+\r

   return EFI_SUCCESS;\r
 }\r
 \r
   return EFI_SUCCESS;\r
 }\r
 \r


@@ -1465,7 +1465,7 @@ BufferToValue (
   Buffer = NULL;\r
 \r
   IsString = (BOOLEAN) ((Question->HiiValue.Type == EFI_IFR_TYPE_STRING) ?  TRUE : FALSE);\r
   Buffer = NULL;\r
 \r
   IsString = (BOOLEAN) ((Question->HiiValue.Type == EFI_IFR_TYPE_STRING) ?  TRUE : FALSE);\r

-  if (Question->Storage->Type == EFI_HII_VARSTORE_BUFFER || \r
+  if (Question->Storage->Type == EFI_HII_VARSTORE_BUFFER ||\r

       Question->Storage->Type == EFI_HII_VARSTORE_EFI_VARIABLE_BUFFER) {\r
     IsBufferStorage = TRUE;\r
   } else {\r
       Question->Storage->Type == EFI_HII_VARSTORE_EFI_VARIABLE_BUFFER) {\r
     IsBufferStorage = TRUE;\r
   } else {\r


@@ -1620,17 +1620,17 @@ GetQuestionValue (
         FreePool (Question->ValueExpression->Result.Buffer);\r
       }\r
       Question->HiiValue.Type = Question->ValueExpression->Result.Type;\r
         FreePool (Question->ValueExpression->Result.Buffer);\r
       }\r
       Question->HiiValue.Type = Question->ValueExpression->Result.Type;\r

-      CopyMem (&Question->HiiValue.Value, &Question->ValueExpression->Result.Value, sizeof (EFI_IFR_TYPE_VALUE));      \r
+      CopyMem (&Question->HiiValue.Value, &Question->ValueExpression->Result.Value, sizeof (EFI_IFR_TYPE_VALUE));\r

     }\r
     return Status;\r
   }\r
     }\r
     return Status;\r
   }\r

-  \r
+\r

   //\r
   // Get question value by read expression.\r
   //\r
   if (Question->ReadExpression != NULL && Form->FormType == STANDARD_MAP_FORM_TYPE) {\r
     Status = EvaluateExpression (FormSet, Form, Question->ReadExpression);\r
   //\r
   // Get question value by read expression.\r
   //\r
   if (Question->ReadExpression != NULL && Form->FormType == STANDARD_MAP_FORM_TYPE) {\r
     Status = EvaluateExpression (FormSet, Form, Question->ReadExpression);\r

-    if (!EFI_ERROR (Status) && \r
+    if (!EFI_ERROR (Status) &&\r

       ((Question->ReadExpression->Result.Type < EFI_IFR_TYPE_OTHER) || (Question->ReadExpression->Result.Type == EFI_IFR_TYPE_BUFFER))) {\r
       //\r
       // Only update question value to the valid result.\r
       ((Question->ReadExpression->Result.Type < EFI_IFR_TYPE_OTHER) || (Question->ReadExpression->Result.Type == EFI_IFR_TYPE_BUFFER))) {\r
       //\r
       // Only update question value to the valid result.\r


@@ -1647,7 +1647,7 @@ GetQuestionValue (
         FreePool (Question->ReadExpression->Result.Buffer);\r
       }\r
       Question->HiiValue.Type = Question->ReadExpression->Result.Type;\r
         FreePool (Question->ReadExpression->Result.Buffer);\r
       }\r
       Question->HiiValue.Type = Question->ReadExpression->Result.Type;\r

-      CopyMem (&Question->HiiValue.Value, &Question->ReadExpression->Result.Value, sizeof (EFI_IFR_TYPE_VALUE));       \r
+      CopyMem (&Question->HiiValue.Value, &Question->ReadExpression->Result.Value, sizeof (EFI_IFR_TYPE_VALUE));\r

       return EFI_SUCCESS;\r
     }\r
   }\r
       return EFI_SUCCESS;\r
     }\r
   }\r


@@ -1748,7 +1748,7 @@ GetQuestionValue (
     Dst = (UINT8 *) &Question->HiiValue.Value;\r
   }\r
 \r
     Dst = (UINT8 *) &Question->HiiValue.Value;\r
   }\r
 \r

-  if (Storage->Type == EFI_HII_VARSTORE_BUFFER || \r
+  if (Storage->Type == EFI_HII_VARSTORE_BUFFER ||\r

       Storage->Type == EFI_HII_VARSTORE_EFI_VARIABLE_BUFFER) {\r
     IsBufferStorage = TRUE;\r
   } else {\r
       Storage->Type == EFI_HII_VARSTORE_EFI_VARIABLE_BUFFER) {\r
     IsBufferStorage = TRUE;\r
   } else {\r


@@ -1933,7 +1933,7 @@ SetQuestionValue (
   if (Question->ValueExpression != NULL) {\r
     return Status;\r
   }\r
   if (Question->ValueExpression != NULL) {\r
     return Status;\r
   }\r

-  \r
+\r

   //\r
   // Before set question value, evaluate its write expression.\r
   //\r
   //\r
   // Before set question value, evaluate its write expression.\r
   //\r


@@ -2028,7 +2028,7 @@ SetQuestionValue (
     Src = (UINT8 *) &Question->HiiValue.Value;\r
   }\r
 \r
     Src = (UINT8 *) &Question->HiiValue.Value;\r
   }\r
 \r

-  if (Storage->Type == EFI_HII_VARSTORE_BUFFER || \r
+  if (Storage->Type == EFI_HII_VARSTORE_BUFFER ||\r

       Storage->Type == EFI_HII_VARSTORE_EFI_VARIABLE_BUFFER) {\r
     IsBufferStorage = TRUE;\r
   } else {\r
       Storage->Type == EFI_HII_VARSTORE_EFI_VARIABLE_BUFFER) {\r
     IsBufferStorage = TRUE;\r
   } else {\r


@@ -2199,7 +2199,7 @@ SetQuestionValue (
       return Status;\r
     }\r
     FreePool (ConfigResp);\r
       return Status;\r
     }\r
     FreePool (ConfigResp);\r

-    \r
+\r

     //\r
     // Sync storage, from editbuffer to buffer.\r
     //\r
     //\r
     // Sync storage, from editbuffer to buffer.\r
     //\r


@@ -2322,9 +2322,9 @@ ValidateQuestion (
 }\r
 \r
 /**\r
 }\r
 \r
 /**\r

-  Perform question check. \r
-  \r
-  If one question has more than one check, process form high priority to low. \r
+  Perform question check.\r
+\r
+  If one question has more than one check, process form high priority to low.\r

   Only one error info will be popup.\r
 \r
   @param  FormSet                FormSet data structure.\r
   Only one error info will be popup.\r
 \r
   @param  FormSet                FormSet data structure.\r


@@ -2425,7 +2425,7 @@ NoSubmitCheck (
 \r
   @param  Storage                The storage which need to sync.\r
   @param  ConfigRequest          The config request string which used to sync storage.\r
 \r
   @param  Storage                The storage which need to sync.\r
   @param  ConfigRequest          The config request string which used to sync storage.\r

-  @param  SyncOrRestore          Sync the buffer to editbuffer or Restore  the \r
+  @param  SyncOrRestore          Sync the buffer to editbuffer or Restore  the\r

                                  editbuffer to buffer\r
                                  if TRUE, copy the editbuffer to the buffer.\r
                                  if FALSE, copy the buffer to the editbuffer.\r
                                  editbuffer to buffer\r
                                  if TRUE, copy the editbuffer to the buffer.\r
                                  if FALSE, copy the buffer to the editbuffer.\r


@@ -2452,7 +2452,7 @@ SynchronizeStorage (
   Status = EFI_SUCCESS;\r
   Result = NULL;\r
 \r
   Status = EFI_SUCCESS;\r
   Result = NULL;\r
 \r

-  if (Storage->Type == EFI_HII_VARSTORE_BUFFER || \r
+  if (Storage->Type == EFI_HII_VARSTORE_BUFFER ||\r

       (Storage->Type == EFI_HII_VARSTORE_EFI_VARIABLE_BUFFER)) {\r
     BufferSize = Storage->Size;\r
 \r
       (Storage->Type == EFI_HII_VARSTORE_EFI_VARIABLE_BUFFER)) {\r
     BufferSize = Storage->Size;\r
 \r


@@ -2787,7 +2787,7 @@ UpdateFlagForForm (
       if ((Question->QuestionFlags & EFI_IFR_FLAG_RECONNECT_REQUIRED) != 0) {\r
         gFlagReconnect = TRUE;\r
       }\r
       if ((Question->QuestionFlags & EFI_IFR_FLAG_RECONNECT_REQUIRED) != 0) {\r
         gFlagReconnect = TRUE;\r
       }\r

-    } \r
+    }\r

   }\r
 }\r
 \r
   }\r
 }\r
 \r


@@ -2796,7 +2796,7 @@ UpdateFlagForForm (
   Also clean ValueChanged flag for all statements.\r
 \r
   Form level or formset level, only one.\r
   Also clean ValueChanged flag for all statements.\r
 \r
   Form level or formset level, only one.\r

-  \r
+\r

   @param  SetFlag                Whether need to set the Reset Flag.\r
   @param  FormSet                FormSet data structure.\r
   @param  Form                   Form data structure.\r
   @param  SetFlag                Whether need to set the Reset Flag.\r
   @param  FormSet                FormSet data structure.\r
   @param  Form                   Form data structure.\r


@@ -2806,7 +2806,7 @@ VOID
 ValueChangeResetFlagUpdate (\r
   IN BOOLEAN                          SetFlag,\r
   IN FORM_BROWSER_FORMSET             *FormSet,\r
 ValueChangeResetFlagUpdate (\r
   IN BOOLEAN                          SetFlag,\r
   IN FORM_BROWSER_FORMSET             *FormSet,\r

-  IN FORM_BROWSER_FORM                *Form  \r
+  IN FORM_BROWSER_FORM                *Form\r

   )\r
 {\r
   FORM_BROWSER_FORM       *CurrentForm;\r
   )\r
 {\r
   FORM_BROWSER_FORM       *CurrentForm;\r


@@ -2827,8 +2827,8 @@ ValueChangeResetFlagUpdate (
 }\r
 \r
 /**\r
 }\r
 \r
 /**\r

-  Base on the return Progress string to find the form. \r
-  \r
+  Base on the return Progress string to find the form.\r
+\r

   Base on the first return Offset/Width (Name) string to find the form\r
   which keep this string.\r
 \r
   Base on the first return Offset/Width (Name) string to find the form\r
   which keep this string.\r
 \r


@@ -3109,9 +3109,9 @@ ConfirmSaveFail (
   ASSERT (StringBuffer != NULL);\r
 \r
   UnicodeSPrint (\r
   ASSERT (StringBuffer != NULL);\r
 \r
   UnicodeSPrint (\r

-    StringBuffer, \r
-    24 * sizeof (CHAR16) + StrSize (FormTitle), \r
-    L"Submit Fail For Form: %s.", \r
+    StringBuffer,\r
+    24 * sizeof (CHAR16) + StrSize (FormTitle),\r
+    L"Submit Fail For Form: %s.",\r

     FormTitle\r
     );\r
 \r
     FormTitle\r
     );\r
 \r


@@ -3148,9 +3148,9 @@ ConfirmNoSubmitFail (
   ASSERT (StringBuffer != NULL);\r
 \r
   UnicodeSPrint (\r
   ASSERT (StringBuffer != NULL);\r
 \r
   UnicodeSPrint (\r

-    StringBuffer, \r
-    24 * sizeof (CHAR16) + StrSize (FormTitle), \r
-    L"NO_SUBMIT_IF error For Form: %s.", \r
+    StringBuffer,\r
+    24 * sizeof (CHAR16) + StrSize (FormTitle),\r
+    L"NO_SUBMIT_IF error For Form: %s.",\r

     FormTitle\r
     );\r
 \r
     FormTitle\r
     );\r
 \r


@@ -3251,7 +3251,7 @@ DiscardForm (
     while (!IsNull (&FormSet->FormListHead, Link)) {\r
       Form = FORM_BROWSER_FORM_FROM_LINK (Link);\r
       Link = GetNextNode (&FormSet->FormListHead, Link);\r
     while (!IsNull (&FormSet->FormListHead, Link)) {\r
       Form = FORM_BROWSER_FORM_FROM_LINK (Link);\r
       Link = GetNextNode (&FormSet->FormListHead, Link);\r

-      \r
+\r

       //\r
       // Call callback with Changed type to inform the driver.\r
       //\r
       //\r
       // Call callback with Changed type to inform the driver.\r
       //\r


@@ -3292,7 +3292,7 @@ DiscardForm (
     mSystemLevelFormSet = OldFormSet;\r
   }\r
 \r
     mSystemLevelFormSet = OldFormSet;\r
   }\r
 \r

-  return EFI_SUCCESS;  \r
+  return EFI_SUCCESS;\r

 }\r
 \r
 /**\r
 }\r
 \r
 /**\r


@@ -3441,9 +3441,9 @@ SubmitForForm (
 \r
   @param  FormSet                FormSet data structure.\r
   @param  SkipProcessFail        Whether skip to process the save failed storage.\r
 \r
   @param  FormSet                FormSet data structure.\r
   @param  SkipProcessFail        Whether skip to process the save failed storage.\r

-                                 If submit formset is called when do system level save, \r
-                                 set this value to true and process the failed formset \r
-                                 together. \r
+                                 If submit formset is called when do system level save,\r
+                                 set this value to true and process the failed formset\r
+                                 together.\r

                                  if submit formset is called when do formset level save,\r
                                  set the value to false and process the failed storage\r
                                  right after process all storages for this formset.\r
                                  if submit formset is called when do formset level save,\r
                                  set the value to false and process the failed storage\r
                                  right after process all storages for this formset.\r


@@ -3478,7 +3478,7 @@ SubmitForFormSet (
     return EFI_SUCCESS;\r
   }\r
 \r
     return EFI_SUCCESS;\r
   }\r
 \r

-  Form = NULL; \r
+  Form = NULL;\r

   Status = NoSubmitCheck (FormSet, &Form, &Question);\r
   if (EFI_ERROR (Status)) {\r
     if (SkipProcessFail) {\r
   Status = NoSubmitCheck (FormSet, &Form, &Question);\r
   if (EFI_ERROR (Status)) {\r
     if (SkipProcessFail) {\r


@@ -3639,7 +3639,7 @@ SubmitForFormSet (
 \r
   //\r
   // 5. Update the NV flag.\r
 \r
   //\r
   // 5. Update the NV flag.\r

-  // \r
+  //\r

   ValueChangeResetFlagUpdate(TRUE, FormSet, NULL);\r
 \r
   //\r
   ValueChangeResetFlagUpdate(TRUE, FormSet, NULL);\r
 \r
   //\r


@@ -3690,7 +3690,7 @@ SubmitForSystem (
 \r
     //\r
     // Remove maintain backup list after save except for the current using FormSet.\r
 \r
     //\r
     // Remove maintain backup list after save except for the current using FormSet.\r

-    //  \r
+    //\r

     if (!IsHiiHandleInBrowserContext (LocalFormSet->HiiHandle)) {\r
       CleanBrowserStorage(LocalFormSet);\r
       RemoveEntryList (&LocalFormSet->Link);\r
     if (!IsHiiHandleInBrowserContext (LocalFormSet->HiiHandle)) {\r
       CleanBrowserStorage(LocalFormSet);\r
       RemoveEntryList (&LocalFormSet->Link);\r


@@ -3937,7 +3937,7 @@ GetOffsetFromConfigResp (
     RequestElement += StrLen (Question->BlockName) + StrLen (L"&VALUE=");\r
     return RequestElement;\r
   }\r
     RequestElement += StrLen (Question->BlockName) + StrLen (L"&VALUE=");\r
     return RequestElement;\r
   }\r

-  \r
+\r

   //\r
   // 2. Change all hex digits in Question->BlockName to lower and compare again.\r
   //\r
   //\r
   // 2. Change all hex digits in Question->BlockName to lower and compare again.\r
   //\r


@@ -3973,7 +3973,7 @@ GetDefaultValueFromAltCfg (
   IN     FORM_BROWSER_FORM                *Form,\r
   IN OUT FORM_BROWSER_STATEMENT           *Question\r
   )\r
   IN     FORM_BROWSER_FORM                *Form,\r
   IN OUT FORM_BROWSER_STATEMENT           *Question\r
   )\r

-{ \r
+{\r

   BROWSER_STORAGE              *Storage;\r
   FORMSET_STORAGE              *FormSetStorage;\r
   CHAR16                       *ConfigResp;\r
   BROWSER_STORAGE              *Storage;\r
   FORMSET_STORAGE              *FormSetStorage;\r
   CHAR16                       *ConfigResp;\r


@@ -4039,7 +4039,7 @@ INTN
 GetDefaultIdForCallBack (\r
   UINTN DefaultId\r
   )\r
 GetDefaultIdForCallBack (\r
   UINTN DefaultId\r
   )\r

-{ \r
+{\r

   if (DefaultId == EFI_HII_DEFAULT_CLASS_STANDARD) {\r
     return EFI_BROWSER_ACTION_DEFAULT_STANDARD;\r
   } else if (DefaultId == EFI_HII_DEFAULT_CLASS_MANUFACTURING) {\r
   if (DefaultId == EFI_HII_DEFAULT_CLASS_STANDARD) {\r
     return EFI_BROWSER_ACTION_DEFAULT_STANDARD;\r
   } else if (DefaultId == EFI_HII_DEFAULT_CLASS_MANUFACTURING) {\r


@@ -4240,7 +4240,7 @@ GetQuestionDefault (
   // There are Five ways to specify default value for a Question:\r
   //  1, use call back function (highest priority)\r
   //  2, use ExtractConfig function\r
   // There are Five ways to specify default value for a Question:\r
   //  1, use call back function (highest priority)\r
   //  2, use ExtractConfig function\r

-  //  3, use nested EFI_IFR_DEFAULT \r
+  //  3, use nested EFI_IFR_DEFAULT\r

   //  4, set flags of EFI_ONE_OF_OPTION (provide Standard and Manufacturing default)\r
   //  5, set flags of EFI_IFR_CHECKBOX (provide Standard and Manufacturing default) (lowest priority)\r
   //\r
   //  4, set flags of EFI_ONE_OF_OPTION (provide Standard and Manufacturing default)\r
   //  5, set flags of EFI_IFR_CHECKBOX (provide Standard and Manufacturing default) (lowest priority)\r
   //\r


@@ -4291,7 +4291,7 @@ ReGetDefault:
   //\r
   // Get default value from altcfg string.\r
   //\r
   //\r
   // Get default value from altcfg string.\r
   //\r

-  if (ConfigAccess != NULL) {  \r
+  if (ConfigAccess != NULL) {\r

     Status = GetDefaultValueFromAltCfg(FormSet, Form, Question);\r
     if (!EFI_ERROR (Status)) {\r
         return Status;\r
     Status = GetDefaultValueFromAltCfg(FormSet, Form, Question);\r
     if (!EFI_ERROR (Status)) {\r
         return Status;\r


@@ -4328,7 +4328,7 @@ ReGetDefault:
             FreePool (Default->ValueExpression->Result.Buffer);\r
           }\r
           HiiValue->Type = Default->ValueExpression->Result.Type;\r
             FreePool (Default->ValueExpression->Result.Buffer);\r
           }\r
           HiiValue->Type = Default->ValueExpression->Result.Type;\r

-          CopyMem (&HiiValue->Value, &Default->ValueExpression->Result.Value, sizeof (EFI_IFR_TYPE_VALUE));       \r
+          CopyMem (&HiiValue->Value, &Default->ValueExpression->Result.Value, sizeof (EFI_IFR_TYPE_VALUE));\r

         } else {\r
           //\r
           // Default value is embedded in EFI_IFR_DEFAULT\r
         } else {\r
           //\r
           // Default value is embedded in EFI_IFR_DEFAULT\r


@@ -4467,7 +4467,7 @@ ReGetDefault:
         }\r
         break;\r
       default:\r
         }\r
         break;\r
       default:\r

-        break;     \r
+        break;\r

       }\r
     } else {\r
       if ((HiiValue->Value.u64 < Question->Minimum) || (HiiValue->Value.u64 > Question->Maximum)) {\r
       }\r
     } else {\r
       if ((HiiValue->Value.u64 < Question->Minimum) || (HiiValue->Value.u64 > Question->Maximum)) {\r


@@ -4776,7 +4776,7 @@ CleanAltCfgForFormSet (
 /**\r
   Reset Questions to their initial value or default value in a Form, Formset or System.\r
 \r
 /**\r
   Reset Questions to their initial value or default value in a Form, Formset or System.\r
 \r

-  GetDefaultValueScope parameter decides which questions will reset \r
+  GetDefaultValueScope parameter decides which questions will reset\r

   to its default value.\r
 \r
   @param  FormSet                FormSet data structure.\r
   to its default value.\r
 \r
   @param  FormSet                FormSet data structure.\r


@@ -5067,7 +5067,7 @@ IsQuestionValueChanged (
 /**\r
   Initialize Question's Edit copy from Storage.\r
 \r
 /**\r
   Initialize Question's Edit copy from Storage.\r
 \r

-  @param  Selection              Selection contains the information about \r
+  @param  Selection              Selection contains the information about\r

                                  the Selection, form and formset to be displayed.\r
                                  Selection action may be updated in retrieve callback.\r
                                  If Selection is NULL, only initialize Question value.\r
                                  the Selection, form and formset to be displayed.\r
                                  Selection action may be updated in retrieve callback.\r
                                  If Selection is NULL, only initialize Question value.\r


@@ -5087,7 +5087,7 @@ LoadFormConfig (
   EFI_STATUS                  Status;\r
   LIST_ENTRY                  *Link;\r
   FORM_BROWSER_STATEMENT      *Question;\r
   EFI_STATUS                  Status;\r
   LIST_ENTRY                  *Link;\r
   FORM_BROWSER_STATEMENT      *Question;\r

-  \r
+\r

   Link = GetFirstNode (&Form->StatementListHead);\r
   while (!IsNull (&Form->StatementListHead, Link)) {\r
     Question = FORM_BROWSER_STATEMENT_FROM_LINK (Link);\r
   Link = GetFirstNode (&Form->StatementListHead);\r
   while (!IsNull (&Form->StatementListHead, Link)) {\r
     Question = FORM_BROWSER_STATEMENT_FROM_LINK (Link);\r


@@ -5117,7 +5117,7 @@ LoadFormConfig (
 /**\r
   Initialize Question's Edit copy from Storage for the whole Formset.\r
 \r
 /**\r
   Initialize Question's Edit copy from Storage for the whole Formset.\r
 \r

-  @param  Selection              Selection contains the information about \r
+  @param  Selection              Selection contains the information about\r

                                  the Selection, form and formset to be displayed.\r
                                  Selection action may be updated in retrieve callback.\r
                                  If Selection is NULL, only initialize Question value.\r
                                  the Selection, form and formset to be displayed.\r
                                  Selection action may be updated in retrieve callback.\r
                                  If Selection is NULL, only initialize Question value.\r


@@ -5153,7 +5153,7 @@ LoadFormSetConfig (
 \r
   //\r
   // Finished question initialization.\r
 \r
   //\r
   // Finished question initialization.\r

-  // \r
+  //\r

   FormSet->QuestionInited = TRUE;\r
 \r
   return EFI_SUCCESS;\r
   FormSet->QuestionInited = TRUE;\r
 \r
   return EFI_SUCCESS;\r


@@ -5189,8 +5189,8 @@ RemoveElement (
   DestStr = NewStr;\r
   NewStr += StrLen (RequestElement);\r
   CopyMem (DestStr, NewStr, StrSize (NewStr));\r
   DestStr = NewStr;\r
   NewStr += StrLen (RequestElement);\r
   CopyMem (DestStr, NewStr, StrSize (NewStr));\r

-  \r
-  Storage->SpareStrLen += StrLen (RequestElement);  \r
+\r
+  Storage->SpareStrLen += StrLen (RequestElement);\r

 }\r
 \r
 /**\r
 }\r
 \r
 /**\r


@@ -5235,7 +5235,7 @@ RemoveConfigRequest (
   if (Storage->BrowserStorage->Type == EFI_HII_VARSTORE_NAME_VALUE) {\r
     RequestElement = StrStr (ConfigRequest, L"PATH");\r
     ASSERT (RequestElement != NULL);\r
   if (Storage->BrowserStorage->Type == EFI_HII_VARSTORE_NAME_VALUE) {\r
     RequestElement = StrStr (ConfigRequest, L"PATH");\r
     ASSERT (RequestElement != NULL);\r

-    RequestElement = StrStr (RequestElement, SearchKey);    \r
+    RequestElement = StrStr (RequestElement, SearchKey);\r

   } else {\r
     RequestElement = StrStr (ConfigRequest, SearchKey);\r
   }\r
   } else {\r
     RequestElement = StrStr (ConfigRequest, SearchKey);\r
   }\r


@@ -5305,7 +5305,7 @@ CleanBrowserStorage (
       RemoveConfigRequest (Storage, Storage->ConfigRequest);\r
     } else if (Storage->BrowserStorage->Type == EFI_HII_VARSTORE_BUFFER ||\r
                Storage->BrowserStorage->Type == EFI_HII_VARSTORE_NAME_VALUE) {\r
       RemoveConfigRequest (Storage, Storage->ConfigRequest);\r
     } else if (Storage->BrowserStorage->Type == EFI_HII_VARSTORE_BUFFER ||\r
                Storage->BrowserStorage->Type == EFI_HII_VARSTORE_NAME_VALUE) {\r

-      if (Storage->BrowserStorage->ConfigRequest != NULL) { \r
+      if (Storage->BrowserStorage->ConfigRequest != NULL) {\r

         FreePool (Storage->BrowserStorage->ConfigRequest);\r
         Storage->BrowserStorage->ConfigRequest = NULL;\r
       }\r
         FreePool (Storage->BrowserStorage->ConfigRequest);\r
         Storage->BrowserStorage->ConfigRequest = NULL;\r
       }\r


@@ -5324,7 +5324,7 @@ CleanBrowserStorage (
   @retval FALSE       The Element not in the configReqeust String.\r
 \r
 **/\r
   @retval FALSE       The Element not in the configReqeust String.\r
 \r
 **/\r

-BOOLEAN \r
+BOOLEAN\r

 ElementValidation (\r
   BROWSER_STORAGE   *BrowserStorage,\r
   CHAR16            *RequestElement\r
 ElementValidation (\r
   BROWSER_STORAGE   *BrowserStorage,\r
   CHAR16            *RequestElement\r


@@ -5391,7 +5391,7 @@ AppendConfigRequest (
   @retval FALSE                  All elements covered by current used elements.\r
 \r
 **/\r
   @retval FALSE                  All elements covered by current used elements.\r
 \r
 **/\r

-BOOLEAN \r
+BOOLEAN\r

 ConfigRequestAdjust (\r
   IN  BROWSER_STORAGE         *Storage,\r
   IN  CHAR16                  *Request,\r
 ConfigRequestAdjust (\r
   IN  BROWSER_STORAGE         *Storage,\r
   IN  CHAR16                  *Request,\r


@@ -5440,7 +5440,7 @@ ConfigRequestAdjust (
   if (Storage->Type == EFI_HII_VARSTORE_NAME_VALUE) {\r
     RequestElement = StrStr (ConfigRequest, L"PATH");\r
     ASSERT (RequestElement != NULL);\r
   if (Storage->Type == EFI_HII_VARSTORE_NAME_VALUE) {\r
     RequestElement = StrStr (ConfigRequest, L"PATH");\r
     ASSERT (RequestElement != NULL);\r

-    RequestElement = StrStr (RequestElement, SearchKey);    \r
+    RequestElement = StrStr (RequestElement, SearchKey);\r

   } else {\r
     RequestElement = StrStr (ConfigRequest, SearchKey);\r
   }\r
   } else {\r
     RequestElement = StrStr (ConfigRequest, SearchKey);\r
   }\r


@@ -5476,7 +5476,7 @@ ConfigRequestAdjust (
         *NextRequestElement = L'\0';\r
       }\r
     }\r
         *NextRequestElement = L'\0';\r
       }\r
     }\r

- \r
+\r

     if (!ElementValidation (Storage, RequestElement)) {\r
       //\r
       // Add this element to the Storage->BrowserStorage->AllRequestElement.\r
     if (!ElementValidation (Storage, RequestElement)) {\r
       //\r
       // Add this element to the Storage->BrowserStorage->AllRequestElement.\r


@@ -5545,7 +5545,7 @@ LoadStorage (
       }\r
 \r
       //\r
       }\r
 \r
       //\r

-      // Just update the ConfigRequest, if storage already initialized. \r
+      // Just update the ConfigRequest, if storage already initialized.\r

       //\r
       if (Storage->BrowserStorage->Initialized) {\r
         ConfigRequestAdjust(Storage->BrowserStorage, Storage->ConfigRequest, FALSE);\r
       //\r
       if (Storage->BrowserStorage->Initialized) {\r
         ConfigRequestAdjust(Storage->BrowserStorage, Storage->ConfigRequest, FALSE);\r


@@ -5569,9 +5569,9 @@ LoadStorage (
     ConfigRequest = AllocateZeroPool (StrLen);\r
     ASSERT (ConfigRequest != NULL);\r
     UnicodeSPrint (\r
     ConfigRequest = AllocateZeroPool (StrLen);\r
     ASSERT (ConfigRequest != NULL);\r
     UnicodeSPrint (\r

-               ConfigRequest, \r
-               StrLen, \r
-               L"%s&OFFSET=0&WIDTH=%04x", \r
+               ConfigRequest,\r
+               StrLen,\r
+               L"%s&OFFSET=0&WIDTH=%04x",\r

                Storage->ConfigHdr,\r
                Storage->BrowserStorage->Size);\r
   } else {\r
                Storage->ConfigHdr,\r
                Storage->BrowserStorage->Size);\r
   } else {\r


@@ -5601,7 +5601,7 @@ LoadStorage (
     if (StrPtr != NULL) {\r
       *StrPtr = L'\0';\r
     }\r
     if (StrPtr != NULL) {\r
       *StrPtr = L'\0';\r
     }\r

-    \r
+\r

     Status = ConfigRespToStorage (Storage->BrowserStorage, Result);\r
     FreePool (Result);\r
   }\r
     Status = ConfigRespToStorage (Storage->BrowserStorage, Result);\r
     FreePool (Result);\r
   }\r


@@ -5609,7 +5609,7 @@ LoadStorage (
   Storage->BrowserStorage->ConfigRequest = AllocateCopyPool (StrSize (Storage->ConfigRequest), Storage->ConfigRequest);\r
 \r
   //\r
   Storage->BrowserStorage->ConfigRequest = AllocateCopyPool (StrSize (Storage->ConfigRequest), Storage->ConfigRequest);\r
 \r
   //\r

-  // Input NULL for ConfigRequest field means sync all fields from editbuffer to buffer. \r
+  // Input NULL for ConfigRequest field means sync all fields from editbuffer to buffer.\r

   //\r
   SynchronizeStorage(Storage->BrowserStorage, NULL, TRUE);\r
 \r
   //\r
   SynchronizeStorage(Storage->BrowserStorage, NULL, TRUE);\r
 \r


@@ -5737,7 +5737,7 @@ InitializeCurrentSetting (
 \r
   //\r
   // Extract default from IFR binary for no storage questions.\r
 \r
   //\r
   // Extract default from IFR binary for no storage questions.\r

-  //  \r
+  //\r

   ExtractDefault (FormSet, NULL, EFI_HII_DEFAULT_CLASS_STANDARD, FormSetLevel, GetDefaultForNoStorage, NULL, TRUE, FALSE);\r
 \r
   //\r
   ExtractDefault (FormSet, NULL, EFI_HII_DEFAULT_CLASS_STANDARD, FormSetLevel, GetDefaultForNoStorage, NULL, TRUE, FALSE);\r
 \r
   //\r


@@ -5989,7 +5989,7 @@ InitializeFormSet (
 \r
 \r
 /**\r
 \r
 \r
 /**\r

-  Save globals used by previous call to SendForm(). SendForm() may be called from \r
+  Save globals used by previous call to SendForm(). SendForm() may be called from\r

   HiiConfigAccess.Callback(), this will cause SendForm() be reentried.\r
   So, save globals of previous call to SendForm() and restore them upon exit.\r
 \r
   HiiConfigAccess.Callback(), this will cause SendForm() be reentried.\r
   So, save globals of previous call to SendForm() and restore them upon exit.\r
 \r


@@ -6134,13 +6134,13 @@ RestoreBrowserContext (
 \r
 /**\r
   Find the matched FormSet context in the backup maintain list based on HiiHandle.\r
 \r
 /**\r
   Find the matched FormSet context in the backup maintain list based on HiiHandle.\r

-  \r
+\r

   @param Handle  The Hii Handle.\r
   @param Handle  The Hii Handle.\r

-  \r
+\r

   @return the found FormSet context. If no found, NULL will return.\r
 \r
 **/\r
   @return the found FormSet context. If no found, NULL will return.\r
 \r
 **/\r

-FORM_BROWSER_FORMSET * \r
+FORM_BROWSER_FORMSET *\r

 GetFormSetFromHiiHandle (\r
   EFI_HII_HANDLE Handle\r
   )\r
 GetFormSetFromHiiHandle (\r
   EFI_HII_HANDLE Handle\r
   )\r


@@ -6159,15 +6159,15 @@ GetFormSetFromHiiHandle (
       return FormSet;\r
     }\r
   }\r
       return FormSet;\r
     }\r
   }\r

-  \r
+\r

   return NULL;\r
 }\r
 \r
 /**\r
   Check whether the input HII handle is the FormSet that is being used.\r
   return NULL;\r
 }\r
 \r
 /**\r
   Check whether the input HII handle is the FormSet that is being used.\r

-  \r
+\r

   @param Handle  The Hii Handle.\r
   @param Handle  The Hii Handle.\r

-  \r
+\r

   @retval TRUE   HII handle is being used.\r
   @retval FALSE  HII handle is not being used.\r
 \r
   @retval TRUE   HII handle is being used.\r
   @retval FALSE  HII handle is not being used.\r
 \r


@@ -6201,20 +6201,20 @@ IsHiiHandleInBrowserContext (
     }\r
     Link = GetNextNode (&gBrowserContextList, Link);\r
   }\r
     }\r
     Link = GetNextNode (&gBrowserContextList, Link);\r
   }\r

-  \r
+\r

   return FALSE;\r
 }\r
 \r
 /**\r
   return FALSE;\r
 }\r
 \r
 /**\r

-  Perform Password check. \r
+  Perform Password check.\r

   Passwork may be encrypted by driver that requires the specific check.\r
   Passwork may be encrypted by driver that requires the specific check.\r

-  \r
+\r

   @param  Form             Form where Password Statement is in.\r
   @param  Statement        Password statement\r
   @param  PasswordString   Password string to be checked. It may be NULL.\r
                            NULL means to restore password.\r
                            "" string can be used to checked whether old password does exist.\r
   @param  Form             Form where Password Statement is in.\r
   @param  Statement        Password statement\r
   @param  PasswordString   Password string to be checked. It may be NULL.\r
                            NULL means to restore password.\r
                            "" string can be used to checked whether old password does exist.\r

-  \r
+\r

   @return Status     Status of Password check.\r
 **/\r
 EFI_STATUS\r
   @return Status     Status of Password check.\r
 **/\r
 EFI_STATUS\r


@@ -6245,7 +6245,7 @@ PasswordCheck (
     //\r
     return EFI_UNSUPPORTED;\r
   }\r
     //\r
     return EFI_UNSUPPORTED;\r
   }\r

-    \r
+\r

   //\r
   // Prepare password string in HII database\r
   //\r
   //\r
   // Prepare password string in HII database\r
   //\r


@@ -6279,7 +6279,7 @@ PasswordCheck (
 \r
 /**\r
   Find the registered HotKey based on KeyData.\r
 \r
 /**\r
   Find the registered HotKey based on KeyData.\r

-  \r
+\r

   @param[in] KeyData     A pointer to a buffer that describes the keystroke\r
                          information for the hot key.\r
 \r
   @param[in] KeyData     A pointer to a buffer that describes the keystroke\r
                          information for the hot key.\r
 \r


@@ -6301,7 +6301,7 @@ GetHotKeyFromRegisterList (
     }\r
     Link = GetNextNode (&gBrowserHotKeyList, Link);\r
   }\r
     }\r
     Link = GetNextNode (&gBrowserHotKeyList, Link);\r
   }\r

-  \r
+\r

   return NULL;\r
 }\r
 \r
   return NULL;\r
 }\r
 \r


@@ -6310,11 +6310,11 @@ GetHotKeyFromRegisterList (
   All hot keys have the same scope. The mixed hot keys with the different level are not supported.\r
   If no scope is set, the default scope will be FormSet level.\r
   After all registered hot keys are removed, previous Scope can reset to another level.\r
   All hot keys have the same scope. The mixed hot keys with the different level are not supported.\r
   If no scope is set, the default scope will be FormSet level.\r
   After all registered hot keys are removed, previous Scope can reset to another level.\r

-  \r
-  @param[in] Scope               Scope level to be set. \r
-  \r
+\r
+  @param[in] Scope               Scope level to be set.\r
+\r

   @retval EFI_SUCCESS            Scope is set correctly.\r
   @retval EFI_SUCCESS            Scope is set correctly.\r

-  @retval EFI_INVALID_PARAMETER  Scope is not the valid value specified in BROWSER_SETTING_SCOPE. \r
+  @retval EFI_INVALID_PARAMETER  Scope is not the valid value specified in BROWSER_SETTING_SCOPE.\r

   @retval EFI_UNSPPORTED         Scope level is different from current one that the registered hot keys have.\r
 \r
 **/\r
   @retval EFI_UNSPPORTED         Scope level is different from current one that the registered hot keys have.\r
 \r
 **/\r


@@ -6347,15 +6347,15 @@ SetScope (
   Only support hot key that is not printable character (control key, function key, etc.).\r
   If the action value is zero, the hot key will be unregistered if it has been registered.\r
   If the same hot key has been registered, the new action and help string will override the previous ones.\r
   Only support hot key that is not printable character (control key, function key, etc.).\r
   If the action value is zero, the hot key will be unregistered if it has been registered.\r
   If the same hot key has been registered, the new action and help string will override the previous ones.\r

-  \r
+\r

   @param[in] KeyData     A pointer to a buffer that describes the keystroke\r
   @param[in] KeyData     A pointer to a buffer that describes the keystroke\r

-                         information for the hot key. Its type is EFI_INPUT_KEY to \r
+                         information for the hot key. Its type is EFI_INPUT_KEY to\r

                          be supported by all ConsoleIn devices.\r
                          be supported by all ConsoleIn devices.\r

-  @param[in] Action      Action value that describes what action will be trigged when the hot key is pressed. \r
+  @param[in] Action      Action value that describes what action will be trigged when the hot key is pressed.\r

   @param[in] DefaultId   Specifies the type of defaults to retrieve, which is only for DEFAULT action.\r
   @param[in] HelpString  Help string that describes the hot key information.\r
                          Its value may be NULL for the unregistered hot key.\r
   @param[in] DefaultId   Specifies the type of defaults to retrieve, which is only for DEFAULT action.\r
   @param[in] HelpString  Help string that describes the hot key information.\r
                          Its value may be NULL for the unregistered hot key.\r

-  \r
+\r

   @retval EFI_SUCCESS            Hot key is registered or unregistered.\r
   @retval EFI_INVALID_PARAMETER  KeyData is NULL or HelpString is NULL on register.\r
   @retval EFI_NOT_FOUND          KeyData is not found to be unregistered.\r
   @retval EFI_SUCCESS            Hot key is registered or unregistered.\r
   @retval EFI_INVALID_PARAMETER  KeyData is NULL or HelpString is NULL on register.\r
   @retval EFI_NOT_FOUND          KeyData is not found to be unregistered.\r


@@ -6376,7 +6376,7 @@ RegisterHotKey (
   //\r
   // Check input parameters.\r
   //\r
   //\r
   // Check input parameters.\r
   //\r

-  if (KeyData == NULL || KeyData->UnicodeChar != CHAR_NULL || \r
+  if (KeyData == NULL || KeyData->UnicodeChar != CHAR_NULL ||\r

      (Action != BROWSER_ACTION_UNREGISTER && HelpString == NULL)) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
      (Action != BROWSER_ACTION_UNREGISTER && HelpString == NULL)) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r


@@ -6385,14 +6385,14 @@ RegisterHotKey (
   // Check whether the input KeyData is in BrowserHotKeyList.\r
   //\r
   HotKey = GetHotKeyFromRegisterList (KeyData);\r
   // Check whether the input KeyData is in BrowserHotKeyList.\r
   //\r
   HotKey = GetHotKeyFromRegisterList (KeyData);\r

-  \r
+\r

   //\r
   // Unregister HotKey\r
   //\r
   if (Action == BROWSER_ACTION_UNREGISTER) {\r
     if (HotKey != NULL) {\r
       //\r
   //\r
   // Unregister HotKey\r
   //\r
   if (Action == BROWSER_ACTION_UNREGISTER) {\r
     if (HotKey != NULL) {\r
       //\r

-      // The registered HotKey is found.  \r
+      // The registered HotKey is found.\r

       // Remove it from List, and free its resource.\r
       //\r
       RemoveEntryList (&HotKey->Link);\r
       // Remove it from List, and free its resource.\r
       //\r
       RemoveEntryList (&HotKey->Link);\r


@@ -6401,7 +6401,7 @@ RegisterHotKey (
       return EFI_SUCCESS;\r
     } else {\r
       //\r
       return EFI_SUCCESS;\r
     } else {\r
       //\r

-      // The registered HotKey is not found. \r
+      // The registered HotKey is not found.\r

       //\r
       return EFI_NOT_FOUND;\r
     }\r
       //\r
       return EFI_NOT_FOUND;\r
     }\r


@@ -6434,11 +6434,11 @@ RegisterHotKey (
 }\r
 \r
 /**\r
 }\r
 \r
 /**\r

-  Register Exit handler function. \r
-  When more than one handler function is registered, the latter one will override the previous one. \r
-  When NULL handler is specified, the previous Exit handler will be unregistered. \r
-  \r
-  @param[in] Handler      Pointer to handler function. \r
+  Register Exit handler function.\r
+  When more than one handler function is registered, the latter one will override the previous one.\r
+  When NULL handler is specified, the previous Exit handler will be unregistered.\r
+\r
+  @param[in] Handler      Pointer to handler function.\r

 \r
 **/\r
 VOID\r
 \r
 **/\r
 VOID\r


@@ -6510,7 +6510,7 @@ IsBrowserDataModified (
   @retval EFI_INVALID_PARAMETER    The input action value is invalid.\r
 \r
 **/\r
   @retval EFI_INVALID_PARAMETER    The input action value is invalid.\r
 \r
 **/\r

-EFI_STATUS \r
+EFI_STATUS\r

 EFIAPI\r
 ExecuteAction (\r
   IN UINT32        Action,\r
 EFIAPI\r
 ExecuteAction (\r
   IN UINT32        Action,\r


@@ -6530,7 +6530,7 @@ ExecuteAction (
   Form    = NULL;\r
   if (gBrowserSettingScope < SystemLevel) {\r
     FormSet = gCurrentSelection->FormSet;\r
   Form    = NULL;\r
   if (gBrowserSettingScope < SystemLevel) {\r
     FormSet = gCurrentSelection->FormSet;\r

-    Form    = gCurrentSelection->Form; \r
+    Form    = gCurrentSelection->Form;\r

   }\r
 \r
   //\r
   }\r
 \r
   //\r


@@ -6625,16 +6625,16 @@ SaveReminder (
       break;\r
     }\r
   }\r
       break;\r
     }\r
   }\r

-  \r
+\r

   //\r
   //\r

-  // No data is changed. No save is required. \r
+  // No data is changed. No save is required.\r

   //\r
   if (!IsDataChanged) {\r
     return DataSavedAction;\r
   }\r
   //\r
   if (!IsDataChanged) {\r
     return DataSavedAction;\r
   }\r

-  \r
+\r

   //\r
   //\r

-  // If data is changed, prompt user to save or discard it. \r
+  // If data is changed, prompt user to save or discard it.\r

   //\r
   do {\r
     ConfirmRet = (UINT32) mFormDisplay->ConfirmDataChange();\r
   //\r
   do {\r
     ConfirmRet = (UINT32) mFormDisplay->ConfirmDataChange();\r

diff --git a/MdeModulePkg/Universal/SetupBrowserDxe/Setup.h b/MdeModulePkg/Universal/SetupBrowserDxe/Setup.h
index 09e0be7494b3d15283d82bd8ec9a00c493c17daa..4dd7176ba57a59226e1153023cd2045fe9f786af 100644 (file)
--- a/MdeModulePkg/Universal/SetupBrowserDxe/Setup.h
+++ b/MdeModulePkg/Universal/SetupBrowserDxe/Setup.h
@@ -1,7 +1,7 @@
 /** @file\r
 Private MACRO, structure and function definitions for Setup Browser module.\r
 \r
 /** @file\r
 Private MACRO, structure and function definitions for Setup Browser module.\r
 \r

-Copyright (c) 2007 - 2017, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2007 - 2018, Intel Corporation. All rights reserved.<BR>\r

 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r


@@ -271,7 +271,7 @@ typedef struct {
 typedef struct {\r
   UINTN                Signature;\r
   LIST_ENTRY           Link;\r
 typedef struct {\r
   UINTN                Signature;\r
   LIST_ENTRY           Link;\r

-  \r
+\r

   EFI_IFR_ONE_OF_OPTION  *OpCode;   // OneOfOption Data\r
 \r
   EFI_STRING_ID        Text;\r
   EFI_IFR_ONE_OF_OPTION  *OpCode;   // OneOfOption Data\r
 \r
   EFI_STRING_ID        Text;\r


@@ -286,14 +286,14 @@ typedef struct {
 \r
 typedef enum {\r
   ExpressFalse = 0,\r
 \r
 typedef enum {\r
   ExpressFalse = 0,\r

-  ExpressGrayOut,  \r
+  ExpressGrayOut,\r

   ExpressSuppress,\r
   ExpressDisable\r
 } EXPRESS_RESULT;\r
 \r
 typedef enum {\r
   ExpressNone = 0,\r
   ExpressSuppress,\r
   ExpressDisable\r
 } EXPRESS_RESULT;\r
 \r
 typedef enum {\r
   ExpressNone = 0,\r

-  ExpressForm,  \r
+  ExpressForm,\r

   ExpressStatement,\r
   ExpressOption\r
 } EXPRESS_LEVEL;\r
   ExpressStatement,\r
   ExpressOption\r
 } EXPRESS_LEVEL;\r


@@ -390,7 +390,7 @@ typedef struct {
 \r
   CHAR16                *ConfigRequest; // <ConfigRequest> = <ConfigHdr> + <RequestElement>\r
   CHAR16                *ConfigAltResp; // Alt config response string for this ConfigRequest.\r
 \r
   CHAR16                *ConfigRequest; // <ConfigRequest> = <ConfigHdr> + <RequestElement>\r
   CHAR16                *ConfigAltResp; // Alt config response string for this ConfigRequest.\r

-  UINTN                 ElementCount;   // Number of <RequestElement> in the <ConfigRequest>  \r
+  UINTN                 ElementCount;   // Number of <RequestElement> in the <ConfigRequest>\r

   UINTN                 SpareStrLen;\r
   CHAR16                *RestoreConfigRequest; // When submit form fail, the element need to be restored\r
   CHAR16                *SyncConfigRequest;    // When submit form fail, the element need to be synced\r
   UINTN                 SpareStrLen;\r
   CHAR16                *RestoreConfigRequest; // When submit form fail, the element need to be restored\r
   CHAR16                *SyncConfigRequest;    // When submit form fail, the element need to be synced\r


@@ -773,10 +773,10 @@ ValidateFormSet (
   @param  SettingScope           Setting Scope for Default action.\r
 \r
 **/\r
   @param  SettingScope           Setting Scope for Default action.\r
 \r
 **/\r

-VOID \r
+VOID\r

 UpdateStatementStatus (\r
   IN FORM_BROWSER_FORMSET             *FormSet,\r
 UpdateStatementStatus (\r
   IN FORM_BROWSER_FORMSET             *FormSet,\r

-  IN FORM_BROWSER_FORM                *Form, \r
+  IN FORM_BROWSER_FORM                *Form,\r

   IN BROWSER_SETTING_SCOPE            SettingScope\r
   );\r
 \r
   IN BROWSER_SETTING_SCOPE            SettingScope\r
   );\r
 \r


@@ -922,13 +922,13 @@ EFI_STATUS
 InitializeFormSet (\r
   IN  EFI_HII_HANDLE                   Handle,\r
   IN OUT EFI_GUID                      *FormSetGuid,\r
 InitializeFormSet (\r
   IN  EFI_HII_HANDLE                   Handle,\r
   IN OUT EFI_GUID                      *FormSetGuid,\r

-  OUT FORM_BROWSER_FORMSET             *FormSet                   \r
+  OUT FORM_BROWSER_FORMSET             *FormSet\r

   );\r
 \r
 /**\r
   Reset Questions to their initial value or default value in a Form, Formset or System.\r
 \r
   );\r
 \r
 /**\r
   Reset Questions to their initial value or default value in a Form, Formset or System.\r
 \r

-  GetDefaultValueScope parameter decides which questions will reset \r
+  GetDefaultValueScope parameter decides which questions will reset\r

   to its default value.\r
 \r
   @param  FormSet                FormSet data structure.\r
   to its default value.\r
 \r
   @param  FormSet                FormSet data structure.\r


@@ -961,7 +961,7 @@ ExtractDefault (
 /**\r
   Initialize Question's Edit copy from Storage.\r
 \r
 /**\r
   Initialize Question's Edit copy from Storage.\r
 \r

-  @param  Selection              Selection contains the information about \r
+  @param  Selection              Selection contains the information about\r

                                  the Selection, form and formset to be displayed.\r
                                  Selection action may be updated in retrieve callback.\r
                                  If Selection is NULL, only initialize Question value.\r
                                  the Selection, form and formset to be displayed.\r
                                  Selection action may be updated in retrieve callback.\r
                                  If Selection is NULL, only initialize Question value.\r


@@ -981,7 +981,7 @@ LoadFormConfig (
 /**\r
   Initialize Question's Edit copy from Storage for the whole Formset.\r
 \r
 /**\r
   Initialize Question's Edit copy from Storage for the whole Formset.\r
 \r

-  @param  Selection              Selection contains the information about \r
+  @param  Selection              Selection contains the information about\r

                                  the Selection, form and formset to be displayed.\r
                                  Selection action may be updated in retrieve callback.\r
                                  If Selection is NULL, only initialize Question value.\r
                                  the Selection, form and formset to be displayed.\r
                                  Selection action may be updated in retrieve callback.\r
                                  If Selection is NULL, only initialize Question value.\r


@@ -1071,7 +1071,7 @@ GetIfrBinaryData (
   );\r
 \r
 /**\r
   );\r
 \r
 /**\r

-  Save globals used by previous call to SendForm(). SendForm() may be called from \r
+  Save globals used by previous call to SendForm(). SendForm() may be called from\r

   HiiConfigAccess.Callback(), this will cause SendForm() be reentried.\r
   So, save globals of previous call to SendForm() and restore them upon exit.\r
 \r
   HiiConfigAccess.Callback(), this will cause SendForm() be reentried.\r
   So, save globals of previous call to SendForm() and restore them upon exit.\r
 \r


@@ -1175,9 +1175,9 @@ BrowserCallback (
                          about the Selection, form and formset to be displayed.\r
                          On output, Selection return the screen item that is selected\r
                          by user.\r
                          about the Selection, form and formset to be displayed.\r
                          On output, Selection return the screen item that is selected\r
                          by user.\r

-  @param SettingLevel    Input Settting level, if it is FormLevel, just exit current form. \r
+  @param SettingLevel    Input Settting level, if it is FormLevel, just exit current form.\r

                          else, we need to exit current formset.\r
                          else, we need to exit current formset.\r

-  \r
+\r

   @retval TRUE           Exit current form.\r
   @retval FALSE          User press ESC and keep in current form.\r
 **/\r
   @retval TRUE           Exit current form.\r
   @retval FALSE          User press ESC and keep in current form.\r
 **/\r


@@ -1229,7 +1229,7 @@ IsNvUpdateRequiredForFormSet (
   @retval EFI_SUCCESS          The call back function executes successfully.\r
   @return Other value if the call back function failed to execute.\r
 **/\r
   @retval EFI_SUCCESS          The call back function executes successfully.\r
   @return Other value if the call back function failed to execute.\r
 **/\r

-EFI_STATUS \r
+EFI_STATUS\r

 ProcessCallBackFunction (\r
   IN OUT UI_MENU_SELECTION               *Selection,\r
   IN     FORM_BROWSER_FORMSET            *FormSet,\r
 ProcessCallBackFunction (\r
   IN OUT UI_MENU_SELECTION               *Selection,\r
   IN     FORM_BROWSER_FORMSET            *FormSet,\r


@@ -1238,11 +1238,11 @@ ProcessCallBackFunction (
   IN     EFI_BROWSER_ACTION              Action,\r
   IN     BOOLEAN                         SkipSaveOrDiscard\r
   );\r
   IN     EFI_BROWSER_ACTION              Action,\r
   IN     BOOLEAN                         SkipSaveOrDiscard\r
   );\r

-  \r
+\r

 /**\r
   Call the retrieve type call back function for one question to get the initialize data.\r
 /**\r
   Call the retrieve type call back function for one question to get the initialize data.\r

-  \r
-  This function only used when in the initialize stage, because in this stage, the \r
+\r
+  This function only used when in the initialize stage, because in this stage, the\r

   Selection->Form is not ready. For other case, use the ProcessCallBackFunction instead.\r
 \r
   @param ConfigAccess          The config access protocol produced by the hii driver.\r
   Selection->Form is not ready. For other case, use the ProcessCallBackFunction instead.\r
 \r
   @param ConfigAccess          The config access protocol produced by the hii driver.\r


@@ -1252,7 +1252,7 @@ ProcessCallBackFunction (
   @retval EFI_SUCCESS          The call back function executes successfully.\r
   @return Other value if the call back function failed to execute.\r
 **/\r
   @retval EFI_SUCCESS          The call back function executes successfully.\r
   @return Other value if the call back function failed to execute.\r
 **/\r

-EFI_STATUS \r
+EFI_STATUS\r

 ProcessRetrieveForQuestion (\r
   IN     EFI_HII_CONFIG_ACCESS_PROTOCOL  *ConfigAccess,\r
   IN     FORM_BROWSER_STATEMENT          *Statement,\r
 ProcessRetrieveForQuestion (\r
   IN     EFI_HII_CONFIG_ACCESS_PROTOCOL  *ConfigAccess,\r
   IN     FORM_BROWSER_STATEMENT          *Statement,\r


@@ -1261,22 +1261,22 @@ ProcessRetrieveForQuestion (
 \r
 /**\r
   Find the matched FormSet context in the backup maintain list based on HiiHandle.\r
 \r
 /**\r
   Find the matched FormSet context in the backup maintain list based on HiiHandle.\r

-  \r
+\r

   @param Handle  The Hii Handle.\r
   @param Handle  The Hii Handle.\r

-  \r
+\r

   @return the found FormSet context. If no found, NULL will return.\r
 \r
 **/\r
   @return the found FormSet context. If no found, NULL will return.\r
 \r
 **/\r

-FORM_BROWSER_FORMSET * \r
+FORM_BROWSER_FORMSET *\r

 GetFormSetFromHiiHandle (\r
   EFI_HII_HANDLE Handle\r
   );\r
 \r
 /**\r
   Check whether the input HII handle is the FormSet that is being used.\r
 GetFormSetFromHiiHandle (\r
   EFI_HII_HANDLE Handle\r
   );\r
 \r
 /**\r
   Check whether the input HII handle is the FormSet that is being used.\r

-  \r
+\r

   @param Handle  The Hii Handle.\r
   @param Handle  The Hii Handle.\r

-  \r
+\r

   @retval TRUE   HII handle is being used.\r
   @retval FALSE  HII handle is not being used.\r
 \r
   @retval TRUE   HII handle is being used.\r
   @retval FALSE  HII handle is not being used.\r
 \r


@@ -1291,11 +1291,11 @@ IsHiiHandleInBrowserContext (
   All hot keys have the same scope. The mixed hot keys with the different level are not supported.\r
   If no scope is set, the default scope will be FormSet level.\r
   After all registered hot keys are removed, previous Scope can reset to another level.\r
   All hot keys have the same scope. The mixed hot keys with the different level are not supported.\r
   If no scope is set, the default scope will be FormSet level.\r
   After all registered hot keys are removed, previous Scope can reset to another level.\r

-  \r
-  @param[in] Scope               Scope level to be set. \r
-  \r
+\r
+  @param[in] Scope               Scope level to be set.\r
+\r

   @retval EFI_SUCCESS            Scope is set correctly.\r
   @retval EFI_SUCCESS            Scope is set correctly.\r

-  @retval EFI_INVALID_PARAMETER  Scope is not the valid value specified in BROWSER_SETTING_SCOPE. \r
+  @retval EFI_INVALID_PARAMETER  Scope is not the valid value specified in BROWSER_SETTING_SCOPE.\r

   @retval EFI_UNSPPORTED         Scope level is different from current one that the registered hot keys have.\r
 \r
 **/\r
   @retval EFI_UNSPPORTED         Scope level is different from current one that the registered hot keys have.\r
 \r
 **/\r


@@ -1310,15 +1310,15 @@ SetScope (
   Only support hot key that is not printable character (control key, function key, etc.).\r
   If the action value is zero, the hot key will be unregistered if it has been registered.\r
   If the same hot key has been registered, the new action and help string will override the previous ones.\r
   Only support hot key that is not printable character (control key, function key, etc.).\r
   If the action value is zero, the hot key will be unregistered if it has been registered.\r
   If the same hot key has been registered, the new action and help string will override the previous ones.\r

-  \r
+\r

   @param[in] KeyData     A pointer to a buffer that describes the keystroke\r
   @param[in] KeyData     A pointer to a buffer that describes the keystroke\r

-                         information for the hot key. Its type is EFI_INPUT_KEY to \r
+                         information for the hot key. Its type is EFI_INPUT_KEY to\r

                          be supported by all ConsoleIn devices.\r
                          be supported by all ConsoleIn devices.\r

-  @param[in] Action      Action value that describes what action will be trigged when the hot key is pressed. \r
+  @param[in] Action      Action value that describes what action will be trigged when the hot key is pressed.\r

   @param[in] DefaultId   Specifies the type of defaults to retrieve, which is only for DEFAULT action.\r
   @param[in] HelpString  Help string that describes the hot key information.\r
                          Its value may be NULL for the unregistered hot key.\r
   @param[in] DefaultId   Specifies the type of defaults to retrieve, which is only for DEFAULT action.\r
   @param[in] HelpString  Help string that describes the hot key information.\r
                          Its value may be NULL for the unregistered hot key.\r

-  \r
+\r

   @retval EFI_SUCCESS            Hot key is registered or unregistered.\r
   @retval EFI_INVALID_PARAMETER  KeyData is NULL.\r
   @retval EFI_NOT_FOUND          KeyData is not found to be unregistered.\r
   @retval EFI_SUCCESS            Hot key is registered or unregistered.\r
   @retval EFI_INVALID_PARAMETER  KeyData is NULL.\r
   @retval EFI_NOT_FOUND          KeyData is not found to be unregistered.\r


@@ -1335,11 +1335,11 @@ RegisterHotKey (
   );\r
 \r
 /**\r
   );\r
 \r
 /**\r

-  Register Exit handler function. \r
-  When more than one handler function is registered, the latter one will override the previous one. \r
-  When NULL handler is specified, the previous Exit handler will be unregistered. \r
-  \r
-  @param[in] Handler      Pointer to handler function. \r
+  Register Exit handler function.\r
+  When more than one handler function is registered, the latter one will override the previous one.\r
+  When NULL handler is specified, the previous Exit handler will be unregistered.\r
+\r
+  @param[in] Handler      Pointer to handler function.\r

 \r
 **/\r
 VOID\r
 \r
 **/\r
 VOID\r


@@ -1349,22 +1349,22 @@ RegiserExitHandler (
   );\r
 \r
 /**\r
   );\r
 \r
 /**\r

-  \r
-  Check whether the browser data has been modified. \r
+\r
+  Check whether the browser data has been modified.\r

 \r
   @retval TRUE        Browser data is changed.\r
   @retval FALSE       No browser data is changed.\r
 \r
 **/\r
 \r
   @retval TRUE        Browser data is changed.\r
   @retval FALSE       No browser data is changed.\r
 \r
 **/\r

-BOOLEAN \r
+BOOLEAN\r

 EFIAPI\r
 IsBrowserDataModified (\r
   VOID\r
   );\r
 \r
 /**\r
 EFIAPI\r
 IsBrowserDataModified (\r
   VOID\r
   );\r
 \r
 /**\r

-  \r
-  Execute the action requested by the Action parameter. \r
+\r
+  Execute the action requested by the Action parameter.\r

 \r
   @param[in] Action     Execute the request action.\r
   @param[in] DefaultId  The default Id info when need to load default value.\r
 \r
   @param[in] Action     Execute the request action.\r
   @param[in] DefaultId  The default Id info when need to load default value.\r


@@ -1373,7 +1373,7 @@ IsBrowserDataModified (
   @retval EFI_INVALID_PARAMETER    The input action value is invalid.\r
 \r
 **/\r
   @retval EFI_INVALID_PARAMETER    The input action value is invalid.\r
 \r
 **/\r

-EFI_STATUS \r
+EFI_STATUS\r

 EFIAPI\r
 ExecuteAction (\r
   IN UINT32        Action,\r
 EFIAPI\r
 ExecuteAction (\r
   IN UINT32        Action,\r


@@ -1411,7 +1411,7 @@ IsResetRequired (
 \r
 /**\r
   Find the registered HotKey based on KeyData.\r
 \r
 /**\r
   Find the registered HotKey based on KeyData.\r

-  \r
+\r

   @param[in] KeyData     A pointer to a buffer that describes the keystroke\r
                          information for the hot key.\r
 \r
   @param[in] KeyData     A pointer to a buffer that describes the keystroke\r
                          information for the hot key.\r
 \r


@@ -1435,7 +1435,7 @@ FORM_BROWSER_STATEMENT *
 GetBrowserStatement (\r
   IN FORM_DISPLAY_ENGINE_STATEMENT *DisplayStatement\r
   );\r
 GetBrowserStatement (\r
   IN FORM_DISPLAY_ENGINE_STATEMENT *DisplayStatement\r
   );\r

-  \r
+\r

 /**\r
   Password may be stored as encrypted by Configuration Driver. When change a\r
   password, user will be challenged with old password. To validate user input old\r
 /**\r
   Password may be stored as encrypted by Configuration Driver. When change a\r
   password, user will be challenged with old password. To validate user input old\r


@@ -1495,7 +1495,7 @@ EFI_STATUS
 SetupBrowser (\r
   IN OUT UI_MENU_SELECTION    *Selection\r
   );\r
 SetupBrowser (\r
   IN OUT UI_MENU_SELECTION    *Selection\r
   );\r

-  \r
+\r

 /**\r
   Free up the resource allocated for all strings required\r
   by Setup Browser.\r
 /**\r
   Free up the resource allocated for all strings required\r
   by Setup Browser.\r


@@ -1538,7 +1538,7 @@ UiAddMenuList (
 **/\r
 FORM_ENTRY_INFO *\r
 UiFindMenuList (\r
 **/\r
 FORM_ENTRY_INFO *\r
 UiFindMenuList (\r

-  IN EFI_HII_HANDLE       HiiHandle, \r
+  IN EFI_HII_HANDLE       HiiHandle,\r

   IN EFI_GUID             *FormSetGuid,\r
   IN UINT16               FormId\r
   );\r
   IN EFI_GUID             *FormSetGuid,\r
   IN UINT16               FormId\r
   );\r


@@ -1559,7 +1559,7 @@ UiFreeMenuList (
 \r
   @param  CurrentMenu    Current Menu\r
   @param  SettingLevel   Whether find parent menu in Form Level or Formset level.\r
 \r
   @param  CurrentMenu    Current Menu\r
   @param  SettingLevel   Whether find parent menu in Form Level or Formset level.\r

-                         In form level, just find the parent menu; \r
+                         In form level, just find the parent menu;\r

                          In formset level, find the parent menu which has different\r
                          formset guid value.\r
 \r
                          In formset level, find the parent menu which has different\r
                          formset guid value.\r
 \r


@@ -1570,7 +1570,7 @@ UiFindParentMenu (
   IN FORM_ENTRY_INFO          *CurrentMenu,\r
   IN BROWSER_SETTING_SCOPE    SettingLevel\r
   );\r
   IN FORM_ENTRY_INFO          *CurrentMenu,\r
   IN BROWSER_SETTING_SCOPE    SettingLevel\r
   );\r

-  \r
+\r

 /**\r
   Validate the HiiHandle.\r
 \r
 /**\r
   Validate the HiiHandle.\r
 \r


@@ -1587,7 +1587,7 @@ ValidateHiiHandle (
 \r
 /**\r
   Copy current Menu list to the new menu list.\r
 \r
 /**\r
   Copy current Menu list to the new menu list.\r

-  \r
+\r

   @param  NewMenuListHead        New create Menu list.\r
   @param  CurrentMenuListHead    Current Menu list.\r
 \r
   @param  NewMenuListHead        New create Menu list.\r
   @param  CurrentMenuListHead    Current Menu list.\r
 \r


@@ -1649,7 +1649,7 @@ SetArrayData (
 \r
 /**\r
    Compare two Hii value.\r
 \r
 /**\r
    Compare two Hii value.\r

- \r
+\r

    @param  Value1                 Expression value to compare on left-hand.\r
    @param  Value2                 Expression value to compare on right-hand.\r
    @param  Result                 Return value after compare.\r
    @param  Value1                 Expression value to compare on left-hand.\r
    @param  Value2                 Expression value to compare on right-hand.\r
    @param  Result                 Return value after compare.\r


@@ -1657,10 +1657,10 @@ SetArrayData (
                                   return Positive value if Value1 is greater than Value2.\r
                                   retval Negative value if Value1 is less than Value2.\r
    @param  HiiHandle              Only required for string compare.\r
                                   return Positive value if Value1 is greater than Value2.\r
                                   retval Negative value if Value1 is less than Value2.\r
    @param  HiiHandle              Only required for string compare.\r

- \r
+\r

    @retval other                  Could not perform compare on two values.\r
    @retval EFI_SUCCESS            Compare the value success.\r
    @retval other                  Could not perform compare on two values.\r
    @retval EFI_SUCCESS            Compare the value success.\r

- \r
+\r

 **/\r
 EFI_STATUS\r
 CompareHiiValue (\r
 **/\r
 EFI_STATUS\r
 CompareHiiValue (\r


@@ -1671,15 +1671,15 @@ CompareHiiValue (
   );\r
 \r
 /**\r
   );\r
 \r
 /**\r

-  Perform Password check. \r
+  Perform Password check.\r

   Passwork may be encrypted by driver that requires the specific check.\r
   Passwork may be encrypted by driver that requires the specific check.\r

-  \r
+\r

   @param  Form             Form where Password Statement is in.\r
   @param  Statement        Password statement\r
   @param  PasswordString   Password string to be checked. It may be NULL.\r
                            NULL means to restore password.\r
                            "" string can be used to checked whether old password does exist.\r
   @param  Form             Form where Password Statement is in.\r
   @param  Statement        Password statement\r
   @param  PasswordString   Password string to be checked. It may be NULL.\r
                            NULL means to restore password.\r
                            "" string can be used to checked whether old password does exist.\r

-  \r
+\r

   @return Status     Status of Password check.\r
 **/\r
 EFI_STATUS\r
   @return Status     Status of Password check.\r
 **/\r
 EFI_STATUS\r


@@ -1703,7 +1703,7 @@ FORM_BROWSER_STATEMENT *
 GetBrowserStatement (\r
   IN FORM_DISPLAY_ENGINE_STATEMENT *DisplayStatement\r
   );\r
 GetBrowserStatement (\r
   IN FORM_DISPLAY_ENGINE_STATEMENT *DisplayStatement\r
   );\r

-  \r
+\r

 /**\r
 \r
   Initialize the Display form structure data.\r
 /**\r
 \r
   Initialize the Display form structure data.\r


@@ -1757,7 +1757,7 @@ DevicePathToHiiHandle (
   @retval FALSE                  All elements covered by current used elements.\r
 \r
 **/\r
   @retval FALSE                  All elements covered by current used elements.\r
 \r
 **/\r

-BOOLEAN \r
+BOOLEAN\r

 ConfigRequestAdjust (\r
   IN  BROWSER_STORAGE         *Storage,\r
   IN  CHAR16                  *Request,\r
 ConfigRequestAdjust (\r
   IN  BROWSER_STORAGE         *Storage,\r
   IN  CHAR16                  *Request,\r


@@ -1765,8 +1765,8 @@ ConfigRequestAdjust (
   );\r
 \r
 /**\r
   );\r
 \r
 /**\r

-  Perform question check. \r
-  \r
+  Perform question check.\r
+\r

   If one question has more than one check, process form high priority to low.\r
 \r
   @param  FormSet                FormSet data structure.\r
   If one question has more than one check, process form high priority to low.\r
 \r
   @param  FormSet                FormSet data structure.\r


@@ -1843,7 +1843,7 @@ GetFstStgFromVarId (
   @param  Storage              browser storage info.\r
 \r
   @return Pointer to a FORMSET_STORAGE data structure.\r
   @param  Storage              browser storage info.\r
 \r
   @return Pointer to a FORMSET_STORAGE data structure.\r

-  \r
+\r

 \r
 **/\r
 FORMSET_STORAGE *\r
 \r
 **/\r
 FORMSET_STORAGE *\r


@@ -1858,7 +1858,7 @@ GetFstStgFromBrsStg (
 \r
   @retval   TRUE     do the reconnect behavior success.\r
   @retval   FALSE    do the reconnect behavior failed.\r
 \r
   @retval   TRUE     do the reconnect behavior success.\r
   @retval   FALSE    do the reconnect behavior failed.\r

-  \r
+\r

 **/\r
 BOOLEAN\r
 ReconnectController (\r
 **/\r
 BOOLEAN\r
 ReconnectController (\r

diff --git a/MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowser.uni b/MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowser.uni
index 4d158360ef014e42bb8ac04da00541c0116bee1d..c81126e96a895e13ff604eb679b62e9670484399 100644 (file)
--- a/MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowser.uni
+++ b/MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowser.uni
@@ -3,13 +3,13 @@
 //\r
 // It also produces FormBrowserEx(2) protocol to let user register the different Hot key service.\r
 //\r
 //\r
 // It also produces FormBrowserEx(2) protocol to let user register the different Hot key service.\r
 //\r

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

 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r
 // which accompanies this distribution. The full text of the license may be found at\r
 // http://opensource.org/licenses/bsd-license.php\r
 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r
 // which accompanies this distribution. The full text of the license may be found at\r
 // http://opensource.org/licenses/bsd-license.php\r

-// \r
+//\r

 // THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 // WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 //\r
 // THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 // WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 //\r

diff --git a/MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf b/MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf
index f7b53ea1d2ce507a0f342a3fbc2f9ce800f98128..4f847d40616824330b2a65e9f09615721c58d639 100644 (file)
--- a/MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf
+++ b/MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf
@@ -1,9 +1,9 @@
 ## @file\r
 # The DXE driver produces FORM BROWSER2 protocol defined in UEFI specification.\r
 #\r
 ## @file\r
 # The DXE driver produces FORM BROWSER2 protocol defined in UEFI specification.\r
 #\r

-# It also produces FormBrowserEx(2) protocol to let user register the different Hot key service. \r
+# It also produces FormBrowserEx(2) protocol to let user register the different Hot key service.\r

 #\r
 #\r

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

 #\r
 #  This program and the accompanying materials\r
 #  are licensed and made available under the terms and conditions of the BSD License\r
 #\r
 #  This program and the accompanying materials\r
 #  are licensed and made available under the terms and conditions of the BSD License\r

diff --git a/MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserExtra.uni b/MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserExtra.uni
index b456e2a54cb9a3c565ea75740e54e4a95ba9324e..73c924a36988440eccafe66fb63fa97023d953ca 100644 (file)
--- a/MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserExtra.uni
+++ b/MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserExtra.uni
@@ -1,7 +1,7 @@
 // /** @file\r
 // SetupBrowser Localized Strings and Content\r
 //\r
 // /** @file\r
 // SetupBrowser Localized Strings and Content\r
 //\r

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

 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r
 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r


@@ -13,8 +13,8 @@
 //\r
 // **/\r
 \r
 //\r
 // **/\r
 \r

-#string STR_PROPERTIES_MODULE_NAME \r
-#language en-US \r
+#string STR_PROPERTIES_MODULE_NAME\r
+#language en-US\r

 "Setup Browser DXE Driver"\r
 \r
 \r
 "Setup Browser DXE Driver"\r
 \r
 \r

diff --git a/MdeModulePkg/Universal/SmbiosDxe/SmbiosDxe.c b/MdeModulePkg/Universal/SmbiosDxe/SmbiosDxe.c
index 4e757e1c47c0e16512c5825c5f24be4e245ca163..78955f3a56ad5a25961d42bda0f53196b570fb1d 100644 (file)
--- a/MdeModulePkg/Universal/SmbiosDxe/SmbiosDxe.c
+++ b/MdeModulePkg/Universal/SmbiosDxe/SmbiosDxe.c
@@ -1,15 +1,15 @@
 /** @file\r
 /** @file\r

-  This code produces the Smbios protocol. It also responsible for constructing \r
+  This code produces the Smbios protocol. It also responsible for constructing\r

   SMBIOS table into system table.\r
   SMBIOS table into system table.\r

-  \r
-Copyright (c) 2009 - 2017, Intel Corporation. All rights reserved.<BR>\r
-This program and the accompanying materials                          \r
-are licensed and made available under the terms and conditions of the BSD License         \r
-which accompanies this distribution.  The full text of the license may be found at        \r
-http://opensource.org/licenses/bsd-license.php                                            \r
-                                                                                          \r
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     \r
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             \r
+\r
+Copyright (c) 2009 - 2018, Intel Corporation. All rights reserved.<BR>\r
+This program and the accompanying materials\r
+are licensed and made available under the terms and conditions of the BSD License\r
+which accompanies this distribution.  The full text of the license may be found at\r
+http://opensource.org/licenses/bsd-license.php\r
+\r
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r

 \r
 **/\r
 \r
 \r
 **/\r
 \r


@@ -165,7 +165,7 @@ SMBIOS_TABLE_3_0_ENTRY_POINT Smbios30EntryPointStructureData = {
 \r
   @retval EFI_SUCCESS           Size retured in Size.\r
   @retval EFI_INVALID_PARAMETER Input SMBIOS structure mal-formed or Size is NULL.\r
 \r
   @retval EFI_SUCCESS           Size retured in Size.\r
   @retval EFI_INVALID_PARAMETER Input SMBIOS structure mal-formed or Size is NULL.\r

-  \r
+\r

 **/\r
 EFI_STATUS\r
 EFIAPI\r
 **/\r
 EFI_STATUS\r
 EFIAPI\r


@@ -180,7 +180,7 @@ GetSmbiosStructureSize (
   UINTN  StrLen;\r
   UINTN  MaxLen;\r
   INT8*  CharInStr;\r
   UINTN  StrLen;\r
   UINTN  MaxLen;\r
   INT8*  CharInStr;\r

-  \r
+\r

   if (Size == NULL || NumberOfStrings == NULL) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
   if (Size == NULL || NumberOfStrings == NULL) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r


@@ -193,7 +193,7 @@ GetSmbiosStructureSize (
   //\r
   // look for the two consecutive zeros, check the string limit by the way.\r
   //\r
   //\r
   // look for the two consecutive zeros, check the string limit by the way.\r
   //\r

-  while (*CharInStr != 0 || *(CharInStr+1) != 0) { \r
+  while (*CharInStr != 0 || *(CharInStr+1) != 0) {\r

     if (*CharInStr == 0) {\r
       *Size += 1;\r
       CharInStr++;\r
     if (*CharInStr == 0) {\r
       *Size += 1;\r
       CharInStr++;\r


@@ -251,7 +251,7 @@ GetSmbiosStructureSize (
 \r
   @retval TRUE       Smbios handle already in use.\r
   @retval FALSE      Smbios handle is NOT used.\r
 \r
   @retval TRUE       Smbios handle already in use.\r
   @retval FALSE      Smbios handle is NOT used.\r

-  \r
+\r

 **/\r
 BOOLEAN\r
 EFIAPI\r
 **/\r
 BOOLEAN\r
 EFIAPI\r


@@ -262,7 +262,7 @@ CheckSmbiosHandleExistance (
 {\r
   LIST_ENTRY              *Link;\r
   SMBIOS_HANDLE_ENTRY     *HandleEntry;\r
 {\r
   LIST_ENTRY              *Link;\r
   SMBIOS_HANDLE_ENTRY     *HandleEntry;\r

-  \r
+\r

   for (Link = Head->ForwardLink; Link != Head; Link = Link->ForwardLink) {\r
     HandleEntry = SMBIOS_HANDLE_ENTRY_FROM_LINK(Link);\r
     if (HandleEntry->SmbiosHandle == Handle) {\r
   for (Link = Head->ForwardLink; Link != Head; Link = Link->ForwardLink) {\r
     HandleEntry = SMBIOS_HANDLE_ENTRY_FROM_LINK(Link);\r
     if (HandleEntry->SmbiosHandle == Handle) {\r


@@ -286,7 +286,7 @@ EFIAPI
 GetMaxSmbiosHandle (\r
   IN CONST  EFI_SMBIOS_PROTOCOL   *This,\r
   IN OUT    EFI_SMBIOS_HANDLE     *MaxHandle\r
 GetMaxSmbiosHandle (\r
   IN CONST  EFI_SMBIOS_PROTOCOL   *This,\r
   IN OUT    EFI_SMBIOS_HANDLE     *MaxHandle\r

-  ) \r
+  )\r

 {\r
   if (This->MajorVersion == 2 && This->MinorVersion == 0) {\r
     *MaxHandle = 0xFFFE;\r
 {\r
   if (This->MajorVersion == 2 && This->MinorVersion == 0) {\r
     *MaxHandle = 0xFFFE;\r


@@ -304,7 +304,7 @@ GetMaxSmbiosHandle (
 \r
   @retval EFI_SUCCESS            Smbios handle got.\r
   @retval EFI_OUT_OF_RESOURCES   Smbios handle is NOT available.\r
 \r
   @retval EFI_SUCCESS            Smbios handle got.\r
   @retval EFI_OUT_OF_RESOURCES   Smbios handle is NOT available.\r

-  \r
+\r

 **/\r
 EFI_STATUS\r
 EFIAPI\r
 **/\r
 EFI_STATUS\r
 EFIAPI\r


@@ -343,8 +343,8 @@ GetAvailableSmbiosHandle (
                                 will be assigned to the SMBIOS record. If the SMBIOS handle is already in use,\r
                                 EFI_ALREADY_STARTED is returned and the SMBIOS record is not updated.\r
   @param  Record                The data for the fixed portion of the SMBIOS record. The format of the record is\r
                                 will be assigned to the SMBIOS record. If the SMBIOS handle is already in use,\r
                                 EFI_ALREADY_STARTED is returned and the SMBIOS record is not updated.\r
   @param  Record                The data for the fixed portion of the SMBIOS record. The format of the record is\r

-                                determined by EFI_SMBIOS_TABLE_HEADER.Type. The size of the formatted area is defined \r
-                                by EFI_SMBIOS_TABLE_HEADER.Length and either followed by a double-null (0x0000) or \r
+                                determined by EFI_SMBIOS_TABLE_HEADER.Type. The size of the formatted area is defined\r
+                                by EFI_SMBIOS_TABLE_HEADER.Length and either followed by a double-null (0x0000) or\r

                                 a set of null terminated strings and a null.\r
 \r
   @retval EFI_SUCCESS           Record was added.\r
                                 a set of null terminated strings and a null.\r
 \r
   @retval EFI_SUCCESS           Record was added.\r


@@ -375,11 +375,11 @@ SmbiosAdd (
   EFI_SMBIOS_RECORD_HEADER    *InternalRecord;\r
   BOOLEAN                     Smbios32BitTable;\r
   BOOLEAN                     Smbios64BitTable;\r
   EFI_SMBIOS_RECORD_HEADER    *InternalRecord;\r
   BOOLEAN                     Smbios32BitTable;\r
   BOOLEAN                     Smbios64BitTable;\r

-  \r
+\r

   if (SmbiosHandle == NULL) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
   if (SmbiosHandle == NULL) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r

-  \r
+\r

   Private = SMBIOS_INSTANCE_FROM_THIS (This);\r
   //\r
   // Check whether SmbiosHandle is already in use\r
   Private = SMBIOS_INSTANCE_FROM_THIS (This);\r
   //\r
   // Check whether SmbiosHandle is already in use\r


@@ -417,14 +417,14 @@ SmbiosAdd (
 \r
   Smbios32BitTable = FALSE;\r
   Smbios64BitTable = FALSE;\r
 \r
   Smbios32BitTable = FALSE;\r
   Smbios64BitTable = FALSE;\r

-  if ((This->MajorVersion < 0x3) || \r
+  if ((This->MajorVersion < 0x3) ||\r

       ((This->MajorVersion >= 0x3) && ((PcdGet32 (PcdSmbiosEntryPointProvideMethod) & BIT0) == BIT0))) {\r
     //\r
     // For SMBIOS 32-bit table, the length of the entire structure table (including all strings) must be reported\r
     // in the Structure Table Length field of the SMBIOS Structure Table Entry Point,\r
     // which is a WORD field limited to 65,535 bytes. So the max size of 32-bit table should not exceed 65,535 bytes.\r
     //\r
       ((This->MajorVersion >= 0x3) && ((PcdGet32 (PcdSmbiosEntryPointProvideMethod) & BIT0) == BIT0))) {\r
     //\r
     // For SMBIOS 32-bit table, the length of the entire structure table (including all strings) must be reported\r
     // in the Structure Table Length field of the SMBIOS Structure Table Entry Point,\r
     // which is a WORD field limited to 65,535 bytes. So the max size of 32-bit table should not exceed 65,535 bytes.\r
     //\r

-    if ((EntryPointStructure != NULL) && \r
+    if ((EntryPointStructure != NULL) &&\r

         (EntryPointStructure->TableLength + StructureSize > SMBIOS_TABLE_MAX_LENGTH)) {\r
       DEBUG ((EFI_D_INFO, "SmbiosAdd: Total length exceeds max 32-bit table length with type = %d size = 0x%x\n", Record->Type, StructureSize));\r
     } else {\r
         (EntryPointStructure->TableLength + StructureSize > SMBIOS_TABLE_MAX_LENGTH)) {\r
       DEBUG ((EFI_D_INFO, "SmbiosAdd: Total length exceeds max 32-bit table length with type = %d size = 0x%x\n", Record->Type, StructureSize));\r
     } else {\r


@@ -432,7 +432,7 @@ SmbiosAdd (
       DEBUG ((EFI_D_INFO, "SmbiosAdd: Smbios type %d with size 0x%x is added to 32-bit table\n", Record->Type, StructureSize));\r
     }\r
   }\r
       DEBUG ((EFI_D_INFO, "SmbiosAdd: Smbios type %d with size 0x%x is added to 32-bit table\n", Record->Type, StructureSize));\r
     }\r
   }\r

-  \r
+\r

   //\r
   // For SMBIOS 3.0, Structure table maximum size in Entry Point structure is DWORD field limited to 0xFFFFFFFF bytes.\r
   //\r
   //\r
   // For SMBIOS 3.0, Structure table maximum size in Entry Point structure is DWORD field limited to 0xFFFFFFFF bytes.\r
   //\r


@@ -441,7 +441,7 @@ SmbiosAdd (
     // For SMBIOS 64-bit table, Structure table maximum size in SMBIOS 3.0 (64-bit) Entry Point\r
     // is a DWORD field limited to 0xFFFFFFFF bytes. So the max size of 64-bit table should not exceed 0xFFFFFFFF bytes.\r
     //\r
     // For SMBIOS 64-bit table, Structure table maximum size in SMBIOS 3.0 (64-bit) Entry Point\r
     // is a DWORD field limited to 0xFFFFFFFF bytes. So the max size of 64-bit table should not exceed 0xFFFFFFFF bytes.\r
     //\r

-    if ((Smbios30EntryPointStructure != NULL) && \r
+    if ((Smbios30EntryPointStructure != NULL) &&\r

         (Smbios30EntryPointStructure->TableMaximumSize + StructureSize > SMBIOS_3_0_TABLE_MAX_LENGTH)) {\r
       DEBUG ((EFI_D_INFO, "SmbiosAdd: Total length exceeds max 64-bit table length with type = %d size = 0x%x\n", Record->Type, StructureSize));\r
     } else {\r
         (Smbios30EntryPointStructure->TableMaximumSize + StructureSize > SMBIOS_3_0_TABLE_MAX_LENGTH)) {\r
       DEBUG ((EFI_D_INFO, "SmbiosAdd: Total length exceeds max 64-bit table length with type = %d size = 0x%x\n", Record->Type, StructureSize));\r
     } else {\r


@@ -459,12 +459,12 @@ SmbiosAdd (
 \r
   //\r
   // Enter into critical section\r
 \r
   //\r
   // Enter into critical section\r

-  //  \r
+  //\r

   Status = EfiAcquireLockOrFail (&Private->DataLock);\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
   Status = EfiAcquireLockOrFail (&Private->DataLock);\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r

-  \r
+\r

   RecordSize  = sizeof (EFI_SMBIOS_RECORD_HEADER) + StructureSize;\r
   TotalSize   = sizeof (EFI_SMBIOS_ENTRY) + RecordSize;\r
 \r
   RecordSize  = sizeof (EFI_SMBIOS_RECORD_HEADER) + StructureSize;\r
   TotalSize   = sizeof (EFI_SMBIOS_ENTRY) + RecordSize;\r
 \r


@@ -520,7 +520,7 @@ SmbiosAdd (
   // configuration table without depending on PI SMBIOS protocol.\r
   //\r
   SmbiosTableConstruction (Smbios32BitTable, Smbios64BitTable);\r
   // configuration table without depending on PI SMBIOS protocol.\r
   //\r
   SmbiosTableConstruction (Smbios32BitTable, Smbios64BitTable);\r

-  \r
+\r

   //\r
   // Leave critical section\r
   //\r
   //\r
   // Leave critical section\r
   //\r


@@ -567,7 +567,7 @@ SmbiosUpdateString (
   EFI_SMBIOS_HANDLE         MaxSmbiosHandle;\r
   EFI_SMBIOS_TABLE_HEADER   *Record;\r
   EFI_SMBIOS_RECORD_HEADER  *InternalRecord;\r
   EFI_SMBIOS_HANDLE         MaxSmbiosHandle;\r
   EFI_SMBIOS_TABLE_HEADER   *Record;\r
   EFI_SMBIOS_RECORD_HEADER  *InternalRecord;\r

-  \r
+\r

   //\r
   // Check args validity\r
   //\r
   //\r
   // Check args validity\r
   //\r


@@ -594,7 +594,7 @@ SmbiosUpdateString (
   } else if (This->MajorVersion < 3) {\r
     //\r
     // Reference SMBIOS 2.7, chapter 6.1.3, it will have no limit on the length of each individual text string.\r
   } else if (This->MajorVersion < 3) {\r
     //\r
     // Reference SMBIOS 2.7, chapter 6.1.3, it will have no limit on the length of each individual text string.\r

-    // However, the length of the entire structure table (including all strings) must be reported \r
+    // However, the length of the entire structure table (including all strings) must be reported\r

     // in the Structure Table Length field of the SMBIOS Structure Table Entry Point,\r
     // which is a WORD field limited to 65,535 bytes.\r
     //\r
     // in the Structure Table Length field of the SMBIOS Structure Table Entry Point,\r
     // which is a WORD field limited to 65,535 bytes.\r
     //\r


@@ -606,7 +606,7 @@ SmbiosUpdateString (
       //\r
       // SMBIOS 3.0 defines the Structure table maximum size as DWORD field limited to 0xFFFFFFFF bytes.\r
       // The input string length should not exceed 0xFFFFFFFF bytes.\r
       //\r
       // SMBIOS 3.0 defines the Structure table maximum size as DWORD field limited to 0xFFFFFFFF bytes.\r
       // The input string length should not exceed 0xFFFFFFFF bytes.\r

-      // \r
+      //\r

       return EFI_UNSUPPORTED;\r
     }\r
   }\r
       return EFI_UNSUPPORTED;\r
     }\r
   }\r


@@ -614,7 +614,7 @@ SmbiosUpdateString (
   Private = SMBIOS_INSTANCE_FROM_THIS (This);\r
   //\r
   // Enter into critical section\r
   Private = SMBIOS_INSTANCE_FROM_THIS (This);\r
   //\r
   // Enter into critical section\r

-  //  \r
+  //\r

   Status = EfiAcquireLockOrFail (&Private->DataLock);\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   Status = EfiAcquireLockOrFail (&Private->DataLock);\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r


@@ -637,7 +637,7 @@ SmbiosUpdateString (
       // Point to unformed string section\r
       //\r
       StrStart = (CHAR8 *) Record + Record->Length;\r
       // Point to unformed string section\r
       //\r
       StrStart = (CHAR8 *) Record + Record->Length;\r

-     \r
+\r

       for (StrIndex = 1, TargetStrOffset = 0; StrIndex < *StringNumber; StrStart++, TargetStrOffset++) {\r
         //\r
         // A string ends in 00h\r
       for (StrIndex = 1, TargetStrOffset = 0; StrIndex < *StringNumber; StrStart++, TargetStrOffset++) {\r
         //\r
         // A string ends in 00h\r


@@ -645,21 +645,21 @@ SmbiosUpdateString (
         if (*StrStart == 0) {\r
           StrIndex++;\r
         }\r
         if (*StrStart == 0) {\r
           StrIndex++;\r
         }\r

-        \r
+\r

         //\r
         // String section ends in double-null (0000h)\r
         //\r
         if (*StrStart == 0 && *(StrStart + 1) == 0) {\r
           EfiReleaseLock (&Private->DataLock);\r
           return EFI_NOT_FOUND;\r
         //\r
         // String section ends in double-null (0000h)\r
         //\r
         if (*StrStart == 0 && *(StrStart + 1) == 0) {\r
           EfiReleaseLock (&Private->DataLock);\r
           return EFI_NOT_FOUND;\r

-        } \r
+        }\r

       }\r
 \r
       if (*StrStart == 0) {\r
         StrStart++;\r
         TargetStrOffset++;\r
       }\r
       }\r
 \r
       if (*StrStart == 0) {\r
         StrStart++;\r
         TargetStrOffset++;\r
       }\r

-      \r
+\r

       //\r
       // Now we get the string target\r
       //\r
       //\r
       // Now we get the string target\r
       //\r


@@ -676,15 +676,15 @@ SmbiosUpdateString (
         EfiReleaseLock (&Private->DataLock);\r
         return EFI_SUCCESS;\r
       }\r
         EfiReleaseLock (&Private->DataLock);\r
         return EFI_SUCCESS;\r
       }\r

-      \r
+\r

       SmbiosEntry->Smbios32BitTable = FALSE;\r
       SmbiosEntry->Smbios64BitTable = FALSE;\r
       SmbiosEntry->Smbios32BitTable = FALSE;\r
       SmbiosEntry->Smbios64BitTable = FALSE;\r

-      if ((This->MajorVersion < 0x3) || \r
+      if ((This->MajorVersion < 0x3) ||\r

           ((This->MajorVersion >= 0x3) && ((PcdGet32 (PcdSmbiosEntryPointProvideMethod) & BIT0) == BIT0))) {\r
         //\r
         // 32-bit table is produced, check the valid length.\r
         //\r
           ((This->MajorVersion >= 0x3) && ((PcdGet32 (PcdSmbiosEntryPointProvideMethod) & BIT0) == BIT0))) {\r
         //\r
         // 32-bit table is produced, check the valid length.\r
         //\r

-        if ((EntryPointStructure != NULL) && \r
+        if ((EntryPointStructure != NULL) &&\r

             (EntryPointStructure->TableLength + InputStrLen - TargetStrLen > SMBIOS_TABLE_MAX_LENGTH)) {\r
           //\r
           // The length of the entire structure table (including all strings) must be reported\r
             (EntryPointStructure->TableLength + InputStrLen - TargetStrLen > SMBIOS_TABLE_MAX_LENGTH)) {\r
           //\r
           // The length of the entire structure table (including all strings) must be reported\r


@@ -696,13 +696,13 @@ SmbiosUpdateString (
           DEBUG ((EFI_D_INFO, "SmbiosUpdateString: New smbios record add to 32-bit table\n"));\r
           SmbiosEntry->Smbios32BitTable = TRUE;\r
         }\r
           DEBUG ((EFI_D_INFO, "SmbiosUpdateString: New smbios record add to 32-bit table\n"));\r
           SmbiosEntry->Smbios32BitTable = TRUE;\r
         }\r

-      } \r
+      }\r

 \r
       if ((This->MajorVersion >= 0x3) && ((PcdGet32 (PcdSmbiosEntryPointProvideMethod) & BIT1) == BIT1)) {\r
         //\r
         // 64-bit table is produced, check the valid length.\r
         //\r
 \r
       if ((This->MajorVersion >= 0x3) && ((PcdGet32 (PcdSmbiosEntryPointProvideMethod) & BIT1) == BIT1)) {\r
         //\r
         // 64-bit table is produced, check the valid length.\r
         //\r

-        if ((Smbios30EntryPointStructure != NULL) && \r
+        if ((Smbios30EntryPointStructure != NULL) &&\r

             (Smbios30EntryPointStructure->TableMaximumSize + InputStrLen - TargetStrLen > SMBIOS_3_0_TABLE_MAX_LENGTH)) {\r
           DEBUG ((EFI_D_INFO, "SmbiosUpdateString: Total length exceeds max 64-bit table length\n"));\r
         } else {\r
             (Smbios30EntryPointStructure->TableMaximumSize + InputStrLen - TargetStrLen > SMBIOS_3_0_TABLE_MAX_LENGTH)) {\r
           DEBUG ((EFI_D_INFO, "SmbiosUpdateString: Total length exceeds max 64-bit table length\n"));\r
         } else {\r


@@ -818,7 +818,7 @@ SmbiosRemove (
   Private = SMBIOS_INSTANCE_FROM_THIS (This);\r
   //\r
   // Enter into critical section\r
   Private = SMBIOS_INSTANCE_FROM_THIS (This);\r
   //\r
   // Enter into critical section\r

-  //  \r
+  //\r

   Status = EfiAcquireLockOrFail (&Private->DataLock);\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   Status = EfiAcquireLockOrFail (&Private->DataLock);\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r


@@ -833,7 +833,7 @@ SmbiosRemove (
       // Remove specified smobios record from DataList\r
       //\r
       RemoveEntryList(Link);\r
       // Remove specified smobios record from DataList\r
       //\r
       RemoveEntryList(Link);\r

-      // \r
+      //\r

       // Remove this handle from AllocatedHandleList\r
       //\r
       Head = &Private->AllocatedHandleListHead;\r
       // Remove this handle from AllocatedHandleList\r
       //\r
       Head = &Private->AllocatedHandleListHead;\r


@@ -872,7 +872,7 @@ SmbiosRemove (
   //\r
   EfiReleaseLock (&Private->DataLock);\r
   return EFI_INVALID_PARAMETER;\r
   //\r
   EfiReleaseLock (&Private->DataLock);\r
   return EFI_INVALID_PARAMETER;\r

-  \r
+\r

 }\r
 \r
 /**\r
 }\r
 \r
 /**\r


@@ -882,13 +882,13 @@ SmbiosRemove (
   @param  SmbiosHandle          On entry, points to the previous handle of the SMBIOS record. On exit, points to the\r
                                 next SMBIOS record handle. If it is FFFEh on entry, then the first SMBIOS record\r
                                 handle will be returned. If it returns FFFEh on exit, then there are no more SMBIOS records.\r
   @param  SmbiosHandle          On entry, points to the previous handle of the SMBIOS record. On exit, points to the\r
                                 next SMBIOS record handle. If it is FFFEh on entry, then the first SMBIOS record\r
                                 handle will be returned. If it returns FFFEh on exit, then there are no more SMBIOS records.\r

-  @param  Type                  On entry it means return the next SMBIOS record of type Type. If a NULL is passed in \r
+  @param  Type                  On entry it means return the next SMBIOS record of type Type. If a NULL is passed in\r

                                 this functionally it ignored. Type is not modified by the GetNext() function.\r
   @param  Record                On exit, points to the SMBIOS Record consisting of the formatted area followed by\r
                                 the unformatted area. The unformatted area optionally contains text strings.\r
                                 this functionally it ignored. Type is not modified by the GetNext() function.\r
   @param  Record                On exit, points to the SMBIOS Record consisting of the formatted area followed by\r
                                 the unformatted area. The unformatted area optionally contains text strings.\r

-  @param  ProducerHandle        On exit, points to the ProducerHandle registered by Add(). If no ProducerHandle was passed into Add() NULL is returned. \r
-                                If a NULL pointer is passed in no data will be returned \r
-                                \r
+  @param  ProducerHandle        On exit, points to the ProducerHandle registered by Add(). If no ProducerHandle was passed into Add() NULL is returned.\r
+                                If a NULL pointer is passed in no data will be returned\r
+\r

   @retval EFI_SUCCESS           SMBIOS record information was successfully returned in Record.\r
   @retval EFI_NOT_FOUND         The SMBIOS record with SmbiosHandle was the last available record.\r
 \r
   @retval EFI_SUCCESS           SMBIOS record information was successfully returned in Record.\r
   @retval EFI_NOT_FOUND         The SMBIOS record with SmbiosHandle was the last available record.\r
 \r


@@ -919,14 +919,14 @@ SmbiosGetNext (
   Head = &Private->DataListHead;\r
   for (Link = Head->ForwardLink; Link != Head; Link = Link->ForwardLink) {\r
     SmbiosEntry = SMBIOS_ENTRY_FROM_LINK(Link);\r
   Head = &Private->DataListHead;\r
   for (Link = Head->ForwardLink; Link != Head; Link = Link->ForwardLink) {\r
     SmbiosEntry = SMBIOS_ENTRY_FROM_LINK(Link);\r

-    SmbiosTableHeader = (EFI_SMBIOS_TABLE_HEADER*)(SmbiosEntry->RecordHeader + 1); \r
+    SmbiosTableHeader = (EFI_SMBIOS_TABLE_HEADER*)(SmbiosEntry->RecordHeader + 1);\r

 \r
     //\r
     // If SmbiosHandle is 0xFFFE, the first matched SMBIOS record handle will be returned\r
     //\r
     if (*SmbiosHandle == SMBIOS_HANDLE_PI_RESERVED) {\r
       if ((Type != NULL) && (*Type != SmbiosTableHeader->Type)) {\r
 \r
     //\r
     // If SmbiosHandle is 0xFFFE, the first matched SMBIOS record handle will be returned\r
     //\r
     if (*SmbiosHandle == SMBIOS_HANDLE_PI_RESERVED) {\r
       if ((Type != NULL) && (*Type != SmbiosTableHeader->Type)) {\r

-        continue;  \r
+        continue;\r

       }\r
 \r
       *SmbiosHandle = SmbiosTableHeader->Handle;\r
       }\r
 \r
       *SmbiosHandle = SmbiosTableHeader->Handle;\r


@@ -947,33 +947,33 @@ SmbiosGetNext (
 \r
     if (StartPointFound) {\r
       if ((Type != NULL) && (*Type != SmbiosTableHeader->Type)) {\r
 \r
     if (StartPointFound) {\r
       if ((Type != NULL) && (*Type != SmbiosTableHeader->Type)) {\r

-        continue; \r
+        continue;\r

       }\r
       }\r

-      \r
+\r

       *SmbiosHandle = SmbiosTableHeader->Handle;\r
       *SmbiosHandle = SmbiosTableHeader->Handle;\r

-      *Record = SmbiosTableHeader; \r
+      *Record = SmbiosTableHeader;\r

       if (ProducerHandle != NULL) {\r
         *ProducerHandle = SmbiosEntry->RecordHeader->ProducerHandle;\r
       }\r
 \r
       if (ProducerHandle != NULL) {\r
         *ProducerHandle = SmbiosEntry->RecordHeader->ProducerHandle;\r
       }\r
 \r

-      return EFI_SUCCESS;   \r
+      return EFI_SUCCESS;\r

     }\r
   }\r
 \r
   *SmbiosHandle = SMBIOS_HANDLE_PI_RESERVED;\r
   return EFI_NOT_FOUND;\r
     }\r
   }\r
 \r
   *SmbiosHandle = SMBIOS_HANDLE_PI_RESERVED;\r
   return EFI_NOT_FOUND;\r

-  \r
+\r

 }\r
 \r
 /**\r
   Allow the caller to discover all of the SMBIOS records.\r
 \r
   @param  This                  The EFI_SMBIOS_PROTOCOL instance.\r
 }\r
 \r
 /**\r
   Allow the caller to discover all of the SMBIOS records.\r
 \r
   @param  This                  The EFI_SMBIOS_PROTOCOL instance.\r

-  @param  CurrentSmbiosEntry    On exit, points to the SMBIOS entry on the list which includes the returned SMBIOS record information. \r
-                                If *CurrentSmbiosEntry is NULL on entry, then the first SMBIOS entry on the list will be returned. \r
+  @param  CurrentSmbiosEntry    On exit, points to the SMBIOS entry on the list which includes the returned SMBIOS record information.\r
+                                If *CurrentSmbiosEntry is NULL on entry, then the first SMBIOS entry on the list will be returned.\r

   @param  Record                On exit, points to the SMBIOS Record consisting of the formatted area followed by\r
                                 the unformatted area. The unformatted area optionally contains text strings.\r
   @param  Record                On exit, points to the SMBIOS Record consisting of the formatted area followed by\r
                                 the unformatted area. The unformatted area optionally contains text strings.\r

-                                \r
+\r

   @retval EFI_SUCCESS           SMBIOS record information was successfully returned in Record.\r
                                 *CurrentSmbiosEntry points to the SMBIOS entry which includes the returned SMBIOS record information.\r
   @retval EFI_NOT_FOUND         There is no more SMBIOS entry.\r
   @retval EFI_SUCCESS           SMBIOS record information was successfully returned in Record.\r
                                 *CurrentSmbiosEntry points to the SMBIOS entry which includes the returned SMBIOS record information.\r
   @retval EFI_NOT_FOUND         There is no more SMBIOS entry.\r


@@ -1005,32 +1005,32 @@ GetNextSmbiosRecord (
     //\r
     Head = &(*CurrentSmbiosEntry)->Link;\r
   }\r
     //\r
     Head = &(*CurrentSmbiosEntry)->Link;\r
   }\r

-  \r
+\r

   Link  = Head->ForwardLink;\r
   Link  = Head->ForwardLink;\r

-  \r
+\r

   if (Link == &Private->DataListHead) {\r
     //\r
     // If no more SMBIOS entry in the list, return not found.\r
     //\r
     return EFI_NOT_FOUND;\r
   }\r
   if (Link == &Private->DataListHead) {\r
     //\r
     // If no more SMBIOS entry in the list, return not found.\r
     //\r
     return EFI_NOT_FOUND;\r
   }\r

-  \r
+\r

   SmbiosEntry = SMBIOS_ENTRY_FROM_LINK(Link);\r
   SmbiosTableHeader = (EFI_SMBIOS_TABLE_HEADER*)(SmbiosEntry->RecordHeader + 1);\r
   SmbiosEntry = SMBIOS_ENTRY_FROM_LINK(Link);\r
   SmbiosTableHeader = (EFI_SMBIOS_TABLE_HEADER*)(SmbiosEntry->RecordHeader + 1);\r

-  *Record = SmbiosTableHeader; \r
+  *Record = SmbiosTableHeader;\r

   *CurrentSmbiosEntry = SmbiosEntry;\r
   *CurrentSmbiosEntry = SmbiosEntry;\r

-  return EFI_SUCCESS;   \r
+  return EFI_SUCCESS;\r

 }\r
 \r
 /**\r
   Assembles SMBIOS table from the SMBIOS protocol. Produce Table\r
   Entry Point and return the pointer to it.\r
 }\r
 \r
 /**\r
   Assembles SMBIOS table from the SMBIOS protocol. Produce Table\r
   Entry Point and return the pointer to it.\r

-  \r
+\r

   @param  TableEntryPointStructure   On exit, points to the SMBIOS entrypoint structure.\r
   @param  TableEntryPointStructure   On exit, points to the SMBIOS entrypoint structure.\r

-                                \r
+\r

   @retval EFI_SUCCESS                Structure created sucessfully.\r
   @retval EFI_OUT_OF_RESOURCES       No enough memory.\r
   @retval EFI_SUCCESS                Structure created sucessfully.\r
   @retval EFI_OUT_OF_RESOURCES       No enough memory.\r

-  \r
+\r

 **/\r
 EFI_STATUS\r
 EFIAPI\r
 **/\r
 EFI_STATUS\r
 EFIAPI\r


@@ -1048,7 +1048,7 @@ SmbiosCreateTable (
   EFI_SMBIOS_TABLE_HEADER         *SmbiosRecord;\r
   EFI_SMBIOS_TABLE_END_STRUCTURE  EndStructure;\r
   EFI_SMBIOS_ENTRY                *CurrentSmbiosEntry;\r
   EFI_SMBIOS_TABLE_HEADER         *SmbiosRecord;\r
   EFI_SMBIOS_TABLE_END_STRUCTURE  EndStructure;\r
   EFI_SMBIOS_ENTRY                *CurrentSmbiosEntry;\r

-  \r
+\r

   Status            = EFI_SUCCESS;\r
   BufferPointer     = NULL;\r
 \r
   Status            = EFI_SUCCESS;\r
   BufferPointer     = NULL;\r
 \r


@@ -1081,9 +1081,9 @@ SmbiosCreateTable (
         return EFI_OUT_OF_RESOURCES;\r
       }\r
     }\r
         return EFI_OUT_OF_RESOURCES;\r
       }\r
     }\r

-    \r
+\r

     EntryPointStructure = (SMBIOS_TABLE_ENTRY_POINT *) (UINTN) PhysicalAddress;\r
     EntryPointStructure = (SMBIOS_TABLE_ENTRY_POINT *) (UINTN) PhysicalAddress;\r

-    \r
+\r

     CopyMem (\r
       EntryPointStructure,\r
       &EntryPointStructureData,\r
     CopyMem (\r
       EntryPointStructure,\r
       &EntryPointStructureData,\r


@@ -1109,7 +1109,7 @@ SmbiosCreateTable (
   CurrentSmbiosEntry = NULL;\r
   do {\r
     Status = GetNextSmbiosRecord (SmbiosProtocol, &CurrentSmbiosEntry, &SmbiosRecord);\r
   CurrentSmbiosEntry = NULL;\r
   do {\r
     Status = GetNextSmbiosRecord (SmbiosProtocol, &CurrentSmbiosEntry, &SmbiosRecord);\r

-                               \r
+\r

     if ((Status == EFI_SUCCESS) && (CurrentSmbiosEntry->Smbios32BitTable)) {\r
       GetSmbiosStructureSize(SmbiosProtocol, SmbiosRecord, &RecordSize, &NumOfStr);\r
       //\r
     if ((Status == EFI_SUCCESS) && (CurrentSmbiosEntry->Smbios32BitTable)) {\r
       GetSmbiosStructureSize(SmbiosProtocol, SmbiosRecord, &RecordSize, &NumOfStr);\r
       //\r


@@ -1122,7 +1122,7 @@ SmbiosCreateTable (
       }\r
     }\r
   } while (!EFI_ERROR(Status));\r
       }\r
     }\r
   } while (!EFI_ERROR(Status));\r

-  \r
+\r

   //\r
   // Create End-Of-Table structure\r
   //\r
   //\r
   // Create End-Of-Table structure\r
   //\r


@@ -1140,15 +1140,15 @@ SmbiosCreateTable (
 \r
   if (EFI_SIZE_TO_PAGES ((UINT32) EntryPointStructure->TableLength) > mPreAllocatedPages) {\r
     //\r
 \r
   if (EFI_SIZE_TO_PAGES ((UINT32) EntryPointStructure->TableLength) > mPreAllocatedPages) {\r
     //\r

-    // If new SMBIOS table size exceeds the previous allocated page, \r
+    // If new SMBIOS table size exceeds the previous allocated page,\r

     // it is time to re-allocate memory (below 4GB).\r
     // it is time to re-allocate memory (below 4GB).\r

-    // \r
+    //\r

     DEBUG ((EFI_D_INFO, "%a() re-allocate SMBIOS 32-bit table\n",\r
       __FUNCTION__));\r
     if (EntryPointStructure->TableAddress != 0) {\r
       //\r
       // Free the previous allocated page\r
     DEBUG ((EFI_D_INFO, "%a() re-allocate SMBIOS 32-bit table\n",\r
       __FUNCTION__));\r
     if (EntryPointStructure->TableAddress != 0) {\r
       //\r
       // Free the previous allocated page\r

-      //      \r
+      //\r

       FreePages (\r
             (VOID*)(UINTN)EntryPointStructure->TableAddress,\r
             mPreAllocatedPages\r
       FreePages (\r
             (VOID*)(UINTN)EntryPointStructure->TableAddress,\r
             mPreAllocatedPages\r


@@ -1156,7 +1156,7 @@ SmbiosCreateTable (
       EntryPointStructure->TableAddress = 0;\r
       mPreAllocatedPages = 0;\r
     }\r
       EntryPointStructure->TableAddress = 0;\r
       mPreAllocatedPages = 0;\r
     }\r

-    \r
+\r

     PhysicalAddress = 0xffffffff;\r
     Status = gBS->AllocatePages (\r
                     AllocateMaxAddress,\r
     PhysicalAddress = 0xffffffff;\r
     Status = gBS->AllocatePages (\r
                     AllocateMaxAddress,\r


@@ -1173,7 +1173,7 @@ SmbiosCreateTable (
       mPreAllocatedPages = EFI_SIZE_TO_PAGES (EntryPointStructure->TableLength);\r
     }\r
   }\r
       mPreAllocatedPages = EFI_SIZE_TO_PAGES (EntryPointStructure->TableLength);\r
     }\r
   }\r

-  \r
+\r

   //\r
   // Assemble the tables\r
   //\r
   //\r
   // Assemble the tables\r
   //\r


@@ -1189,7 +1189,7 @@ SmbiosCreateTable (
       BufferPointer = BufferPointer + RecordSize;\r
     }\r
   } while (!EFI_ERROR(Status));\r
       BufferPointer = BufferPointer + RecordSize;\r
     }\r
   } while (!EFI_ERROR(Status));\r

-  \r
+\r

   //\r
   // Assemble End-Of-Table structure\r
   //\r
   //\r
   // Assemble End-Of-Table structure\r
   //\r


@@ -1240,7 +1240,7 @@ SmbiosCreate64BitTable (
   EFI_SMBIOS_TABLE_HEADER         *SmbiosRecord;\r
   EFI_SMBIOS_TABLE_END_STRUCTURE  EndStructure;\r
   EFI_SMBIOS_ENTRY                *CurrentSmbiosEntry;\r
   EFI_SMBIOS_TABLE_HEADER         *SmbiosRecord;\r
   EFI_SMBIOS_TABLE_END_STRUCTURE  EndStructure;\r
   EFI_SMBIOS_ENTRY                *CurrentSmbiosEntry;\r

-  \r
+\r

   Status            = EFI_SUCCESS;\r
   BufferPointer     = NULL;\r
 \r
   Status            = EFI_SUCCESS;\r
   BufferPointer     = NULL;\r
 \r


@@ -1264,9 +1264,9 @@ SmbiosCreate64BitTable (
       DEBUG ((EFI_D_ERROR, "SmbiosCreate64BitTable() could not allocate Smbios30EntryPointStructure\n"));\r
       return EFI_OUT_OF_RESOURCES;\r
     }\r
       DEBUG ((EFI_D_ERROR, "SmbiosCreate64BitTable() could not allocate Smbios30EntryPointStructure\n"));\r
       return EFI_OUT_OF_RESOURCES;\r
     }\r

-    \r
+\r

     Smbios30EntryPointStructure = (SMBIOS_TABLE_3_0_ENTRY_POINT *) (UINTN) PhysicalAddress;\r
     Smbios30EntryPointStructure = (SMBIOS_TABLE_3_0_ENTRY_POINT *) (UINTN) PhysicalAddress;\r

-    \r
+\r

     CopyMem (\r
       Smbios30EntryPointStructure,\r
       &Smbios30EntryPointStructureData,\r
     CopyMem (\r
       Smbios30EntryPointStructure,\r
       &Smbios30EntryPointStructureData,\r


@@ -1286,7 +1286,7 @@ SmbiosCreate64BitTable (
   CurrentSmbiosEntry = NULL;\r
   do {\r
     Status = GetNextSmbiosRecord (SmbiosProtocol, &CurrentSmbiosEntry, &SmbiosRecord);\r
   CurrentSmbiosEntry = NULL;\r
   do {\r
     Status = GetNextSmbiosRecord (SmbiosProtocol, &CurrentSmbiosEntry, &SmbiosRecord);\r

-                               \r
+\r

     if ((Status == EFI_SUCCESS) && (CurrentSmbiosEntry->Smbios64BitTable)) {\r
       GetSmbiosStructureSize(SmbiosProtocol, SmbiosRecord, &RecordSize, &NumOfStr);\r
       //\r
     if ((Status == EFI_SUCCESS) && (CurrentSmbiosEntry->Smbios64BitTable)) {\r
       GetSmbiosStructureSize(SmbiosProtocol, SmbiosRecord, &RecordSize, &NumOfStr);\r
       //\r


@@ -1309,7 +1309,7 @@ SmbiosCreate64BitTable (
 \r
   if (EFI_SIZE_TO_PAGES (Smbios30EntryPointStructure->TableMaximumSize) > mPre64BitAllocatedPages) {\r
     //\r
 \r
   if (EFI_SIZE_TO_PAGES (Smbios30EntryPointStructure->TableMaximumSize) > mPre64BitAllocatedPages) {\r
     //\r

-    // If new SMBIOS table size exceeds the previous allocated page, \r
+    // If new SMBIOS table size exceeds the previous allocated page,\r

     // it is time to re-allocate memory at anywhere.\r
     //\r
     DEBUG ((EFI_D_INFO, "%a() re-allocate SMBIOS 64-bit table\n",\r
     // it is time to re-allocate memory at anywhere.\r
     //\r
     DEBUG ((EFI_D_INFO, "%a() re-allocate SMBIOS 64-bit table\n",\r


@@ -1317,7 +1317,7 @@ SmbiosCreate64BitTable (
     if (Smbios30EntryPointStructure->TableAddress != 0) {\r
       //\r
       // Free the previous allocated page\r
     if (Smbios30EntryPointStructure->TableAddress != 0) {\r
       //\r
       // Free the previous allocated page\r

-      //      \r
+      //\r

       FreePages (\r
             (VOID*)(UINTN)Smbios30EntryPointStructure->TableAddress,\r
             mPre64BitAllocatedPages\r
       FreePages (\r
             (VOID*)(UINTN)Smbios30EntryPointStructure->TableAddress,\r
             mPre64BitAllocatedPages\r


@@ -1383,7 +1383,7 @@ SmbiosCreate64BitTable (
 \r
 /**\r
   Create Smbios Table and installs the Smbios Table to the System Table.\r
 \r
 /**\r
   Create Smbios Table and installs the Smbios Table to the System Table.\r

-  \r
+\r

   @param  Smbios32BitTable    The flag to update 32-bit table.\r
   @param  Smbios64BitTable    The flag to update 64-bit table.\r
 \r
   @param  Smbios32BitTable    The flag to update 32-bit table.\r
   @param  Smbios64BitTable    The flag to update 64-bit table.\r
 \r


@@ -1416,7 +1416,7 @@ SmbiosTableConstruction (
 \r
 /**\r
 \r
 \r
 /**\r
 \r

-  Driver to produce Smbios protocol and pre-allocate 1 page for the final SMBIOS table. \r
+  Driver to produce Smbios protocol and pre-allocate 1 page for the final SMBIOS table.\r

 \r
   @param ImageHandle     Module's image handle\r
   @param SystemTable     Pointer of EFI_SYSTEM_TABLE\r
 \r
   @param ImageHandle     Module's image handle\r
   @param SystemTable     Pointer of EFI_SYSTEM_TABLE\r


@@ -1445,7 +1445,7 @@ SmbiosDriverEntryPoint (
   InitializeListHead (&mPrivateData.DataListHead);\r
   InitializeListHead (&mPrivateData.AllocatedHandleListHead);\r
   EfiInitializeLock (&mPrivateData.DataLock, TPL_NOTIFY);\r
   InitializeListHead (&mPrivateData.DataListHead);\r
   InitializeListHead (&mPrivateData.AllocatedHandleListHead);\r
   EfiInitializeLock (&mPrivateData.DataLock, TPL_NOTIFY);\r

-  \r
+\r

   //\r
   // Make a new handle and install the protocol\r
   //\r
   //\r
   // Make a new handle and install the protocol\r
   //\r

diff --git a/MdeModulePkg/Universal/SmbiosDxe/SmbiosDxe.h b/MdeModulePkg/Universal/SmbiosDxe/SmbiosDxe.h
index 10cff8dd59f69971e03e4919915e77996f63e8a1..0f5aa7355e3e429c81d779bfdaea8df9e6cb4f44 100644 (file)
--- a/MdeModulePkg/Universal/SmbiosDxe/SmbiosDxe.h
+++ b/MdeModulePkg/Universal/SmbiosDxe/SmbiosDxe.h
@@ -1,14 +1,14 @@
 /** @file\r
   This code supports the implementation of the Smbios protocol\r
 /** @file\r
   This code supports the implementation of the Smbios protocol\r

-  \r
-Copyright (c) 2009 - 2015, Intel Corporation. All rights reserved.<BR>\r
-This program and the accompanying materials                          \r
-are licensed and made available under the terms and conditions of the BSD License         \r
-which accompanies this distribution.  The full text of the license may be found at        \r
-http://opensource.org/licenses/bsd-license.php                                            \r
-                                                                                          \r
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     \r
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             \r
+\r
+Copyright (c) 2009 - 2018, Intel Corporation. All rights reserved.<BR>\r
+This program and the accompanying materials\r
+are licensed and made available under the terms and conditions of the BSD License\r
+which accompanies this distribution.  The full text of the license may be found at\r
+http://opensource.org/licenses/bsd-license.php\r
+\r
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r

 \r
 **/\r
 \r
 \r
 **/\r
 \r


@@ -115,10 +115,10 @@ typedef struct {
 \r
 /**\r
   Create Smbios Table and installs the Smbios Table to the System Table.\r
 \r
 /**\r
   Create Smbios Table and installs the Smbios Table to the System Table.\r

-  \r
+\r

   @param  Smbios32BitTable    The flag to update 32-bit table.\r
   @param  Smbios64BitTable    The flag to update 64-bit table.\r
   @param  Smbios32BitTable    The flag to update 32-bit table.\r
   @param  Smbios64BitTable    The flag to update 64-bit table.\r

-  \r
+\r

 **/\r
 VOID\r
 EFIAPI\r
 **/\r
 VOID\r
 EFIAPI\r

diff --git a/MdeModulePkg/Universal/SmbiosDxe/SmbiosDxe.inf b/MdeModulePkg/Universal/SmbiosDxe/SmbiosDxe.inf
index 4fd6b97b420dcdef808b486331bfff78c0641083..0e623aeb4131e67be07a685eed8937da6f0a6cd8 100644 (file)
--- a/MdeModulePkg/Universal/SmbiosDxe/SmbiosDxe.inf
+++ b/MdeModulePkg/Universal/SmbiosDxe/SmbiosDxe.inf
@@ -1,7 +1,7 @@
 ## @file\r
 # This driver initializes and installs the SMBIOS protocol, constructs SMBIOS table into system configuration table.\r
 #\r
 ## @file\r
 # This driver initializes and installs the SMBIOS protocol, constructs SMBIOS table into system configuration table.\r
 #\r

-# Copyright (c) 2009 - 2015, Intel Corporation. All rights reserved.<BR>\r
+# Copyright (c) 2009 - 2018, Intel Corporation. All rights reserved.<BR>\r

 #\r
 #  This program and the accompanying materials\r
 #  are licensed and made available under the terms and conditions of the BSD License\r
 #\r
 #  This program and the accompanying materials\r
 #  are licensed and made available under the terms and conditions of the BSD License\r


@@ -49,7 +49,7 @@
 \r
 [Protocols]\r
   gEfiSmbiosProtocolGuid                            ## PRODUCES\r
 \r
 [Protocols]\r
   gEfiSmbiosProtocolGuid                            ## PRODUCES\r

-  \r
+\r

 [Guids]\r
   gEfiSmbiosTableGuid                               ## SOMETIMES_PRODUCES ## SystemTable\r
   gEfiSmbios3TableGuid                              ## SOMETIMES_PRODUCES ## SystemTable\r
 [Guids]\r
   gEfiSmbiosTableGuid                               ## SOMETIMES_PRODUCES ## SystemTable\r
   gEfiSmbios3TableGuid                              ## SOMETIMES_PRODUCES ## SystemTable\r

diff --git a/MdeModulePkg/Universal/SmbiosDxe/SmbiosDxeExtra.uni b/MdeModulePkg/Universal/SmbiosDxe/SmbiosDxeExtra.uni
index 94f5ec59a581477ae4d03e4547e7ada5fd23cf3e..05c7bce3939dc7d0fa3bd36edd500eab642da7dc 100644 (file)
--- a/MdeModulePkg/Universal/SmbiosDxe/SmbiosDxeExtra.uni
+++ b/MdeModulePkg/Universal/SmbiosDxe/SmbiosDxeExtra.uni
@@ -1,7 +1,7 @@
 // /** @file\r
 // SmbiosDxe Localized Strings and Content\r
 //\r
 // /** @file\r
 // SmbiosDxe Localized Strings and Content\r
 //\r

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

 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r
 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r


@@ -12,8 +12,8 @@
 //\r
 // **/\r
 \r
 //\r
 // **/\r
 \r

-#string STR_PROPERTIES_MODULE_NAME \r
-#language en-US \r
+#string STR_PROPERTIES_MODULE_NAME\r
+#language en-US\r

 "SMBIOS DXE Driver"\r
 \r
 \r
 "SMBIOS DXE Driver"\r
 \r
 \r

diff --git a/MdeModulePkg/Universal/SmbiosMeasurementDxe/SmbiosMeasurementDxe.inf b/MdeModulePkg/Universal/SmbiosMeasurementDxe/SmbiosMeasurementDxe.inf
index 5d3aa67f7c8bf438028931547d7ec5e8c43ccb26..879bc214810e15764e3d548d13753d68df0ee93f 100644 (file)
--- a/MdeModulePkg/Universal/SmbiosMeasurementDxe/SmbiosMeasurementDxe.inf
+++ b/MdeModulePkg/Universal/SmbiosMeasurementDxe/SmbiosMeasurementDxe.inf
@@ -8,10 +8,10 @@
 #     asset numbers or serial numbers, MUST NOT be measured into PCR [1],\r
 #     or any other PCR.\r
 # The OEM types are skipped and platform code can measure them by self if required.\r
 #     asset numbers or serial numbers, MUST NOT be measured into PCR [1],\r
 #     or any other PCR.\r
 # The OEM types are skipped and platform code can measure them by self if required.\r

-# \r
+#\r

 # A platform may use its own policy to filter some fields in SMBIOS table.\r
 #\r
 # A platform may use its own policy to filter some fields in SMBIOS table.\r
 #\r

-# Copyright (c) 2015 - 2017, Intel Corporation. All rights reserved.<BR>\r
+# Copyright (c) 2015 - 2018, Intel Corporation. All rights reserved.<BR>\r

 #\r
 #  This program and the accompanying materials\r
 #  are licensed and made available under the terms and conditions of the BSD License\r
 #\r
 #  This program and the accompanying materials\r
 #  are licensed and made available under the terms and conditions of the BSD License\r

diff --git a/MdeModulePkg/Universal/SmbiosMeasurementDxe/SmbiosMeasurementDxeExtra.uni b/MdeModulePkg/Universal/SmbiosMeasurementDxe/SmbiosMeasurementDxeExtra.uni
index ed298ad9e64056c61eb90953e5cfdad54907ab93..d9a8d4cb69076f2f9437d722068de35f17a46f44 100644 (file)
--- a/MdeModulePkg/Universal/SmbiosMeasurementDxe/SmbiosMeasurementDxeExtra.uni
+++ b/MdeModulePkg/Universal/SmbiosMeasurementDxe/SmbiosMeasurementDxeExtra.uni
@@ -1,7 +1,7 @@
 // /** @file\r
 // SmbiosMeasurementDxe Localized Strings and Content\r
 //\r
 // /** @file\r
 // SmbiosMeasurementDxe Localized Strings and Content\r
 //\r

-// Copyright (c) 2015, Intel Corporation. All rights reserved.<BR>\r
+// Copyright (c) 2015 - 2018, Intel Corporation. All rights reserved.<BR>\r

 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r
 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r


@@ -12,8 +12,8 @@
 //\r
 // **/\r
 \r
 //\r
 // **/\r
 \r

-#string STR_PROPERTIES_MODULE_NAME \r
-#language en-US \r
+#string STR_PROPERTIES_MODULE_NAME\r
+#language en-US\r

 "SMBIOS Measurement DXE Driver"\r
 \r
 \r
 "SMBIOS Measurement DXE Driver"\r
 \r
 \r

diff --git a/MdeModulePkg/Universal/StatusCodeHandler/Pei/MemoryStausCodeWorker.c b/MdeModulePkg/Universal/StatusCodeHandler/Pei/MemoryStausCodeWorker.c
index bdf1d2700e10106238ea6139e073230a878514eb..b2981121cbb7c104b0d2624b90905698380e17a0 100644 (file)
--- a/MdeModulePkg/Universal/StatusCodeHandler/Pei/MemoryStausCodeWorker.c
+++ b/MdeModulePkg/Universal/StatusCodeHandler/Pei/MemoryStausCodeWorker.c
@@ -1,7 +1,7 @@
 /** @file\r
   PEI memory status code worker.\r
 \r
 /** @file\r
   PEI memory status code worker.\r
 \r

-  Copyright (c) 2006 - 2010, Intel Corporation. All rights reserved.<BR>\r
+  Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r

   This program and the accompanying materials\r
   are licensed and made available under the terms and conditions of the BSD License\r
   which accompanies this distribution.  The full text of the license may be found at\r
   This program and the accompanying materials\r
   are licensed and made available under the terms and conditions of the BSD License\r
   which accompanies this distribution.  The full text of the license may be found at\r


@@ -90,7 +90,7 @@ MemoryStatusCodeReportWorker (
   MEMORY_STATUSCODE_RECORD          *Record;\r
 \r
   //\r
   MEMORY_STATUSCODE_RECORD          *Record;\r
 \r
   //\r

-  // Find GUID'ed HOBs to locate current record buffer. \r
+  // Find GUID'ed HOBs to locate current record buffer.\r

   //\r
   Hob.Raw = GetFirstGuidHob (&gMemoryStatusCodeRecordGuid);\r
   ASSERT (Hob.Raw != NULL);\r
   //\r
   Hob.Raw = GetFirstGuidHob (&gMemoryStatusCodeRecordGuid);\r
   ASSERT (Hob.Raw != NULL);\r

diff --git a/MdeModulePkg/Universal/StatusCodeHandler/Pei/SerialStatusCodeWorker.c b/MdeModulePkg/Universal/StatusCodeHandler/Pei/SerialStatusCodeWorker.c
index 1b891b307dbbf93bdf10b6b9ae027fbf664fa4b5..96d589652054169a30060ccbc36c5797e7f9c65f 100644 (file)
--- a/MdeModulePkg/Universal/StatusCodeHandler/Pei/SerialStatusCodeWorker.c
+++ b/MdeModulePkg/Universal/StatusCodeHandler/Pei/SerialStatusCodeWorker.c
@@ -1,7 +1,7 @@
 /** @file\r
   Serial I/O status code reporting worker.\r
 \r
 /** @file\r
   Serial I/O status code reporting worker.\r
 \r

-  Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.<BR>\r
+  Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r

   This program and the accompanying materials\r
   are licensed and made available under the terms and conditions of the BSD License\r
   which accompanies this distribution.  The full text of the license may be found at\r
   This program and the accompanying materials\r
   are licensed and made available under the terms and conditions of the BSD License\r
   which accompanies this distribution.  The full text of the license may be found at\r


@@ -94,9 +94,9 @@ SerialStatusCodeReportWorker (
                   Value,\r
                   Instance\r
                   );\r
                   Value,\r
                   Instance\r
                   );\r

-    \r
+\r

     ASSERT(CharCount > 0);\r
     ASSERT(CharCount > 0);\r

-    \r
+\r

     if (CallerId != NULL) {\r
       CharCount += AsciiSPrint (\r
                      &Buffer[CharCount],\r
     if (CallerId != NULL) {\r
       CharCount += AsciiSPrint (\r
                      &Buffer[CharCount],\r

diff --git a/MdeModulePkg/Universal/StatusCodeHandler/Pei/StatusCodeHandlerPei.c b/MdeModulePkg/Universal/StatusCodeHandler/Pei/StatusCodeHandlerPei.c
index 368f2056d929d411ce57480e0c28199832e6e083..f9d9f154ba2831835fad5e49bed7c358d5819fab 100644 (file)
--- a/MdeModulePkg/Universal/StatusCodeHandler/Pei/StatusCodeHandlerPei.c
+++ b/MdeModulePkg/Universal/StatusCodeHandler/Pei/StatusCodeHandlerPei.c
@@ -2,7 +2,7 @@
   Report Status Code Handler PEIM which produces general handlers and hook them\r
   onto the PEI status code router.\r
 \r
   Report Status Code Handler PEIM which produces general handlers and hook them\r
   onto the PEI status code router.\r
 \r

-  Copyright (c) 2009, Intel Corporation. All rights reserved.<BR>\r
+  Copyright (c) 2009 - 2018, Intel Corporation. All rights reserved.<BR>\r

   This program and the accompanying materials\r
   are licensed and made available under the terms and conditions of the BSD License\r
   which accompanies this distribution.  The full text of the license may be found at\r
   This program and the accompanying materials\r
   are licensed and made available under the terms and conditions of the BSD License\r
   which accompanies this distribution.  The full text of the license may be found at\r


@@ -17,7 +17,7 @@
 \r
 /**\r
   Entry point of Status Code PEIM.\r
 \r
 /**\r
   Entry point of Status Code PEIM.\r

-  \r
+\r

   This function is the entry point of this Status Code PEIM.\r
   It initializes supported status code devices according to PCD settings,\r
   and installs Status Code PPI.\r
   This function is the entry point of this Status Code PEIM.\r
   It initializes supported status code devices according to PCD settings,\r
   and installs Status Code PPI.\r


@@ -54,13 +54,13 @@ StatusCodeHandlerPeiEntry (
   if (FeaturePcdGet (PcdStatusCodeUseSerial)) {\r
     Status = SerialPortInitialize();\r
     ASSERT_EFI_ERROR (Status);\r
   if (FeaturePcdGet (PcdStatusCodeUseSerial)) {\r
     Status = SerialPortInitialize();\r
     ASSERT_EFI_ERROR (Status);\r

-    Status = RscHandlerPpi->Register (SerialStatusCodeReportWorker);                     \r
+    Status = RscHandlerPpi->Register (SerialStatusCodeReportWorker);\r

     ASSERT_EFI_ERROR (Status);\r
   }\r
   if (FeaturePcdGet (PcdStatusCodeUseMemory)) {\r
     Status = MemoryStatusCodeInitializeWorker ();\r
     ASSERT_EFI_ERROR (Status);\r
     ASSERT_EFI_ERROR (Status);\r
   }\r
   if (FeaturePcdGet (PcdStatusCodeUseMemory)) {\r
     Status = MemoryStatusCodeInitializeWorker ();\r
     ASSERT_EFI_ERROR (Status);\r

-    Status = RscHandlerPpi->Register (MemoryStatusCodeReportWorker);                     \r
+    Status = RscHandlerPpi->Register (MemoryStatusCodeReportWorker);\r

     ASSERT_EFI_ERROR (Status);\r
   }\r
 \r
     ASSERT_EFI_ERROR (Status);\r
   }\r
 \r

diff --git a/MdeModulePkg/Universal/StatusCodeHandler/Pei/StatusCodeHandlerPei.inf b/MdeModulePkg/Universal/StatusCodeHandler/Pei/StatusCodeHandlerPei.inf
index 7c4faa360e0bf0ea467fc24250bb13acf317a148..5d96fe3041681f4df0fd30943ae7dcad24c083e4 100644 (file)
--- a/MdeModulePkg/Universal/StatusCodeHandler/Pei/StatusCodeHandlerPei.inf
+++ b/MdeModulePkg/Universal/StatusCodeHandler/Pei/StatusCodeHandlerPei.inf
@@ -1,7 +1,7 @@
 ## @file\r
 #  Report Status Code Handler PEIM which produces general handlers and hook them onto the PEI status code router.\r
 #\r
 ## @file\r
 #  Report Status Code Handler PEIM which produces general handlers and hook them onto the PEI status code router.\r
 #\r

-#  Copyright (c) 2009 - 2014, Intel Corporation. All rights reserved.<BR>\r
+#  Copyright (c) 2009 - 2018, Intel Corporation. All rights reserved.<BR>\r

 #\r
 #  This program and the accompanying materials\r
 #  are licensed and made available under the terms and conditions of the BSD License\r
 #\r
 #  This program and the accompanying materials\r
 #  are licensed and made available under the terms and conditions of the BSD License\r


@@ -19,7 +19,7 @@
   MODULE_UNI_FILE                = StatusCodeHandlerPei.uni\r
   FILE_GUID                      = 9D225237-FA01-464C-A949-BAABC02D31D0\r
   MODULE_TYPE                    = PEIM\r
   MODULE_UNI_FILE                = StatusCodeHandlerPei.uni\r
   FILE_GUID                      = 9D225237-FA01-464C-A949-BAABC02D31D0\r
   MODULE_TYPE                    = PEIM\r

-  VERSION_STRING                 = 1.0  \r
+  VERSION_STRING                 = 1.0\r

   ENTRY_POINT                    = StatusCodeHandlerPeiEntry\r
 \r
 #\r
   ENTRY_POINT                    = StatusCodeHandlerPeiEntry\r
 \r
 #\r


@@ -48,13 +48,13 @@
   PrintLib\r
   DebugLib\r
   BaseMemoryLib\r
   PrintLib\r
   DebugLib\r
   BaseMemoryLib\r

-  \r
+\r

 [Guids]\r
   ## SOMETIMES_PRODUCES   ## HOB\r
   ## SOMETIMES_CONSUMES   ## HOB\r
   gMemoryStatusCodeRecordGuid\r
   gEfiStatusCodeDataTypeStringGuid              ## SOMETIMES_CONSUMES   ## UNDEFINED\r
 [Guids]\r
   ## SOMETIMES_PRODUCES   ## HOB\r
   ## SOMETIMES_CONSUMES   ## HOB\r
   gMemoryStatusCodeRecordGuid\r
   gEfiStatusCodeDataTypeStringGuid              ## SOMETIMES_CONSUMES   ## UNDEFINED\r

-  \r
+\r

 [Ppis]\r
   gEfiPeiRscHandlerPpiGuid                      ## CONSUMES\r
 \r
 [Ppis]\r
   gEfiPeiRscHandlerPpiGuid                      ## CONSUMES\r
 \r

diff --git a/MdeModulePkg/Universal/StatusCodeHandler/Pei/StatusCodeHandlerPeiExtra.uni b/MdeModulePkg/Universal/StatusCodeHandler/Pei/StatusCodeHandlerPeiExtra.uni
index 273f09a57786c2d6d2169f4739baa6655eb190bf..520ec5ec3a2126040c021dda6705baa1801141ef 100644 (file)
--- a/MdeModulePkg/Universal/StatusCodeHandler/Pei/StatusCodeHandlerPeiExtra.uni
+++ b/MdeModulePkg/Universal/StatusCodeHandler/Pei/StatusCodeHandlerPeiExtra.uni
@@ -1,7 +1,7 @@
 // /** @file\r
 // StatusCodeHandlerPei Localized Strings and Content\r
 //\r
 // /** @file\r
 // StatusCodeHandlerPei Localized Strings and Content\r
 //\r

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

 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r
 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r


@@ -12,8 +12,8 @@
 //\r
 // **/\r
 \r
 //\r
 // **/\r
 \r

-#string STR_PROPERTIES_MODULE_NAME \r
-#language en-US \r
+#string STR_PROPERTIES_MODULE_NAME\r
+#language en-US\r

 "Status Code Handler PEI Module"\r
 \r
 \r
 "Status Code Handler PEI Module"\r
 \r
 \r

diff --git a/MdeModulePkg/Universal/StatusCodeHandler/RuntimeDxe/MemoryStatusCodeWorker.c b/MdeModulePkg/Universal/StatusCodeHandler/RuntimeDxe/MemoryStatusCodeWorker.c
index a306d7517fb7af581ad0448f09e42f67e966ee05..bf0cf2d0897701cfb551a1cb15ebae162f841267 100644 (file)
--- a/MdeModulePkg/Universal/StatusCodeHandler/RuntimeDxe/MemoryStatusCodeWorker.c
+++ b/MdeModulePkg/Universal/StatusCodeHandler/RuntimeDxe/MemoryStatusCodeWorker.c
@@ -1,7 +1,7 @@
 /** @file\r
   Runtime memory status code worker.\r
 \r
 /** @file\r
   Runtime memory status code worker.\r
 \r

-  Copyright (c) 2006 - 2009, Intel Corporation. All rights reserved.<BR>\r
+  Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r

   (C) Copyright 2016 Hewlett Packard Enterprise Development LP<BR>\r
   This program and the accompanying materials\r
   are licensed and made available under the terms and conditions of the BSD License\r
   (C) Copyright 2016 Hewlett Packard Enterprise Development LP<BR>\r
   This program and the accompanying materials\r
   are licensed and made available under the terms and conditions of the BSD License\r


@@ -42,7 +42,7 @@ RtMemoryStatusCodeInitializeWorker (
 \r
   mRtMemoryStatusCodeTable->RecordIndex      = 0;\r
   mRtMemoryStatusCodeTable->NumberOfRecords  = 0;\r
 \r
   mRtMemoryStatusCodeTable->RecordIndex      = 0;\r
   mRtMemoryStatusCodeTable->NumberOfRecords  = 0;\r

-  mRtMemoryStatusCodeTable->MaxRecordsNumber = \r
+  mRtMemoryStatusCodeTable->MaxRecordsNumber =\r

     (PcdGet16 (PcdStatusCodeMemorySize) * 1024) / sizeof (MEMORY_STATUSCODE_RECORD);\r
   Status = gBS->InstallConfigurationTable (&gMemoryStatusCodeRecordGuid, mRtMemoryStatusCodeTable);\r
 \r
     (PcdGet16 (PcdStatusCodeMemorySize) * 1024) / sizeof (MEMORY_STATUSCODE_RECORD);\r
   Status = gBS->InstallConfigurationTable (&gMemoryStatusCodeRecordGuid, mRtMemoryStatusCodeTable);\r
 \r


@@ -51,7 +51,7 @@ RtMemoryStatusCodeInitializeWorker (
 \r
 \r
 /**\r
 \r
 \r
 /**\r

-  Report status code into runtime memory. If the runtime pool is full, roll back to the \r
+  Report status code into runtime memory. If the runtime pool is full, roll back to the\r

   first record and overwrite it.\r
 \r
   @param  CodeType                Indicates the type of status code being reported.\r
   first record and overwrite it.\r
 \r
   @param  CodeType                Indicates the type of status code being reported.\r

diff --git a/MdeModulePkg/Universal/StatusCodeHandler/RuntimeDxe/SerialStatusCodeWorker.c b/MdeModulePkg/Universal/StatusCodeHandler/RuntimeDxe/SerialStatusCodeWorker.c
index 45986fcae38adf23600608bca0ea5d36c14540b0..66fb9e7c8d60e888a99f2e48e1890107746a461f 100644 (file)
--- a/MdeModulePkg/Universal/StatusCodeHandler/RuntimeDxe/SerialStatusCodeWorker.c
+++ b/MdeModulePkg/Universal/StatusCodeHandler/RuntimeDxe/SerialStatusCodeWorker.c
@@ -1,14 +1,14 @@
 /** @file\r
   Serial I/O status code reporting worker.\r
 \r
 /** @file\r
   Serial I/O status code reporting worker.\r
 \r

-  Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.<BR>\r
-  This program and the accompanying materials                          \r
-  are licensed and made available under the terms and conditions of the BSD License         \r
-  which accompanies this distribution.  The full text of the license may be found at        \r
-  http://opensource.org/licenses/bsd-license.php                                            \r
-                                                                                            \r
-  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     \r
-  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             \r
+  Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r
+  This program and the accompanying materials\r
+  are licensed and made available under the terms and conditions of the BSD License\r
+  which accompanies this distribution.  The full text of the license may be found at\r
+  http://opensource.org/licenses/bsd-license.php\r
+\r
+  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
+  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r

 \r
 **/\r
 \r
 \r
 **/\r
 \r


@@ -16,7 +16,7 @@
 \r
 /**\r
   Convert status code value and extended data to readable ASCII string, send string to serial I/O device.\r
 \r
 /**\r
   Convert status code value and extended data to readable ASCII string, send string to serial I/O device.\r

- \r
+\r

   @param  CodeType         Indicates the type of status code being reported.\r
   @param  Value            Describes the current status of a hardware or software entity.\r
                            This included information about the class and subclass that is used to\r
   @param  CodeType         Indicates the type of status code being reported.\r
   @param  Value            Describes the current status of a hardware or software entity.\r
                            This included information about the class and subclass that is used to\r


@@ -73,9 +73,9 @@ SerialStatusCodeReportWorker (
     // Print DEBUG() information into output buffer.\r
     //\r
     CharCount = AsciiBSPrint (\r
     // Print DEBUG() information into output buffer.\r
     //\r
     CharCount = AsciiBSPrint (\r

-                  Buffer, \r
-                  sizeof (Buffer), \r
-                  Format, \r
+                  Buffer,\r
+                  sizeof (Buffer),\r
+                  Format,\r

                   Marker\r
                   );\r
   } else if ((CodeType & EFI_STATUS_CODE_TYPE_MASK) == EFI_ERROR_CODE) {\r
                   Marker\r
                   );\r
   } else if ((CodeType & EFI_STATUS_CODE_TYPE_MASK) == EFI_ERROR_CODE) {\r


@@ -83,15 +83,15 @@ SerialStatusCodeReportWorker (
     // Print ERROR information into output buffer.\r
     //\r
     CharCount = AsciiSPrint (\r
     // Print ERROR information into output buffer.\r
     //\r
     CharCount = AsciiSPrint (\r

-                  Buffer, \r
-                  sizeof (Buffer), \r
-                  "ERROR: C%08x:V%08x I%x", \r
-                  CodeType, \r
-                  Value, \r
+                  Buffer,\r
+                  sizeof (Buffer),\r
+                  "ERROR: C%08x:V%08x I%x",\r
+                  CodeType,\r
+                  Value,\r

                   Instance\r
                   );\r
     ASSERT (CharCount > 0);\r
                   Instance\r
                   );\r
     ASSERT (CharCount > 0);\r

-   \r
+\r

     if (CallerId != NULL) {\r
       CharCount += AsciiSPrint (\r
                      &Buffer[CharCount],\r
     if (CallerId != NULL) {\r
       CharCount += AsciiSPrint (\r
                      &Buffer[CharCount],\r


@@ -120,10 +120,10 @@ SerialStatusCodeReportWorker (
     // Print PROGRESS information into output buffer.\r
     //\r
     CharCount = AsciiSPrint (\r
     // Print PROGRESS information into output buffer.\r
     //\r
     CharCount = AsciiSPrint (\r

-                  Buffer, \r
-                  sizeof (Buffer), \r
-                  "PROGRESS CODE: V%08x I%x\n\r", \r
-                  Value, \r
+                  Buffer,\r
+                  sizeof (Buffer),\r
+                  "PROGRESS CODE: V%08x I%x\n\r",\r
+                  Value,\r

                   Instance\r
                   );\r
   } else if (Data != NULL &&\r
                   Instance\r
                   );\r
   } else if (Data != NULL &&\r


@@ -143,11 +143,11 @@ SerialStatusCodeReportWorker (
     // Code type is not defined.\r
     //\r
     CharCount = AsciiSPrint (\r
     // Code type is not defined.\r
     //\r
     CharCount = AsciiSPrint (\r

-                  Buffer, \r
-                  sizeof (Buffer), \r
-                  "Undefined: C%08x:V%08x I%x\n\r", \r
-                  CodeType, \r
-                  Value, \r
+                  Buffer,\r
+                  sizeof (Buffer),\r
+                  "Undefined: C%08x:V%08x I%x\n\r",\r
+                  CodeType,\r
+                  Value,\r

                   Instance\r
                   );\r
   }\r
                   Instance\r
                   );\r
   }\r

diff --git a/MdeModulePkg/Universal/StatusCodeHandler/RuntimeDxe/StatusCodeHandlerRuntimeDxe.c b/MdeModulePkg/Universal/StatusCodeHandler/RuntimeDxe/StatusCodeHandlerRuntimeDxe.c
index 9149ca4efa44215ceb9219cd24effe467f8d085e..e47e083ff1b1f9570ee6df560f2a9a16b2f67110 100644 (file)
--- a/MdeModulePkg/Universal/StatusCodeHandler/RuntimeDxe/StatusCodeHandlerRuntimeDxe.c
+++ b/MdeModulePkg/Universal/StatusCodeHandler/RuntimeDxe/StatusCodeHandlerRuntimeDxe.c
@@ -2,7 +2,7 @@
   Status Code Handler Driver which produces general handlers and hook them\r
   onto the DXE status code router.\r
 \r
   Status Code Handler Driver which produces general handlers and hook them\r
   onto the DXE status code router.\r
 \r

-  Copyright (c) 2006 - 2009, Intel Corporation. All rights reserved.<BR>\r
+  Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r

   This program and the accompanying materials\r
   are licensed and made available under the terms and conditions of the BSD License\r
   which accompanies this distribution.  The full text of the license may be found at\r
   This program and the accompanying materials\r
   are licensed and made available under the terms and conditions of the BSD License\r
   which accompanies this distribution.  The full text of the license may be found at\r


@@ -66,9 +66,9 @@ VirtualAddressChangeCallBack (
 }\r
 \r
 /**\r
 }\r
 \r
 /**\r

-  Dispatch initialization request to sub status code devices based on \r
+  Dispatch initialization request to sub status code devices based on\r

   customized feature flags.\r
   customized feature flags.\r

- \r
+\r

 **/\r
 VOID\r
 InitializationDispatcherWorker (\r
 **/\r
 VOID\r
 InitializationDispatcherWorker (\r


@@ -99,11 +99,11 @@ InitializationDispatcherWorker (
   }\r
 \r
   //\r
   }\r
 \r
   //\r

-  // Replay Status code which saved in GUID'ed HOB to all supported devices. \r
+  // Replay Status code which saved in GUID'ed HOB to all supported devices.\r

   //\r
   if (FeaturePcdGet (PcdStatusCodeReplayIn)) {\r
   //\r
   if (FeaturePcdGet (PcdStatusCodeReplayIn)) {\r

-    // \r
-    // Journal GUID'ed HOBs to find all record entry, if found, \r
+    //\r
+    // Journal GUID'ed HOBs to find all record entry, if found,\r

     // then output record to support replay device.\r
     //\r
     Hob.Raw   = GetFirstGuidHob (&gMemoryStatusCodeRecordGuid);\r
     // then output record to support replay device.\r
     //\r
     Hob.Raw   = GetFirstGuidHob (&gMemoryStatusCodeRecordGuid);\r


@@ -152,7 +152,7 @@ InitializationDispatcherWorker (
 \r
   @param  ImageHandle       The firmware allocated handle for the EFI image.\r
   @param  SystemTable       A pointer to the EFI System Table.\r
 \r
   @param  ImageHandle       The firmware allocated handle for the EFI image.\r
   @param  SystemTable       A pointer to the EFI System Table.\r

-  \r
+\r

   @retval EFI_SUCCESS       The entry point is executed successfully.\r
 \r
 **/\r
   @retval EFI_SUCCESS       The entry point is executed successfully.\r
 \r
 **/\r

diff --git a/MdeModulePkg/Universal/StatusCodeHandler/RuntimeDxe/StatusCodeHandlerRuntimeDxe.h b/MdeModulePkg/Universal/StatusCodeHandler/RuntimeDxe/StatusCodeHandlerRuntimeDxe.h
index a3185f5b5260b621c7927ca17207a0080764216e..5c1239d3551d9e0e6302c81dd92dda1a7ecbe6ab 100644 (file)
--- a/MdeModulePkg/Universal/StatusCodeHandler/RuntimeDxe/StatusCodeHandlerRuntimeDxe.h
+++ b/MdeModulePkg/Universal/StatusCodeHandler/RuntimeDxe/StatusCodeHandlerRuntimeDxe.h
@@ -1,7 +1,7 @@
 /** @file\r
   Internal include file for Status Code Handler Driver.\r
 \r
 /** @file\r
   Internal include file for Status Code Handler Driver.\r
 \r

-  Copyright (c) 2006 - 2012, Intel Corporation. All rights reserved.<BR>\r
+  Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r

   (C) Copyright 2016 Hewlett Packard Enterprise Development LP<BR>\r
   This program and the accompanying materials\r
   are licensed and made available under the terms and conditions of the BSD License\r
   (C) Copyright 2016 Hewlett Packard Enterprise Development LP<BR>\r
   This program and the accompanying materials\r
   are licensed and made available under the terms and conditions of the BSD License\r


@@ -45,7 +45,7 @@ extern RUNTIME_MEMORY_STATUSCODE_HEADER  *mRtMemoryStatusCodeTable;
 \r
 /**\r
   Locates Serial I/O Protocol as initialization for serial status code worker.\r
 \r
 /**\r
   Locates Serial I/O Protocol as initialization for serial status code worker.\r

- \r
+\r

   @retval EFI_SUCCESS  Serial I/O Protocol is successfully located.\r
 \r
 **/\r
   @retval EFI_SUCCESS  Serial I/O Protocol is successfully located.\r
 \r
 **/\r


@@ -86,7 +86,7 @@ SerialStatusCodeReportWorker (
 \r
 /**\r
   Initialize runtime memory status code table as initialization for runtime memory status code worker\r
 \r
 /**\r
   Initialize runtime memory status code table as initialization for runtime memory status code worker\r

- \r
+\r

   @retval EFI_SUCCESS  Runtime memory status code table successfully initialized.\r
   @retval others       Errors from gBS->InstallConfigurationTable().\r
 \r
   @retval EFI_SUCCESS  Runtime memory status code table successfully initialized.\r
   @retval others       Errors from gBS->InstallConfigurationTable().\r
 \r


@@ -97,7 +97,7 @@ RtMemoryStatusCodeInitializeWorker (
   );\r
 \r
 /**\r
   );\r
 \r
 /**\r

-  Report status code into runtime memory. If the runtime pool is full, roll back to the \r
+  Report status code into runtime memory. If the runtime pool is full, roll back to the\r

   first record and overwrite it.\r
 \r
   @param  CodeType                Indicates the type of status code being reported.\r
   first record and overwrite it.\r
 \r
   @param  CodeType                Indicates the type of status code being reported.\r

diff --git a/MdeModulePkg/Universal/StatusCodeHandler/RuntimeDxe/StatusCodeHandlerRuntimeDxe.inf b/MdeModulePkg/Universal/StatusCodeHandler/RuntimeDxe/StatusCodeHandlerRuntimeDxe.inf
index 637804f5dee4a54ae3fcbbe53dd18898e62a682e..928ae15b6fe65c8c68b1e8ccca369de9f7ccb874 100644 (file)
--- a/MdeModulePkg/Universal/StatusCodeHandler/RuntimeDxe/StatusCodeHandlerRuntimeDxe.inf
+++ b/MdeModulePkg/Universal/StatusCodeHandler/RuntimeDxe/StatusCodeHandlerRuntimeDxe.inf
@@ -1,7 +1,7 @@
 ## @file\r
 #  Status Code Handler Driver which produces general handlers and hook them onto the DXE status code router.\r
 #\r
 ## @file\r
 #  Status Code Handler Driver which produces general handlers and hook them onto the DXE status code router.\r
 #\r

-#  Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.<BR>\r
+#  Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r

 #  (C) Copyright 2016 Hewlett Packard Enterprise Development LP<BR>\r
 #\r
 #  This program and the accompanying materials\r
 #  (C) Copyright 2016 Hewlett Packard Enterprise Development LP<BR>\r
 #\r
 #  This program and the accompanying materials\r


@@ -51,7 +51,7 @@
   ReportStatusCodeLib\r
   DebugLib\r
   BaseMemoryLib\r
   ReportStatusCodeLib\r
   DebugLib\r
   BaseMemoryLib\r

-  \r
+\r

 [Guids]\r
   ## SOMETIMES_CONSUMES   ## HOB\r
   ## SOMETIMES_PRODUCES   ## SystemTable\r
 [Guids]\r
   ## SOMETIMES_CONSUMES   ## HOB\r
   ## SOMETIMES_PRODUCES   ## SystemTable\r

diff --git a/MdeModulePkg/Universal/StatusCodeHandler/RuntimeDxe/StatusCodeHandlerRuntimeDxeExtra.uni b/MdeModulePkg/Universal/StatusCodeHandler/RuntimeDxe/StatusCodeHandlerRuntimeDxeExtra.uni
index 2093444b50d391f4737098c153ce675d2309d62f..4c19b6b79c32116922ec9242534aeefef5be2d1e 100644 (file)
--- a/MdeModulePkg/Universal/StatusCodeHandler/RuntimeDxe/StatusCodeHandlerRuntimeDxeExtra.uni
+++ b/MdeModulePkg/Universal/StatusCodeHandler/RuntimeDxe/StatusCodeHandlerRuntimeDxeExtra.uni
@@ -1,7 +1,7 @@
 // /** @file\r
 // StatusCodeHandlerRuntimeDxe Localized Strings and Content\r
 //\r
 // /** @file\r
 // StatusCodeHandlerRuntimeDxe Localized Strings and Content\r
 //\r

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

 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r
 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r


@@ -12,8 +12,8 @@
 //\r
 // **/\r
 \r
 //\r
 // **/\r
 \r

-#string STR_PROPERTIES_MODULE_NAME \r
-#language en-US \r
+#string STR_PROPERTIES_MODULE_NAME\r
+#language en-US\r

 "Status Code Handler DXE Driver"\r
 \r
 \r
 "Status Code Handler DXE Driver"\r
 \r
 \r

diff --git a/MdeModulePkg/Universal/StatusCodeHandler/Smm/MemoryStatusCodeWorker.c b/MdeModulePkg/Universal/StatusCodeHandler/Smm/MemoryStatusCodeWorker.c
index 6baf2dd0f26066ce4f8d97537646e05f68ce13b5..8d3b61c4cba53795528b767239681e123d05facf 100644 (file)
--- a/MdeModulePkg/Universal/StatusCodeHandler/Smm/MemoryStatusCodeWorker.c
+++ b/MdeModulePkg/Universal/StatusCodeHandler/Smm/MemoryStatusCodeWorker.c
@@ -1,15 +1,15 @@
 /** @file\r
   Runtime memory status code worker.\r
 \r
 /** @file\r
   Runtime memory status code worker.\r
 \r

-  Copyright (c) 2006 - 2010, Intel Corporation. All rights reserved.<BR>\r
+  Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r

   (C) Copyright 2016 Hewlett Packard Enterprise Development LP<BR>\r
   (C) Copyright 2016 Hewlett Packard Enterprise Development LP<BR>\r

-  This program and the accompanying materials                          \r
-  are licensed and made available under the terms and conditions of the BSD License         \r
-  which accompanies this distribution.  The full text of the license may be found at        \r
-  http://opensource.org/licenses/bsd-license.php                                            \r
+  This program and the accompanying materials\r
+  are licensed and made available under the terms and conditions of the BSD License\r
+  which accompanies this distribution.  The full text of the license may be found at\r
+  http://opensource.org/licenses/bsd-license.php\r

 \r
 \r

-  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     \r
-  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             \r
+  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
+  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r

 \r
 **/\r
 \r
 \r
 **/\r
 \r


@@ -48,7 +48,7 @@ MemoryStatusCodeInitializeWorker (
 \r
 \r
 /**\r
 \r
 \r
 /**\r

-  Report status code into runtime memory. If the runtime pool is full, roll back to the \r
+  Report status code into runtime memory. If the runtime pool is full, roll back to the\r

   first record and overwrite it.\r
 \r
   @param  CodeType                Indicates the type of status code being reported.\r
   first record and overwrite it.\r
 \r
   @param  CodeType                Indicates the type of status code being reported.\r

diff --git a/MdeModulePkg/Universal/StatusCodeHandler/Smm/SerialStatusCodeWorker.c b/MdeModulePkg/Universal/StatusCodeHandler/Smm/SerialStatusCodeWorker.c
index 8f2fbf4f7a4219bd26b7b41fd4d73b4403f3e406..0f1e12f97762495ab703e19151741e86e4fbc99c 100644 (file)
--- a/MdeModulePkg/Universal/StatusCodeHandler/Smm/SerialStatusCodeWorker.c
+++ b/MdeModulePkg/Universal/StatusCodeHandler/Smm/SerialStatusCodeWorker.c
@@ -1,14 +1,14 @@
 /** @file\r
   Serial I/O status code reporting worker.\r
 \r
 /** @file\r
   Serial I/O status code reporting worker.\r
 \r

-  Copyright (c) 2009 - 2014, Intel Corporation. All rights reserved.<BR>\r
-  This program and the accompanying materials                          \r
-  are licensed and made available under the terms and conditions of the BSD License         \r
-  which accompanies this distribution.  The full text of the license may be found at        \r
-  http://opensource.org/licenses/bsd-license.php                                            \r
-                                                                                            \r
-  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     \r
-  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             \r
+  Copyright (c) 2009 - 2018, Intel Corporation. All rights reserved.<BR>\r
+  This program and the accompanying materials\r
+  are licensed and made available under the terms and conditions of the BSD License\r
+  which accompanies this distribution.  The full text of the license may be found at\r
+  http://opensource.org/licenses/bsd-license.php\r
+\r
+  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
+  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r

 \r
 **/\r
 \r
 \r
 **/\r
 \r


@@ -16,7 +16,7 @@
 \r
 /**\r
   Convert status code value and extended data to readable ASCII string, send string to serial I/O device.\r
 \r
 /**\r
   Convert status code value and extended data to readable ASCII string, send string to serial I/O device.\r

- \r
+\r

   @param  CodeType         Indicates the type of status code being reported.\r
   @param  Value            Describes the current status of a hardware or software entity.\r
                            This included information about the class and subclass that is used to\r
   @param  CodeType         Indicates the type of status code being reported.\r
   @param  Value            Describes the current status of a hardware or software entity.\r
                            This included information about the class and subclass that is used to\r


@@ -73,9 +73,9 @@ SerialStatusCodeReportWorker (
     // Print DEBUG() information into output buffer.\r
     //\r
     CharCount = AsciiBSPrint (\r
     // Print DEBUG() information into output buffer.\r
     //\r
     CharCount = AsciiBSPrint (\r

-                  Buffer, \r
-                  sizeof (Buffer), \r
-                  Format, \r
+                  Buffer,\r
+                  sizeof (Buffer),\r
+                  Format,\r

                   Marker\r
                   );\r
   } else if ((CodeType & EFI_STATUS_CODE_TYPE_MASK) == EFI_ERROR_CODE) {\r
                   Marker\r
                   );\r
   } else if ((CodeType & EFI_STATUS_CODE_TYPE_MASK) == EFI_ERROR_CODE) {\r


@@ -83,15 +83,15 @@ SerialStatusCodeReportWorker (
     // Print ERROR information into output buffer.\r
     //\r
     CharCount = AsciiSPrint (\r
     // Print ERROR information into output buffer.\r
     //\r
     CharCount = AsciiSPrint (\r

-                  Buffer, \r
-                  sizeof (Buffer), \r
-                  "ERROR: C%08x:V%08x I%x", \r
-                  CodeType, \r
-                  Value, \r
+                  Buffer,\r
+                  sizeof (Buffer),\r
+                  "ERROR: C%08x:V%08x I%x",\r
+                  CodeType,\r
+                  Value,\r

                   Instance\r
                   );\r
     ASSERT (CharCount > 0);\r
                   Instance\r
                   );\r
     ASSERT (CharCount > 0);\r

-   \r
+\r

     if (CallerId != NULL) {\r
       CharCount += AsciiSPrint (\r
                      &Buffer[CharCount],\r
     if (CallerId != NULL) {\r
       CharCount += AsciiSPrint (\r
                      &Buffer[CharCount],\r


@@ -120,10 +120,10 @@ SerialStatusCodeReportWorker (
     // Print PROGRESS information into output buffer.\r
     //\r
     CharCount = AsciiSPrint (\r
     // Print PROGRESS information into output buffer.\r
     //\r
     CharCount = AsciiSPrint (\r

-                  Buffer, \r
-                  sizeof (Buffer), \r
-                  "PROGRESS CODE: V%08x I%x\n\r", \r
-                  Value, \r
+                  Buffer,\r
+                  sizeof (Buffer),\r
+                  "PROGRESS CODE: V%08x I%x\n\r",\r
+                  Value,\r

                   Instance\r
                   );\r
   } else if (Data != NULL &&\r
                   Instance\r
                   );\r
   } else if (Data != NULL &&\r


@@ -143,11 +143,11 @@ SerialStatusCodeReportWorker (
     // Code type is not defined.\r
     //\r
     CharCount = AsciiSPrint (\r
     // Code type is not defined.\r
     //\r
     CharCount = AsciiSPrint (\r

-                  Buffer, \r
-                  sizeof (Buffer), \r
-                  "Undefined: C%08x:V%08x I%x\n\r", \r
-                  CodeType, \r
-                  Value, \r
+                  Buffer,\r
+                  sizeof (Buffer),\r
+                  "Undefined: C%08x:V%08x I%x\n\r",\r
+                  CodeType,\r
+                  Value,\r

                   Instance\r
                   );\r
   }\r
                   Instance\r
                   );\r
   }\r

diff --git a/MdeModulePkg/Universal/StatusCodeHandler/Smm/StatusCodeHandlerSmm.c b/MdeModulePkg/Universal/StatusCodeHandler/Smm/StatusCodeHandlerSmm.c
index 5e84ea43dabbdbab4cb81831670bb8ea649bc31d..846685b1c9df6cb041cdd026d6560505b11720bb 100644 (file)
--- a/MdeModulePkg/Universal/StatusCodeHandler/Smm/StatusCodeHandlerSmm.c
+++ b/MdeModulePkg/Universal/StatusCodeHandler/Smm/StatusCodeHandlerSmm.c
@@ -2,7 +2,7 @@
   Status Code Handler Driver which produces general handlers and hook them\r
   onto the SMM status code router.\r
 \r
   Status Code Handler Driver which produces general handlers and hook them\r
   onto the SMM status code router.\r
 \r

-  Copyright (c) 2009, Intel Corporation. All rights reserved.<BR>\r
+  Copyright (c) 2009 - 2018, Intel Corporation. All rights reserved.<BR>\r

   This program and the accompanying materials\r
   are licensed and made available under the terms and conditions of the BSD License\r
   which accompanies this distribution.  The full text of the license may be found at\r
   This program and the accompanying materials\r
   are licensed and made available under the terms and conditions of the BSD License\r
   which accompanies this distribution.  The full text of the license may be found at\r


@@ -19,9 +19,9 @@ EFI_SMM_RSC_HANDLER_PROTOCOL  *mRscHandlerProtocol       = NULL;
 \r
 \r
 /**\r
 \r
 \r
 /**\r

-  Dispatch initialization request to sub status code devices based on \r
+  Dispatch initialization request to sub status code devices based on\r

   customized feature flags.\r
   customized feature flags.\r

- \r
+\r

 **/\r
 VOID\r
 InitializationDispatcherWorker (\r
 **/\r
 VOID\r
 InitializationDispatcherWorker (\r


@@ -54,7 +54,7 @@ InitializationDispatcherWorker (
 \r
   @param  ImageHandle       The firmware allocated handle for the EFI image.\r
   @param  SystemTable       A pointer to the EFI System Table.\r
 \r
   @param  ImageHandle       The firmware allocated handle for the EFI image.\r
   @param  SystemTable       A pointer to the EFI System Table.\r

-  \r
+\r

   @retval EFI_SUCCESS       The entry point is executed successfully.\r
 \r
 **/\r
   @retval EFI_SUCCESS       The entry point is executed successfully.\r
 \r
 **/\r

diff --git a/MdeModulePkg/Universal/StatusCodeHandler/Smm/StatusCodeHandlerSmm.h b/MdeModulePkg/Universal/StatusCodeHandler/Smm/StatusCodeHandlerSmm.h
index 1a374c2ead2ddb27df05130b3964e75ca1fb748e..6b80b0acbbd104c2f144954aa70ef22863dbc220 100644 (file)
--- a/MdeModulePkg/Universal/StatusCodeHandler/Smm/StatusCodeHandlerSmm.h
+++ b/MdeModulePkg/Universal/StatusCodeHandler/Smm/StatusCodeHandlerSmm.h
@@ -1,7 +1,7 @@
 /** @file\r
   Internal include file for Status Code Handler Driver.\r
 \r
 /** @file\r
   Internal include file for Status Code Handler Driver.\r
 \r

-  Copyright (c) 2009 - 2012, Intel Corporation. All rights reserved.<BR>\r
+  Copyright (c) 2009 - 2018, Intel Corporation. All rights reserved.<BR>\r

   (C) Copyright 2016 Hewlett Packard Enterprise Development LP<BR>\r
   This program and the accompanying materials\r
   are licensed and made available under the terms and conditions of the BSD License\r
   (C) Copyright 2016 Hewlett Packard Enterprise Development LP<BR>\r
   This program and the accompanying materials\r
   are licensed and made available under the terms and conditions of the BSD License\r


@@ -83,7 +83,7 @@ SerialStatusCodeReportWorker (
 \r
 /**\r
   Initialize runtime memory status code table as initialization for runtime memory status code worker\r
 \r
 /**\r
   Initialize runtime memory status code table as initialization for runtime memory status code worker\r

- \r
+\r

   @retval EFI_SUCCESS  Runtime memory status code table successfully initialized.\r
 \r
 **/\r
   @retval EFI_SUCCESS  Runtime memory status code table successfully initialized.\r
 \r
 **/\r


@@ -93,7 +93,7 @@ MemoryStatusCodeInitializeWorker (
   );\r
 \r
 /**\r
   );\r
 \r
 /**\r

-  Report status code into runtime memory. If the runtime pool is full, roll back to the \r
+  Report status code into runtime memory. If the runtime pool is full, roll back to the\r

   first record and overwrite it.\r
 \r
   @param  CodeType                Indicates the type of status code being reported.\r
   first record and overwrite it.\r
 \r
   @param  CodeType                Indicates the type of status code being reported.\r

diff --git a/MdeModulePkg/Universal/StatusCodeHandler/Smm/StatusCodeHandlerSmm.inf b/MdeModulePkg/Universal/StatusCodeHandler/Smm/StatusCodeHandlerSmm.inf
index 7b5073546e99e87dfeb01389bbbfacd51214e0c5..fbc62f5f4e33c6b53b583cef8d5757aac42be57d 100644 (file)
--- a/MdeModulePkg/Universal/StatusCodeHandler/Smm/StatusCodeHandlerSmm.inf
+++ b/MdeModulePkg/Universal/StatusCodeHandler/Smm/StatusCodeHandlerSmm.inf
@@ -1,7 +1,7 @@
 ## @file\r
 #  Status Code Handler Driver which produces general handlers and hook them onto the SMM status code router.\r
 #\r
 ## @file\r
 #  Status Code Handler Driver which produces general handlers and hook them onto the SMM status code router.\r
 #\r

-#  Copyright (c) 2009 - 2014, Intel Corporation. All rights reserved.<BR>\r
+#  Copyright (c) 2009 - 2018, Intel Corporation. All rights reserved.<BR>\r

 #  (C) Copyright 2016 Hewlett Packard Enterprise Development LP<BR>\r
 #\r
 #  This program and the accompanying materials\r
 #  (C) Copyright 2016 Hewlett Packard Enterprise Development LP<BR>\r
 #\r
 #  This program and the accompanying materials\r


@@ -21,7 +21,7 @@
   FILE_GUID                      = 79CD78D8-6EDC-4978-BD02-3299C387AB17\r
   MODULE_TYPE                    = DXE_SMM_DRIVER\r
   PI_SPECIFICATION_VERSION       = 0x0001000A\r
   FILE_GUID                      = 79CD78D8-6EDC-4978-BD02-3299C387AB17\r
   MODULE_TYPE                    = DXE_SMM_DRIVER\r
   PI_SPECIFICATION_VERSION       = 0x0001000A\r

-  VERSION_STRING                 = 1.0  \r
+  VERSION_STRING                 = 1.0\r

   ENTRY_POINT                    = StatusCodeHandlerSmmEntry\r
 \r
 #\r
   ENTRY_POINT                    = StatusCodeHandlerSmmEntry\r
 \r
 #\r

diff --git a/MdeModulePkg/Universal/StatusCodeHandler/Smm/StatusCodeHandlerSmmExtra.uni b/MdeModulePkg/Universal/StatusCodeHandler/Smm/StatusCodeHandlerSmmExtra.uni
index 05422d5ee5c0a5c6e642e1b327a5da35c7e6efbe..03225ac3bd89b9583e280f0aafcdf80bc1e26724 100644 (file)
--- a/MdeModulePkg/Universal/StatusCodeHandler/Smm/StatusCodeHandlerSmmExtra.uni
+++ b/MdeModulePkg/Universal/StatusCodeHandler/Smm/StatusCodeHandlerSmmExtra.uni
@@ -1,7 +1,7 @@
 // /** @file\r
 // StatusCodeHandlerSmm Localized Strings and Content\r
 //\r
 // /** @file\r
 // StatusCodeHandlerSmm Localized Strings and Content\r
 //\r

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

 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r
 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r


@@ -12,8 +12,8 @@
 //\r
 // **/\r
 \r
 //\r
 // **/\r
 \r

-#string STR_PROPERTIES_MODULE_NAME \r
-#language en-US \r
+#string STR_PROPERTIES_MODULE_NAME\r
+#language en-US\r

 "Status Code Handler SMM Driver"\r
 \r
 \r
 "Status Code Handler SMM Driver"\r
 \r
 \r

diff --git a/MdeModulePkg/Universal/TimestampDxe/TimestampDxe.c b/MdeModulePkg/Universal/TimestampDxe/TimestampDxe.c
index 30349b5ec52e2c218d68b8861222c2a717a61191..bce2d8c0acd9905d0a6cdbfa09540f7d898abd0f 100644 (file)
--- a/MdeModulePkg/Universal/TimestampDxe/TimestampDxe.c
+++ b/MdeModulePkg/Universal/TimestampDxe/TimestampDxe.c
@@ -1,7 +1,7 @@
 /** @file\r
   Implementation of Timestamp Protocol using UEFI APIs.\r
 /** @file\r
   Implementation of Timestamp Protocol using UEFI APIs.\r

-  \r
-Copyright (c) 2013, Intel Corporation. All rights reserved.<BR>\r
+\r
+Copyright (c) 2013 - 2018, Intel Corporation. All rights reserved.<BR>\r

 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r


@@ -45,9 +45,9 @@ EFI_TIMESTAMP_PROPERTIES mTimestampProperties = {
   will always roll over to zero. The properties of the counter can be retrieved from GetProperties().\r
   The caller should be prepared for the function to return the same value twice across successive calls.\r
   The counter value will not go backwards other than when wrapping, as defined by EndValue in GetProperties().\r
   will always roll over to zero. The properties of the counter can be retrieved from GetProperties().\r
   The caller should be prepared for the function to return the same value twice across successive calls.\r
   The counter value will not go backwards other than when wrapping, as defined by EndValue in GetProperties().\r

-  The frequency of the returned timestamp counter value must remain constant. Power management operations that \r
-  affect clocking must not change the returned counter frequency. The quantization of counter value updates may \r
-  vary as long as the value reflecting time passed remains consistent.           \r
+  The frequency of the returned timestamp counter value must remain constant. Power management operations that\r
+  affect clocking must not change the returned counter frequency. The quantization of counter value updates may\r
+  vary as long as the value reflecting time passed remains consistent.\r

 \r
   @retval The current value of the free running timestamp counter.\r
 \r
 \r
   @retval The current value of the free running timestamp counter.\r
 \r


@@ -63,7 +63,7 @@ TimestampDriverGetTimestamp (
   //\r
   UINT64  TimestampValue;\r
   TimestampValue = 0;\r
   //\r
   UINT64  TimestampValue;\r
   TimestampValue = 0;\r

-  \r
+\r

   //\r
   // Get the timestamp\r
   //\r
   //\r
   // Get the timestamp\r
   //\r


@@ -72,7 +72,7 @@ TimestampDriverGetTimestamp (
   } else {\r
     TimestampValue = GetPerformanceCounter() - mTimerLibStartValue;\r
   }\r
   } else {\r
     TimestampValue = GetPerformanceCounter() - mTimerLibStartValue;\r
   }\r

-    \r
+\r

   return TimestampValue;\r
 }\r
 \r
   return TimestampValue;\r
 }\r
 \r


@@ -81,9 +81,9 @@ TimestampDriverGetTimestamp (
 \r
   @param[out]  Properties              The properties of the timestamp counter.\r
 \r
 \r
   @param[out]  Properties              The properties of the timestamp counter.\r
 \r

-  @retval      EFI_SUCCESS             The properties were successfully retrieved. \r
-  @retval      EFI_DEVICE_ERROR        An error occurred trying to retrieve the properties of the timestamp \r
-                                       counter subsystem. Properties is not pedated.                                \r
+  @retval      EFI_SUCCESS             The properties were successfully retrieved.\r
+  @retval      EFI_DEVICE_ERROR        An error occurred trying to retrieve the properties of the timestamp\r
+                                       counter subsystem. Properties is not pedated.\r

   @retval      EFI_INVALID_PARAMETER   Properties is NULL.\r
 \r
 **/\r
   @retval      EFI_INVALID_PARAMETER   Properties is NULL.\r
 \r
 **/\r


@@ -96,12 +96,12 @@ TimestampDriverGetProperties(
   if (Properties == NULL) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
   if (Properties == NULL) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r

-  \r
+\r

   //\r
   // Get timestamp properties\r
   //\r
   CopyMem((VOID *) Properties, (VOID *) &mTimestampProperties, sizeof (mTimestampProperties));\r
   //\r
   // Get timestamp properties\r
   //\r
   CopyMem((VOID *) Properties, (VOID *) &mTimestampProperties, sizeof (mTimestampProperties));\r

-  \r
+\r

   return EFI_SUCCESS;\r
 }\r
 \r
   return EFI_SUCCESS;\r
 }\r
 \r


@@ -130,26 +130,26 @@ TimestampDriverInitialize (
   )\r
 {\r
   EFI_STATUS  Status;\r
   )\r
 {\r
   EFI_STATUS  Status;\r

-  \r
+\r

   EFI_HANDLE  TimestampHandle;\r
   TimestampHandle = NULL;\r
   EFI_HANDLE  TimestampHandle;\r
   TimestampHandle = NULL;\r

-  \r
+\r

   //\r
   // Get the start value, end value and frequency in Timerlib\r
   //\r
   mTimestampProperties.Frequency = GetPerformanceCounterProperties(&mTimerLibStartValue, &mTimerLibEndValue);\r
   //\r
   // Get the start value, end value and frequency in Timerlib\r
   //\r
   mTimestampProperties.Frequency = GetPerformanceCounterProperties(&mTimerLibStartValue, &mTimerLibEndValue);\r

-  \r
+\r

   //\r
   //\r

-  // Set the EndValue \r
+  // Set the EndValue\r

   //\r
   if (mTimerLibEndValue > mTimerLibStartValue) {\r
     mTimestampProperties.EndValue = mTimerLibEndValue - mTimerLibStartValue;\r
   } else {\r
     mTimestampProperties.EndValue = mTimerLibStartValue - mTimerLibEndValue;\r
   }\r
   //\r
   if (mTimerLibEndValue > mTimerLibStartValue) {\r
     mTimestampProperties.EndValue = mTimerLibEndValue - mTimerLibStartValue;\r
   } else {\r
     mTimestampProperties.EndValue = mTimerLibStartValue - mTimerLibEndValue;\r
   }\r

-  \r
+\r

   DEBUG ((EFI_D_INFO, "TimerFrequency:0x%lx, TimerLibStartTime:0x%lx, TimerLibEndtime:0x%lx\n", mTimestampProperties.Frequency, mTimerLibStartValue, mTimerLibEndValue));\r
   DEBUG ((EFI_D_INFO, "TimerFrequency:0x%lx, TimerLibStartTime:0x%lx, TimerLibEndtime:0x%lx\n", mTimestampProperties.Frequency, mTimerLibStartValue, mTimerLibEndValue));\r

-  \r
+\r

   //\r
   // Install the Timestamp Protocol onto a new handle\r
   //\r
   //\r
   // Install the Timestamp Protocol onto a new handle\r
   //\r


@@ -159,7 +159,7 @@ TimestampDriverInitialize (
                   &mTimestamp,\r
                   NULL\r
                   );\r
                   &mTimestamp,\r
                   NULL\r
                   );\r

-                  \r
+\r

   ASSERT_EFI_ERROR (Status);\r
 \r
   return EFI_SUCCESS;\r
   ASSERT_EFI_ERROR (Status);\r
 \r
   return EFI_SUCCESS;\r

diff --git a/MdeModulePkg/Universal/TimestampDxe/TimestampDxe.inf b/MdeModulePkg/Universal/TimestampDxe/TimestampDxe.inf
index f71d5262ea2871440167f97c2ee163ebb253b029..07858857e3953bb529216b63eca2b0f4d9dd9c13 100644 (file)
--- a/MdeModulePkg/Universal/TimestampDxe/TimestampDxe.inf
+++ b/MdeModulePkg/Universal/TimestampDxe/TimestampDxe.inf
@@ -1,7 +1,7 @@
 ## @file\r
 # Generic Timestamp driver producing Timestamp Protocol using UEFI APIs.\r
 #\r
 ## @file\r
 # Generic Timestamp driver producing Timestamp Protocol using UEFI APIs.\r
 #\r

-# Copyright (c) 2013 - 2014, Intel Corporation. All rights reserved.<BR>\r
+# Copyright (c) 2013 - 2018, Intel Corporation. All rights reserved.<BR>\r

 #\r
 #  This program and the accompanying materials\r
 #  are licensed and made available under the terms and conditions of the BSD License\r
 #\r
 #  This program and the accompanying materials\r
 #  are licensed and made available under the terms and conditions of the BSD License\r


@@ -32,7 +32,7 @@
   MdePkg/MdePkg.dec\r
 \r
 [Sources]\r
   MdePkg/MdePkg.dec\r
 \r
 [Sources]\r

-  TimestampDxe.c \r
+  TimestampDxe.c\r

 \r
 [LibraryClasses]\r
   UefiBootServicesTableLib\r
 \r
 [LibraryClasses]\r
   UefiBootServicesTableLib\r

diff --git a/MdeModulePkg/Universal/TimestampDxe/TimestampDxeExtra.uni b/MdeModulePkg/Universal/TimestampDxe/TimestampDxeExtra.uni
index aba52deb8d81152ff69bfd7c5f176f5cf7e4c88c..f99138ff4c7c53af3221d274aaaf76b513d16414 100644 (file)
--- a/MdeModulePkg/Universal/TimestampDxe/TimestampDxeExtra.uni
+++ b/MdeModulePkg/Universal/TimestampDxe/TimestampDxeExtra.uni
@@ -1,7 +1,7 @@
 // /** @file\r
 // TimestampDxe Localized Strings and Content\r
 //\r
 // /** @file\r
 // TimestampDxe Localized Strings and Content\r
 //\r

-// Copyright (c) 2014, Intel Corporation. All rights reserved.<BR>\r
+// Copyright (c) 2014 - 2018, Intel Corporation. All rights reserved.<BR>\r

 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r
 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r


@@ -12,8 +12,8 @@
 //\r
 // **/\r
 \r
 //\r
 // **/\r
 \r

-#string STR_PROPERTIES_MODULE_NAME \r
-#language en-US \r
+#string STR_PROPERTIES_MODULE_NAME\r
+#language en-US\r

 "Timestamp DXE Driver"\r
 \r
 \r
 "Timestamp DXE Driver"\r
 \r
 \r

diff --git a/MdeModulePkg/Universal/Variable/EmuRuntimeDxe/EmuVariable.c b/MdeModulePkg/Universal/Variable/EmuRuntimeDxe/EmuVariable.c
index 8202d37daad041830126fed42fdb2ebd23dbc49e..1bcf931b96a670ab1fc66cd66f9d88d68f363e7f 100644 (file)
--- a/MdeModulePkg/Universal/Variable/EmuRuntimeDxe/EmuVariable.c
+++ b/MdeModulePkg/Universal/Variable/EmuRuntimeDxe/EmuVariable.c
@@ -29,7 +29,7 @@ VARIABLE_INFO_ENTRY *gVariableInfo = NULL;
 #define ISO_639_2_ENTRY_SIZE    3\r
 \r
 /**\r
 #define ISO_639_2_ENTRY_SIZE    3\r
 \r
 /**\r

-  Update the variable region with Variable information. These are the same \r
+  Update the variable region with Variable information. These are the same\r

   arguments as the EFI Variable services.\r
 \r
   @param[in] VariableName       Name of variable\r
   arguments as the EFI Variable services.\r
 \r
   @param[in] VariableName       Name of variable\r


@@ -40,7 +40,7 @@ VARIABLE_INFO_ENTRY *gVariableInfo = NULL;
 \r
   @param[in] DataSize           Size of data. 0 means delete\r
 \r
 \r
   @param[in] DataSize           Size of data. 0 means delete\r
 \r

-  @param[in] Attributes              Attribues of the variable\r
+  @param[in] Attributes         Attribues of the variable\r

 \r
   @param[in] Variable           The variable information which is used to keep track of variable usage.\r
 \r
 \r
   @param[in] Variable           The variable information which is used to keep track of variable usage.\r
 \r


@@ -272,13 +272,13 @@ GetEndPointer (
 }\r
 \r
 /**\r
 }\r
 \r
 /**\r

-  Routine used to track statistical information about variable usage. \r
+  Routine used to track statistical information about variable usage.\r

   The data is stored in the EFI system table so it can be accessed later.\r
   The data is stored in the EFI system table so it can be accessed later.\r

-  VariableInfo.efi can dump out the table. Only Boot Services variable \r
+  VariableInfo.efi can dump out the table. Only Boot Services variable\r

   accesses are tracked by this code. The PcdVariableCollectStatistics\r
   accesses are tracked by this code. The PcdVariableCollectStatistics\r

-  build flag controls if this feature is enabled. \r
+  build flag controls if this feature is enabled.\r

 \r
 \r

-  A read that hits in the cache will have Read and Cache true for \r
+  A read that hits in the cache will have Read and Cache true for\r

   the transaction. Data is allocated by this routine, but never\r
   freed.\r
 \r
   the transaction. Data is allocated by this routine, but never\r
   freed.\r
 \r


@@ -328,7 +328,7 @@ UpdateVariableInfo (
       gBS->InstallConfigurationTable (&gEfiVariableGuid, gVariableInfo);\r
     }\r
 \r
       gBS->InstallConfigurationTable (&gEfiVariableGuid, gVariableInfo);\r
     }\r
 \r

-    \r
+\r

     for (Entry = gVariableInfo; Entry != NULL; Entry = Entry->Next) {\r
       if (CompareGuid (VendorGuid, &Entry->VendorGuid)) {\r
         if (StrCmp (VariableName, Entry->Name) == 0) {\r
     for (Entry = gVariableInfo; Entry != NULL; Entry = Entry->Next) {\r
       if (CompareGuid (VendorGuid, &Entry->VendorGuid)) {\r
         if (StrCmp (VariableName, Entry->Name) == 0) {\r


@@ -399,7 +399,7 @@ GetIndexFromSupportedLangCodes(
   IN  CHAR8            *SupportedLang,\r
   IN  CHAR8            *Lang,\r
   IN  BOOLEAN          Iso639Language\r
   IN  CHAR8            *SupportedLang,\r
   IN  CHAR8            *Lang,\r
   IN  BOOLEAN          Iso639Language\r

-  ) \r
+  )\r

 {\r
   UINTN    Index;\r
   UINTN    CompareLength;\r
 {\r
   UINTN    Index;\r
   UINTN    CompareLength;\r


@@ -434,8 +434,8 @@ GetIndexFromSupportedLangCodes(
       // Determine the length of the next language code in SupportedLang\r
       //\r
       for (CompareLength = 0; SupportedLang[CompareLength] != '\0' && SupportedLang[CompareLength] != ';'; CompareLength++);\r
       // Determine the length of the next language code in SupportedLang\r
       //\r
       for (CompareLength = 0; SupportedLang[CompareLength] != '\0' && SupportedLang[CompareLength] != ';'; CompareLength++);\r

-      \r
-      if ((CompareLength == LanguageLength) && \r
+\r
+      if ((CompareLength == LanguageLength) &&\r

           (AsciiStrnCmp (Lang, SupportedLang, CompareLength) == 0)) {\r
         //\r
         // Successfully find the index of Lang string in SupportedLang string.\r
           (AsciiStrnCmp (Lang, SupportedLang, CompareLength) == 0)) {\r
         //\r
         // Successfully find the index of Lang string in SupportedLang string.\r


@@ -523,7 +523,7 @@ GetLangFromSupportedLangCodes (
         return CopyMem (mVariableModuleGlobal->PlatformLang, Supported - CompareLength, CompareLength);\r
       }\r
       SubIndex++;\r
         return CopyMem (mVariableModuleGlobal->PlatformLang, Supported - CompareLength, CompareLength);\r
       }\r
       SubIndex++;\r

-      \r
+\r

       //\r
       // Skip ';' characters in Supported\r
       //\r
       //\r
       // Skip ';' characters in Supported\r
       //\r


@@ -533,10 +533,10 @@ GetLangFromSupportedLangCodes (
 }\r
 \r
 /**\r
 }\r
 \r
 /**\r

-  Returns a pointer to an allocated buffer that contains the best matching language \r
-  from a set of supported languages.  \r
-  \r
-  This function supports both ISO 639-2 and RFC 4646 language codes, but language \r
+  Returns a pointer to an allocated buffer that contains the best matching language\r
+  from a set of supported languages.\r
+\r
+  This function supports both ISO 639-2 and RFC 4646 language codes, but language\r

   code types may not be mixed in a single call to this function. This function\r
   supports a variable argument list that allows the caller to pass in a prioritized\r
   list of language codes to test against all the language codes in SupportedLanguages.\r
   code types may not be mixed in a single call to this function. This function\r
   supports a variable argument list that allows the caller to pass in a prioritized\r
   list of language codes to test against all the language codes in SupportedLanguages.\r


@@ -544,37 +544,37 @@ GetLangFromSupportedLangCodes (
   If SupportedLanguages is NULL, then ASSERT().\r
 \r
   @param[in]  SupportedLanguages  A pointer to a Null-terminated ASCII string that\r
   If SupportedLanguages is NULL, then ASSERT().\r
 \r
   @param[in]  SupportedLanguages  A pointer to a Null-terminated ASCII string that\r

-                                  contains a set of language codes in the format \r
+                                  contains a set of language codes in the format\r

                                   specified by Iso639Language.\r
   @param[in]  Iso639Language      If not zero, then all language codes are assumed to be\r
                                   in ISO 639-2 format.  If zero, then all language\r
                                   codes are assumed to be in RFC 4646 language format\r
                                   specified by Iso639Language.\r
   @param[in]  Iso639Language      If not zero, then all language codes are assumed to be\r
                                   in ISO 639-2 format.  If zero, then all language\r
                                   codes are assumed to be in RFC 4646 language format\r

-  @param[in]  ...                 A variable argument list that contains pointers to \r
+  @param[in]  ...                 A variable argument list that contains pointers to\r

                                   Null-terminated ASCII strings that contain one or more\r
                                   language codes in the format specified by Iso639Language.\r
                                   The first language code from each of these language\r
                                   code lists is used to determine if it is an exact or\r
                                   Null-terminated ASCII strings that contain one or more\r
                                   language codes in the format specified by Iso639Language.\r
                                   The first language code from each of these language\r
                                   code lists is used to determine if it is an exact or\r

-                                  close match to any of the language codes in \r
+                                  close match to any of the language codes in\r

                                   SupportedLanguages.  Close matches only apply to RFC 4646\r
                                   language codes, and the matching algorithm from RFC 4647\r
                                   SupportedLanguages.  Close matches only apply to RFC 4646\r
                                   language codes, and the matching algorithm from RFC 4647\r

-                                  is used to determine if a close match is present.  If \r
+                                  is used to determine if a close match is present.  If\r

                                   an exact or close match is found, then the matching\r
                                   language code from SupportedLanguages is returned.  If\r
                                   no matches are found, then the next variable argument\r
                                   an exact or close match is found, then the matching\r
                                   language code from SupportedLanguages is returned.  If\r
                                   no matches are found, then the next variable argument\r

-                                  parameter is evaluated.  The variable argument list \r
+                                  parameter is evaluated.  The variable argument list\r

                                   is terminated by a NULL.\r
 \r
   @retval NULL   The best matching language could not be found in SupportedLanguages.\r
                                   is terminated by a NULL.\r
 \r
   @retval NULL   The best matching language could not be found in SupportedLanguages.\r

-  @retval NULL   There are not enough resources available to return the best matching \r
+  @retval NULL   There are not enough resources available to return the best matching\r

                  language.\r
                  language.\r

-  @retval Other  A pointer to a Null-terminated ASCII string that is the best matching \r
+  @retval Other  A pointer to a Null-terminated ASCII string that is the best matching\r

                  language in SupportedLanguages.\r
 \r
 **/\r
 CHAR8 *\r
 EFIAPI\r
 VariableGetBestLanguage (\r
                  language in SupportedLanguages.\r
 \r
 **/\r
 CHAR8 *\r
 EFIAPI\r
 VariableGetBestLanguage (\r

-  IN CONST CHAR8  *SupportedLanguages, \r
+  IN CONST CHAR8  *SupportedLanguages,\r

   IN UINTN        Iso639Language,\r
   ...\r
   )\r
   IN UINTN        Iso639Language,\r
   ...\r
   )\r


@@ -649,7 +649,7 @@ VariableGetBestLanguage (
         LanguageLength = 0;\r
       } else {\r
         //\r
         LanguageLength = 0;\r
       } else {\r
         //\r

-        // If RFC 4646 mode, then trim Language from the right to the next '-' character \r
+        // If RFC 4646 mode, then trim Language from the right to the next '-' character\r

         //\r
         for (LanguageLength--; LanguageLength > 0 && Language[LanguageLength] != '-'; LanguageLength--);\r
       }\r
         //\r
         for (LanguageLength--; LanguageLength > 0 && Language[LanguageLength] != '-'; LanguageLength--);\r
       }\r


@@ -658,7 +658,7 @@ VariableGetBestLanguage (
   VA_END (Args);\r
 \r
   //\r
   VA_END (Args);\r
 \r
   //\r

-  // No matches were found \r
+  // No matches were found\r

   //\r
   return NULL;\r
 }\r
   //\r
   return NULL;\r
 }\r


@@ -723,7 +723,7 @@ AutoUpdateLangVariable(
     ASSERT (mVariableModuleGlobal->PlatformLangCodes != NULL);\r
 \r
     //\r
     ASSERT (mVariableModuleGlobal->PlatformLangCodes != NULL);\r
 \r
     //\r

-    // PlatformLang holds a single language from PlatformLangCodes, \r
+    // PlatformLang holds a single language from PlatformLangCodes,\r

     // so the size of PlatformLangCodes is enough for the PlatformLang.\r
     //\r
     if (mVariableModuleGlobal->PlatformLang != NULL) {\r
     // so the size of PlatformLangCodes is enough for the PlatformLang.\r
     //\r
     if (mVariableModuleGlobal->PlatformLang != NULL) {\r


@@ -753,7 +753,7 @@ AutoUpdateLangVariable(
     ASSERT (mVariableModuleGlobal->LangCodes != NULL);\r
   }\r
 \r
     ASSERT (mVariableModuleGlobal->LangCodes != NULL);\r
   }\r
 \r

-  if (SetLanguageCodes \r
+  if (SetLanguageCodes\r

       && (mVariableModuleGlobal->PlatformLangCodes != NULL)\r
       && (mVariableModuleGlobal->LangCodes != NULL)) {\r
     //\r
       && (mVariableModuleGlobal->PlatformLangCodes != NULL)\r
       && (mVariableModuleGlobal->LangCodes != NULL)) {\r
     //\r


@@ -785,7 +785,7 @@ AutoUpdateLangVariable(
       }\r
     }\r
   }\r
       }\r
     }\r
   }\r

-  \r
+\r

   //\r
   // According to UEFI spec, "Lang" and "PlatformLang" is NV|BS|RT attributions.\r
   //\r
   //\r
   // According to UEFI spec, "Lang" and "PlatformLang" is NV|BS|RT attributions.\r
   //\r


@@ -849,7 +849,7 @@ AutoUpdateLangVariable(
         //\r
         FindVariable (L"PlatformLang", &gEfiGlobalVariableGuid, &Variable, (VARIABLE_GLOBAL *)mVariableModuleGlobal);\r
 \r
         //\r
         FindVariable (L"PlatformLang", &gEfiGlobalVariableGuid, &Variable, (VARIABLE_GLOBAL *)mVariableModuleGlobal);\r
 \r

-        Status = UpdateVariable (L"PlatformLang", &gEfiGlobalVariableGuid, BestPlatformLang, \r
+        Status = UpdateVariable (L"PlatformLang", &gEfiGlobalVariableGuid, BestPlatformLang,\r

                                  AsciiStrSize (BestPlatformLang), Attributes, &Variable);\r
 \r
         DEBUG ((EFI_D_INFO, "Variable Driver Auto Update Lang, Lang:%a, PlatformLang:%a\n", BestLang, BestPlatformLang));\r
                                  AsciiStrSize (BestPlatformLang), Attributes, &Variable);\r
 \r
         DEBUG ((EFI_D_INFO, "Variable Driver Auto Update Lang, Lang:%a, PlatformLang:%a\n", BestLang, BestPlatformLang));\r


@@ -860,7 +860,7 @@ AutoUpdateLangVariable(
 }\r
 \r
 /**\r
 }\r
 \r
 /**\r

-  Update the variable region with Variable information. These are the same \r
+  Update the variable region with Variable information. These are the same\r

   arguments as the EFI Variable services.\r
 \r
   @param[in] VariableName       Name of variable\r
   arguments as the EFI Variable services.\r
 \r
   @param[in] VariableName       Name of variable\r


@@ -907,10 +907,10 @@ UpdateVariable (
     // Update/Delete existing variable\r
     //\r
 \r
     // Update/Delete existing variable\r
     //\r
 \r

-    if (EfiAtRuntime ()) {        \r
+    if (EfiAtRuntime ()) {\r

       //\r
       //\r

-      // If EfiAtRuntime and the variable is Volatile and Runtime Access,  \r
-      // the volatile is ReadOnly, and SetVariable should be aborted and \r
+      // If EfiAtRuntime and the variable is Volatile and Runtime Access,\r
+      // the volatile is ReadOnly, and SetVariable should be aborted and\r

       // return EFI_WRITE_PROTECTED.\r
       //\r
       if (Variable->Volatile) {\r
       // return EFI_WRITE_PROTECTED.\r
       //\r
       if (Variable->Volatile) {\r


@@ -952,21 +952,21 @@ UpdateVariable (
       //\r
       Variable->CurrPtr->State &= VAR_IN_DELETED_TRANSITION;\r
     }\r
       //\r
       Variable->CurrPtr->State &= VAR_IN_DELETED_TRANSITION;\r
     }\r

-    \r
+\r

   } else {\r
     //\r
     // No found existing variable, Create a new variable\r
   } else {\r
     //\r
     // No found existing variable, Create a new variable\r

-    //  \r
-    \r
+    //\r
+\r

     //\r
     // Make sure we are trying to create a new variable.\r
     //\r
     // Make sure we are trying to create a new variable.\r

-    // Setting a data variable with no access, or zero DataSize attributes means to delete it.    \r
+    // Setting a data variable with no access, or zero DataSize attributes means to delete it.\r

     //\r
     if (DataSize == 0 || (Attributes & (EFI_VARIABLE_RUNTIME_ACCESS | EFI_VARIABLE_BOOTSERVICE_ACCESS)) == 0) {\r
       Status = EFI_NOT_FOUND;\r
       goto Done;\r
     }\r
     //\r
     if (DataSize == 0 || (Attributes & (EFI_VARIABLE_RUNTIME_ACCESS | EFI_VARIABLE_BOOTSERVICE_ACCESS)) == 0) {\r
       Status = EFI_NOT_FOUND;\r
       goto Done;\r
     }\r

-        \r
+\r

     //\r
     // Only variable have NV|RT attribute can be created in Runtime\r
     //\r
     //\r
     // Only variable have NV|RT attribute can be created in Runtime\r
     //\r


@@ -974,14 +974,14 @@ UpdateVariable (
         (((Attributes & EFI_VARIABLE_RUNTIME_ACCESS) == 0) || ((Attributes & EFI_VARIABLE_NON_VOLATILE) == 0))) {\r
       Status = EFI_INVALID_PARAMETER;\r
       goto Done;\r
         (((Attributes & EFI_VARIABLE_RUNTIME_ACCESS) == 0) || ((Attributes & EFI_VARIABLE_NON_VOLATILE) == 0))) {\r
       Status = EFI_INVALID_PARAMETER;\r
       goto Done;\r

-    }         \r
+    }\r

   }\r
   }\r

-  \r
+\r

   //\r
   // Function part - create a new variable and copy the data.\r
   // Both update a variable and create a variable will come here.\r
   //\r
   //\r
   // Function part - create a new variable and copy the data.\r
   // Both update a variable and create a variable will come here.\r
   //\r

-  \r
+\r

   VarNameOffset = sizeof (VARIABLE_HEADER);\r
   VarNameSize   = StrSize (VariableName);\r
   VarDataOffset = VarNameOffset + VarNameSize + GET_PAD_SIZE (VarNameSize);\r
   VarNameOffset = sizeof (VARIABLE_HEADER);\r
   VarNameSize   = StrSize (VariableName);\r
   VarDataOffset = VarNameOffset + VarNameSize + GET_PAD_SIZE (VarNameSize);\r


@@ -989,9 +989,9 @@ UpdateVariable (
 \r
   if ((Attributes & EFI_VARIABLE_NON_VOLATILE) != 0) {\r
     NonVolatileVarableStoreSize = ((VARIABLE_STORE_HEADER *)(UINTN)(Global->NonVolatileVariableBase))->Size;\r
 \r
   if ((Attributes & EFI_VARIABLE_NON_VOLATILE) != 0) {\r
     NonVolatileVarableStoreSize = ((VARIABLE_STORE_HEADER *)(UINTN)(Global->NonVolatileVariableBase))->Size;\r

-    if ((((Attributes & EFI_VARIABLE_HARDWARE_ERROR_RECORD) != 0) \r
+    if ((((Attributes & EFI_VARIABLE_HARDWARE_ERROR_RECORD) != 0)\r

       && ((HEADER_ALIGN (VarSize) + mVariableModuleGlobal->HwErrVariableTotalSize) > PcdGet32 (PcdHwErrStorageSize)))\r
       && ((HEADER_ALIGN (VarSize) + mVariableModuleGlobal->HwErrVariableTotalSize) > PcdGet32 (PcdHwErrStorageSize)))\r

-      || (((Attributes & EFI_VARIABLE_HARDWARE_ERROR_RECORD) == 0) \r
+      || (((Attributes & EFI_VARIABLE_HARDWARE_ERROR_RECORD) == 0)\r

       && ((HEADER_ALIGN (VarSize) + mVariableModuleGlobal->CommonVariableTotalSize) > NonVolatileVarableStoreSize - sizeof (VARIABLE_STORE_HEADER) - PcdGet32 (PcdHwErrStorageSize)))) {\r
       Status = EFI_OUT_OF_RESOURCES;\r
       goto Done;\r
       && ((HEADER_ALIGN (VarSize) + mVariableModuleGlobal->CommonVariableTotalSize) > NonVolatileVarableStoreSize - sizeof (VARIABLE_STORE_HEADER) - PcdGet32 (PcdHwErrStorageSize)))) {\r
       Status = EFI_OUT_OF_RESOURCES;\r
       goto Done;\r


@@ -1144,21 +1144,21 @@ FindVariable (
 \r
 /**\r
   This code finds variable in storage blocks (Volatile or Non-Volatile).\r
 \r
 /**\r
   This code finds variable in storage blocks (Volatile or Non-Volatile).\r

-  \r
+\r

   @param  VariableName           A Null-terminated Unicode string that is the name of\r
                                  the vendor's variable.\r
   @param  VendorGuid             A unique identifier for the vendor.\r
   @param  VariableName           A Null-terminated Unicode string that is the name of\r
                                  the vendor's variable.\r
   @param  VendorGuid             A unique identifier for the vendor.\r

-  @param  Attributes             If not NULL, a pointer to the memory location to return the \r
+  @param  Attributes             If not NULL, a pointer to the memory location to return the\r

                                  attributes bitmask for the variable.\r
   @param  DataSize               Size of Data found. If size is less than the\r
                                  data, this value contains the required size.\r
                                  attributes bitmask for the variable.\r
   @param  DataSize               Size of Data found. If size is less than the\r
                                  data, this value contains the required size.\r

-  @param  Data                   On input, the size in bytes of the return Data buffer.  \r
+  @param  Data                   On input, the size in bytes of the return Data buffer.\r

                                  On output, the size of data returned in Data.\r
   @param  Global                 Pointer to VARIABLE_GLOBAL structure\r
 \r
                                  On output, the size of data returned in Data.\r
   @param  Global                 Pointer to VARIABLE_GLOBAL structure\r
 \r

-  @retval EFI_SUCCESS            The function completed successfully. \r
+  @retval EFI_SUCCESS            The function completed successfully.\r

   @retval EFI_NOT_FOUND          The variable was not found.\r
   @retval EFI_NOT_FOUND          The variable was not found.\r

-  @retval EFI_BUFFER_TOO_SMALL   DataSize is too small for the result.  DataSize has \r
+  @retval EFI_BUFFER_TOO_SMALL   DataSize is too small for the result.  DataSize has\r

                                  been updated with the size needed to complete the request.\r
   @retval EFI_INVALID_PARAMETER  VariableName or VendorGuid or DataSize is NULL.\r
 \r
                                  been updated with the size needed to complete the request.\r
   @retval EFI_INVALID_PARAMETER  VariableName or VendorGuid or DataSize is NULL.\r
 \r


@@ -1208,7 +1208,7 @@ EmuGetVariable (
     }\r
     VariableDataPtr = GetVariableDataPtr (Variable.CurrPtr);\r
     ASSERT (VariableDataPtr != NULL);\r
     }\r
     VariableDataPtr = GetVariableDataPtr (Variable.CurrPtr);\r
     ASSERT (VariableDataPtr != NULL);\r

-    \r
+\r

     CopyMem (Data, VariableDataPtr, VarDataSize);\r
     if (Attributes != NULL) {\r
       *Attributes = Variable.CurrPtr->Attributes;\r
     CopyMem (Data, VariableDataPtr, VarDataSize);\r
     if (Attributes != NULL) {\r
       *Attributes = Variable.CurrPtr->Attributes;\r


@@ -1368,9 +1368,9 @@ Done:
   This code sets variable in storage blocks (Volatile or Non-Volatile).\r
 \r
   @param  VariableName           A Null-terminated Unicode string that is the name of the vendor's\r
   This code sets variable in storage blocks (Volatile or Non-Volatile).\r
 \r
   @param  VariableName           A Null-terminated Unicode string that is the name of the vendor's\r

-                                 variable.  Each VariableName is unique for each \r
-                                 VendorGuid.  VariableName must contain 1 or more \r
-                                 Unicode characters.  If VariableName is an empty Unicode \r
+                                 variable.  Each VariableName is unique for each\r
+                                 VendorGuid.  VariableName must contain 1 or more\r
+                                 Unicode characters.  If VariableName is an empty Unicode\r

                                  string, then EFI_INVALID_PARAMETER is returned.\r
   @param  VendorGuid             A unique identifier for the vendor\r
   @param  Attributes             Attributes bitmask to set for the variable\r
                                  string, then EFI_INVALID_PARAMETER is returned.\r
   @param  VendorGuid             A unique identifier for the vendor\r
   @param  Attributes             Attributes bitmask to set for the variable\r


@@ -1381,10 +1381,10 @@ Done:
   @param  VolatileOffset         The offset of last volatile variable\r
   @param  NonVolatileOffset      The offset of last non-volatile variable\r
 \r
   @param  VolatileOffset         The offset of last volatile variable\r
   @param  NonVolatileOffset      The offset of last non-volatile variable\r
 \r

-  @retval EFI_SUCCESS            The firmware has successfully stored the variable and its data as \r
+  @retval EFI_SUCCESS            The firmware has successfully stored the variable and its data as\r

                                  defined by the Attributes.\r
                                  defined by the Attributes.\r

-  @retval EFI_INVALID_PARAMETER  An invalid combination of attribute bits was supplied, or the \r
-                                 DataSize exceeds the maximum allowed, or VariableName is an empty \r
+  @retval EFI_INVALID_PARAMETER  An invalid combination of attribute bits was supplied, or the\r
+                                 DataSize exceeds the maximum allowed, or VariableName is an empty\r

                                  Unicode string, or VendorGuid is NULL.\r
   @retval EFI_OUT_OF_RESOURCES   Not enough storage is available to hold the variable and its data.\r
   @retval EFI_DEVICE_ERROR       The variable could not be saved due to a hardware failure.\r
                                  Unicode string, or VendorGuid is NULL.\r
   @retval EFI_OUT_OF_RESOURCES   Not enough storage is available to hold the variable and its data.\r
   @retval EFI_DEVICE_ERROR       The variable could not be saved due to a hardware failure.\r


@@ -1413,7 +1413,7 @@ EmuSetVariable (
   //\r
   if (VariableName == NULL || VariableName[0] == 0 || VendorGuid == NULL) {\r
     return EFI_INVALID_PARAMETER;\r
   //\r
   if (VariableName == NULL || VariableName[0] == 0 || VendorGuid == NULL) {\r
     return EFI_INVALID_PARAMETER;\r

-  }  \r
+  }\r

 \r
   if (DataSize != 0 && Data == NULL) {\r
     return EFI_INVALID_PARAMETER;\r
 \r
   if (DataSize != 0 && Data == NULL) {\r
     return EFI_INVALID_PARAMETER;\r


@@ -1433,11 +1433,11 @@ EmuSetVariable (
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r

-  \r
+\r

   if ((UINTN)(~0) - DataSize < StrSize(VariableName)){\r
     //\r
   if ((UINTN)(~0) - DataSize < StrSize(VariableName)){\r
     //\r

-    // Prevent whole variable size overflow \r
-    // \r
+    // Prevent whole variable size overflow\r
+    //\r

     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r


@@ -1463,7 +1463,7 @@ EmuSetVariable (
   //\r
     if (StrSize (VariableName) + DataSize > PcdGet32 (PcdMaxVariableSize) - sizeof (VARIABLE_HEADER)) {\r
       return EFI_INVALID_PARAMETER;\r
   //\r
     if (StrSize (VariableName) + DataSize > PcdGet32 (PcdMaxVariableSize) - sizeof (VARIABLE_HEADER)) {\r
       return EFI_INVALID_PARAMETER;\r

-    }  \r
+    }\r

   }\r
 \r
   AcquireLockOnlyAtBootTime(&Global->VariableServicesLock);\r
   }\r
 \r
   AcquireLockOnlyAtBootTime(&Global->VariableServicesLock);\r


@@ -1471,7 +1471,7 @@ EmuSetVariable (
   //\r
   // Check whether the input variable is already existed\r
   //\r
   //\r
   // Check whether the input variable is already existed\r
   //\r

-  \r
+\r

   Status = FindVariable (VariableName, VendorGuid, &Variable, Global);\r
 \r
   //\r
   Status = FindVariable (VariableName, VendorGuid, &Variable, Global);\r
 \r
   //\r


@@ -1491,18 +1491,18 @@ EmuSetVariable (
 \r
   @param  Attributes                   Attributes bitmask to specify the type of variables\r
                                        on which to return information.\r
 \r
   @param  Attributes                   Attributes bitmask to specify the type of variables\r
                                        on which to return information.\r

-  @param  MaximumVariableStorageSize   On output the maximum size of the storage space available for \r
-                                       the EFI variables associated with the attributes specified.  \r
-  @param  RemainingVariableStorageSize Returns the remaining size of the storage space available for EFI \r
+  @param  MaximumVariableStorageSize   On output the maximum size of the storage space available for\r
+                                       the EFI variables associated with the attributes specified.\r
+  @param  RemainingVariableStorageSize Returns the remaining size of the storage space available for EFI\r

                                        variables associated with the attributes specified.\r
                                        variables associated with the attributes specified.\r

-  @param  MaximumVariableSize          Returns the maximum size of an individual EFI variable \r
+  @param  MaximumVariableSize          Returns the maximum size of an individual EFI variable\r

                                        associated with the attributes specified.\r
   @param  Global                       Pointer to VARIABLE_GLOBAL structure.\r
 \r
   @retval EFI_SUCCESS                  Valid answer returned.\r
   @retval EFI_INVALID_PARAMETER        An invalid combination of attribute bits was supplied\r
                                        associated with the attributes specified.\r
   @param  Global                       Pointer to VARIABLE_GLOBAL structure.\r
 \r
   @retval EFI_SUCCESS                  Valid answer returned.\r
   @retval EFI_INVALID_PARAMETER        An invalid combination of attribute bits was supplied\r

-  @retval EFI_UNSUPPORTED              The attribute is not supported on this platform, and the \r
-                                       MaximumVariableStorageSize, RemainingVariableStorageSize, \r
+  @retval EFI_UNSUPPORTED              The attribute is not supported on this platform, and the\r
+                                       MaximumVariableStorageSize, RemainingVariableStorageSize,\r

                                        MaximumVariableSize are undefined.\r
 \r
 **/\r
                                        MaximumVariableSize are undefined.\r
 \r
 **/\r


@@ -1529,12 +1529,12 @@ EmuQueryVariableInfo (
   if(MaximumVariableStorageSize == NULL || RemainingVariableStorageSize == NULL || MaximumVariableSize == NULL || Attributes == 0) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
   if(MaximumVariableStorageSize == NULL || RemainingVariableStorageSize == NULL || MaximumVariableSize == NULL || Attributes == 0) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r

-  \r
+\r

   if((Attributes & (EFI_VARIABLE_NON_VOLATILE | EFI_VARIABLE_BOOTSERVICE_ACCESS | EFI_VARIABLE_RUNTIME_ACCESS | EFI_VARIABLE_HARDWARE_ERROR_RECORD)) == 0) {\r
     //\r
     // Make sure the Attributes combination is supported by the platform.\r
     //\r
   if((Attributes & (EFI_VARIABLE_NON_VOLATILE | EFI_VARIABLE_BOOTSERVICE_ACCESS | EFI_VARIABLE_RUNTIME_ACCESS | EFI_VARIABLE_HARDWARE_ERROR_RECORD)) == 0) {\r
     //\r
     // Make sure the Attributes combination is supported by the platform.\r
     //\r

-    return EFI_UNSUPPORTED;  \r
+    return EFI_UNSUPPORTED;\r

   } else if ((Attributes & (EFI_VARIABLE_RUNTIME_ACCESS | EFI_VARIABLE_BOOTSERVICE_ACCESS)) == EFI_VARIABLE_RUNTIME_ACCESS) {\r
     //\r
     // Make sure if runtime bit is set, boot service bit is set also.\r
   } else if ((Attributes & (EFI_VARIABLE_RUNTIME_ACCESS | EFI_VARIABLE_BOOTSERVICE_ACCESS)) == EFI_VARIABLE_RUNTIME_ACCESS) {\r
     //\r
     // Make sure if runtime bit is set, boot service bit is set also.\r


@@ -1633,7 +1633,7 @@ EmuQueryVariableInfo (
   } else if ((*RemainingVariableStorageSize - sizeof (VARIABLE_HEADER)) < *MaximumVariableSize) {\r
     *MaximumVariableSize = *RemainingVariableStorageSize - sizeof (VARIABLE_HEADER);\r
   }\r
   } else if ((*RemainingVariableStorageSize - sizeof (VARIABLE_HEADER)) < *MaximumVariableSize) {\r
     *MaximumVariableSize = *RemainingVariableStorageSize - sizeof (VARIABLE_HEADER);\r
   }\r

-  \r
+\r

   ReleaseLockOnlyAtBootTime (&Global->VariableServicesLock);\r
   return EFI_SUCCESS;\r
 }\r
   ReleaseLockOnlyAtBootTime (&Global->VariableServicesLock);\r
   return EFI_SUCCESS;\r
 }\r


@@ -1674,7 +1674,7 @@ InitializeVariableStore (
   //\r
   // Note that in EdkII variable driver implementation, Hardware Error Record type variable\r
   // is stored with common variable in the same NV region. So the platform integrator should\r
   //\r
   // Note that in EdkII variable driver implementation, Hardware Error Record type variable\r
   // is stored with common variable in the same NV region. So the platform integrator should\r

-  // ensure that the value of PcdHwErrStorageSize is less than or equal to the value of \r
+  // ensure that the value of PcdHwErrStorageSize is less than or equal to the value of\r

   // PcdVariableStoreSize.\r
   //\r
   ASSERT (PcdGet32 (PcdHwErrStorageSize) <= PcdGet32 (PcdVariableStoreSize));\r
   // PcdVariableStoreSize.\r
   //\r
   ASSERT (PcdGet32 (PcdHwErrStorageSize) <= PcdGet32 (PcdVariableStoreSize));\r

diff --git a/MdeModulePkg/Universal/Variable/EmuRuntimeDxe/EmuVariableRuntimeDxe.inf b/MdeModulePkg/Universal/Variable/EmuRuntimeDxe/EmuVariableRuntimeDxe.inf
index 0dafddee55cd1248fca9f8611d2172f02ed041c1..12d52dd130e317c7ed041cf144805b8547bfc62b 100644 (file)
--- a/MdeModulePkg/Universal/Variable/EmuRuntimeDxe/EmuVariableRuntimeDxe.inf
+++ b/MdeModulePkg/Universal/Variable/EmuRuntimeDxe/EmuVariableRuntimeDxe.inf
@@ -4,7 +4,7 @@
 # This module installs variable arch protocol and variable write arch protocol to provide\r
 # four EFI_RUNTIME_SERVICES: SetVariable, GetVariable, GetNextVariableName and QueryVariableInfo.\r
 #\r
 # This module installs variable arch protocol and variable write arch protocol to provide\r
 # four EFI_RUNTIME_SERVICES: SetVariable, GetVariable, GetNextVariableName and QueryVariableInfo.\r
 #\r

-# Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.<BR>\r
+# Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r

 #\r
 #  This program and the accompanying materials\r
 #  are licensed and made available under the terms and conditions of the BSD License\r
 #\r
 #  This program and the accompanying materials\r
 #  are licensed and made available under the terms and conditions of the BSD License\r


@@ -85,4 +85,4 @@
   TRUE\r
 \r
 [UserExtensions.TianoCore."ExtraFiles"]\r
   TRUE\r
 \r
 [UserExtensions.TianoCore."ExtraFiles"]\r

-  EmuVariableRuntimeDxeExtra.uni
\ No newline at end of file
+  EmuVariableRuntimeDxeExtra.uni\r

diff --git a/MdeModulePkg/Universal/Variable/EmuRuntimeDxe/EmuVariableRuntimeDxeExtra.uni b/MdeModulePkg/Universal/Variable/EmuRuntimeDxe/EmuVariableRuntimeDxeExtra.uni
index c3bbd2bf7b59a4f2e162982895c32ae390f70380..a5000373733e6dd0e5c5138b106f81fcb8c391b2 100644 (file)
--- a/MdeModulePkg/Universal/Variable/EmuRuntimeDxe/EmuVariableRuntimeDxeExtra.uni
+++ b/MdeModulePkg/Universal/Variable/EmuRuntimeDxe/EmuVariableRuntimeDxeExtra.uni
@@ -1,7 +1,7 @@
 // /** @file\r
 // EmuVariableRuntimeDxe Localized Strings and Content\r
 //\r
 // /** @file\r
 // EmuVariableRuntimeDxe Localized Strings and Content\r
 //\r

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

 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r
 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r


@@ -12,8 +12,8 @@
 //\r
 // **/\r
 \r
 //\r
 // **/\r
 \r

-#string STR_PROPERTIES_MODULE_NAME \r
-#language en-US \r
+#string STR_PROPERTIES_MODULE_NAME\r
+#language en-US\r

 "Emulation Variable DXE Driver"\r
 \r
 \r
 "Emulation Variable DXE Driver"\r
 \r
 \r

diff --git a/MdeModulePkg/Universal/Variable/EmuRuntimeDxe/InitVariable.c b/MdeModulePkg/Universal/Variable/EmuRuntimeDxe/InitVariable.c
index 309a4b8dbfeb61e8b2e599b0a7dcd7aa1c6dc826..dac0464253d6b66de14dadb5c7a8a9fd567605cd 100644 (file)
--- a/MdeModulePkg/Universal/Variable/EmuRuntimeDxe/InitVariable.c
+++ b/MdeModulePkg/Universal/Variable/EmuRuntimeDxe/InitVariable.c
@@ -1,9 +1,9 @@
 /** @file\r
 \r
 /** @file\r
 \r

-  Implment all four UEFI runtime variable services and \r
+  Implment all four UEFI runtime variable services and\r

   install variable architeture protocol.\r
   install variable architeture protocol.\r

-  \r
-Copyright (c) 2006 - 2016, Intel Corporation. All rights reserved.<BR>\r
+\r
+Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r

 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r


@@ -29,7 +29,7 @@ EFI_EVENT   mVirtualAddressChangeEvent = NULL;
                                     data, this value contains the required size.\r
   @param Data                       The buffer to return the contents of the variable. May be NULL\r
                                     with a zero DataSize in order to determine the size buffer needed.\r
                                     data, this value contains the required size.\r
   @param Data                       The buffer to return the contents of the variable. May be NULL\r
                                     with a zero DataSize in order to determine the size buffer needed.\r

-                      \r
+\r

   @return EFI_INVALID_PARAMETER     Invalid parameter\r
   @return EFI_SUCCESS               Find the specified variable\r
   @return EFI_NOT_FOUND             Not found\r
   @return EFI_INVALID_PARAMETER     Invalid parameter\r
   @return EFI_SUCCESS               Find the specified variable\r
   @return EFI_NOT_FOUND             Not found\r


@@ -203,13 +203,13 @@ VariableClassAddressChangeEvent (
 \r
 /**\r
   EmuVariable Driver main entry point. The Variable driver places the 4 EFI\r
 \r
 /**\r
   EmuVariable Driver main entry point. The Variable driver places the 4 EFI\r

-  runtime services in the EFI System Table and installs arch protocols \r
+  runtime services in the EFI System Table and installs arch protocols\r

   for variable read and write services being available. It also registers\r
   notification function for EVT_SIGNAL_VIRTUAL_ADDRESS_CHANGE event.\r
 \r
   for variable read and write services being available. It also registers\r
   notification function for EVT_SIGNAL_VIRTUAL_ADDRESS_CHANGE event.\r
 \r

-  @param[in] ImageHandle    The firmware allocated handle for the EFI image.  \r
+  @param[in] ImageHandle    The firmware allocated handle for the EFI image.\r

   @param[in] SystemTable    A pointer to the EFI System Table.\r
   @param[in] SystemTable    A pointer to the EFI System Table.\r

-  \r
+\r

   @retval EFI_SUCCESS       Variable service successfully initialized.\r
 \r
 **/\r
   @retval EFI_SUCCESS       Variable service successfully initialized.\r
 \r
 **/\r

diff --git a/MdeModulePkg/Universal/Variable/EmuRuntimeDxe/Variable.h b/MdeModulePkg/Universal/Variable/EmuRuntimeDxe/Variable.h
index 985f56791909137dd26f8a1c53a631f90e81d468..2851582d0dc0c2d75ae26f80d3e7dcdbe6ca4ad9 100644 (file)
--- a/MdeModulePkg/Universal/Variable/EmuRuntimeDxe/Variable.h
+++ b/MdeModulePkg/Universal/Variable/EmuRuntimeDxe/Variable.h
@@ -3,7 +3,7 @@
   The internal header file includes the common header files, defines\r
   internal structure and functions used by EmuVariable module.\r
 \r
   The internal header file includes the common header files, defines\r
   internal structure and functions used by EmuVariable module.\r
 \r

-Copyright (c) 2006 - 2017, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r

 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r


@@ -139,21 +139,21 @@ VariableClassAddressChangeEvent (
 \r
 /**\r
   This code finds variable in storage blocks (Volatile or Non-Volatile).\r
 \r
 /**\r
   This code finds variable in storage blocks (Volatile or Non-Volatile).\r

-  \r
+\r

   @param  VariableName           A Null-terminated Unicode string that is the name of\r
                                  the vendor's variable.\r
   @param  VendorGuid             A unique identifier for the vendor.\r
   @param  VariableName           A Null-terminated Unicode string that is the name of\r
                                  the vendor's variable.\r
   @param  VendorGuid             A unique identifier for the vendor.\r

-  @param  Attributes             If not NULL, a pointer to the memory location to return the \r
+  @param  Attributes             If not NULL, a pointer to the memory location to return the\r

                                  attributes bitmask for the variable.\r
   @param  DataSize               Size of Data found. If size is less than the\r
                                  data, this value contains the required size.\r
                                  attributes bitmask for the variable.\r
   @param  DataSize               Size of Data found. If size is less than the\r
                                  data, this value contains the required size.\r

-  @param  Data                   On input, the size in bytes of the return Data buffer.  \r
+  @param  Data                   On input, the size in bytes of the return Data buffer.\r

                                  On output, the size of data returned in Data.\r
   @param  Global                 Pointer to VARIABLE_GLOBAL structure\r
 \r
                                  On output, the size of data returned in Data.\r
   @param  Global                 Pointer to VARIABLE_GLOBAL structure\r
 \r

-  @retval EFI_SUCCESS            The function completed successfully. \r
+  @retval EFI_SUCCESS            The function completed successfully.\r

   @retval EFI_NOT_FOUND          The variable was not found.\r
   @retval EFI_NOT_FOUND          The variable was not found.\r

-  @retval EFI_BUFFER_TOO_SMALL   DataSize is too small for the result.  DataSize has \r
+  @retval EFI_BUFFER_TOO_SMALL   DataSize is too small for the result.  DataSize has\r

                                  been updated with the size needed to complete the request.\r
   @retval EFI_INVALID_PARAMETER  VariableName or VendorGuid or DataSize is NULL.\r
 \r
                                  been updated with the size needed to complete the request.\r
   @retval EFI_INVALID_PARAMETER  VariableName or VendorGuid or DataSize is NULL.\r
 \r


@@ -206,9 +206,9 @@ EmuGetNextVariableName (
   This code sets variable in storage blocks (Volatile or Non-Volatile).\r
 \r
   @param  VariableName           A Null-terminated Unicode string that is the name of the vendor's\r
   This code sets variable in storage blocks (Volatile or Non-Volatile).\r
 \r
   @param  VariableName           A Null-terminated Unicode string that is the name of the vendor's\r

-                                 variable.  Each VariableName is unique for each \r
-                                 VendorGuid.  VariableName must contain 1 or more \r
-                                 Unicode characters.  If VariableName is an empty Unicode \r
+                                 variable.  Each VariableName is unique for each\r
+                                 VendorGuid.  VariableName must contain 1 or more\r
+                                 Unicode characters.  If VariableName is an empty Unicode\r

                                  string, then EFI_INVALID_PARAMETER is returned.\r
   @param  VendorGuid             A unique identifier for the vendor\r
   @param  Attributes             Attributes bitmask to set for the variable\r
                                  string, then EFI_INVALID_PARAMETER is returned.\r
   @param  VendorGuid             A unique identifier for the vendor\r
   @param  Attributes             Attributes bitmask to set for the variable\r


@@ -219,10 +219,10 @@ EmuGetNextVariableName (
   @param  VolatileOffset         The offset of last volatile variable\r
   @param  NonVolatileOffset      The offset of last non-volatile variable\r
 \r
   @param  VolatileOffset         The offset of last volatile variable\r
   @param  NonVolatileOffset      The offset of last non-volatile variable\r
 \r

-  @retval EFI_SUCCESS            The firmware has successfully stored the variable and its data as \r
+  @retval EFI_SUCCESS            The firmware has successfully stored the variable and its data as\r

                                  defined by the Attributes.\r
                                  defined by the Attributes.\r

-  @retval EFI_INVALID_PARAMETER  An invalid combination of attribute bits was supplied, or the \r
-                                 DataSize exceeds the maximum allowed, or VariableName is an empty \r
+  @retval EFI_INVALID_PARAMETER  An invalid combination of attribute bits was supplied, or the\r
+                                 DataSize exceeds the maximum allowed, or VariableName is an empty\r

                                  Unicode string, or VendorGuid is NULL.\r
   @retval EFI_OUT_OF_RESOURCES   Not enough storage is available to hold the variable and its data.\r
   @retval EFI_DEVICE_ERROR       The variable could not be saved due to a hardware failure.\r
                                  Unicode string, or VendorGuid is NULL.\r
   @retval EFI_OUT_OF_RESOURCES   Not enough storage is available to hold the variable and its data.\r
   @retval EFI_DEVICE_ERROR       The variable could not be saved due to a hardware failure.\r


@@ -249,18 +249,18 @@ EmuSetVariable (
 \r
   @param  Attributes                   Attributes bitmask to specify the type of variables\r
                                        on which to return information.\r
 \r
   @param  Attributes                   Attributes bitmask to specify the type of variables\r
                                        on which to return information.\r

-  @param  MaximumVariableStorageSize   On output the maximum size of the storage space available for \r
-                                       the EFI variables associated with the attributes specified.  \r
-  @param  RemainingVariableStorageSize Returns the remaining size of the storage space available for EFI \r
+  @param  MaximumVariableStorageSize   On output the maximum size of the storage space available for\r
+                                       the EFI variables associated with the attributes specified.\r
+  @param  RemainingVariableStorageSize Returns the remaining size of the storage space available for EFI\r

                                        variables associated with the attributes specified.\r
                                        variables associated with the attributes specified.\r

-  @param  MaximumVariableSize          Returns the maximum size of an individual EFI variable \r
+  @param  MaximumVariableSize          Returns the maximum size of an individual EFI variable\r

                                        associated with the attributes specified.\r
   @param  Global                       Pointer to VARIABLE_GLOBAL structure.\r
 \r
   @retval EFI_SUCCESS                  Valid answer returned.\r
   @retval EFI_INVALID_PARAMETER        An invalid combination of attribute bits was supplied\r
                                        associated with the attributes specified.\r
   @param  Global                       Pointer to VARIABLE_GLOBAL structure.\r
 \r
   @retval EFI_SUCCESS                  Valid answer returned.\r
   @retval EFI_INVALID_PARAMETER        An invalid combination of attribute bits was supplied\r

-  @retval EFI_UNSUPPORTED              The attribute is not supported on this platform, and the \r
-                                       MaximumVariableStorageSize, RemainingVariableStorageSize, \r
+  @retval EFI_UNSUPPORTED              The attribute is not supported on this platform, and the\r
+                                       MaximumVariableStorageSize, RemainingVariableStorageSize,\r

                                        MaximumVariableSize are undefined.\r
 \r
 **/\r
                                        MaximumVariableSize are undefined.\r
 \r
 **/\r

diff --git a/MdeModulePkg/Universal/Variable/Pei/PeiVariable.uni b/MdeModulePkg/Universal/Variable/Pei/PeiVariable.uni
index 65ca7d02dbe664888939819cdc10bf43a95ca269..c27d6949439e5b35bd0da191550aef31efad0ea4 100644 (file)
--- a/MdeModulePkg/Universal/Variable/Pei/PeiVariable.uni
+++ b/MdeModulePkg/Universal/Variable/Pei/PeiVariable.uni
@@ -3,13 +3,13 @@
 //\r
 // This module implements ReadOnly Variable Services required by PEIM and installs PEI ReadOnly Varaiable2 PPI.\r
 //\r
 //\r
 // This module implements ReadOnly Variable Services required by PEIM and installs PEI ReadOnly Varaiable2 PPI.\r
 //\r

-// Copyright (c) 2006 - 2015, Intel Corporation. All rights reserved.<BR>\r
+// Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r

 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r
 // which accompanies this distribution. The full text of the license may be found at\r
 // http://opensource.org/licenses/bsd-license.php\r
 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r
 // which accompanies this distribution. The full text of the license may be found at\r
 // http://opensource.org/licenses/bsd-license.php\r

-// \r
+//\r

 // THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 // WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 //\r
 // THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 // WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 //\r

diff --git a/MdeModulePkg/Universal/Variable/Pei/PeiVariableExtra.uni b/MdeModulePkg/Universal/Variable/Pei/PeiVariableExtra.uni
index 8b967d4e8f6ab13cb6425928b24672322d47679a..3d24f294c6861c9b18d75a943de7a64de6f7d1a2 100644 (file)
--- a/MdeModulePkg/Universal/Variable/Pei/PeiVariableExtra.uni
+++ b/MdeModulePkg/Universal/Variable/Pei/PeiVariableExtra.uni
@@ -1,7 +1,7 @@
 // /** @file\r
 // PeiVariable Localized Strings and Content\r
 //\r
 // /** @file\r
 // PeiVariable Localized Strings and Content\r
 //\r

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

 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r
 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r


@@ -13,8 +13,8 @@
 //\r
 // **/\r
 \r
 //\r
 // **/\r
 \r

-#string STR_PROPERTIES_MODULE_NAME \r
-#language en-US \r
+#string STR_PROPERTIES_MODULE_NAME\r
+#language en-US\r

 "Variable Access PEI Module"\r
 \r
 \r
 "Variable Access PEI Module"\r
 \r
 \r

diff --git a/MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxeExtra.uni b/MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxeExtra.uni
index 2d8eaf2669967f59b9a37be32495987fefca703d..b31790d05310a22ce38e27a7d594cceb5416e543 100644 (file)
--- a/MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxeExtra.uni
+++ b/MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxeExtra.uni
@@ -1,7 +1,7 @@
 // /** @file\r
 // VariableRuntimeDxe Localized Strings and Content\r
 //\r
 // /** @file\r
 // VariableRuntimeDxe Localized Strings and Content\r
 //\r

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

 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r
 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r


@@ -12,8 +12,8 @@
 //\r
 // **/\r
 \r
 //\r
 // **/\r
 \r

-#string STR_PROPERTIES_MODULE_NAME \r
-#language en-US \r
+#string STR_PROPERTIES_MODULE_NAME\r
+#language en-US\r

 "VariableRuntimeDxe module"\r
 \r
 \r
 "VariableRuntimeDxe module"\r
 \r
 \r

diff --git a/MdeModulePkg/Universal/Variable/RuntimeDxe/VariableSmmExtra.uni b/MdeModulePkg/Universal/Variable/RuntimeDxe/VariableSmmExtra.uni
index 0de87760861db21467f95358f29ea1b7e397ea5f..089533a5f12ee06e39ea39ff5b99c2ebe1c3f7d5 100644 (file)
--- a/MdeModulePkg/Universal/Variable/RuntimeDxe/VariableSmmExtra.uni
+++ b/MdeModulePkg/Universal/Variable/RuntimeDxe/VariableSmmExtra.uni
@@ -1,7 +1,7 @@
 // /** @file\r
 // VariableSmm Localized Strings and Content\r
 //\r
 // /** @file\r
 // VariableSmm Localized Strings and Content\r
 //\r

-// Copyright (c) 2013 - 2015, Intel Corporation. All rights reserved.<BR>\r
+// Copyright (c) 2013 - 2018, Intel Corporation. All rights reserved.<BR>\r

 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r
 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r


@@ -12,8 +12,8 @@
 //\r
 // **/\r
 \r
 //\r
 // **/\r
 \r

-#string STR_PROPERTIES_MODULE_NAME \r
-#language en-US \r
+#string STR_PROPERTIES_MODULE_NAME\r
+#language en-US\r

 "VariableSmm module"\r
 \r
 \r
 "VariableSmm module"\r
 \r
 \r

diff --git a/MdeModulePkg/Universal/Variable/RuntimeDxe/VariableSmmRuntimeDxeExtra.uni b/MdeModulePkg/Universal/Variable/RuntimeDxe/VariableSmmRuntimeDxeExtra.uni
index 674e201e880031df269446ffa01710d3c06609b8..842ded5589a3e43bf927a3d1700db0158384436e 100644 (file)
--- a/MdeModulePkg/Universal/Variable/RuntimeDxe/VariableSmmRuntimeDxeExtra.uni
+++ b/MdeModulePkg/Universal/Variable/RuntimeDxe/VariableSmmRuntimeDxeExtra.uni
@@ -1,7 +1,7 @@
 // /** @file\r
 // VariableSmmRuntimeDxe Localized Strings and Content\r
 //\r
 // /** @file\r
 // VariableSmmRuntimeDxe Localized Strings and Content\r
 //\r

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

 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r
 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r


@@ -12,8 +12,8 @@
 //\r
 // **/\r
 \r
 //\r
 // **/\r
 \r

-#string STR_PROPERTIES_MODULE_NAME \r
-#language en-US \r
+#string STR_PROPERTIES_MODULE_NAME\r
+#language en-US\r

 "VariableSmmRuntimeDxe module"\r
 \r
 \r
 "VariableSmmRuntimeDxe module"\r
 \r
 \r

diff --git a/MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimer.c b/MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimer.c
index 6dedfbf7021858397224afa5e1a10fc1b7c37676..df8062a6ccc6f3d59d817be0466572b351af4d44 100644 (file)
--- a/MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimer.c
+++ b/MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimer.c
@@ -1,7 +1,7 @@
 /** @file\r
   Implementation of Watchdog Timer Architectural Protocol using UEFI APIs.\r
 /** @file\r
   Implementation of Watchdog Timer Architectural Protocol using UEFI APIs.\r

-  \r
-Copyright (c) 2006 - 2010, Intel Corporation. All rights reserved.<BR>\r
+\r
+Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r

 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r


@@ -74,7 +74,7 @@ WatchdogTimerDriverExpires (
   if (mWatchdogTimerNotifyFunction != NULL) {\r
     mWatchdogTimerNotifyFunction (mWatchdogTimerPeriod);\r
   }\r
   if (mWatchdogTimerNotifyFunction != NULL) {\r
     mWatchdogTimerNotifyFunction (mWatchdogTimerPeriod);\r
   }\r

-  \r
+\r

   DEBUG ((EFI_D_ERROR, "Watchdog Timer resetting system\n"));\r
 \r
   //\r
   DEBUG ((EFI_D_ERROR, "Watchdog Timer resetting system\n"));\r
 \r
   //\r

diff --git a/MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimer.h b/MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimer.h
index e7bb0b2bfdd919aee161e28d43d4f887e543d7a4..3eec749f59b89bd813e347537e92258adddfa47a 100644 (file)
--- a/MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimer.h
+++ b/MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimer.h
@@ -1,14 +1,14 @@
 /** @file\r
 /** @file\r

-  The internal include file for WatchDogTimer module.  \r
-\r
-Copyright (c) 2006 - 2008, Intel Corporation. All rights reserved.<BR>\r
-This program and the accompanying materials                          \r
-are licensed and made available under the terms and conditions of the BSD License         \r
-which accompanies this distribution.  The full text of the license may be found at        \r
-http://opensource.org/licenses/bsd-license.php                                            \r
-                                                                                          \r
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     \r
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             \r
+  The internal include file for WatchDogTimer module.\r
+\r
+Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r
+This program and the accompanying materials\r
+are licensed and made available under the terms and conditions of the BSD License\r
+which accompanies this distribution.  The full text of the license may be found at\r
+http://opensource.org/licenses/bsd-license.php\r
+\r
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r

 \r
 **/\r
 \r
 \r
 **/\r
 \r

diff --git a/MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimer.inf b/MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimer.inf
index bde84574b9a89bf3349a5b6f6f7a45075789fb79..cd2daf3033516211cd5dc0218d1a772cabcb5fa3 100644 (file)
--- a/MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimer.inf
+++ b/MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimer.inf
@@ -1,7 +1,7 @@
 ## @file\r
 # Generic watchdog timer driver producing Watchdog Timer Architectural Protocol using UEFI APIs.\r
 #\r
 ## @file\r
 # Generic watchdog timer driver producing Watchdog Timer Architectural Protocol using UEFI APIs.\r
 #\r

-# Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.<BR>\r
+# Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r

 #\r
 #  This program and the accompanying materials\r
 #  are licensed and made available under the terms and conditions of the BSD License\r
 #\r
 #  This program and the accompanying materials\r
 #  are licensed and made available under the terms and conditions of the BSD License\r


@@ -53,4 +53,4 @@
 #\r
 \r
 [UserExtensions.TianoCore."ExtraFiles"]\r
 #\r
 \r
 [UserExtensions.TianoCore."ExtraFiles"]\r

-  WatchdogTimerExtra.uni
\ No newline at end of file
+  WatchdogTimerExtra.uni\r

diff --git a/MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimerExtra.uni b/MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimerExtra.uni
index 1d83d5ed25f84007a7cf4da1ec9af5882b617706..836d68b5ddacd21e8e42a744979be88cb5809118 100644 (file)
--- a/MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimerExtra.uni
+++ b/MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimerExtra.uni
@@ -1,7 +1,7 @@
 // /** @file\r
 // WatchdogTimer Localized Strings and Content\r
 //\r
 // /** @file\r
 // WatchdogTimer Localized Strings and Content\r
 //\r

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

 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r
 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r


@@ -12,8 +12,8 @@
 //\r
 // **/\r
 \r
 //\r
 // **/\r
 \r

-#string STR_PROPERTIES_MODULE_NAME \r
-#language en-US \r
+#string STR_PROPERTIES_MODULE_NAME\r
+#language en-US\r

 "Watchdog Timer DXE Driver"\r
 \r
 \r
 "Watchdog Timer DXE Driver"\r
 \r
 \r